diff options
250 files changed, 775 insertions, 775 deletions
diff --git a/atlantikdesigner/designer/boardinfo.cpp b/atlantikdesigner/designer/boardinfo.cpp index b7399b0..77b00a8 100644 --- a/atlantikdesigner/designer/boardinfo.cpp +++ b/atlantikdesigner/designer/boardinfo.cpp @@ -15,8 +15,8 @@ #include "boardinfo.h" -BoardInfoDlg::BoardInfoDlg(bool editable, BoardInfo *info, TQWidget *tqparent, const char *_name, bool modal) - : KDialogBase(KDialogBase::Tabbed, i18n("Gameboard Information"), (editable? Ok|Apply|Cancel : Close), (editable? Ok : Close), tqparent, _name, modal) +BoardInfoDlg::BoardInfoDlg(bool editable, BoardInfo *info, TQWidget *parent, const char *_name, bool modal) + : KDialogBase(KDialogBase::Tabbed, i18n("Gameboard Information"), (editable? Ok|Apply|Cancel : Close), (editable? Ok : Close), parent, _name, modal) { if (!info) return; @@ -110,7 +110,7 @@ void BoardInfoDlg::slotOk() /////////////////////////////////// -LotsaEdits::LotsaEdits(bool editable, TQStringList defaults, TQWidget *tqparent, const char *name) : TQWidget(tqparent, name) +LotsaEdits::LotsaEdits(bool editable, TQStringList defaults, TQWidget *parent, const char *name) : TQWidget(parent, name) { list.setAutoDelete(true); this->editable = editable; diff --git a/atlantikdesigner/designer/boardinfo.h b/atlantikdesigner/designer/boardinfo.h index 9faff57..25d6e71 100644 --- a/atlantikdesigner/designer/boardinfo.h +++ b/atlantikdesigner/designer/boardinfo.h @@ -33,7 +33,7 @@ class LotsaEdits : public TQWidget TQ_OBJECT public: - LotsaEdits(bool, TQStringList=TQStringList(), TQWidget *tqparent=0, const char *name=0); + LotsaEdits(bool, TQStringList=TQStringList(), TQWidget *parent=0, const char *name=0); public slots: TQStringList save(); @@ -54,7 +54,7 @@ class BoardInfoDlg : public KDialogBase TQ_OBJECT public: - BoardInfoDlg(bool editable, BoardInfo *, TQWidget *tqparent=0, const char *_name=0, bool = true); + BoardInfoDlg(bool editable, BoardInfo *, TQWidget *parent=0, const char *_name=0, bool = true); protected slots: void slotOk(); diff --git a/atlantikdesigner/designer/designer.cpp b/atlantikdesigner/designer/designer.cpp index 744840c..3f39fb6 100644 --- a/atlantikdesigner/designer/designer.cpp +++ b/atlantikdesigner/designer/designer.cpp @@ -35,8 +35,8 @@ #include "editor.h" #include "designer.h" -AtlanticDesigner::AtlanticDesigner(TQWidget *tqparent, const char *name) - : KMainWindow(tqparent, name) +AtlanticDesigner::AtlanticDesigner(TQWidget *parent, const char *name) + : KMainWindow(parent, name) { firstBoard = true; estates.setAutoDelete(true); diff --git a/atlantikdesigner/designer/designer.h b/atlantikdesigner/designer/designer.h index f8c9674..553a921 100644 --- a/atlantikdesigner/designer/designer.h +++ b/atlantikdesigner/designer/designer.h @@ -28,7 +28,7 @@ class AtlanticDesigner : public KMainWindow TQ_OBJECT public: - AtlanticDesigner(TQWidget *tqparent = 0, const char *name = 0); + AtlanticDesigner(TQWidget *parent = 0, const char *name = 0); ~AtlanticDesigner(); protected: diff --git a/atlantikdesigner/designer/editor.cpp b/atlantikdesigner/designer/editor.cpp index 4cf95ed..81e2135 100644 --- a/atlantikdesigner/designer/editor.cpp +++ b/atlantikdesigner/designer/editor.cpp @@ -144,8 +144,8 @@ void ConfigEstate::setPassMoney(const int passMoney) TQStringList types; -EstateEdit::EstateEdit(ConfigEstateGroupList *newGroups, EstateList *estates, TQValueList<CardStack> *cards, TQWidget *tqparent, const char *name) - : TQWidget(tqparent, name) +EstateEdit::EstateEdit(ConfigEstateGroupList *newGroups, EstateList *estates, TQValueList<CardStack> *cards, TQWidget *parent, const char *name) + : TQWidget(parent, name) { groups = newGroups; @@ -378,8 +378,8 @@ bool EstateEdit::rightArrow()const ///////////////////////////////// -TaxDlg::TaxDlg(TQWidget *tqparent, char *name) - : EstateDlg(tqparent, name) +TaxDlg::TaxDlg(TQWidget *parent, char *name) + : EstateDlg(parent, name) { TQGridLayout *taxBox = new TQGridLayout(this, 2, 2, KDialog::marginHint(), KDialog::spacingHint()); taxBox->addWidget(new TQLabel(i18n("Fixed tax:"), this), 0, 0); @@ -406,8 +406,8 @@ void TaxDlg::update() ///////////////////////////////// -GenericDlg::GenericDlg(TQWidget *tqparent, char *name) - : EstateDlg(tqparent, name) +GenericDlg::GenericDlg(TQWidget *parent, char *name) + : EstateDlg(parent, name) { TQHBoxLayout *tqlayout = new TQHBoxLayout(this, KDialog::spacingHint()); tqlayout->addWidget(new TQLabel(i18n("Background:"), this)); @@ -429,8 +429,8 @@ void GenericDlg::update() ///////////////////////////////// -CardsDlg::CardsDlg(EstateList *newEstates, TQValueList<CardStack> *newCards, TQWidget *tqparent, char *name) - : EstateDlg(tqparent, name) +CardsDlg::CardsDlg(EstateList *newEstates, TQValueList<CardStack> *newCards, TQWidget *parent, char *name) + : EstateDlg(parent, name) { estates = newEstates; stacks = newCards; @@ -515,8 +515,8 @@ void CardsDlg::update() ///////////////////////////////// -ChooseWidget::ChooseWidget(EstateList *estates, int id, Card *card, TQWidget *tqparent, char *name) - : TQWidget (tqparent, name) +ChooseWidget::ChooseWidget(EstateList *estates, int id, Card *card, TQWidget *parent, char *name) + : TQWidget (parent, name) { this->id = id; this->card = card; @@ -640,7 +640,7 @@ Skipped: ///////////////////////////////// -CardView::CardView(EstateList *estates, CardStack *stack, TQWidget *tqparent, char *name) : TQWidget(tqparent, name) +CardView::CardView(EstateList *estates, CardStack *stack, TQWidget *parent, char *name) : TQWidget(parent, name) { card = 0; @@ -812,8 +812,8 @@ void CardView::updateButtonsEnabled() ///////////////////////////////// -StreetDlg::StreetDlg(ConfigEstateGroupList *newGroups, TQWidget *tqparent, char *name) - : EstateDlg(tqparent, name) +StreetDlg::StreetDlg(ConfigEstateGroupList *newGroups, TQWidget *parent, char *name) + : EstateDlg(parent, name) { groups = newGroups; diff --git a/atlantikdesigner/designer/editor.h b/atlantikdesigner/designer/editor.h index 4abc9ce..051df1f 100644 --- a/atlantikdesigner/designer/editor.h +++ b/atlantikdesigner/designer/editor.h @@ -90,7 +90,7 @@ class EstateDlg : public TQWidget TQ_OBJECT public: - EstateDlg(TQWidget *tqparent = 0, char *name = 0) : TQWidget(tqparent, name) { estate = 0; } + EstateDlg(TQWidget *parent = 0, char *name = 0) : TQWidget(parent, name) { estate = 0; } signals: void updateBackground(); @@ -113,7 +113,7 @@ class EstateEdit : public TQWidget TQ_OBJECT public: - EstateEdit(ConfigEstateGroupList *, EstateList *, TQValueList<CardStack> *, TQWidget *tqparent = 0, const char *name = 0); + EstateEdit(ConfigEstateGroupList *, EstateList *, TQValueList<CardStack> *, TQWidget *parent = 0, const char *name = 0); ConfigEstate *theEstate() { return estate; } bool upArrow()const; bool downArrow()const; @@ -169,7 +169,7 @@ class ChooseWidget : public TQWidget TQ_OBJECT public: - ChooseWidget(EstateList *, int id, Card *, TQWidget *tqparent = 0, char *name = 0); + ChooseWidget(EstateList *, int id, Card *, TQWidget *parent = 0, char *name = 0); public slots: void typeChanged(int); @@ -197,7 +197,7 @@ class CardView : public TQWidget TQ_OBJECT public: - CardView(EstateList *, CardStack *, TQWidget *tqparent = 0, char *name = 0); + CardView(EstateList *, CardStack *, TQWidget *parent = 0, char *name = 0); private slots: void selected(int); @@ -232,7 +232,7 @@ class TaxDlg : public EstateDlg TQ_OBJECT public: - TaxDlg(TQWidget *tqparent = 0, char *name = 0); + TaxDlg(TQWidget *parent = 0, char *name = 0); protected: virtual void save(); @@ -249,7 +249,7 @@ class GenericDlg : public EstateDlg TQ_OBJECT public: - GenericDlg(TQWidget *tqparent = 0, char *name = 0); + GenericDlg(TQWidget *parent = 0, char *name = 0); protected: virtual void save(); @@ -265,7 +265,7 @@ class CardsDlg : public EstateDlg TQ_OBJECT public: - CardsDlg(EstateList *, TQValueList<CardStack> *, TQWidget *tqparent = 0, char *name = 0); + CardsDlg(EstateList *, TQValueList<CardStack> *, TQWidget *parent = 0, char *name = 0); protected: virtual void save(); @@ -290,7 +290,7 @@ class StreetDlg : public EstateDlg TQ_OBJECT public: - StreetDlg(ConfigEstateGroupList *, TQWidget *tqparent = 0, char *name = 0); + StreetDlg(ConfigEstateGroupList *, TQWidget *parent = 0, char *name = 0); protected: virtual void save(); diff --git a/atlantikdesigner/designer/group.cpp b/atlantikdesigner/designer/group.cpp index cd804e6..b3da81f 100644 --- a/atlantikdesigner/designer/group.cpp +++ b/atlantikdesigner/designer/group.cpp @@ -19,8 +19,8 @@ #include "group.h" -GroupEditor::GroupEditor(ConfigEstateGroupList *newList, TQWidget *tqparent) - : KDialogBase(KDialogBase::Plain, i18n("Group Editor"), Ok|Apply|Cancel, Ok, tqparent, "Group Editor", false, true), mylist(*newList) +GroupEditor::GroupEditor(ConfigEstateGroupList *newList, TQWidget *parent) + : KDialogBase(KDialogBase::Plain, i18n("Group Editor"), Ok|Apply|Cancel, Ok, parent, "Group Editor", false, true), mylist(*newList) { setWFlags(WDestructiveClose); list = newList; diff --git a/atlantikdesigner/designer/group.h b/atlantikdesigner/designer/group.h index 97b0446..606189b 100644 --- a/atlantikdesigner/designer/group.h +++ b/atlantikdesigner/designer/group.h @@ -56,7 +56,7 @@ class GroupEditor : public KDialogBase TQ_OBJECT public: - GroupEditor(ConfigEstateGroupList *, TQWidget *tqparent=0); + GroupEditor(ConfigEstateGroupList *, TQWidget *parent=0); signals: void changed(); diff --git a/kaddressbook-plugins/xxports/gmx/gmx_xxport.cpp b/kaddressbook-plugins/xxports/gmx/gmx_xxport.cpp index bc69af0..403e9f8 100644 --- a/kaddressbook-plugins/xxports/gmx/gmx_xxport.cpp +++ b/kaddressbook-plugins/xxports/gmx/gmx_xxport.cpp @@ -48,8 +48,8 @@ K_EXPORT_KADDRESSBOOK_XXFILTER_CATALOG( libkaddrbk_gmx_xxport, GMXXXPort, "libka #define GMX_FILESELECTION_STRING "*.gmxa|" + i18n( "GMX addressbook file (*.gmxa)" ) -GMXXXPort::GMXXXPort( KABC::AddressBook *ab, TQWidget *tqparent, const char *name ) - : KAB::XXPort( ab, tqparent, name ) +GMXXXPort::GMXXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name ) + : KAB::XXPort( ab, parent, name ) { createImportAction( i18n( "Import GMX Address Book..." ) ); createExportAction( i18n( "Export GMX Address Book..." ) ); diff --git a/kaddressbook-plugins/xxports/gmx/gmx_xxport.h b/kaddressbook-plugins/xxports/gmx/gmx_xxport.h index dd4661b..6f8a344 100644 --- a/kaddressbook-plugins/xxports/gmx/gmx_xxport.h +++ b/kaddressbook-plugins/xxports/gmx/gmx_xxport.h @@ -33,7 +33,7 @@ class GMXXXPort : public KAB::XXPort TQ_OBJECT public: - GMXXXPort( KABC::AddressBook *ab, TQWidget *tqparent, const char *name = 0 ); + GMXXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 ); TQString identifier() const { return "gmx"; } diff --git a/kaddressbook-plugins/xxports/kworldclock/geo_xxport.cpp b/kaddressbook-plugins/xxports/kworldclock/geo_xxport.cpp index ba75565..51a37ac 100644 --- a/kaddressbook-plugins/xxports/kworldclock/geo_xxport.cpp +++ b/kaddressbook-plugins/xxports/kworldclock/geo_xxport.cpp @@ -40,8 +40,8 @@ class FlagInfo K_EXPORT_KADDRESSBOOK_XXFILTER_CATALOG( libkaddrbk_geo_xxport, GeoXXPort, "libkaddrbk_geo_xxport" ) -GeoXXPort::GeoXXPort( KABC::AddressBook *ab, TQWidget *tqparent, const char *name ) - : KAB::XXPort( ab, tqparent, name ) +GeoXXPort::GeoXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name ) + : KAB::XXPort( ab, parent, name ) { createExportAction( i18n( "Export Geo Data..." ) ); } diff --git a/kaddressbook-plugins/xxports/kworldclock/geo_xxport.h b/kaddressbook-plugins/xxports/kworldclock/geo_xxport.h index d31ce49..57331bd 100644 --- a/kaddressbook-plugins/xxports/kworldclock/geo_xxport.h +++ b/kaddressbook-plugins/xxports/kworldclock/geo_xxport.h @@ -32,7 +32,7 @@ class GeoXXPort : public KAB::XXPort TQ_OBJECT public: - GeoXXPort( KABC::AddressBook *ab, TQWidget *tqparent, const char *name = 0 ); + GeoXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 ); TQString identifier() const { return "geo"; } diff --git a/kate/cppsymbolviewer/plugin_katesymbolviewer.cpp b/kate/cppsymbolviewer/plugin_katesymbolviewer.cpp index 8931bce..fc3bd57 100644 --- a/kate/cppsymbolviewer/plugin_katesymbolviewer.cpp +++ b/kate/cppsymbolviewer/plugin_katesymbolviewer.cpp @@ -241,8 +241,8 @@ void KatePluginSymbolViewerView::goToSymbol(TQListViewItem *it) kv->gotoLineNumber(it->text(1).toInt(NULL, 10)); } -KatePluginSymbolViewer::KatePluginSymbolViewer( TQObject* tqparent, const char* name, const TQStringList& ) - : Kate::Plugin ( (Kate::Application*)tqparent, name ), +KatePluginSymbolViewer::KatePluginSymbolViewer( TQObject* parent, const char* name, const TQStringList& ) + : Kate::Plugin ( (Kate::Application*)parent, name ), pConfig("katecppsymbolviewerpluginrc") { pConfig.setGroup("global"); @@ -307,7 +307,7 @@ void KatePluginSymbolViewer::applyConfig( KatePluginSymbolViewerConfigPage* p ) // BEGIN KatePluginSymbolViewerConfigPage KatePluginSymbolViewerConfigPage::KatePluginSymbolViewerConfigPage( - TQObject* /*tqparent*/ /*= 0L*/, TQWidget *parentWidget /*= 0L*/) + TQObject* /*parent*/ /*= 0L*/, TQWidget *parentWidget /*= 0L*/) : Kate::PluginConfigPage( parentWidget ) { TQVBoxLayout* top = new TQVBoxLayout(this, 0, diff --git a/kate/cppsymbolviewer/plugin_katesymbolviewer.h b/kate/cppsymbolviewer/plugin_katesymbolviewer.h index 9d0779f..1c1e3f8 100644 --- a/kate/cppsymbolviewer/plugin_katesymbolviewer.h +++ b/kate/cppsymbolviewer/plugin_katesymbolviewer.h @@ -94,7 +94,7 @@ class KatePluginSymbolViewerConfigPage : public Kate::PluginConfigPage friend class KatePluginSymbolViewer; public: - KatePluginSymbolViewerConfigPage (TQObject* tqparent = 0L, TQWidget *parentWidget = 0L); + KatePluginSymbolViewerConfigPage (TQObject* parent = 0L, TQWidget *parentWidget = 0L); ~KatePluginSymbolViewerConfigPage (); /** @@ -128,7 +128,7 @@ class KatePluginSymbolViewer : public Kate::Plugin, Kate::PluginViewInterface, K TQ_OBJECT public: - KatePluginSymbolViewer( TQObject* tqparent = 0, const char* name = 0, const TQStringList& = TQStringList() ); + KatePluginSymbolViewer( TQObject* parent = 0, const char* name = 0, const TQStringList& = TQStringList() ); virtual ~KatePluginSymbolViewer(); void addView (Kate::MainWindow *win); diff --git a/kate/filelistloader/katefll_initplugin.cpp b/kate/filelistloader/katefll_initplugin.cpp index 5d70f46..882ff70 100644 --- a/kate/filelistloader/katefll_initplugin.cpp +++ b/kate/filelistloader/katefll_initplugin.cpp @@ -30,8 +30,8 @@ K_EXPORT_COMPONENT_FACTORY( katefll_initplugin, KGenericFactory<InitPluginKateFileListLoader>( "katefll_loader" ) ) -InitPluginKateFileListLoader::InitPluginKateFileListLoader (TQObject * tqparent, const char *name, const TQStringList datalist) - :InitPlugin((Kate::Application*)tqparent,name) +InitPluginKateFileListLoader::InitPluginKateFileListLoader (TQObject * parent, const char *name, const TQStringList datalist) + :InitPlugin((Kate::Application*)parent,name) { } diff --git a/kate/filelistloader/katefll_plugin.cpp b/kate/filelistloader/katefll_plugin.cpp index 0c50e6b..a499ef2 100644 --- a/kate/filelistloader/katefll_plugin.cpp +++ b/kate/filelistloader/katefll_plugin.cpp @@ -42,8 +42,8 @@ class PluginView : public KXMLGUIClient KRecentFilesAction *recentFiles; }; -PluginKateFileListLoader::PluginKateFileListLoader (TQObject * tqparent, const char *name, const TQStringList) - : Plugin((Kate::Application*)tqparent,name), PluginViewInterface(), +PluginKateFileListLoader::PluginKateFileListLoader (TQObject * parent, const char *name, const TQStringList) + : Plugin((Kate::Application*)parent,name), PluginViewInterface(), m_config( new KConfig("katefilelistpluginrc") ) { m_config->setGroup("General"); diff --git a/kate/filetemplates/plugin/filetemplates.cpp b/kate/filetemplates/plugin/filetemplates.cpp index 2bae5f8..2ed6036 100644 --- a/kate/filetemplates/plugin/filetemplates.cpp +++ b/kate/filetemplates/plugin/filetemplates.cpp @@ -98,9 +98,9 @@ KatePluginFactory::~KatePluginFactory() delete s_instance; } -TQObject* KatePluginFactory::createObject( TQObject* tqparent, const char* name, const char*, const TQStringList & ) +TQObject* KatePluginFactory::createObject( TQObject* parent, const char* name, const char*, const TQStringList & ) { - return new KateFileTemplates( tqparent, name ); + return new KateFileTemplates( parent, name ); } KInstance* KatePluginFactory::s_instance = 0L; @@ -125,8 +125,8 @@ class TemplateInfo //END TemplateInfo //BEGIN KateFileTemplates -KateFileTemplates::KateFileTemplates( TQObject* tqparent, const char* name ) - : Kate::Plugin ( (Kate::Application*)tqparent, name ), +KateFileTemplates::KateFileTemplates( TQObject* parent, const char* name ) + : Kate::Plugin ( (Kate::Application*)parent, name ), m_actionCollection( new KActionCollection( this, "template_actions", new KInstance("kate") ) ) { // create actions, so that they are shared. @@ -544,8 +544,8 @@ void KateFileTemplates::slotEditTemplate() //BEGIN KateTemplateInfoWidget // This widget can be used to change the data of a TemplateInfo object -KateTemplateInfoWidget::KateTemplateInfoWidget( TQWidget *tqparent, TemplateInfo *info, KateFileTemplates *kft ) - : TQWidget( tqparent ), +KateTemplateInfoWidget::KateTemplateInfoWidget( TQWidget *parent, TemplateInfo *info, KateFileTemplates *kft ) + : TQWidget( parent ), info( info ), kft( kft ) { @@ -659,8 +659,8 @@ void KateTemplateInfoWidget::slotHlSet( int id ) //BEGIN KateTemplateWizard // A simple wizard to help create a new template :-) -KateTemplateWizard::KateTemplateWizard( TQWidget *tqparent, KateFileTemplates *kft ) - : KWizard( tqparent ), +KateTemplateWizard::KateTemplateWizard( TQWidget *parent, KateFileTemplates *kft ) + : KWizard( parent ), kft( kft ) { // Hide the help button for now @@ -733,7 +733,7 @@ KateTemplateWizard::KateTemplateWizard( TQWidget *tqparent, KateFileTemplates *k map[ "fullname" ] = ""; map[ "email" ] = ""; - KTextEditor::TemplateInterface::expandMacros( map, tqparent ); + KTextEditor::TemplateInterface::expandMacros( map, parent ); TQString sFullname = map["fullname"]; TQString sEmail = map["email"]; TQString _s = sFullname; @@ -1072,8 +1072,8 @@ void KateTemplateWizard::accept() class KateTemplateItem : public KListViewItem { public: - KateTemplateItem( KListViewItem *tqparent, TemplateInfo *templateinfo ) - : KListViewItem( tqparent, templateinfo->tmplate ), templateinfo( templateinfo ) + KateTemplateItem( KListViewItem *parent, TemplateInfo *templateinfo ) + : KListViewItem( parent, templateinfo->tmplate ), templateinfo( templateinfo ) { } TemplateInfo *templateinfo; @@ -1083,7 +1083,7 @@ class KateTemplateItem : public KListViewItem //BEGIN KFTNewStuff class KFTNewStuff : public KNewStuff { public: - KFTNewStuff( const TQString &type, TQWidget *tqparent=0 ) : KNewStuff( type, tqparent ), m_win( tqparent ) {} + KFTNewStuff( const TQString &type, TQWidget *parent=0 ) : KNewStuff( type, parent ), m_win( parent ) {} ~KFTNewStuff() {} bool install( const TQString &/*filename*/ ) { return true; } bool createUploadFile( const TQString &/*filename*/ ) { return false; } @@ -1099,8 +1099,8 @@ class KFTNewStuff : public KNewStuff { //END KTNewStuff //BEGIN KateTemplateManager -KateTemplateManager::KateTemplateManager( KateFileTemplates *kft, TQWidget *tqparent, const char *name ) - : TQWidget( tqparent, name ) +KateTemplateManager::KateTemplateManager( KateFileTemplates *kft, TQWidget *parent, const char *name ) + : TQWidget( parent, name ) , kft( kft ) { TQGridLayout *lo = new TQGridLayout( this, 2, 6 ); diff --git a/kate/filetemplates/plugin/filetemplates.h b/kate/filetemplates/plugin/filetemplates.h index ec3134c..ce8ccff 100644 --- a/kate/filetemplates/plugin/filetemplates.h +++ b/kate/filetemplates/plugin/filetemplates.h @@ -45,7 +45,7 @@ class KatePluginFactory : public KLibFactory KatePluginFactory(); virtual ~KatePluginFactory(); - virtual TQObject* createObject( TQObject* tqparent = 0, const char* pname = 0, const char* name = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList() ); + virtual TQObject* createObject( TQObject* parent = 0, const char* pname = 0, const char* name = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList() ); private: static KInstance* s_instance; @@ -77,7 +77,7 @@ class KateFileTemplates : public Kate::Plugin, public Kate::PluginViewInterface TQ_OBJECT public: - KateFileTemplates( TQObject* tqparent = 0, const char* name = 0 ); + KateFileTemplates( TQObject* parent = 0, const char* name = 0 ); virtual ~KateFileTemplates(); void addView (Kate::MainWindow *win); @@ -161,7 +161,7 @@ class KateTemplateInfoWidget : public TQWidget Q_OBJECT TQ_OBJECT public: - KateTemplateInfoWidget( TQWidget *tqparent=0, TemplateInfo *info=0, KateFileTemplates *kft=0 ); + KateTemplateInfoWidget( TQWidget *parent=0, TemplateInfo *info=0, KateFileTemplates *kft=0 ); ~KateTemplateInfoWidget() {} TemplateInfo *info; @@ -196,7 +196,7 @@ class KateTemplateWizard : public KWizard Q_OBJECT TQ_OBJECT public: - KateTemplateWizard( TQWidget* tqparent, KateFileTemplates *ktf ); + KateTemplateWizard( TQWidget* parent, KateFileTemplates *ktf ); ~KateTemplateWizard() {} public slots: @@ -236,7 +236,7 @@ class KateTemplateManager : public TQWidget Q_OBJECT TQ_OBJECT public: - KateTemplateManager( KateFileTemplates *kft=0, TQWidget *tqparent=0, const char *name=0 ); + KateTemplateManager( KateFileTemplates *kft=0, TQWidget *parent=0, const char *name=0 ); ~KateTemplateManager() {} public slots: diff --git a/kate/helloworld/plugin_katehelloworld.cpp b/kate/helloworld/plugin_katehelloworld.cpp index 216071e..3031f51 100644 --- a/kate/helloworld/plugin_katehelloworld.cpp +++ b/kate/helloworld/plugin_katehelloworld.cpp @@ -16,8 +16,8 @@ class PluginView : public KXMLGUIClient Kate::MainWindow *win; }; -KatePluginHelloWorld::KatePluginHelloWorld( TQObject* tqparent, const char* name, const TQStringList& ) - : Kate::Plugin ( (Kate::Application*)tqparent, name ) +KatePluginHelloWorld::KatePluginHelloWorld( TQObject* parent, const char* name, const TQStringList& ) + : Kate::Plugin ( (Kate::Application*)parent, name ) { } diff --git a/kate/helloworld/plugin_katehelloworld.h b/kate/helloworld/plugin_katehelloworld.h index 7c71b01..8dec264 100644 --- a/kate/helloworld/plugin_katehelloworld.h +++ b/kate/helloworld/plugin_katehelloworld.h @@ -15,7 +15,7 @@ class KatePluginHelloWorld : public Kate::Plugin, Kate::PluginViewInterface TQ_OBJECT public: - KatePluginHelloWorld( TQObject* tqparent = 0, const char* name = 0, const TQStringList& = TQStringList() ); + KatePluginHelloWorld( TQObject* parent = 0, const char* name = 0, const TQStringList& = TQStringList() ); virtual ~KatePluginHelloWorld(); void addView (Kate::MainWindow *win); diff --git a/kate/htmltools/plugin_katehtmltools.cpp b/kate/htmltools/plugin_katehtmltools.cpp index ba7c530..edf2ef1 100644 --- a/kate/htmltools/plugin_katehtmltools.cpp +++ b/kate/htmltools/plugin_katehtmltools.cpp @@ -36,8 +36,8 @@ class PluginView : public KXMLGUIClient Kate::MainWindow *win; }; -PluginKateHtmlTools::PluginKateHtmlTools( TQObject* tqparent, const char* name, const TQStringList& ) - : Kate::Plugin ( (Kate::Application *)tqparent, name ) +PluginKateHtmlTools::PluginKateHtmlTools( TQObject* parent, const char* name, const TQStringList& ) + : Kate::Plugin ( (Kate::Application *)parent, name ) { } diff --git a/kate/htmltools/plugin_katehtmltools.h b/kate/htmltools/plugin_katehtmltools.h index f517b99..321e98b 100644 --- a/kate/htmltools/plugin_katehtmltools.h +++ b/kate/htmltools/plugin_katehtmltools.h @@ -34,7 +34,7 @@ class PluginKateHtmlTools : public Kate::Plugin, Kate::PluginViewInterface TQ_OBJECT public: - PluginKateHtmlTools( TQObject* tqparent = 0, const char* name = 0, const TQStringList& = TQStringList() ); + PluginKateHtmlTools( TQObject* parent = 0, const char* name = 0, const TQStringList& = TQStringList() ); virtual ~PluginKateHtmlTools(); void addView (Kate::MainWindow *win); diff --git a/kate/insertcommand/plugin_kateinsertcommand.cpp b/kate/insertcommand/plugin_kateinsertcommand.cpp index 74f857e..813b36a 100644 --- a/kate/insertcommand/plugin_kateinsertcommand.cpp +++ b/kate/insertcommand/plugin_kateinsertcommand.cpp @@ -57,8 +57,8 @@ class PluginView : public KXMLGUIClient //END //BEGIN PluginKateInsertCommand -PluginKateInsertCommand::PluginKateInsertCommand( TQObject* tqparent, const char* name, const TQStringList& ) - : Kate::Plugin ( (Kate::Application *)tqparent, name ), +PluginKateInsertCommand::PluginKateInsertCommand( TQObject* parent, const char* name, const TQStringList& ) + : Kate::Plugin ( (Kate::Application *)parent, name ), kv ( 0 ), sh ( 0 ) { @@ -277,13 +277,13 @@ void PluginKateInsertCommand::applyConfig( InsertCommandConfigPage *p ) //BEGIN CmdPrompt // This is a simple dialog to retrieve a command and decide if // stdErr should be included in the text inserted. -CmdPrompt::CmdPrompt(TQWidget* tqparent, +CmdPrompt::CmdPrompt(TQWidget* parent, const char* name, const TQStringList& cmdhist, const TQString& dir, const TQString& /*docdir*/, int settings) - : KDialogBase (tqparent, name, true, i18n("Insert Command"), Ok|Cancel, Ok, true) + : KDialogBase (parent, name, true, i18n("Insert Command"), Ok|Cancel, Ok, true) { TQWidget *page = new TQWidget( this ); setMainWidget(page); @@ -345,8 +345,8 @@ void CmdPrompt::slotTextChanged(const TQString &text) //BEGIN WaitDlg implementation // This is a dialog that is displayed while a command is running, // with a cancel button to allow the user to kill the command -WaitDlg::WaitDlg(TQWidget* tqparent, const TQString& text, const TQString& title) - : KDialogBase( tqparent, "wait dialog", true, title, Cancel, Cancel, true ) +WaitDlg::WaitDlg(TQWidget* parent, const TQString& text, const TQString& title) + : KDialogBase( parent, "wait dialog", true, title, Cancel, Cancel, true ) { TQWidget *page = new TQWidget( this ); setMainWidget( page ); @@ -366,7 +366,7 @@ WaitDlg::~WaitDlg() //BEGIN InsertCommandConfigPage // This is the config page for this plugin. -InsertCommandConfigPage::InsertCommandConfigPage(TQObject* /*tqparent*/, +InsertCommandConfigPage::InsertCommandConfigPage(TQObject* /*parent*/, TQWidget *parentWidget) : Kate::PluginConfigPage( parentWidget ) { diff --git a/kate/insertcommand/plugin_kateinsertcommand.h b/kate/insertcommand/plugin_kateinsertcommand.h index 9a33cbe..c5bd551 100644 --- a/kate/insertcommand/plugin_kateinsertcommand.h +++ b/kate/insertcommand/plugin_kateinsertcommand.h @@ -58,7 +58,7 @@ class PluginKateInsertCommand : public Kate::Plugin, TQ_OBJECT public: - PluginKateInsertCommand( TQObject* tqparent = 0, const char* name = 0, const TQStringList& = TQStringList() ); + PluginKateInsertCommand( TQObject* parent = 0, const char* name = 0, const TQStringList& = TQStringList() ); virtual ~PluginKateInsertCommand(); void addView (Kate::MainWindow *win); @@ -106,7 +106,7 @@ class CmdPrompt : public KDialogBase Q_OBJECT TQ_OBJECT public: - CmdPrompt(TQWidget* tqparent=0, + CmdPrompt(TQWidget* parent=0, const char* name=0, const TQStringList& cmdhist=TQStringList(), const TQString& dir=TQString(), @@ -132,7 +132,7 @@ private slots: class WaitDlg : public KDialogBase { public: - WaitDlg(TQWidget* tqparent, + WaitDlg(TQWidget* parent, const TQString& text=TQString(), const TQString& title=i18n("Please Wait")); ~WaitDlg(); @@ -146,7 +146,7 @@ class InsertCommandConfigPage : public Kate::PluginConfigPage friend class PluginKateInsertCommand; public: - InsertCommandConfigPage(TQObject* tqparent = 0L, TQWidget *parentWidget = 0L); + InsertCommandConfigPage(TQObject* parent = 0L, TQWidget *parentWidget = 0L); ~InsertCommandConfigPage() {} /** Reimplemented from Kate::PluginConfigPage diff --git a/kate/kjswrapper/bindings.cpp b/kate/kjswrapper/bindings.cpp index bf6ec28..9f49bcb 100644 --- a/kate/kjswrapper/bindings.cpp +++ b/kate/kjswrapper/bindings.cpp @@ -17,7 +17,7 @@ using namespace Kate::JS; -Bindings::Bindings(TQObject *tqparent): KJSEmbed::Bindings::JSBindingPlugin(tqparent,"KateAppBindings",TQStringList()) { +Bindings::Bindings(TQObject *parent): KJSEmbed::Bindings::JSBindingPlugin(parent,"KateAppBindings",TQStringList()) { } Bindings::~Bindings() { @@ -74,11 +74,11 @@ void DocumentManager::addBindings(KJS::ExecState *exec, KJSEmbed::JSObjectProxy object.put(exec, "closeAllDocument", KJS::Object(new DocumentManager( exec, CloseAllDocuments, proxy,dict ))); } -DocumentManager::DocumentManager( KJS::ExecState *exec, int id, KJSEmbed::JSObjectProxy *tqparent, RefCountedObjectDict *dict ):KJSEmbed::JSProxyImp(exec) { +DocumentManager::DocumentManager( KJS::ExecState *exec, int id, KJSEmbed::JSObjectProxy *parent, RefCountedObjectDict *dict ):KJSEmbed::JSProxyImp(exec) { m_dict=dict; m_dict->incRef(); m_id=id; - m_proxy=tqparent; + m_proxy=parent; } DocumentManager::~DocumentManager() { @@ -231,7 +231,7 @@ KJS::Value Kate::JS::Management::call( KJS::ExecState *exec, KJS::Object &self, } void Kate::JS::Application::addBindings(KJS::ExecState *exec, KJSEmbed::JSObjectProxy *proxy,KJS::Object &object){ - PluginKateKJSWrapper *wrap=static_cast<PluginKateKJSWrapper*>(proxy->part()->tqparent()); + PluginKateKJSWrapper *wrap=static_cast<PluginKateKJSWrapper*>(proxy->part()->parent()); KJS::Object ToolView(new Application( exec, ToolView, proxy ,wrap)); ToolView.put(exec,KJS::Identifier("Left"),KJS::Number(KDockWidget::DockLeft) ,KJS::ReadOnly | KJS::DontDelete); ToolView.put(exec,KJS::Identifier("Top"),KJS::Number(KDockWidget::DockTop) ,KJS::ReadOnly | KJS::DontDelete); @@ -262,10 +262,10 @@ void Kate::JS::Application::addBindings(KJS::ExecState *exec, KJSEmbed::JSObject } -Kate::JS::Application::Application( KJS::ExecState *exec, int id, KJSEmbed::JSObjectProxy *tqparent,PluginKateKJSWrapper *plugin):KJSEmbed::JSProxyImp(exec) { +Kate::JS::Application::Application( KJS::ExecState *exec, int id, KJSEmbed::JSObjectProxy *parent,PluginKateKJSWrapper *plugin):KJSEmbed::JSProxyImp(exec) { kdDebug()<<"Kate::JS::Application::Application"<<endl; m_id=id; - m_proxy=tqparent; + m_proxy=parent; m_plugin=plugin; } @@ -417,7 +417,7 @@ void Kate::JS::MainWindow::addBindings(KJS::ExecState *exec, KJSEmbed::JSObjectP if (!mw) return; kdDebug()<<"Kate::JS::MainWindow::addBindings - 3"<<endl; - PluginKateKJSWrapper *wrap=static_cast<PluginKateKJSWrapper*>(proxy->part()->tqparent()); + PluginKateKJSWrapper *wrap=static_cast<PluginKateKJSWrapper*>(proxy->part()->parent()); if (!wrap) return; kdDebug()<<"Kate::JS::MainWindow::addBindings - 4"<<endl; @@ -427,10 +427,10 @@ void Kate::JS::MainWindow::addBindings(KJS::ExecState *exec, KJSEmbed::JSObjectP -Kate::JS::MainWindow::MainWindow( KJS::ExecState *exec, int id, KJSEmbed::JSObjectProxy *tqparent,PluginKateKJSWrapper *plugin):KJSEmbed::JSProxyImp(exec) { +Kate::JS::MainWindow::MainWindow( KJS::ExecState *exec, int id, KJSEmbed::JSObjectProxy *parent,PluginKateKJSWrapper *plugin):KJSEmbed::JSProxyImp(exec) { kdDebug()<<"Kate::JS::MainWindow::MainWindow"<<endl; m_id=id; - m_proxy=tqparent; + m_proxy=parent; m_plugin=plugin; } diff --git a/kate/kjswrapper/bindings.h b/kate/kjswrapper/bindings.h index 4fc8449..a9859c8 100644 --- a/kate/kjswrapper/bindings.h +++ b/kate/kjswrapper/bindings.h @@ -34,7 +34,7 @@ namespace Kate { class Bindings: public KJSEmbed::Bindings::JSBindingPlugin { public: - Bindings(TQObject *tqparent); + Bindings(TQObject *parent); virtual ~Bindings(); KJS::Object createBinding(KJSEmbed::KJSEmbedPart *jspart, KJS::ExecState *exec, const KJS::List &args) const; void addBindings(KJS::ExecState *exec, KJS::Object &target) const; @@ -57,7 +57,7 @@ namespace Kate { virtual KJS::Value call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args ); static void addBindings(KJS::ExecState *exec, KJSEmbed::JSObjectProxy *proxy,KJS::Object &target); private: - DocumentManager( KJS::ExecState *exec, int id, KJSEmbed::JSObjectProxy *tqparent, RefCountedObjectDict *dict ); + DocumentManager( KJS::ExecState *exec, int id, KJSEmbed::JSObjectProxy *parent, RefCountedObjectDict *dict ); virtual ~DocumentManager(); private: RefCountedObjectDict *m_dict; @@ -98,7 +98,7 @@ namespace Kate { virtual KJS::Value call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args ); static void addBindings(KJS::ExecState *exec, KJSEmbed::JSObjectProxy *proxy,KJS::Object &target); private: - Application( KJS::ExecState *exec, int id, KJSEmbed::JSObjectProxy *tqparent, PluginKateKJSWrapper *plugin ); + Application( KJS::ExecState *exec, int id, KJSEmbed::JSObjectProxy *parent, PluginKateKJSWrapper *plugin ); ~Application(); private: int m_id; @@ -136,7 +136,7 @@ namespace Kate { virtual KJS::Value call( KJS::ExecState *exec, KJS::Object &self, const KJS::List &args ); static void addBindings(KJS::ExecState *exec, KJSEmbed::JSObjectProxy *proxy,KJS::Object &target); private: - MainWindow( KJS::ExecState *exec, int id, KJSEmbed::JSObjectProxy *tqparent, PluginKateKJSWrapper *plugin ); + MainWindow( KJS::ExecState *exec, int id, KJSEmbed::JSObjectProxy *parent, PluginKateKJSWrapper *plugin ); ~MainWindow(); private: int m_id; diff --git a/kate/kjswrapper/plugin_katekjswrapper.cpp b/kate/kjswrapper/plugin_katekjswrapper.cpp index 521024c..926b184 100644 --- a/kate/kjswrapper/plugin_katekjswrapper.cpp +++ b/kate/kjswrapper/plugin_katekjswrapper.cpp @@ -53,8 +53,8 @@ void PluginKateKJSWrapperView::removeFromWindow() { win->guiFactory()->removeClient (this); } -PluginKateKJSWrapper::PluginKateKJSWrapper( TQObject* tqparent, const char* name, const TQStringList& list) - : Kate::Plugin ( (Kate::Application *)tqparent, name ) { +PluginKateKJSWrapper::PluginKateKJSWrapper( TQObject* parent, const char* name, const TQStringList& list) + : Kate::Plugin ( (Kate::Application *)parent, name ) { m_views.setAutoDelete(true); m_scriptname=list[0]; m_kateAppBindings=new Kate::JS::Bindings(this); @@ -370,18 +370,18 @@ void PluginKateKJSWrapper::applyConfig( KateKJSWrapperConfigPage *p ) #endif } -KateKJSWrapperConfigPage::KateKJSWrapperConfigPage(KJS::Object pageConstructor,PluginKateKJSWrapper* tqparent, +KateKJSWrapperConfigPage::KateKJSWrapperConfigPage(KJS::Object pageConstructor,PluginKateKJSWrapper* parent, TQWidget *parentWidget) - : Kate::PluginConfigPage( parentWidget ),m_plugin(tqparent) + : Kate::PluginConfigPage( parentWidget ),m_plugin(parent) { TQVBoxLayout *l=new TQVBoxLayout(this); l->setAutoAdd(true); l->activate(); - KJS::Interpreter *js = tqparent->m_part->interpreter(); + KJS::Interpreter *js = parent->m_part->interpreter(); KJS::ExecState *exec = js->globalExec(); exec->clearException(); KJS::List param; - param.append(tqparent->m_part->factory()->createProxy(exec,this,0)); + param.append(parent->m_part->factory()->createProxy(exec,this,0)); m_pageObject=pageConstructor.construct(exec,param); } diff --git a/kate/kjswrapper/plugin_katekjswrapper.h b/kate/kjswrapper/plugin_katekjswrapper.h index 31300d9..496f783 100644 --- a/kate/kjswrapper/plugin_katekjswrapper.h +++ b/kate/kjswrapper/plugin_katekjswrapper.h @@ -76,7 +76,7 @@ class PluginKateKJSWrapper : public Kate::Plugin, TQ_OBJECT public: - PluginKateKJSWrapper( TQObject* tqparent = 0, const char* name = 0, const TQStringList& = TQStringList() ); + PluginKateKJSWrapper( TQObject* parent = 0, const char* name = 0, const TQStringList& = TQStringList() ); virtual ~PluginKateKJSWrapper(); void addView (Kate::MainWindow *win); @@ -122,7 +122,7 @@ class KateKJSWrapperConfigPage : public Kate::PluginConfigPage friend class PluginKateKJSWrapper; public: - KateKJSWrapperConfigPage(KJS::Object pageConstructor,PluginKateKJSWrapper* tqparent = 0L, TQWidget *parentWidget = 0L); + KateKJSWrapperConfigPage(KJS::Object pageConstructor,PluginKateKJSWrapper* parent = 0L, TQWidget *parentWidget = 0L); ~KateKJSWrapperConfigPage() {}; /** Reimplemented from Kate::PluginConfigPage diff --git a/kate/kpybrowser/kpybrowser.cpp b/kate/kpybrowser/kpybrowser.cpp index e69205f..3ee96e5 100644 --- a/kate/kpybrowser/kpybrowser.cpp +++ b/kate/kpybrowser/kpybrowser.cpp @@ -181,8 +181,8 @@ getOpenNodes (TQValueList < TQString > *open_nodes, PyBrowseNode * node) } -KPyBrowser::KPyBrowser (TQWidget * tqparent, const char *name): -KListView (tqparent, name) +KPyBrowser::KPyBrowser (TQWidget * parent, const char *name): +KListView (parent, name) { addColumn(i18n("Name")); @@ -380,7 +380,7 @@ KPyBrowser::tip (const TQPoint & p, TQRect & r, TQString & str) ///////////////////////////////////////////////////////////////////// // KateFileList::KFLToolTip implementation -KPyBrowser::KPBToolTip::KPBToolTip (TQWidget * tqparent):TQToolTip (tqparent) +KPyBrowser::KPBToolTip::KPBToolTip (TQWidget * parent):TQToolTip (parent) { } diff --git a/kate/kpybrowser/kpybrowser.h b/kate/kpybrowser/kpybrowser.h index ea0c43f..eafe0af 100644 --- a/kate/kpybrowser/kpybrowser.h +++ b/kate/kpybrowser/kpybrowser.h @@ -38,7 +38,7 @@ class KPyBrowser : public KListView TQ_OBJECT public: /** construtor */ - KPyBrowser(TQWidget* tqparent=0, const char *name=0); + KPyBrowser(TQWidget* parent=0, const char *name=0); /** destructor */ ~KPyBrowser(); void parseText(TQString &pytext); @@ -60,7 +60,7 @@ class KPyBrowser : public KListView class KPBToolTip : public TQToolTip { public: - KPBToolTip(TQWidget *tqparent); + KPBToolTip(TQWidget *parent); protected: void maybeTip( const TQPoint & ); }; diff --git a/kate/kpybrowser/pybrowse_part.cpp b/kate/kpybrowser/pybrowse_part.cpp index 1cff538..4cd379c 100644 --- a/kate/kpybrowser/pybrowse_part.cpp +++ b/kate/kpybrowser/pybrowse_part.cpp @@ -130,8 +130,8 @@ void PluginViewPyBrowse::slotShowPyBrowser() //TO DO implement this later so that you can turn the browser off and on } -KatePluginPyBrowse::KatePluginPyBrowse( TQObject* tqparent, const char* name, const TQStringList& ) - : Kate::Plugin ( (Kate::Application *)tqparent, name ) +KatePluginPyBrowse::KatePluginPyBrowse( TQObject* parent, const char* name, const TQStringList& ) + : Kate::Plugin ( (Kate::Application *)parent, name ) { } diff --git a/kate/kpybrowser/pybrowse_part.h b/kate/kpybrowser/pybrowse_part.h index f649170..66c71b1 100644 --- a/kate/kpybrowser/pybrowse_part.h +++ b/kate/kpybrowser/pybrowse_part.h @@ -61,7 +61,7 @@ class KatePluginPyBrowse : public Kate::Plugin, public Kate::PluginViewInterface TQ_OBJECT public: - KatePluginPyBrowse( TQObject* tqparent = 0, const char* name = 0, const TQStringList& = TQStringList() ); + KatePluginPyBrowse( TQObject* parent = 0, const char* name = 0, const TQStringList& = TQStringList() ); ~KatePluginPyBrowse(); void addView(Kate::MainWindow *win); diff --git a/kate/kpybrowser/pybrowsenode.cpp b/kate/kpybrowser/pybrowsenode.cpp index 9310478..fa49d5c 100644 --- a/kate/kpybrowser/pybrowsenode.cpp +++ b/kate/kpybrowser/pybrowsenode.cpp @@ -99,16 +99,16 @@ static const char *py_function_xpm[] = { }; -PyBrowseNode::PyBrowseNode (TQListViewItem * tqparent, const TQString &name, +PyBrowseNode::PyBrowseNode (TQListViewItem * parent, const TQString &name, const TQString &signature, int nodeType): -TQListViewItem (tqparent, signature) +TQListViewItem (parent, signature) { init (name, signature, nodeType); } -PyBrowseNode::PyBrowseNode (TQListView * tqparent, const TQString &name, +PyBrowseNode::PyBrowseNode (TQListView * parent, const TQString &name, const TQString &signature, int nodeType): -TQListViewItem (tqparent, signature) +TQListViewItem (parent, signature) { init (name, signature, nodeType); } diff --git a/kate/kpybrowser/pybrowsenode.h b/kate/kpybrowser/pybrowsenode.h index 8b18fc1..373547c 100644 --- a/kate/kpybrowser/pybrowsenode.h +++ b/kate/kpybrowser/pybrowsenode.h @@ -37,8 +37,8 @@ class PyBrowseNode : public TQListViewItem { public: TQPixmap *pyClassPixmap; - PyBrowseNode(TQListView *tqparent, const TQString &a_name, const TQString &a_signature, int type); - PyBrowseNode(TQListViewItem *tqparent, const TQString &a_name, const TQString &a_signature, int type); + PyBrowseNode(TQListView *parent, const TQString &a_name, const TQString &a_signature, int type); + PyBrowseNode(TQListViewItem *parent, const TQString &a_name, const TQString &a_signature, int type); ~PyBrowseNode(); void init(const TQString &a_name, const TQString &a_signature, int nodeType); diff --git a/kate/make/plugin_katemake.cpp b/kate/make/plugin_katemake.cpp index f61cfe0..bda41f5 100644 --- a/kate/make/plugin_katemake.cpp +++ b/kate/make/plugin_katemake.cpp @@ -62,8 +62,8 @@ K_EXPORT_COMPONENT_FACTORY( katemakeplugin, KGenericFactory<PluginKateMake>( "ka // #define FUNCTIONSETUP kdDebug() << k_funcinfo << endl; #define FUNCTIONSETUP -PluginKateMake::PluginKateMake( TQObject* tqparent, const char* name, const TQStringList& ) - : Kate::Plugin ( (Kate::Application *)tqparent, name ) +PluginKateMake::PluginKateMake( TQObject* parent, const char* name, const TQStringList& ) + : Kate::Plugin ( (Kate::Application *)parent, name ) { FUNCTIONSETUP; } @@ -123,11 +123,11 @@ void PluginKateMake::removeView(Kate::MainWindow *win) class ErrorMessage : public TQListViewItem { public: - ErrorMessage(TQListView *tqparent, + ErrorMessage(TQListView *parent, const TQString &filename, int lineno, const TQString &message) : - TQListViewItem(tqparent, + TQListViewItem(parent, filename, (lineno > 0 ? TQString::number(lineno) : TQString()), message) @@ -136,8 +136,8 @@ public: m_lineno = lineno; m_serial = s_serial++; } - ErrorMessage(TQListView *tqparent,const TQString &message) : - TQListViewItem(tqparent,TQString(),TQString(),TQString()) + ErrorMessage(TQListView *parent,const TQString &message) : + TQListViewItem(parent,TQString(),TQString(),TQString()) { TQString m(message); m.remove('\n'); @@ -149,8 +149,8 @@ public: m_serial = s_serial++; setSelectable(false); } - ErrorMessage(TQListView *tqparent, bool start) : - TQListViewItem(tqparent,TQString()) + ErrorMessage(TQListView *parent, bool start) : + TQListViewItem(parent,TQString()) { m_isError=false; m_lineno=-1; @@ -261,7 +261,7 @@ TQString ErrorMessage::fancyMessage() const class LinePopup : public KPassivePopup { protected: - LinePopup( TQWidget *tqparent=0, const char *name=0, WFlags f=0 ); + LinePopup( TQWidget *parent=0, const char *name=0, WFlags f=0 ); virtual ~LinePopup(); public: @@ -292,12 +292,12 @@ LinePopup::~LinePopup() one=0L; } -/* static */ LinePopup *LinePopup::message(TQWidget *tqparent, +/* static */ LinePopup *LinePopup::message(TQWidget *parent, const TQPoint &p, ErrorMessage *e) { if (one) delete one; - LinePopup *pop = new LinePopup( tqparent ); + LinePopup *pop = new LinePopup( parent ); pop->setAutoDelete( true ); @@ -321,10 +321,10 @@ LinePopup::~LinePopup() } } -PluginKateMakeView::PluginKateMakeView(TQWidget *tqparent, +PluginKateMakeView::PluginKateMakeView(TQWidget *parent, Kate::MainWindow *mainwin, const char* name) : - TQListView(tqparent,name), + TQListView(parent,name), KXMLGUIClient(), win(mainwin), filenameDetector(0L), @@ -674,7 +674,7 @@ bool PluginKateMakeView::slotValidate() class Settings : public KDialogBase { public: - Settings( TQWidget *tqparent, + Settings( TQWidget *parent, const TQString &src, const TQString &bld); KLineEdit *edit_src,*edit_bld; diff --git a/kate/make/plugin_katemake.h b/kate/make/plugin_katemake.h index f39ba88..0d3721d 100644 --- a/kate/make/plugin_katemake.h +++ b/kate/make/plugin_katemake.h @@ -54,7 +54,7 @@ class PluginKateMakeView : public TQListView, public KXMLGUIClient TQ_OBJECT public: - PluginKateMakeView(TQWidget *tqparent, + PluginKateMakeView(TQWidget *parent, Kate::MainWindow *mainwin, const char* name); virtual ~PluginKateMakeView(); @@ -96,7 +96,7 @@ class PluginKateMake : public Kate::Plugin, Kate::PluginViewInterface TQ_OBJECT public: - PluginKateMake( TQObject* tqparent = 0, const char* name = 0, const TQStringList& = TQStringList() ); + PluginKateMake( TQObject* parent = 0, const char* name = 0, const TQStringList& = TQStringList() ); virtual ~PluginKateMake(); void addView (Kate::MainWindow *win); diff --git a/kate/modeline/ModelinePlugin.cpp b/kate/modeline/ModelinePlugin.cpp index 3cf73c4..9184f6a 100644 --- a/kate/modeline/ModelinePlugin.cpp +++ b/kate/modeline/ModelinePlugin.cpp @@ -41,8 +41,8 @@ class PluginView : public KXMLGUIClient K_EXPORT_COMPONENT_FACTORY( katemodelineplugin, KGenericFactory<ModelinePlugin>( "katemodeline" ) ) -ModelinePlugin::ModelinePlugin( TQObject* tqparent, const char* name, const TQStringList &args ) - : Kate::Plugin ( (Kate::Application *) tqparent, name ) +ModelinePlugin::ModelinePlugin( TQObject* parent, const char* name, const TQStringList &args ) + : Kate::Plugin ( (Kate::Application *) parent, name ) { } diff --git a/kate/modeline/ModelinePlugin.h b/kate/modeline/ModelinePlugin.h index c9ff37f..a8cc884 100644 --- a/kate/modeline/ModelinePlugin.h +++ b/kate/modeline/ModelinePlugin.h @@ -26,7 +26,7 @@ class ModelinePlugin : public Kate::Plugin, Kate::PluginViewInterface TQ_OBJECT public: - ModelinePlugin( TQObject* tqparent = 0, const char* name = 0, const TQStringList &args = TQStringList() ); + ModelinePlugin( TQObject* parent = 0, const char* name = 0, const TQStringList &args = TQStringList() ); virtual ~ModelinePlugin(); void addView (Kate::MainWindow *win); diff --git a/kate/openheader/plugin_kateopenheader.cpp b/kate/openheader/plugin_kateopenheader.cpp index eade8e8..61cd592 100644 --- a/kate/openheader/plugin_kateopenheader.cpp +++ b/kate/openheader/plugin_kateopenheader.cpp @@ -36,8 +36,8 @@ class PluginView : public KXMLGUIClient K_EXPORT_COMPONENT_FACTORY( kateopenheaderplugin, KGenericFactory<PluginKateOpenHeader>( "kateopenheader" ) ) -PluginKateOpenHeader::PluginKateOpenHeader( TQObject* tqparent, const char* name, const TQStringList& ) - : Kate::Plugin ( (Kate::Application *)tqparent, name ) +PluginKateOpenHeader::PluginKateOpenHeader( TQObject* parent, const char* name, const TQStringList& ) + : Kate::Plugin ( (Kate::Application *)parent, name ) { } diff --git a/kate/openheader/plugin_kateopenheader.h b/kate/openheader/plugin_kateopenheader.h index 0556735..b40b92a 100644 --- a/kate/openheader/plugin_kateopenheader.h +++ b/kate/openheader/plugin_kateopenheader.h @@ -34,7 +34,7 @@ class PluginKateOpenHeader : public Kate::Plugin, Kate::PluginViewInterface TQ_OBJECT public: - PluginKateOpenHeader( TQObject* tqparent = 0, const char* name = 0, const TQStringList& = TQStringList() ); + PluginKateOpenHeader( TQObject* parent = 0, const char* name = 0, const TQStringList& = TQStringList() ); virtual ~PluginKateOpenHeader(); void addView (Kate::MainWindow *win); diff --git a/kate/snippets/csnippet.cpp b/kate/snippets/csnippet.cpp index c873949..2aebb5d 100644 --- a/kate/snippets/csnippet.cpp +++ b/kate/snippets/csnippet.cpp @@ -9,8 +9,8 @@ ***************************************************************************/ #include "csnippet.h" -CSnippet::CSnippet(TQString sKey, TQString sValue, TQListViewItem *lvi, TQObject *tqparent, const char *name) - : TQObject(tqparent, name), _sKey(sKey), _sValue(sValue), _lvi(lvi) {} +CSnippet::CSnippet(TQString sKey, TQString sValue, TQListViewItem *lvi, TQObject *parent, const char *name) + : TQObject(parent, name), _sKey(sKey), _sValue(sValue), _lvi(lvi) {} CSnippet::~CSnippet() {} diff --git a/kate/snippets/csnippet.h b/kate/snippets/csnippet.h index ae9bef6..cee992c 100644 --- a/kate/snippets/csnippet.h +++ b/kate/snippets/csnippet.h @@ -23,7 +23,7 @@ class CSnippet : public TQObject { Q_OBJECT TQ_OBJECT public: - CSnippet(TQString sKey, TQString sValue, TQListViewItem *lvi, TQObject *tqparent = 0, const char *name = 0); + CSnippet(TQString sKey, TQString sValue, TQListViewItem *lvi, TQObject *parent = 0, const char *name = 0); ~CSnippet(); TQString getKey() { return _sKey; } TQString getValue() { return _sValue; } diff --git a/kate/snippets/cwidgetsnippets.cpp b/kate/snippets/cwidgetsnippets.cpp index 819bcaf..e58c15f 100644 --- a/kate/snippets/cwidgetsnippets.cpp +++ b/kate/snippets/cwidgetsnippets.cpp @@ -9,8 +9,8 @@ ***************************************************************************/ #include "cwidgetsnippets.h" -CWidgetSnippets::CWidgetSnippets( TQWidget* tqparent, const char* name, WFlags fl) - : CWidgetSnippetsBase(tqparent, name, fl) +CWidgetSnippets::CWidgetSnippets( TQWidget* parent, const char* name, WFlags fl) + : CWidgetSnippetsBase(parent, name, fl) { } diff --git a/kate/snippets/cwidgetsnippets.h b/kate/snippets/cwidgetsnippets.h index f3962e1..831f335 100644 --- a/kate/snippets/cwidgetsnippets.h +++ b/kate/snippets/cwidgetsnippets.h @@ -17,7 +17,7 @@ */ class CWidgetSnippets : public CWidgetSnippetsBase { public: - CWidgetSnippets( TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 ); + CWidgetSnippets( TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); ~CWidgetSnippets(); diff --git a/kate/snippets/plugin_katesnippets.cpp b/kate/snippets/plugin_katesnippets.cpp index 018faf8..649b45d 100644 --- a/kate/snippets/plugin_katesnippets.cpp +++ b/kate/snippets/plugin_katesnippets.cpp @@ -95,12 +95,12 @@ KatePluginSnippetsView::~ KatePluginSnippetsView() { /** * ctor KatePluginSnippets - * @param tqparent + * @param parent * @param name * @return */ -KatePluginSnippets::KatePluginSnippets( TQObject* tqparent, const char* name, const TQStringList& ) - : Kate::Plugin ( (Kate::Application*)tqparent, name ) {} +KatePluginSnippets::KatePluginSnippets( TQObject* parent, const char* name, const TQStringList& ) + : Kate::Plugin ( (Kate::Application*)parent, name ) {} /** * dtor KatePluginSnippets diff --git a/kate/snippets/plugin_katesnippets.h b/kate/snippets/plugin_katesnippets.h index 0aca230..25c49a0 100644 --- a/kate/snippets/plugin_katesnippets.h +++ b/kate/snippets/plugin_katesnippets.h @@ -66,7 +66,7 @@ class KatePluginSnippets : public Kate::Plugin, Kate::PluginViewInterface { TQ_OBJECT public: - KatePluginSnippets( TQObject* tqparent = 0, const char* name = 0, const TQStringList& = TQStringList() ); + KatePluginSnippets( TQObject* parent = 0, const char* name = 0, const TQStringList& = TQStringList() ); virtual ~KatePluginSnippets(); void addView (Kate::MainWindow *win); diff --git a/kate/tabbarextension/plugin_katetabbarextension.cpp b/kate/tabbarextension/plugin_katetabbarextension.cpp index ece507f..2fd9378 100644 --- a/kate/tabbarextension/plugin_katetabbarextension.cpp +++ b/kate/tabbarextension/plugin_katetabbarextension.cpp @@ -73,17 +73,17 @@ KatePluginFactory::~KatePluginFactory() } TQObject* KatePluginFactory::createObject( - TQObject* tqparent, const char* name, const char*, const TQStringList & ) + TQObject* parent, const char* name, const char*, const TQStringList & ) { - return new KatePluginTabBarExtension( tqparent, name ); + return new KatePluginTabBarExtension( parent, name ); } KInstance* KatePluginFactory::s_instance = 0L; // BEGIN KatePluginTabBarExtension KatePluginTabBarExtension::KatePluginTabBarExtension( - TQObject* tqparent, const char* name ) - : Kate::Plugin ( (Kate::Application*)tqparent, name ), + TQObject* parent, const char* name ) + : Kate::Plugin ( (Kate::Application*)parent, name ), pConfig(new KConfig("katetabbarextensionpluginrc")) { pConfig->setGroup("global"); @@ -175,8 +175,8 @@ void KatePluginTabBarExtension::applyConfig( KateTabBarExtensionConfigPage* p ) // BEGIN KateTabBarButton KateTabBarButton::KateTabBarButton(Kate::ViewManager* pViewManager, - Kate::Document *pDoc, TQWidget * tqparent, const char * name) - : TQPushButton(tqparent, name), + Kate::Document *pDoc, TQWidget * parent, const char * name) + : TQPushButton(parent, name), modified(false), myDocID(pDoc->documentNumber()), doc(pDoc), @@ -264,8 +264,8 @@ void KateTabBarButton::setOn(bool on) // BEGIN KateTabBarExtension KateTabBarExtension::KateTabBarExtension( Kate::DocumentManager *pDocManager, Kate::MainWindow *win, bool bHorizOrientation, bool bSort, - TQWidget* tqparent, const char* name, WFlags f ) - : TQWidget(tqparent, name, f), + TQWidget* parent, const char* name, WFlags f ) + : TQWidget(parent, name, f), pCurrentTab(0), m_win(win), m_docManager(pDocManager), m_sort(false) { if (bHorizOrientation) { @@ -475,7 +475,7 @@ void KateTabBarExtension::slotViewChanged () // BEGIN KateTabBarExtensionConfigPage KateTabBarExtensionConfigPage::KateTabBarExtensionConfigPage( - TQObject* /*tqparent*/ /*= 0L*/, TQWidget *parentWidget /*= 0L*/) + TQObject* /*parent*/ /*= 0L*/, TQWidget *parentWidget /*= 0L*/) : Kate::PluginConfigPage( parentWidget ) { TQVBoxLayout* top = new TQVBoxLayout(this, 0, diff --git a/kate/tabbarextension/plugin_katetabbarextension.h b/kate/tabbarextension/plugin_katetabbarextension.h index e74a73e..8fcf398 100644 --- a/kate/tabbarextension/plugin_katetabbarextension.h +++ b/kate/tabbarextension/plugin_katetabbarextension.h @@ -67,7 +67,7 @@ class KatePluginFactory : public KLibFactory KatePluginFactory(); virtual ~KatePluginFactory(); - virtual TQObject* createObject( TQObject* tqparent = 0, const char* pname = 0, + virtual TQObject* createObject( TQObject* parent = 0, const char* pname = 0, const char* name = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList() ); private: @@ -88,11 +88,11 @@ class KateTabBarButton: public TQPushButton * constructor * @param pViewManager pointer to kate's the view manager * @param pDoc pointer to the document, that the tab button represents - * @param tqparent tqparent widget + * @param parent parent widget * @param name name of the tab button */ KateTabBarButton(Kate::ViewManager* pViewManager, Kate::Document *pDoc, - TQWidget* tqparent = 0, const char * name = 0); + TQWidget* parent = 0, const char * name = 0); /** * standard destructor (emtpy) @@ -164,13 +164,13 @@ class KateTabBarExtension : public TQWidget * @param win pinter to the main window * @param bHorizOrientation true, if orientation is Qt::Horizontal * @param bSort true, if orientation is Qt::Horizontal - * @param tqparent tqparent widget + * @param parent parent widget * @param name name of widget * @param f widget flags */ KateTabBarExtension( Kate::DocumentManager *pDocManager, Kate::MainWindow *win, bool bHorizOrientation, bool bSort, - TQWidget * tqparent = 0, const char * name = 0, WFlags f = 0 ); + TQWidget * parent = 0, const char * name = 0, WFlags f = 0 ); /** standard destructor */ ~KateTabBarExtension(); @@ -268,7 +268,7 @@ class KateTabBarExtensionConfigPage : public Kate::PluginConfigPage friend class KatePluginTabBarExtension; public: - KateTabBarExtensionConfigPage (TQObject* tqparent = 0L, TQWidget *parentWidget = 0L); + KateTabBarExtensionConfigPage (TQObject* parent = 0L, TQWidget *parentWidget = 0L); ~KateTabBarExtensionConfigPage (); /** @@ -301,7 +301,7 @@ class KatePluginTabBarExtension : public Kate::Plugin, Kate::PluginViewInterface TQ_OBJECT public: - KatePluginTabBarExtension( TQObject* tqparent = 0, const char* name = 0 ); + KatePluginTabBarExtension( TQObject* parent = 0, const char* name = 0 ); virtual ~KatePluginTabBarExtension(); void addView (Kate::MainWindow *win); diff --git a/kate/textfilter/plugin_katetextfilter.cpp b/kate/textfilter/plugin_katetextfilter.cpp index 0b53f45..97d28c2 100644 --- a/kate/textfilter/plugin_katetextfilter.cpp +++ b/kate/textfilter/plugin_katetextfilter.cpp @@ -44,8 +44,8 @@ class PluginView : public KXMLGUIClient Kate::MainWindow *win; }; -PluginKateTextFilter::PluginKateTextFilter( TQObject* tqparent, const char* name, const TQStringList& ) - : Kate::Plugin ( (Kate::Application *)tqparent, name ), +PluginKateTextFilter::PluginKateTextFilter( TQObject* parent, const char* name, const TQStringList& ) + : Kate::Plugin ( (Kate::Application *)parent, name ), Kate::Command(), m_pFilterShellProcess (NULL) { diff --git a/kate/textfilter/plugin_katetextfilter.h b/kate/textfilter/plugin_katetextfilter.h index 772a30d..0f9c973 100644 --- a/kate/textfilter/plugin_katetextfilter.h +++ b/kate/textfilter/plugin_katetextfilter.h @@ -36,7 +36,7 @@ class PluginKateTextFilter : public Kate::Plugin, public Kate::PluginViewInterfa TQ_OBJECT public: - PluginKateTextFilter( TQObject* tqparent = 0, const char* name = 0, const TQStringList& = TQStringList() ); + PluginKateTextFilter( TQObject* parent = 0, const char* name = 0, const TQStringList& = TQStringList() ); virtual ~PluginKateTextFilter(); void addView (Kate::MainWindow *win); diff --git a/kate/xmlcheck/plugin_katexmlcheck.cpp b/kate/xmlcheck/plugin_katexmlcheck.cpp index 1345d46..b1a0ea3 100644 --- a/kate/xmlcheck/plugin_katexmlcheck.cpp +++ b/kate/xmlcheck/plugin_katexmlcheck.cpp @@ -54,8 +54,8 @@ K_EXPORT_COMPONENT_FACTORY( katexmlcheckplugin, KGenericFactory<PluginKateXMLCheck>( "katexmlcheck" ) ) -PluginKateXMLCheck::PluginKateXMLCheck( TQObject* tqparent, const char* name, const TQStringList& ) - : Kate::Plugin ( (Kate::Application *)tqparent, name ) +PluginKateXMLCheck::PluginKateXMLCheck( TQObject* parent, const char* name, const TQStringList& ) + : Kate::Plugin ( (Kate::Application *)parent, name ) { } @@ -94,8 +94,8 @@ void PluginKateXMLCheck::removeView(Kate::MainWindow *win) //--------------------------------- -PluginKateXMLCheckView::PluginKateXMLCheckView(TQWidget *tqparent,Kate::MainWindow *mainwin,const char* name) - :TQListView(tqparent,name),KXMLGUIClient(),win(mainwin) +PluginKateXMLCheckView::PluginKateXMLCheckView(TQWidget *parent,Kate::MainWindow *mainwin,const char* name) + :TQListView(parent,name),KXMLGUIClient(),win(mainwin) { m_tmp_file=0; m_proc=0; diff --git a/kate/xmlcheck/plugin_katexmlcheck.h b/kate/xmlcheck/plugin_katexmlcheck.h index 89c6c59..8e0577a 100644 --- a/kate/xmlcheck/plugin_katexmlcheck.h +++ b/kate/xmlcheck/plugin_katexmlcheck.h @@ -47,7 +47,7 @@ class PluginKateXMLCheckView : public TQListView, public KXMLGUIClient TQ_OBJECT public: - PluginKateXMLCheckView(TQWidget *tqparent,Kate::MainWindow *mainwin,const char* name); + PluginKateXMLCheckView(TQWidget *parent,Kate::MainWindow *mainwin,const char* name); virtual ~PluginKateXMLCheckView(); Kate::MainWindow *win; @@ -76,7 +76,7 @@ class PluginKateXMLCheck : public Kate::Plugin, Kate::PluginViewInterface TQ_OBJECT public: - PluginKateXMLCheck( TQObject* tqparent = 0, const char* name = 0, const TQStringList& = TQStringList() ); + PluginKateXMLCheck( TQObject* parent = 0, const char* name = 0, const TQStringList& = TQStringList() ); virtual ~PluginKateXMLCheck(); void addView (Kate::MainWindow *win); diff --git a/kate/xmltools/plugin_katexmltools.cpp b/kate/xmltools/plugin_katexmltools.cpp index e8936b8..ce53476 100644 --- a/kate/xmltools/plugin_katexmltools.cpp +++ b/kate/xmltools/plugin_katexmltools.cpp @@ -52,7 +52,7 @@ FIXME: TODO: -check for mem leaks --add "Go to opening/tqparent tag"? +-add "Go to opening/parent tag"? -check doctype to get top-level element -can undo behaviour be improved?, e.g. the plugins internal deletions of text don't have to be an extra step @@ -113,8 +113,8 @@ class PluginView : public KXMLGUIClient Kate::MainWindow *win; }; -PluginKateXMLTools::PluginKateXMLTools( TQObject* tqparent, const char* name, const TQStringList& ) - : Kate::Plugin ( (Kate::Application*)tqparent, name ) +PluginKateXMLTools::PluginKateXMLTools( TQObject* parent, const char* name, const TQStringList& ) + : Kate::Plugin ( (Kate::Application*)parent, name ) { //kdDebug() << "PluginKateXMLTools constructor called" << endl; @@ -132,7 +132,7 @@ PluginKateXMLTools::PluginKateXMLTools( TQObject* tqparent, const char* name, co m_dtds.setAutoDelete( true ); - m_documentManager = ((Kate::Application*)tqparent)->documentManager(); + m_documentManager = ((Kate::Application*)parent)->documentManager(); // connect( m_documentManager, TQT_SIGNAL(documentCreated()), // this, TQT_SLOT(slotDocumentCreated()) ); @@ -283,11 +283,11 @@ void PluginKateXMLTools::keyEvent( int, int, const TQString &/*s*/ ) { kdDebug() << "*outside tag -> get elements" << endl; TQString parentElement = getParentElement( *kv, true ); - kdDebug() << "tqparent: " << parentElement << endl; + kdDebug() << "parent: " << parentElement << endl; allowed = m_docDtds[docNumber]->allowedElements(parentElement ); m_mode = elements; } - // TODO: optionally close tqparent tag if not left=="/>" + // TODO: optionally close parent tag if not left=="/>" else if( leftCh == " " || (isQuote(leftCh) && secondLeftCh == "=") ) { // TODO: check secondLeftChar, too?! then you don't need to trigger @@ -603,7 +603,7 @@ void PluginKateXMLTools::slotInsertElement() } /** - * Insert a closing tag for the nearest not-closed tqparent element. + * Insert a closing tag for the nearest not-closed parent element. */ void PluginKateXMLTools::slotCloseElement() { @@ -895,10 +895,10 @@ TQString PluginKateXMLTools::insideAttribute( Kate::View &kv ) } /** - * Find the tqparent element for the current cursor position. That is, + * Find the parent element for the current cursor position. That is, * go left and find the first opening element that's not closed yet, * ignoring empty elements. - * Examples: If cursor is at "X", the correct tqparent element is "p": + * Examples: If cursor is at "X", the correct parent element is "p": * <p> <a x="xyz"> foo <i> test </i> bar </a> X * <p> <a x="xyz"> foo bar </a> X * <p> foo <img/> bar X @@ -1099,8 +1099,8 @@ TQStringList PluginKateXMLTools::sortTQStringList( TQStringList list ) { } //BEGIN InsertElement dialog -InsertElement::InsertElement( TQWidget *tqparent, const char *name ) - :KDialogBase( tqparent, name, true, i18n("Insert XML Element" ), +InsertElement::InsertElement( TQWidget *parent, const char *name ) + :KDialogBase( parent, name, true, i18n("Insert XML Element" ), KDialogBase::Ok|KDialogBase::Cancel) { } diff --git a/kate/xmltools/plugin_katexmltools.h b/kate/xmltools/plugin_katexmltools.h index 892a142..651ba7b 100644 --- a/kate/xmltools/plugin_katexmltools.h +++ b/kate/xmltools/plugin_katexmltools.h @@ -53,7 +53,7 @@ class PluginKateXMLTools : public Kate::Plugin, Kate::PluginViewInterface public: - PluginKateXMLTools( TQObject* tqparent = 0, const char* name = 0, const TQStringList& = TQStringList() ); + PluginKateXMLTools( TQObject* parent = 0, const char* name = 0, const TQStringList& = TQStringList() ); virtual ~PluginKateXMLTools(); void addView ( Kate::MainWindow *win ); void removeView( Kate::MainWindow *win ); @@ -140,7 +140,7 @@ class InsertElement : public KDialogBase TQ_OBJECT public: - InsertElement( TQWidget *tqparent, const char *name ); + InsertElement( TQWidget *parent, const char *name ); ~InsertElement(); TQString showDialog( TQStringList &completions ); private slots: diff --git a/kate/xmltools/pseudo_dtd.cpp b/kate/xmltools/pseudo_dtd.cpp index 51d1fe3..99de846 100644 --- a/kate/xmltools/pseudo_dtd.cpp +++ b/kate/xmltools/pseudo_dtd.cpp @@ -192,7 +192,7 @@ bool PseudoDTD::parseElements( TQDomDocument *doc, TQProgressDialog *progress ) } /** - * Check which elements are allowed inside a tqparent element. This returns + * Check which elements are allowed inside a parent element. This returns * a list of allowed elements, but it doesn't care about order or if only a certain * number of occurences is allowed. */ diff --git a/kate/xmltools/testcases.xml b/kate/xmltools/testcases.xml index 9828751..e66fc60 100644 --- a/kate/xmltools/testcases.xml +++ b/kate/xmltools/testcases.xml @@ -62,7 +62,7 @@ it should be inserted, including the trailing semicolon. <a href="foo"> blah <em>X -- <a> inside <a> is not allowed, but this limitation is not part of the DTD, so the plugin will incorrectly claim that <a> is allowed at "X". <head><title> foobar</title> X -- <title> is only allowed once, but the plugin - only looks for the tqparent element (<head> in this case) and ignores the existing <title>. + only looks for the parent element (<head> in this case) and ignores the existing <title>. <a href="foo" X > -- an attribute may only appear once, but "href" is listed by the plugin although it's used already. <td align = "X"> -- whitespace around '=' is not recognized although it's legal. diff --git a/kfile-plugins/cert/kfile_cert.cpp b/kfile-plugins/cert/kfile_cert.cpp index 3ffd163..8a711ba 100644 --- a/kfile-plugins/cert/kfile_cert.cpp +++ b/kfile-plugins/cert/kfile_cert.cpp @@ -39,8 +39,8 @@ typedef KGenericFactory<CertPlugin> CertFactory; K_EXPORT_COMPONENT_FACTORY(kfile_cert, CertFactory("kfile-cert")) -CertPlugin::CertPlugin(TQObject *tqparent, const char *name, const TQStringList &args) - : KFilePlugin(tqparent, name, args) +CertPlugin::CertPlugin(TQObject *parent, const char *name, const TQStringList &args) + : KFilePlugin(parent, name, args) { //add the mimetype here - example: //KFileMimeTypeInfo* info = addMimeTypeInfo( "text/html" ); diff --git a/kfile-plugins/cert/kfile_cert.h b/kfile-plugins/cert/kfile_cert.h index 2991674..8756d5e 100644 --- a/kfile-plugins/cert/kfile_cert.h +++ b/kfile-plugins/cert/kfile_cert.h @@ -35,7 +35,7 @@ class CertPlugin: public KFilePlugin { private: void appendDNItems(KFileMetaInfoGroup &group, const TQString &DN); public: - CertPlugin(TQObject *tqparent, const char *name, const TQStringList& args); + CertPlugin(TQObject *parent, const char *name, const TQStringList& args); virtual bool readInfo(KFileMetaInfo& info, uint what); }; diff --git a/kfile-plugins/desktop/kfile_desktop.cpp b/kfile-plugins/desktop/kfile_desktop.cpp index 5d2c9cc..5c56d9e 100644 --- a/kfile-plugins/desktop/kfile_desktop.cpp +++ b/kfile-plugins/desktop/kfile_desktop.cpp @@ -30,9 +30,9 @@ typedef KGenericFactory<KDotDesktopPlugin> DotDesktopFactory; K_EXPORT_COMPONENT_FACTORY(kfile_desktop, DotDesktopFactory("kfile_desktop")) -KDotDesktopPlugin::KDotDesktopPlugin(TQObject *tqparent, const char *name, +KDotDesktopPlugin::KDotDesktopPlugin(TQObject *parent, const char *name, const TQStringList &preferredItems) - : KFilePlugin(tqparent, name, preferredItems) + : KFilePlugin(parent, name, preferredItems) { kdDebug(7034) << ".desktop plugin\n"; diff --git a/kfile-plugins/desktop/kfile_desktop.h b/kfile-plugins/desktop/kfile_desktop.h index f4d6b25..3cc6db0 100644 --- a/kfile-plugins/desktop/kfile_desktop.h +++ b/kfile-plugins/desktop/kfile_desktop.h @@ -31,7 +31,7 @@ class KDotDesktopPlugin: public KFilePlugin TQ_OBJECT public: - KDotDesktopPlugin( TQObject *tqparent, const char *name, + KDotDesktopPlugin( TQObject *parent, const char *name, const TQStringList& args ); virtual bool readInfo ( KFileMetaInfo& info, uint what ); diff --git a/kfile-plugins/folder/kfile_folder.cpp b/kfile-plugins/folder/kfile_folder.cpp index 8b08084..fe4ea9a 100644 --- a/kfile-plugins/folder/kfile_folder.cpp +++ b/kfile-plugins/folder/kfile_folder.cpp @@ -30,10 +30,10 @@ typedef KGenericFactory<KFolderPlugin> KFolderFactory; K_EXPORT_COMPONENT_FACTORY(kfile_folder, KFolderFactory( "kfile_folder" )) -KFolderPlugin::KFolderPlugin(TQObject *tqparent, const char *name, +KFolderPlugin::KFolderPlugin(TQObject *parent, const char *name, const TQStringList &args) - : KFilePlugin(tqparent, name, args) + : KFilePlugin(parent, name, args) { KFileMimeTypeInfo* info = addMimeTypeInfo( "inode/directory" ); diff --git a/kfile-plugins/folder/kfile_folder.h b/kfile-plugins/folder/kfile_folder.h index ff3f241..7ad20ad 100644 --- a/kfile-plugins/folder/kfile_folder.h +++ b/kfile-plugins/folder/kfile_folder.h @@ -30,7 +30,7 @@ class KFolderPlugin: public KFilePlugin TQ_OBJECT public: - KFolderPlugin( TQObject *tqparent, const char *name, const TQStringList& args ); + KFolderPlugin( TQObject *parent, const char *name, const TQStringList& args ); virtual bool readInfo( KFileMetaInfo& info, uint what); }; diff --git a/kfile-plugins/html/kfile_html.cpp b/kfile-plugins/html/kfile_html.cpp index 3711e46..7ed2859 100644 --- a/kfile-plugins/html/kfile_html.cpp +++ b/kfile-plugins/html/kfile_html.cpp @@ -34,9 +34,9 @@ typedef KGenericFactory<KHtmlPlugin> HtmlFactory; K_EXPORT_COMPONENT_FACTORY( kfile_html, HtmlFactory( "kfile_html" ) ) -KHtmlPlugin::KHtmlPlugin( TQObject *tqparent, const char *name, +KHtmlPlugin::KHtmlPlugin( TQObject *parent, const char *name, const TQStringList &args ) - : KFilePlugin( tqparent, name, args ) + : KFilePlugin( parent, name, args ) { kdDebug(7034) << "html plugin\n"; diff --git a/kfile-plugins/html/kfile_html.h b/kfile-plugins/html/kfile_html.h index 1f23eae..d226629 100644 --- a/kfile-plugins/html/kfile_html.h +++ b/kfile-plugins/html/kfile_html.h @@ -32,7 +32,7 @@ class KHtmlPlugin: public KFilePlugin TQ_OBJECT public: - KHtmlPlugin( TQObject *tqparent, const char *name, const TQStringList& args ); + KHtmlPlugin( TQObject *parent, const char *name, const TQStringList& args ); virtual bool readInfo( KFileMetaInfo& info, uint what ); }; diff --git a/kfile-plugins/lnk/kfile_lnk.cpp b/kfile-plugins/lnk/kfile_lnk.cpp index 46e8b9d..804181a 100644 --- a/kfile-plugins/lnk/kfile_lnk.cpp +++ b/kfile-plugins/lnk/kfile_lnk.cpp @@ -35,9 +35,9 @@ K_EXPORT_COMPONENT_FACTORY(kfile_lnk, lnkFactory( "kfile_lnk" )) //-------------------------------------------------------------------------------- -lnkPlugin::lnkPlugin(TQObject *tqparent, const char *name, +lnkPlugin::lnkPlugin(TQObject *parent, const char *name, const TQStringList &args) - : KFilePlugin(tqparent, name, args) + : KFilePlugin(parent, name, args) { KFileMimeTypeInfo* info = addMimeTypeInfo( "application/x-win-lnk" ); diff --git a/kfile-plugins/lnk/kfile_lnk.h b/kfile-plugins/lnk/kfile_lnk.h index bc8b832..4ee2eb6 100644 --- a/kfile-plugins/lnk/kfile_lnk.h +++ b/kfile-plugins/lnk/kfile_lnk.h @@ -38,7 +38,7 @@ class lnkPlugin: public KFilePlugin TQ_OBJECT public: - lnkPlugin( TQObject *tqparent, const char *name, const TQStringList& args ); + lnkPlugin( TQObject *parent, const char *name, const TQStringList& args ); virtual bool readInfo( KFileMetaInfo& info, uint what); }; diff --git a/kfile-plugins/mhtml/kfile_mhtml.cpp b/kfile-plugins/mhtml/kfile_mhtml.cpp index 895d969..0a07ea9 100644 --- a/kfile-plugins/mhtml/kfile_mhtml.cpp +++ b/kfile-plugins/mhtml/kfile_mhtml.cpp @@ -34,9 +34,9 @@ typedef KGenericFactory<mhtmlPlugin> mhtmlFactory; K_EXPORT_COMPONENT_FACTORY(kfile_mhtml, mhtmlFactory( "kfile_mhtml" )) -mhtmlPlugin::mhtmlPlugin(TQObject *tqparent, const char *name, +mhtmlPlugin::mhtmlPlugin(TQObject *parent, const char *name, const TQStringList &args) - : KFilePlugin(tqparent, name, args) + : KFilePlugin(parent, name, args) { KFileMimeTypeInfo* info = addMimeTypeInfo( "application/x-mimearchive" ); KFileMimeTypeInfo::GroupInfo* group = 0L; diff --git a/kfile-plugins/mhtml/kfile_mhtml.h b/kfile-plugins/mhtml/kfile_mhtml.h index 217ddf1..199dcfb 100644 --- a/kfile-plugins/mhtml/kfile_mhtml.h +++ b/kfile-plugins/mhtml/kfile_mhtml.h @@ -35,7 +35,7 @@ class mhtmlPlugin: public KFilePlugin TQ_OBJECT public: - mhtmlPlugin( TQObject *tqparent, const char *name, const TQStringList& args ); + mhtmlPlugin( TQObject *parent, const char *name, const TQStringList& args ); virtual bool readInfo( KFileMetaInfo& info, uint what); private: TQString decodeRFC2047Phrase(const TQString &msg, bool removeLessGreater=TRUE); diff --git a/kfile-plugins/txt/kfile_txt.cpp b/kfile-plugins/txt/kfile_txt.cpp index 47f0d64..fbd1c8b 100644 --- a/kfile-plugins/txt/kfile_txt.cpp +++ b/kfile-plugins/txt/kfile_txt.cpp @@ -30,8 +30,8 @@ typedef KGenericFactory<KTxtPlugin> TxtFactory; K_EXPORT_COMPONENT_FACTORY(kfile_txt, TxtFactory("kfile_txt")) -KTxtPlugin::KTxtPlugin(TQObject *tqparent, const char *name, - const TQStringList &args) : KFilePlugin(tqparent, name, args) +KTxtPlugin::KTxtPlugin(TQObject *parent, const char *name, + const TQStringList &args) : KFilePlugin(parent, name, args) { kdDebug(7034) << "Text file meta info plugin\n"; makeMimeTypeInfo( "text/plain" ); diff --git a/kfile-plugins/txt/kfile_txt.h b/kfile-plugins/txt/kfile_txt.h index c765a83..ac07a26 100644 --- a/kfile-plugins/txt/kfile_txt.h +++ b/kfile-plugins/txt/kfile_txt.h @@ -30,7 +30,7 @@ class KTxtPlugin: public KFilePlugin TQ_OBJECT public: - KTxtPlugin(TQObject *tqparent, const char *name, const TQStringList& args); + KTxtPlugin(TQObject *parent, const char *name, const TQStringList& args); virtual bool readInfo(KFileMetaInfo& info, uint what); private: diff --git a/kicker-applets/kbinaryclock/datepicker.cpp b/kicker-applets/kbinaryclock/datepicker.cpp index 7adef9e..8a267fb 100644 --- a/kicker-applets/kbinaryclock/datepicker.cpp +++ b/kicker-applets/kbinaryclock/datepicker.cpp @@ -29,8 +29,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <klocale.h> #include <kwin.h> -DatePicker::DatePicker(TQWidget *tqparent, const TQDate& date) - : TQVBox( tqparent, 0, WType_TopLevel | WDestructiveClose | +DatePicker::DatePicker(TQWidget *parent, const TQDate& date) + : TQVBox( parent, 0, WType_TopLevel | WDestructiveClose | WStyle_Customize | WStyle_StaysOnTop | WStyle_NoBorder ) { setFrameStyle( TQFrame::PopupPanel | TQFrame::Raised ); diff --git a/kicker-applets/kbinaryclock/kbinaryclock.cpp b/kicker-applets/kbinaryclock/kbinaryclock.cpp index 2e46273..2aaec6e 100644 --- a/kicker-applets/kbinaryclock/kbinaryclock.cpp +++ b/kicker-applets/kbinaryclock/kbinaryclock.cpp @@ -41,15 +41,15 @@ extern "C" { - KDE_EXPORT KPanelApplet* init( TQWidget *tqparent, const TQString& configFile ) { + KDE_EXPORT KPanelApplet* init( TQWidget *parent, const TQString& configFile ) { KGlobal::locale()->insertCatalogue( "kbinaryclock"); return new KBinaryClock( configFile, KPanelApplet::Normal, - KPanelApplet::Preferences, tqparent, "kbinaryclock"); + KPanelApplet::Preferences, parent, "kbinaryclock"); } } -KConfigDialogImp::KConfigDialogImp( TQWidget *tqparent, const char *name, KConfigSkeleton *prefs, KDialogBase::DialogType dialogType, KDialogBase::ButtonCode defaultButton, bool modal) : - KConfigDialog(tqparent, name, prefs, dialogType,(KDialogBase::ButtonCode) (KDialogBase::Default | KDialogBase::Ok | KDialogBase::Apply | KDialogBase::Cancel ), defaultButton, modal) +KConfigDialogImp::KConfigDialogImp( TQWidget *parent, const char *name, KConfigSkeleton *prefs, KDialogBase::DialogType dialogType, KDialogBase::ButtonCode defaultButton, bool modal) : + KConfigDialog(parent, name, prefs, dialogType,(KDialogBase::ButtonCode) (KDialogBase::Default | KDialogBase::Ok | KDialogBase::Apply | KDialogBase::Cancel ), defaultButton, modal) { // As a temporary mesure until the kicker applet's app name is set to the // applets name so KDialogBase gets the right info. @@ -61,7 +61,7 @@ KConfigDialogImp::KConfigDialogImp( TQWidget *tqparent, const char *name, KConfi connect(this, TQT_SIGNAL(widgetModified()), settings, TQT_SLOT(updatePreview())); } -SettingsImp::SettingsImp(TQWidget* tqparent, const char* name, WFlags fl): Settings(tqparent, name, fl){ +SettingsImp::SettingsImp(TQWidget* parent, const char* name, WFlags fl): Settings(parent, name, fl){ } /** @@ -116,8 +116,8 @@ void SettingsImp::updatePreview(){ /** * Constructor, create LED's */ -KBinaryClock::KBinaryClock(const TQString& configFile, Type type, int actions, TQWidget *tqparent, const char *name) - : KPanelApplet(configFile, type, actions, tqparent, name), ledWidth(6), +KBinaryClock::KBinaryClock(const TQString& configFile, Type type, int actions, TQWidget *parent, const char *name) + : KPanelApplet(configFile, type, actions, parent, name), ledWidth(6), _calendar(NULL), _disableCalendar(false), prefs( new Prefs(sharedConfig())), m_tooltip(this) { diff --git a/kicker-applets/kbinaryclock/kbinaryclock.h b/kicker-applets/kbinaryclock/kbinaryclock.h index cfa8422..1aae352 100644 --- a/kicker-applets/kbinaryclock/kbinaryclock.h +++ b/kicker-applets/kbinaryclock/kbinaryclock.h @@ -40,7 +40,7 @@ class SettingsImp : public Settings { Q_OBJECT TQ_OBJECT public: - SettingsImp(TQWidget* tqparent=0, + SettingsImp(TQWidget* parent=0, const char* name=0, WFlags fl=0); public slots: @@ -50,7 +50,7 @@ public slots: class KConfigDialogImp : public KConfigDialog { public: - KConfigDialogImp(TQWidget *tqparent, const char *name, + KConfigDialogImp(TQWidget *parent, const char *name, KConfigSkeleton *prefs, KDialogBase::DialogType dialogType = KDialogBase::IconList, KDialogBase::ButtonCode defaultButton = Ok, @@ -74,7 +74,7 @@ class KBinaryClock : public KPanelApplet { Q_OBJECT TQ_OBJECT public: - KBinaryClock(const TQString& configFile, Type t = Normal, int actions = 0, TQWidget *tqparent = 0, const char *name = 0); + KBinaryClock(const TQString& configFile, Type t = Normal, int actions = 0, TQWidget *parent = 0, const char *name = 0); ~KBinaryClock(); virtual int widthForHeight (int height) const; diff --git a/kicker-applets/kolourpicker/kolourpicker.cpp b/kicker-applets/kolourpicker/kolourpicker.cpp index 101bd42..fbce8cf 100644 --- a/kicker-applets/kolourpicker/kolourpicker.cpp +++ b/kicker-applets/kolourpicker/kolourpicker.cpp @@ -48,18 +48,18 @@ $Id$ // Applet initialization function extern "C" { - KDE_EXPORT KPanelApplet* init(TQWidget *tqparent, const TQString& configFile) + KDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile) { KGlobal::locale()->insertCatalogue("kolourpicker"); return new KolourPicker(configFile, KPanelApplet::Normal, KPanelApplet::About, - tqparent, "kolourpicker"); + parent, "kolourpicker"); } } KolourPicker::KolourPicker(const TQString& configFile, Type type, - int actions, TQWidget *tqparent, const char *name) - : KPanelApplet(configFile, type, actions, tqparent, name), + int actions, TQWidget *parent, const char *name) + : KPanelApplet(configFile, type, actions, parent, name), m_picking(0) { KAboutData *about = new KAboutData("kolourpicker", @@ -339,16 +339,16 @@ TQPixmap KolourPicker::colorPixmap(const TQColor &c) const img.setPixel(x, y, tqRgba(128, 128, 128, 255)); } - TQBitmap tqmask(16, 16); - tqmask.fill(TQt::color0); - TQPainter p(&tqmask); + TQBitmap mask(16, 16); + mask.fill(TQt::color0); + TQPainter p(&mask); p.setPen(TQt::NoPen); p.setBrush(TQt::color1); p.drawEllipse(0, 0, 15, 15); p.end(); TQPixmap pm = TQPixmap(img.smoothScale(16, 16)); - pm.setMask(tqmask); + pm.setMask(mask); return pm; } diff --git a/kicker-applets/kolourpicker/kolourpicker.h b/kicker-applets/kolourpicker/kolourpicker.h index c223339..c9870e2 100644 --- a/kicker-applets/kolourpicker/kolourpicker.h +++ b/kicker-applets/kolourpicker/kolourpicker.h @@ -37,7 +37,7 @@ class KolourPicker : public KPanelApplet TQ_OBJECT public: KolourPicker(const TQString& configFile, Type t = Normal, int actions = 0, - TQWidget *tqparent = 0, const char *name = 0); + TQWidget *parent = 0, const char *name = 0); ~KolourPicker(); virtual int heightForWidth(int) const; virtual int widthForHeight(int) const; diff --git a/kicker-applets/kolourpicker/simplebutton.cpp b/kicker-applets/kolourpicker/simplebutton.cpp index 8e6c8ec..f232377 100644 --- a/kicker-applets/kolourpicker/simplebutton.cpp +++ b/kicker-applets/kolourpicker/simplebutton.cpp @@ -32,8 +32,8 @@ #include <kipc.h> #include <kstandarddirs.h> -SimpleButton::SimpleButton(TQWidget *tqparent, const char *name) - : TQButton(tqparent, name), +SimpleButton::SimpleButton(TQWidget *parent, const char *name) + : TQButton(parent, name), m_highlight(false), m_orientation(Qt::Horizontal) { @@ -192,8 +192,8 @@ void SimpleButton::resizeEvent( TQResizeEvent * ) } -SimpleArrowButton::SimpleArrowButton(TQWidget *tqparent, TQt::ArrowType arrow, const char *name) - : SimpleButton(tqparent, name) +SimpleArrowButton::SimpleArrowButton(TQWidget *parent, TQt::ArrowType arrow, const char *name) + : SimpleButton(parent, name) { setBackgroundOrigin(AncestorOrigin); _arrow = arrow; diff --git a/kicker-applets/kolourpicker/simplebutton.h b/kicker-applets/kolourpicker/simplebutton.h index 9b4e231..0cf11e5 100644 --- a/kicker-applets/kolourpicker/simplebutton.h +++ b/kicker-applets/kolourpicker/simplebutton.h @@ -32,7 +32,7 @@ class KDE_EXPORT SimpleButton : public TQButton TQ_OBJECT public: - SimpleButton(TQWidget *tqparent, const char *name = 0); + SimpleButton(TQWidget *parent, const char *name = 0); void setPixmap(const TQPixmap &pix); void setOrientation(Qt::Orientation orientaton); TQSize tqsizeHint() const; @@ -67,7 +67,7 @@ class KDE_EXPORT SimpleArrowButton: public SimpleButton TQ_OBJECT public: - SimpleArrowButton(TQWidget *tqparent = 0, TQt::ArrowType arrow = TQt::UpArrow, const char *name = 0); + SimpleArrowButton(TQWidget *parent = 0, TQt::ArrowType arrow = TQt::UpArrow, const char *name = 0); virtual ~SimpleArrowButton() {}; TQSize tqsizeHint() const; diff --git a/kicker-applets/ktimemon/timemon.cc b/kicker-applets/ktimemon/timemon.cc index c13cfbc..2c78031 100644 --- a/kicker-applets/ktimemon/timemon.cc +++ b/kicker-applets/ktimemon/timemon.cc @@ -35,11 +35,11 @@ extern "C" { - KDE_EXPORT KPanelApplet* init(TQWidget *tqparent, const TQString& configFile) + KDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile) { KGlobal::locale()->insertCatalogue("ktimemon"); KTimeMon *mon = new KTimeMon(configFile, KPanelApplet::Normal, - KPanelApplet::Preferences, tqparent, "ktimemon"); + KPanelApplet::Preferences, parent, "ktimemon"); return mon; } } @@ -185,8 +185,8 @@ void KTimeMon::maybeTip(const TQPoint& p) // Initialise the member variables, read the configuration data base, // set up the widget, and start the timer. KTimeMon::KTimeMon(const TQString& configFile, Type type, int actions, - TQWidget *tqparent, const char *name) - : KPanelApplet(configFile, type, actions, tqparent, name, WRepaintNoErase), TQToolTip(this), + TQWidget *parent, const char *name) + : KPanelApplet(configFile, type, actions, parent, name, WRepaintNoErase), TQToolTip(this), configDialog(0), bgProcess(0), kernelColour("red1"), userColour("blue"), niceColour("yellow"), iowaitColour("darkgreen"), diff --git a/kicker-applets/ktimemon/timemon.h b/kicker-applets/ktimemon/timemon.h index 12fc6ba..7e023c5 100644 --- a/kicker-applets/ktimemon/timemon.h +++ b/kicker-applets/ktimemon/timemon.h @@ -51,7 +51,7 @@ public: enum MouseAction { NOTHING, SWITCH, MENU, COMMAND }; KTimeMon(const TQString& configFile, Type t = Normal, int actions = 0, - TQWidget *tqparent = 0, const char *name = 0); + TQWidget *parent = 0, const char *name = 0); virtual ~KTimeMon(); void writeConfiguration(); // write back the configuration data diff --git a/kicker-applets/math/mathapplet.cpp b/kicker-applets/math/mathapplet.cpp index 8274bb6..772afeb 100644 --- a/kicker-applets/math/mathapplet.cpp +++ b/kicker-applets/math/mathapplet.cpp @@ -49,16 +49,16 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. extern "C" { - KDE_EXPORT KPanelApplet* init(TQWidget *tqparent, const TQString& configFile) + KDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile) { KGlobal::locale()->insertCatalogue("kmathapplet"); - return new MathApplet(configFile, KPanelApplet::Stretch, 0, tqparent, "kmathapplet"); + return new MathApplet(configFile, KPanelApplet::Stretch, 0, parent, "kmathapplet"); } } MathApplet::MathApplet(const TQString& configFile, Type type, int actions, - TQWidget *tqparent, const char *name) - : KPanelApplet(configFile, type, actions, tqparent, name), + TQWidget *parent, const char *name) + : KPanelApplet(configFile, type, actions, parent, name), m_hasFocus(false) { // setBackgroundMode(X11ParentRelative); diff --git a/kicker-applets/math/mathapplet.h b/kicker-applets/math/mathapplet.h index 97e4270..e7e4235 100644 --- a/kicker-applets/math/mathapplet.h +++ b/kicker-applets/math/mathapplet.h @@ -42,7 +42,7 @@ class MathApplet : public KPanelApplet public: MathApplet(const TQString& configFile, Type t = Stretch, int actions = 0, - TQWidget *tqparent = 0, const char *name = 0); + TQWidget *parent = 0, const char *name = 0); virtual ~MathApplet(); int widthForHeight(int height) const; diff --git a/kicker-applets/mediacontrol/mcslider.cpp b/kicker-applets/mediacontrol/mcslider.cpp index b67708c..7224d9c 100644 --- a/kicker-applets/mediacontrol/mcslider.cpp +++ b/kicker-applets/mediacontrol/mcslider.cpp @@ -19,8 +19,8 @@ #include "mcslider.h" -MCSlider::MCSlider( Qt::Orientation orientation, TQWidget *tqparent, const char *name ) - : TQSlider( orientation, tqparent, name ) +MCSlider::MCSlider( Qt::Orientation orientation, TQWidget *parent, const char *name ) + : TQSlider( orientation, parent, name ) { setBackgroundOrigin(WidgetOrigin); setBackground(); diff --git a/kicker-applets/mediacontrol/mcslider.h b/kicker-applets/mediacontrol/mcslider.h index 0c4a784..1d81b82 100644 --- a/kicker-applets/mediacontrol/mcslider.h +++ b/kicker-applets/mediacontrol/mcslider.h @@ -26,7 +26,7 @@ class MCSlider : public TQSlider TQ_OBJECT public: - MCSlider( Qt::Orientation orientation, TQWidget *tqparent, const char *name = 0 ); + MCSlider( Qt::Orientation orientation, TQWidget *parent, const char *name = 0 ); ~MCSlider(); void setBackground(); private: diff --git a/kicker-applets/mediacontrol/mediacontrol.cpp b/kicker-applets/mediacontrol/mediacontrol.cpp index cb94759..a2bf77b 100644 --- a/kicker-applets/mediacontrol/mediacontrol.cpp +++ b/kicker-applets/mediacontrol/mediacontrol.cpp @@ -57,12 +57,12 @@ const int NO_BUTTONS = 4; extern "C" { - KDE_EXPORT KPanelApplet *init( TQWidget *tqparent, const TQString &configFile) + KDE_EXPORT KPanelApplet *init( TQWidget *parent, const TQString &configFile) { KGlobal::locale()->insertCatalogue("mediacontrol"); return new MediaControl(configFile, KPanelApplet::Normal, KPanelApplet::About | KPanelApplet::Preferences | - KPanelApplet::ReportBug, tqparent, "mediacontrol"); + KPanelApplet::ReportBug, parent, "mediacontrol"); } } @@ -91,9 +91,9 @@ class MediaControlToolTip : public TQToolTip // ============================================================================= MediaControl::MediaControl(const TQString &configFile, Type t, int actions, - TQWidget *tqparent, const char *name) + TQWidget *parent, const char *name) : DCOPObject("MediaControl"), - KPanelApplet(configFile, t, actions, tqparent, name), + KPanelApplet(configFile, t, actions, parent, name), mInstance(new KInstance("mediacontrol")), mAboutData(new KAboutData("mediacontrol", I18N_NOOP("MediaControl"), @@ -600,8 +600,8 @@ void MediaControl::resizeEvent( TQResizeEvent* ) // Our Button ======================================================================== -TrayButton::TrayButton(TQWidget* tqparent, const char* name) - : SimpleButton (tqparent, name) +TrayButton::TrayButton(TQWidget* parent, const char* name) + : SimpleButton (parent, name) { setBackgroundMode(PaletteBackground); setBackgroundOrigin(AncestorOrigin); diff --git a/kicker-applets/mediacontrol/mediacontrol.h b/kicker-applets/mediacontrol/mediacontrol.h index 887ebb4..161db39 100644 --- a/kicker-applets/mediacontrol/mediacontrol.h +++ b/kicker-applets/mediacontrol/mediacontrol.h @@ -56,7 +56,7 @@ class TrayButton : public SimpleButton TQ_OBJECT public: - TrayButton(TQWidget* tqparent, const char* name); + TrayButton(TQWidget* parent, const char* name); virtual ~TrayButton() {} void setIconSet(const TQIconSet &iconSet); }; diff --git a/kicker-applets/mediacontrol/mediacontrolconfig.cpp b/kicker-applets/mediacontrol/mediacontrolconfig.cpp index 2636398..6df8886 100644 --- a/kicker-applets/mediacontrol/mediacontrolconfig.cpp +++ b/kicker-applets/mediacontrol/mediacontrolconfig.cpp @@ -42,8 +42,8 @@ #include <knuminput.h> #include <kstandarddirs.h> -MediaControlConfig::MediaControlConfig( ConfigFrontend *cfg, TQWidget *tqparent, const char* name) -: KDialogBase( tqparent, name, false, i18n("MediaControl"), Ok | Apply | Cancel, Ok, false ) +MediaControlConfig::MediaControlConfig( ConfigFrontend *cfg, TQWidget *parent, const char* name) +: KDialogBase( parent, name, false, i18n("MediaControl"), Ok | Apply | Cancel, Ok, false ) { _configFrontend = cfg; if (!_configFrontend) // emergency!!! diff --git a/kicker-applets/mediacontrol/mediacontrolconfig.h b/kicker-applets/mediacontrol/mediacontrolconfig.h index 4d5c388..5ce463a 100644 --- a/kicker-applets/mediacontrol/mediacontrolconfig.h +++ b/kicker-applets/mediacontrol/mediacontrolconfig.h @@ -30,7 +30,7 @@ class MediaControlConfig: public KDialogBase Q_OBJECT TQ_OBJECT public: - MediaControlConfig(ConfigFrontend *cfg, TQWidget *tqparent = 0, const char* name = "MediaControlConfig"); + MediaControlConfig(ConfigFrontend *cfg, TQWidget *parent = 0, const char* name = "MediaControlConfig"); void readSkinDir(const TQString &dir); void load(); diff --git a/kicker-applets/mediacontrol/simplebutton.cpp b/kicker-applets/mediacontrol/simplebutton.cpp index 8e6c8ec..f232377 100644 --- a/kicker-applets/mediacontrol/simplebutton.cpp +++ b/kicker-applets/mediacontrol/simplebutton.cpp @@ -32,8 +32,8 @@ #include <kipc.h> #include <kstandarddirs.h> -SimpleButton::SimpleButton(TQWidget *tqparent, const char *name) - : TQButton(tqparent, name), +SimpleButton::SimpleButton(TQWidget *parent, const char *name) + : TQButton(parent, name), m_highlight(false), m_orientation(Qt::Horizontal) { @@ -192,8 +192,8 @@ void SimpleButton::resizeEvent( TQResizeEvent * ) } -SimpleArrowButton::SimpleArrowButton(TQWidget *tqparent, TQt::ArrowType arrow, const char *name) - : SimpleButton(tqparent, name) +SimpleArrowButton::SimpleArrowButton(TQWidget *parent, TQt::ArrowType arrow, const char *name) + : SimpleButton(parent, name) { setBackgroundOrigin(AncestorOrigin); _arrow = arrow; diff --git a/kicker-applets/mediacontrol/simplebutton.h b/kicker-applets/mediacontrol/simplebutton.h index 9b4e231..0cf11e5 100644 --- a/kicker-applets/mediacontrol/simplebutton.h +++ b/kicker-applets/mediacontrol/simplebutton.h @@ -32,7 +32,7 @@ class KDE_EXPORT SimpleButton : public TQButton TQ_OBJECT public: - SimpleButton(TQWidget *tqparent, const char *name = 0); + SimpleButton(TQWidget *parent, const char *name = 0); void setPixmap(const TQPixmap &pix); void setOrientation(Qt::Orientation orientaton); TQSize tqsizeHint() const; @@ -67,7 +67,7 @@ class KDE_EXPORT SimpleArrowButton: public SimpleButton TQ_OBJECT public: - SimpleArrowButton(TQWidget *tqparent = 0, TQt::ArrowType arrow = TQt::UpArrow, const char *name = 0); + SimpleArrowButton(TQWidget *parent = 0, TQt::ArrowType arrow = TQt::UpArrow, const char *name = 0); virtual ~SimpleArrowButton() {}; TQSize tqsizeHint() const; diff --git a/konq-plugins/adblock/adblock.cpp b/konq-plugins/adblock/adblock.cpp index 74d07cd..57cf2cc 100644 --- a/konq-plugins/adblock/adblock.cpp +++ b/konq-plugins/adblock/adblock.cpp @@ -56,11 +56,11 @@ using namespace DOM; typedef KGenericFactory<AdBlock> AdBlockFactory; K_EXPORT_COMPONENT_FACTORY( libadblock, AdBlockFactory( "adblock" ) ) -AdBlock::AdBlock(TQObject *tqparent, const char *name, const TQStringList &) : - KParts::Plugin(tqparent, name), +AdBlock::AdBlock(TQObject *parent, const char *name, const TQStringList &) : + KParts::Plugin(parent, name), m_label(0), m_menu(0) { - m_part = dynamic_cast<KHTMLPart *>(tqparent); + m_part = dynamic_cast<KHTMLPart *>(parent); if(!m_part) { kdDebug() << "couldn't get KHTMLPart" << endl; return; } m_menu = new KPopupMenu(m_part->widget()); diff --git a/konq-plugins/adblock/adblock.h b/konq-plugins/adblock/adblock.h index 87c1e5d..a0b4775 100644 --- a/konq-plugins/adblock/adblock.h +++ b/konq-plugins/adblock/adblock.h @@ -49,7 +49,7 @@ class AdBlock : public KParts::Plugin TQ_OBJECT public: - AdBlock(TQObject *tqparent, const char *name, const TQStringList &); + AdBlock(TQObject *parent, const char *name, const TQStringList &); ~AdBlock(); private: diff --git a/konq-plugins/adblock/adblockdialogue.cpp b/konq-plugins/adblock/adblockdialogue.cpp index d4e0140..1aff0f6 100644 --- a/konq-plugins/adblock/adblockdialogue.cpp +++ b/konq-plugins/adblock/adblockdialogue.cpp @@ -32,8 +32,8 @@ #include <tqfont.h> #include <tqpainter.h> -AdBlockDlg::AdBlockDlg(TQWidget *tqparent, AdElementList &elements) : - KDialogBase( tqparent, "Adblock dialogue", true, "Adblock - able Items", Ok|Cancel, Ok, true ) +AdBlockDlg::AdBlockDlg(TQWidget *parent, AdElementList &elements) : + KDialogBase( parent, "Adblock dialogue", true, "Adblock - able Items", Ok|Cancel, Ok, true ) { TQVBox *page = makeVBoxMainWidget(); m_label1 = new TQLabel( i18n("All blockable items in this page:"), page, "label1" ); diff --git a/konq-plugins/adblock/adblockdialogue.h b/konq-plugins/adblock/adblockdialogue.h index b0e397f..f62c2ee 100644 --- a/konq-plugins/adblock/adblockdialogue.h +++ b/konq-plugins/adblock/adblockdialogue.h @@ -40,7 +40,7 @@ private: KPopupMenu *m_menu; public: - AdBlockDlg(TQWidget *tqparent, AdElementList &elements); + AdBlockDlg(TQWidget *parent, AdElementList &elements); ~AdBlockDlg(); private slots: diff --git a/konq-plugins/akregator/akregatorplugin.cpp b/konq-plugins/akregator/akregatorplugin.cpp index 684bc20..32891a2 100644 --- a/konq-plugins/akregator/akregatorplugin.cpp +++ b/konq-plugins/akregator/akregatorplugin.cpp @@ -65,8 +65,8 @@ AkregatorMenu::AkregatorMenu( KonqPopupMenu * popupmenu, const char *name, const KHTMLView* view = 0L; - if (popupmenu && popupmenu->tqparent() && popupmenu->tqparent()->inherits("KHTMLView")) - view = static_cast<KHTMLView*>(TQT_TQWIDGET(popupmenu->tqparent())); + if (popupmenu && popupmenu->parent() && popupmenu->parent()->inherits("KHTMLView")) + view = static_cast<KHTMLView*>(TQT_TQWIDGET(popupmenu->parent())); if (view) m_part = view->part(); diff --git a/konq-plugins/akregator/konqfeedicon.cpp b/konq-plugins/akregator/konqfeedicon.cpp index f8cedbd..57bddf3 100644 --- a/konq-plugins/akregator/konqfeedicon.cpp +++ b/konq-plugins/akregator/konqfeedicon.cpp @@ -55,12 +55,12 @@ typedef KGenericFactory<KonqFeedIcon> KonqFeedIconFactory; K_EXPORT_COMPONENT_FACTORY(libakregatorkonqfeedicon, KonqFeedIconFactory("akregatorkonqfeedicon")) -KonqFeedIcon::KonqFeedIcon(TQObject *tqparent, const char *name, const TQStringList &) - : KParts::Plugin(tqparent, name), PluginBase(), m_part(0), m_feedIcon(0), m_statusBarEx(0), m_menu(0) +KonqFeedIcon::KonqFeedIcon(TQObject *parent, const char *name, const TQStringList &) + : KParts::Plugin(parent, name), PluginBase(), m_part(0), m_feedIcon(0), m_statusBarEx(0), m_menu(0) { KGlobal::locale()->insertCatalogue("akregator_konqplugin"); - m_part = dynamic_cast<KHTMLPart*>(tqparent); + m_part = dynamic_cast<KHTMLPart*>(parent); if(!m_part) { kdDebug() << "couldn't get part" << endl; return; } // FIXME: need to do this because of a bug in khtmlpart, it's fixed now for 3.4 (and prolly backported for 3.3.3?) //connect(m_part->view(), TQT_SIGNAL(finishedLayout()), this, TQT_SLOT(addFeedIcon())); diff --git a/konq-plugins/akregator/konqfeedicon.h b/konq-plugins/akregator/konqfeedicon.h index 1dcadcd..8699442 100644 --- a/konq-plugins/akregator/konqfeedicon.h +++ b/konq-plugins/akregator/konqfeedicon.h @@ -48,7 +48,7 @@ class KonqFeedIcon : public KParts::Plugin, PluginBase Q_OBJECT TQ_OBJECT public: - KonqFeedIcon(TQObject *tqparent, const char *name, const TQStringList &); + KonqFeedIcon(TQObject *parent, const char *name, const TQStringList &); ~KonqFeedIcon(); diff --git a/konq-plugins/autorefresh/autorefresh.cpp b/konq-plugins/autorefresh/autorefresh.cpp index bcb40f2..64be883 100644 --- a/konq-plugins/autorefresh/autorefresh.cpp +++ b/konq-plugins/autorefresh/autorefresh.cpp @@ -16,8 +16,8 @@ #include <tqtimer.h> #include <kgenericfactory.h> -AutoRefresh::AutoRefresh( TQObject* tqparent, const char* name, const TQStringList & /*args*/ ) - : Plugin( tqparent, name ) +AutoRefresh::AutoRefresh( TQObject* parent, const char* name, const TQStringList & /*args*/ ) + : Plugin( parent, name ) { timer = new TQTimer( this ); connect( timer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotRefresh() ) ); @@ -85,7 +85,7 @@ void AutoRefresh::slotIntervalChanged() void AutoRefresh::slotRefresh() { - if ( !tqparent()->inherits("KParts::ReadOnlyPart") ) { + if ( !parent()->inherits("KParts::ReadOnlyPart") ) { TQString title = i18n( "Cannot Refresh Source" ); TQString text = i18n( "<qt>This plugin cannot auto-refresh the current part.</qt>" ); @@ -93,7 +93,7 @@ void AutoRefresh::slotRefresh() } else { - KParts::ReadOnlyPart *part = (KParts::ReadOnlyPart *) tqparent(); + KParts::ReadOnlyPart *part = (KParts::ReadOnlyPart *) parent(); // Get URL KURL url = part->url(); diff --git a/konq-plugins/autorefresh/autorefresh.h b/konq-plugins/autorefresh/autorefresh.h index 04bdbdc..c84295d 100644 --- a/konq-plugins/autorefresh/autorefresh.h +++ b/konq-plugins/autorefresh/autorefresh.h @@ -37,7 +37,7 @@ public: /** * Construct a new KParts plugin. */ - AutoRefresh( TQObject* tqparent = 0, const char* name = 0, const TQStringList &args = TQStringList() ); + AutoRefresh( TQObject* parent = 0, const char* name = 0, const TQStringList &args = TQStringList() ); /** * Destructor. diff --git a/konq-plugins/babelfish/plugin_babelfish.cpp b/konq-plugins/babelfish/plugin_babelfish.cpp index bf2e7da..4d1a61b 100644 --- a/konq-plugins/babelfish/plugin_babelfish.cpp +++ b/konq-plugins/babelfish/plugin_babelfish.cpp @@ -34,9 +34,9 @@ typedef KGenericFactory<PluginBabelFish> BabelFishFactory; static const KAboutData aboutdata("babelfish", I18N_NOOP("Translate Web Page") , "1.0" ); K_EXPORT_COMPONENT_FACTORY( libbabelfishplugin, BabelFishFactory( &aboutdata ) ) -PluginBabelFish::PluginBabelFish( TQObject* tqparent, const char* name, +PluginBabelFish::PluginBabelFish( TQObject* parent, const char* name, const TQStringList & ) - : Plugin( tqparent, name ) + : Plugin( parent, name ) { setInstance(BabelFishFactory::instance()); @@ -178,9 +178,9 @@ PluginBabelFish::PluginBabelFish( TQObject* tqparent, const char* name, m_menu->setEnabled( true ); // TODO: we could also support plain text viewers... - if ( tqparent && tqparent->inherits( "KHTMLPart" ) ) + if ( parent && parent->inherits( "KHTMLPart" ) ) { - KParts::ReadOnlyPart* part = static_cast<KParts::ReadOnlyPart *>(tqparent); + KParts::ReadOnlyPart* part = static_cast<KParts::ReadOnlyPart *>(parent); connect( part, TQT_SIGNAL(started(KIO::Job*)), this, TQT_SLOT(slotStarted(KIO::Job*)) ); } @@ -193,9 +193,9 @@ PluginBabelFish::~PluginBabelFish() void PluginBabelFish::slotStarted( KIO::Job* ) { - if ( tqparent()->inherits("KHTMLPart") && + if ( parent()->inherits("KHTMLPart") && // Babelfish wants http URLs only. No https. - static_cast<KParts::ReadOnlyPart *>(tqparent())->url().protocol().lower() == "http" ) + static_cast<KParts::ReadOnlyPart *>(parent())->url().protocol().lower() == "http" ) { m_menu->setEnabled( true ); } @@ -211,8 +211,8 @@ void PluginBabelFish::translateURL() if ( !sender() ) return; - // The tqparent is assumed to be a KHTMLPart - if ( !tqparent()->inherits("KHTMLPart") ) + // The parent is assumed to be a KHTMLPart + if ( !parent()->inherits("KHTMLPart") ) { TQString title = i18n( "Cannot Translate Source" ); TQString text = i18n( "Only web pages can be translated using " @@ -227,7 +227,7 @@ void PluginBabelFish::translateURL() TQString engine = cfg.readEntry( TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name(), "babelfish" ); // Get URL - KHTMLPart *part = dynamic_cast<KHTMLPart *>(tqparent()); + KHTMLPart *part = dynamic_cast<KHTMLPart *>(parent()); if ( !part ) return; diff --git a/konq-plugins/babelfish/plugin_babelfish.h b/konq-plugins/babelfish/plugin_babelfish.h index 98efe04..af7bb01 100644 --- a/konq-plugins/babelfish/plugin_babelfish.h +++ b/konq-plugins/babelfish/plugin_babelfish.h @@ -30,7 +30,7 @@ class PluginBabelFish : public KParts::Plugin Q_OBJECT TQ_OBJECT public: - PluginBabelFish( TQObject* tqparent, const char* name, + PluginBabelFish( TQObject* parent, const char* name, const TQStringList & ); virtual ~PluginBabelFish(); diff --git a/konq-plugins/crashes/crashesplugin.cpp b/konq-plugins/crashes/crashesplugin.cpp index 5e04b1a..57a4caa 100644 --- a/konq-plugins/crashes/crashesplugin.cpp +++ b/konq-plugins/crashes/crashesplugin.cpp @@ -37,10 +37,10 @@ typedef KGenericFactory<CrashesPlugin> CrashesPluginFactory; K_EXPORT_COMPONENT_FACTORY( libcrashesplugin, CrashesPluginFactory( "crashesplugin" ) ) -CrashesPlugin::CrashesPlugin( TQObject* tqparent, const char* name, const TQStringList & ) -: KParts::Plugin( tqparent, name ) +CrashesPlugin::CrashesPlugin( TQObject* parent, const char* name, const TQStringList & ) +: KParts::Plugin( parent, name ) { - m_part = (tqparent && tqparent->inherits( "KHTMLPart" )) ? static_cast<KHTMLPart*>(tqparent) : 0L; + m_part = (parent && parent->inherits( "KHTMLPart" )) ? static_cast<KHTMLPart*>(parent) : 0L; m_pCrashesMenu = new KActionMenu( i18n("&Crashes"), "core", actionCollection(), "crashes" ); diff --git a/konq-plugins/crashes/crashesplugin.h b/konq-plugins/crashes/crashesplugin.h index 0af567e..fa68b97 100644 --- a/konq-plugins/crashes/crashesplugin.h +++ b/konq-plugins/crashes/crashesplugin.h @@ -38,7 +38,7 @@ class CrashesPlugin : public KParts::Plugin TQ_OBJECT public: - CrashesPlugin( TQObject* tqparent, const char* name, + CrashesPlugin( TQObject* parent, const char* name, const TQStringList & ); ~CrashesPlugin(); diff --git a/konq-plugins/dirfilter/dirfilterplugin.cpp b/konq-plugins/dirfilter/dirfilterplugin.cpp index eb06bbc..09a3bfb 100644 --- a/konq-plugins/dirfilter/dirfilterplugin.cpp +++ b/konq-plugins/dirfilter/dirfilterplugin.cpp @@ -141,14 +141,14 @@ void SessionManager::loadSettings() -DirFilterPlugin::DirFilterPlugin (TQObject* tqparent, const char* name, +DirFilterPlugin::DirFilterPlugin (TQObject* parent, const char* name, const TQStringList&) - :KParts::Plugin (tqparent, name), + :KParts::Plugin (parent, name), m_pFilterMenu(0), m_searchWidget(0), m_oldFilterString("") { - m_part = ::tqqt_cast<KonqDirPart*>(tqparent); + m_part = ::tqqt_cast<KonqDirPart*>(parent); if ( !m_part || !m_part->scrollWidget() ) return; diff --git a/konq-plugins/dirfilter/dirfilterplugin.h b/konq-plugins/dirfilter/dirfilterplugin.h index d6e87e6..4e5f32c 100644 --- a/konq-plugins/dirfilter/dirfilterplugin.h +++ b/konq-plugins/dirfilter/dirfilterplugin.h @@ -85,7 +85,7 @@ class DirFilterPlugin : public KParts::Plugin public: - DirFilterPlugin (TQObject* tqparent, const char* name, const TQStringList &); + DirFilterPlugin (TQObject* parent, const char* name, const TQStringList &); ~DirFilterPlugin (); protected: diff --git a/konq-plugins/domtreeviewer/domlistviewitem.cpp b/konq-plugins/domtreeviewer/domlistviewitem.cpp index 4203765..8951451 100644 --- a/konq-plugins/domtreeviewer/domlistviewitem.cpp +++ b/konq-plugins/domtreeviewer/domlistviewitem.cpp @@ -23,26 +23,26 @@ #include <kglobalsettings.h> -DOMListViewItem::DOMListViewItem( const DOM::Node &node, TQListView *tqparent ) - : TQListViewItem( tqparent ), m_node(node) +DOMListViewItem::DOMListViewItem( const DOM::Node &node, TQListView *parent ) + : TQListViewItem( parent ), m_node(node) { init(); } -DOMListViewItem::DOMListViewItem( const DOM::Node &node, TQListView *tqparent, TQListViewItem *after) - : TQListViewItem( tqparent, after ), m_node(node) +DOMListViewItem::DOMListViewItem( const DOM::Node &node, TQListView *parent, TQListViewItem *after) + : TQListViewItem( parent, after ), m_node(node) { init(); } -DOMListViewItem::DOMListViewItem( const DOM::Node &node, TQListViewItem *tqparent ) - : TQListViewItem( tqparent ), m_node(node) +DOMListViewItem::DOMListViewItem( const DOM::Node &node, TQListViewItem *parent ) + : TQListViewItem( parent ), m_node(node) { init(); } -DOMListViewItem::DOMListViewItem( const DOM::Node &node, TQListViewItem *tqparent, TQListViewItem *after) - : TQListViewItem( tqparent, after ), m_node(node) +DOMListViewItem::DOMListViewItem( const DOM::Node &node, TQListViewItem *parent, TQListViewItem *after) + : TQListViewItem( parent, after ), m_node(node) { init(); } diff --git a/konq-plugins/domtreeviewer/domlistviewitem.h b/konq-plugins/domtreeviewer/domlistviewitem.h index 14cf5ec..3ba7378 100644 --- a/konq-plugins/domtreeviewer/domlistviewitem.h +++ b/konq-plugins/domtreeviewer/domlistviewitem.h @@ -26,10 +26,10 @@ class DOMListViewItem : public TQListViewItem { public: - DOMListViewItem( const DOM::Node &, TQListView *tqparent ); - DOMListViewItem( const DOM::Node &, TQListView *tqparent, TQListViewItem *after ); - DOMListViewItem( const DOM::Node &, TQListViewItem *tqparent ); - DOMListViewItem( const DOM::Node &, TQListViewItem *tqparent, TQListViewItem *after ); + DOMListViewItem( const DOM::Node &, TQListView *parent ); + DOMListViewItem( const DOM::Node &, TQListView *parent, TQListViewItem *after ); + DOMListViewItem( const DOM::Node &, TQListViewItem *parent ); + DOMListViewItem( const DOM::Node &, TQListViewItem *parent, TQListViewItem *after ); virtual ~DOMListViewItem(); virtual void paintCell( TQPainter *p, const TQColorGroup &cg, diff --git a/konq-plugins/domtreeviewer/domtreecommands.cpp b/konq-plugins/domtreeviewer/domtreecommands.cpp index 7eef49d..a072409 100644 --- a/konq-plugins/domtreeviewer/domtreecommands.cpp +++ b/konq-plugins/domtreeviewer/domtreecommands.cpp @@ -423,8 +423,8 @@ TQString ChangeCDataCommand::name() const // == ManipulateNodeCommand =========================================== -ManipulateNodeCommand::ManipulateNodeCommand(const DOM::Node &node, const DOM::Node &tqparent, const DOM::Node &after) -: _node(node), _parent(tqparent), _after(after) +ManipulateNodeCommand::ManipulateNodeCommand(const DOM::Node &node, const DOM::Node &parent, const DOM::Node &after) +: _node(node), _parent(parent), _after(after) { } @@ -457,8 +457,8 @@ void ManipulateNodeCommand::remove() // == InsertNodeCommand =========================================== -InsertNodeCommand::InsertNodeCommand(const DOM::Node &node, const DOM::Node &tqparent, const DOM::Node &after) -: ManipulateNodeCommand(node, tqparent, after) +InsertNodeCommand::InsertNodeCommand(const DOM::Node &node, const DOM::Node &parent, const DOM::Node &after) +: ManipulateNodeCommand(node, parent, after) { } @@ -485,8 +485,8 @@ TQString InsertNodeCommand::name() const // == RemoveNodeCommand =========================================== -RemoveNodeCommand::RemoveNodeCommand(const DOM::Node &node, const DOM::Node &tqparent, const DOM::Node &after) -: ManipulateNodeCommand(node, tqparent, after) +RemoveNodeCommand::RemoveNodeCommand(const DOM::Node &node, const DOM::Node &parent, const DOM::Node &after) +: ManipulateNodeCommand(node, parent, after) { } @@ -513,8 +513,8 @@ TQString RemoveNodeCommand::name() const // == MoveNodeCommand =========================================== -MoveNodeCommand::MoveNodeCommand(const DOM::Node &node, const DOM::Node &tqparent, const DOM::Node &after) -: _node(node), new_parent(tqparent), new_after(after) +MoveNodeCommand::MoveNodeCommand(const DOM::Node &node, const DOM::Node &parent, const DOM::Node &after) +: _node(node), new_parent(parent), new_after(after) { old_parent = node.parentNode(); old_after = node.nextSibling(); diff --git a/konq-plugins/domtreeviewer/domtreecommands.h b/konq-plugins/domtreeviewer/domtreecommands.h index 43af96b..6361fd7 100644 --- a/konq-plugins/domtreeviewer/domtreecommands.h +++ b/konq-plugins/domtreeviewer/domtreecommands.h @@ -277,10 +277,10 @@ class ManipulateNodeCommand : public ManipulationCommand { public: /** - * Prepare command, where \c node is to be contained in \c tqparent, just + * Prepare command, where \c node is to be contained in \c parent, just * before \c after. If \c after is 0, it is appended at the end. */ - ManipulateNodeCommand(const DOM::Node &node, const DOM::Node &tqparent, const DOM::Node &after); + ManipulateNodeCommand(const DOM::Node &node, const DOM::Node &parent, const DOM::Node &after); virtual ~ManipulateNodeCommand(); protected: @@ -304,10 +304,10 @@ class InsertNodeCommand : public ManipulateNodeCommand { public: /** - * Prepare insertion command, inserting \c node into \c tqparent, just + * Prepare insertion command, inserting \c node into \c parent, just * before \c after. If \c after is 0, append it to the list of tqchildren. */ - InsertNodeCommand(const DOM::Node &node, const DOM::Node &tqparent, const DOM::Node &after); + InsertNodeCommand(const DOM::Node &node, const DOM::Node &parent, const DOM::Node &after); virtual ~InsertNodeCommand(); virtual TQString name() const; @@ -330,10 +330,10 @@ class RemoveNodeCommand : public ManipulateNodeCommand { public: /** - * Prepare insertion command, inserting \c node into \c tqparent, just + * Prepare insertion command, inserting \c node into \c parent, just * before \c after. If \c after is 0, append it to the list of tqchildren. */ - RemoveNodeCommand(const DOM::Node &node, const DOM::Node &tqparent, const DOM::Node &after); + RemoveNodeCommand(const DOM::Node &node, const DOM::Node &parent, const DOM::Node &after); virtual ~RemoveNodeCommand(); virtual TQString name() const; @@ -353,10 +353,10 @@ class MoveNodeCommand : public ManipulationCommand { public: /** - * Move \c node from current position into \c tqparent, just before \c after. + * Move \c node from current position into \c parent, just before \c after. * Appends if \c after is 0. */ - MoveNodeCommand(const DOM::Node &node, const DOM::Node &tqparent, const DOM::Node &after); + MoveNodeCommand(const DOM::Node &node, const DOM::Node &parent, const DOM::Node &after); virtual ~MoveNodeCommand(); virtual TQString name() const; diff --git a/konq-plugins/domtreeviewer/domtreeview.cpp b/konq-plugins/domtreeviewer/domtreeview.cpp index 84f78ac..615f056 100644 --- a/konq-plugins/domtreeviewer/domtreeview.cpp +++ b/konq-plugins/domtreeviewer/domtreeview.cpp @@ -64,8 +64,8 @@ using namespace domtreeviewer; -DOMTreeView::DOMTreeView(TQWidget *tqparent, const char* name, bool /*allowSaving*/) - : DOMTreeViewBase(tqparent, name), m_expansionDepth(5), m_maxDepth(0), +DOMTreeView::DOMTreeView(TQWidget *parent, const char* name, bool /*allowSaving*/) + : DOMTreeViewBase(parent, name), m_expansionDepth(5), m_maxDepth(0), m_bPure(true), m_bShowAttributes(true), m_bHighlightHTML(true), m_findDialog(0), focused_child(0) { @@ -318,13 +318,13 @@ void DOMTreeView::addElement ( const DOM::Node &node, DOMListViewItem *cur_item m_itemdict.insert(node.handle(), cur_item); } - DOMListViewItem *tqparent; - if (cur_item->tqparent()) { - tqparent = static_cast<DOMListViewItem *>(cur_item->tqparent()); + DOMListViewItem *parent; + if (cur_item->parent()) { + parent = static_cast<DOMListViewItem *>(cur_item->parent()); } else { - tqparent = cur_item; + parent = cur_item; } - cur_item = new DOMListViewItem(node, tqparent, cur_item); + cur_item = new DOMListViewItem(node, parent, cur_item); } // This is one is too much DOMListViewItem *notLastItem = static_cast<DOMListViewItem *>(cur_item->itemAbove()); @@ -469,13 +469,13 @@ void DOMTreeView::slotMovedItems(TQPtrList<TQListViewItem> &items, TQPtrList<TQL for (; it != items.end(); ++it, ++anit) { DOMListViewItem *item = static_cast<DOMListViewItem *>(*it); DOMListViewItem *anitem = static_cast<DOMListViewItem *>(*anit); - DOM::Node tqparent = static_cast<DOMListViewItem *>(item->tqparent())->node(); - Q_ASSERT(!tqparent.isNull()); + DOM::Node parent = static_cast<DOMListViewItem *>(item->parent())->node(); + Q_ASSERT(!parent.isNull()); // kdDebug(90180) << " afternow " << anitem << " node " << (anitem ? anitem->node().nodeName().string() : TQString()) << "=" << (anitem ? anitem->node().nodeValue().string() : TQString()) << endl; - cmd->addCommand(new MoveNodeCommand(item->node(), tqparent, - anitem ? anitem->node().nextSibling() : tqparent.firstChild()) + cmd->addCommand(new MoveNodeCommand(item->node(), parent, + anitem ? anitem->node().nextSibling() : parent.firstChild()) ); } @@ -720,8 +720,8 @@ void DOMTreeView::hideMessageLine() void DOMTreeView::moveToParent() { // This is a hypersmart algorithm. - // If infoNode is defined, go to the tqparent of infoNode, otherwise, go - // to the tqparent of the tree view's current item. + // If infoNode is defined, go to the parent of infoNode, otherwise, go + // to the parent of the tree view's current item. // Hope this isn't too smart. DOM::Node cur = infoNode; @@ -773,15 +773,15 @@ void DOMTreeView::deleteNodes() // don't regard node more than once if (item->node() == last) continue; - // check for selected tqparent + // check for selected parent bool has_selected_parent = false; - for (TQListViewItem *p = item->tqparent(); p; p = p->tqparent()) { + for (TQListViewItem *p = item->parent(); p; p = p->parent()) { if (p->isSelected()) { has_selected_parent = true; break; } } if (has_selected_parent) continue; // kdDebug(90180) << " item->node " << item->node().nodeName().string() << ": schedule for removal" << endl; - // remove this node if it isn't already recursively removed by its tqparent + // remove this node if it isn't already recursively removed by its parent cmd->addCommand(new RemoveNodeCommand(item->node(), item->node().parentNode(), item->node().nextSibling())); last = item->node(); } @@ -885,13 +885,13 @@ void DOMTreeView::slotAddElementDlg() DOM::Node curNode = item->node(); try { - DOM::Node tqparent = addBefore() ? curNode.parentNode() : curNode; + DOM::Node parent = addBefore() ? curNode.parentNode() : curNode; DOM::Node after = addBefore() ? curNode : 0; // ### take namespace into account DOM::Node newNode = curNode.ownerDocument().createElement(qname); - ManipulationCommand *cmd = new InsertNodeCommand(newNode, tqparent, after); + ManipulationCommand *cmd = new InsertNodeCommand(newNode, parent, after); mainWindow()->executeAndAddCommand(cmd); if (cmd->isValid()) activateNode(newNode); @@ -921,12 +921,12 @@ void DOMTreeView::slotAddTextDlg() DOM::Node curNode = item->node(); try { - DOM::Node tqparent = addBefore() ? curNode.parentNode() : curNode; + DOM::Node parent = addBefore() ? curNode.parentNode() : curNode; DOM::Node after = addBefore() ? curNode : 0; DOM::Node newNode = curNode.ownerDocument().createTextNode(text); - ManipulationCommand *cmd = new InsertNodeCommand(newNode, tqparent, after); + ManipulationCommand *cmd = new InsertNodeCommand(newNode, parent, after); mainWindow()->executeAndAddCommand(cmd); if (cmd->isValid()) activateNode(newNode); @@ -950,14 +950,14 @@ class AttributeListItem : public TQListViewItem bool _new; public: - AttributeListItem(TQListView *tqparent, TQListViewItem *prev) - : super(tqparent, prev), _new(true) + AttributeListItem(TQListView *parent, TQListViewItem *prev) + : super(parent, prev), _new(true) { } AttributeListItem(const TQString &attrName, const TQString &attrValue, - TQListView *tqparent, TQListViewItem *prev) - : super(tqparent, prev), _new(false) + TQListView *parent, TQListViewItem *prev) + : super(parent, prev), _new(false) { setText(0, attrName); setText(1, attrValue); diff --git a/konq-plugins/domtreeviewer/domtreeview.h b/konq-plugins/domtreeviewer/domtreeview.h index 499a545..6ff1634 100644 --- a/konq-plugins/domtreeviewer/domtreeview.h +++ b/konq-plugins/domtreeviewer/domtreeview.h @@ -50,7 +50,7 @@ class DOMTreeView : public DOMTreeViewBase TQ_OBJECT public: - DOMTreeView(TQWidget *tqparent, const char* name, bool allowSaving = true); + DOMTreeView(TQWidget *parent, const char* name, bool allowSaving = true); ~DOMTreeView(); KHTMLPart *htmlPart() const { return part; } diff --git a/konq-plugins/domtreeviewer/plugin_domtreeviewer.cpp b/konq-plugins/domtreeviewer/plugin_domtreeviewer.cpp index 2615263..bf3afa7 100644 --- a/konq-plugins/domtreeviewer/plugin_domtreeviewer.cpp +++ b/konq-plugins/domtreeviewer/plugin_domtreeviewer.cpp @@ -15,9 +15,9 @@ typedef KGenericFactory<PluginDomtreeviewer> DomtreeviewerFactory; K_EXPORT_COMPONENT_FACTORY( libdomtreeviewerplugin, DomtreeviewerFactory( "domtreeviewer" ) ) -PluginDomtreeviewer::PluginDomtreeviewer( TQObject* tqparent, const char* name, +PluginDomtreeviewer::PluginDomtreeviewer( TQObject* parent, const char* name, const TQStringList & ) - : Plugin( tqparent, name ), m_dialog( 0 ) + : Plugin( parent, name ), m_dialog( 0 ) { (void) new KAction( i18n("Show &DOM Tree"), "domtreeviewer", 0, @@ -38,7 +38,7 @@ void PluginDomtreeviewer::slotShowDOMTree() delete m_dialog; Q_ASSERT((DOMTreeWindow *)m_dialog == (DOMTreeWindow *)0); } - if (KHTMLPart *part = ::tqqt_cast<KHTMLPart *>(tqparent())) + if (KHTMLPart *part = ::tqqt_cast<KHTMLPart *>(parent())) { m_dialog = new DOMTreeWindow(this); connect( m_dialog, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) ); diff --git a/konq-plugins/domtreeviewer/plugin_domtreeviewer.h b/konq-plugins/domtreeviewer/plugin_domtreeviewer.h index 75ec607..e450555 100644 --- a/konq-plugins/domtreeviewer/plugin_domtreeviewer.h +++ b/konq-plugins/domtreeviewer/plugin_domtreeviewer.h @@ -14,7 +14,7 @@ class PluginDomtreeviewer : public KParts::Plugin Q_OBJECT TQ_OBJECT public: - PluginDomtreeviewer( TQObject* tqparent, const char* name, + PluginDomtreeviewer( TQObject* parent, const char* name, const TQStringList & ); virtual ~PluginDomtreeviewer(); diff --git a/konq-plugins/domtreeviewer/signalreceiver.cpp b/konq-plugins/domtreeviewer/signalreceiver.cpp index fb67abf..a0c0b1b 100644 --- a/konq-plugins/domtreeviewer/signalreceiver.cpp +++ b/konq-plugins/domtreeviewer/signalreceiver.cpp @@ -20,8 +20,8 @@ #include "signalreceiver.h" -SignalReceiver::SignalReceiver(TQObject *tqparent, const char *name) -: TQObject(tqparent, name), rcvd(false) +SignalReceiver::SignalReceiver(TQObject *parent, const char *name) +: TQObject(parent, name), rcvd(false) { } diff --git a/konq-plugins/domtreeviewer/signalreceiver.h b/konq-plugins/domtreeviewer/signalreceiver.h index 9652310..8ff35cd 100644 --- a/konq-plugins/domtreeviewer/signalreceiver.h +++ b/konq-plugins/domtreeviewer/signalreceiver.h @@ -48,7 +48,7 @@ class SignalReceiver : public TQObject TQ_OBJECT public: - SignalReceiver(TQObject *tqparent = 0, const char *name = 0); + SignalReceiver(TQObject *parent = 0, const char *name = 0); virtual ~SignalReceiver(); /** returns true if any signal has been received */ diff --git a/konq-plugins/fsview/fsview.cpp b/konq-plugins/fsview/fsview.cpp index a22e8b2..830bb3d 100644 --- a/konq-plugins/fsview/fsview.cpp +++ b/konq-plugins/fsview/fsview.cpp @@ -43,8 +43,8 @@ TQMap<TQString, MetricEntry> FSView::_dirMetric; -FSView::FSView(Inode* base, TQWidget* tqparent, const char* name) - : TreeMapWidget(base, tqparent, name) +FSView::FSView(Inode* base, TQWidget* parent, const char* name) + : TreeMapWidget(base, parent, name) { setFieldType(0, i18n("Name")); setFieldType(1, i18n("Size")); diff --git a/konq-plugins/fsview/fsview.h b/konq-plugins/fsview/fsview.h index fe1c689..91471c5 100644 --- a/konq-plugins/fsview/fsview.h +++ b/konq-plugins/fsview/fsview.h @@ -63,7 +63,7 @@ class FSView : public TreeMapWidget, public ScanListener public: enum ColorMode { None = 0, Depth, Name, Owner, Group, Mime }; - FSView(Inode*, TQWidget* tqparent=0, const char* name=0); + FSView(Inode*, TQWidget* parent=0, const char* name=0); ~FSView(); KConfig* config() { return _config; } diff --git a/konq-plugins/fsview/fsview_part.cpp b/konq-plugins/fsview/fsview_part.cpp index 0fdfee7..0d5eda7 100644 --- a/konq-plugins/fsview/fsview_part.cpp +++ b/konq-plugins/fsview/fsview_part.cpp @@ -94,9 +94,9 @@ KAboutData* FSViewPart::createAboutData() } FSViewPart::FSViewPart(TQWidget *parentWidget, const char *widgetName, - TQObject *tqparent, const char *name, + TQObject *parent, const char *name, const TQStringList& /* args */) - : KParts::ReadOnlyPart(tqparent, name) + : KParts::ReadOnlyPart(parent, name) { // we need an instance setInstance( FSViewPartFactory::instance() ); @@ -365,9 +365,9 @@ void FSViewBrowserExtension::refresh() while( (i=s.next()) ) commonParent = commonParent->commonParent(i); - /* if commonParent is a file, update tqparent directory */ + /* if commonParent is a file, update parent directory */ if ( !((Inode*)commonParent)->isDir() ) { - commonParent = commonParent->tqparent(); + commonParent = commonParent->parent(); if (!commonParent) return; } diff --git a/konq-plugins/fsview/fsview_part.h b/konq-plugins/fsview/fsview_part.h index 2328e21..5d3545f 100644 --- a/konq-plugins/fsview/fsview_part.h +++ b/konq-plugins/fsview/fsview_part.h @@ -87,7 +87,7 @@ class FSViewPart : public KParts::ReadOnlyPart TQ_PROPERTY( bool supportsUndo READ supportsUndo ) public: FSViewPart(TQWidget *parentWidget, const char *widgetName, - TQObject *tqparent, const char *name, const TQStringList &args); + TQObject *parent, const char *name, const TQStringList &args); virtual ~FSViewPart(); diff --git a/konq-plugins/fsview/inode.cpp b/konq-plugins/fsview/inode.cpp index 849877e..d4875c2 100644 --- a/konq-plugins/fsview/inode.cpp +++ b/konq-plugins/fsview/inode.cpp @@ -40,12 +40,12 @@ Inode::Inode() init(""); } -Inode::Inode(ScanDir* d, Inode* tqparent) - : TreeMapItem(tqparent) +Inode::Inode(ScanDir* d, Inode* parent) + : TreeMapItem(parent) { TQString absPath; - if (tqparent) { - absPath = tqparent->path(); + if (parent) { + absPath = parent->path(); if (!absPath.endsWith("/")) absPath += "/"; } absPath += d->name(); @@ -56,12 +56,12 @@ Inode::Inode(ScanDir* d, Inode* tqparent) init(absPath); } -Inode::Inode(ScanFile* f, Inode* tqparent) - : TreeMapItem(tqparent) +Inode::Inode(ScanFile* f, Inode* parent) + : TreeMapItem(parent) { TQString absPath; - if (tqparent) - absPath = tqparent->path() + "/"; + if (parent) + absPath = parent->path() + "/"; absPath += f->name(); _dirPeer = 0; diff --git a/konq-plugins/fsview/scan.cpp b/konq-plugins/fsview/scan.cpp index c79ff99..1d3d06a 100644 --- a/konq-plugins/fsview/scan.cpp +++ b/konq-plugins/fsview/scan.cpp @@ -80,8 +80,8 @@ void ScanManager::startScan(ScanDir* from) if (scanRunning()) stopScan(); from->clear(); - if (from->tqparent()) - from->tqparent()->setupChildRescan(); + if (from->parent()) + from->parent()->setupChildRescan(); _list.append(new ScanItem(from->path(),from)); } diff --git a/konq-plugins/fsview/scan.h b/konq-plugins/fsview/scan.h index 6d570f7..ca4ce4f 100644 --- a/konq-plugins/fsview/scan.h +++ b/konq-plugins/fsview/scan.h @@ -179,7 +179,7 @@ class ScanDir */ void setupChildRescan(); - /* Absolute path. Warning: Slow, loops to top tqparent. */ + /* Absolute path. Warning: Slow, loops to top parent. */ TQString path(); /* get integer data attribute */ @@ -192,7 +192,7 @@ class ScanDir KIO::fileoffset_t size() { update(); return _size; } unsigned int fileCount() { update(); return _fileCount; } unsigned int dirCount() { update(); return _dirCount; } - ScanDir* tqparent() { return _parent; } + ScanDir* parent() { return _parent; } bool scanStarted() { return (_dirsFinished >= 0); } bool scanFinished() { return (_dirsFinished == (int)_dirs.count()); } bool scanRunning() { return scanStarted() && !scanFinished(); } diff --git a/konq-plugins/fsview/treemap.cpp b/konq-plugins/fsview/treemap.cpp index f77b37f..fc83601 100644 --- a/konq-plugins/fsview/treemap.cpp +++ b/konq-plugins/fsview/treemap.cpp @@ -717,11 +717,11 @@ int TreeMapItemList::compareItems ( Item item1, Item item2 ) bool ascending; int result; - TreeMapItem* tqparent = ((TreeMapItem*)item1)->tqparent(); + TreeMapItem* parent = ((TreeMapItem*)item1)->parent(); // shouldn't happen - if (!tqparent) return 0; + if (!parent) return 0; - int textNo = tqparent->sorting(&ascending); + int textNo = parent->sorting(&ascending); if (textNo < 0) { double diff = ((TreeMapItem*)item1)->value() - @@ -738,22 +738,22 @@ int TreeMapItemList::compareItems ( Item item1, Item item2 ) TreeMapItem* TreeMapItemList::commonParent() { - TreeMapItem* tqparent, *item; - tqparent = first(); - if (tqparent) + TreeMapItem* parent, *item; + parent = first(); + if (parent) while( (item = next()) != 0) - tqparent = tqparent->commonParent(item); + parent = parent->commonParent(item); - return tqparent; + return parent; } // TreeMapItem -TreeMapItem::TreeMapItem(TreeMapItem* tqparent, double value) +TreeMapItem::TreeMapItem(TreeMapItem* parent, double value) { _value = value; - _parent = tqparent; + _parent = parent; _sum = 0; _tqchildren = 0; @@ -764,7 +764,7 @@ TreeMapItem::TreeMapItem(TreeMapItem* tqparent, double value) _freeRects = 0; if (_parent) { - // take sorting from tqparent + // take sorting from parent _sortTextNo = _parent->sorting(&_sortAscending); _parent->addItem(this); } @@ -775,12 +775,12 @@ TreeMapItem::TreeMapItem(TreeMapItem* tqparent, double value) } -TreeMapItem::TreeMapItem(TreeMapItem* tqparent, double value, +TreeMapItem::TreeMapItem(TreeMapItem* parent, double value, TQString text1, TQString text2, TQString text3, TQString text4) { _value = value; - _parent = tqparent; + _parent = parent; // this resizes the text vector only if needed if (!text4.isEmpty()) setText(3, text4); @@ -829,7 +829,7 @@ bool TreeMapItem::isChildOf(TreeMapItem* item) TreeMapItem* TreeMapItem::commonParent(TreeMapItem* item) { while (item && !isChildOf(item)) { - item = item->tqparent(); + item = item->parent(); } return item; } @@ -1103,8 +1103,8 @@ void TreeMapTip::maybeTip( const TQPoint& pos ) // TreeMapWidget TreeMapWidget::TreeMapWidget(TreeMapItem* base, - TQWidget* tqparent, const char* name) - : TQWidget(tqparent, name) + TQWidget* parent, const char* name) + : TQWidget(parent, name) { _base = base; _base->setWidget(this); @@ -1446,9 +1446,9 @@ void TreeMapWidget::deletingItem(TreeMapItem* i) // don't redraw a deleted item if (_needsRefresh == i) { - // we can savely redraw the tqparent, as deleting order is - // from child to tqparent; i.e. i->tqparent() is existing. - _needsRefresh = i->tqparent(); + // we can savely redraw the parent, as deleting order is + // from child to parent; i.e. i->parent() is existing. + _needsRefresh = i->parent(); } } @@ -1468,7 +1468,7 @@ TQString TreeMapWidget::tipString(TreeMapItem* i) const tip += itemTip; } - i = i->tqparent(); + i = i->parent(); } return tip; } @@ -1530,7 +1530,7 @@ TreeMapItem* TreeMapWidget::possibleSelection(TreeMapItem* i) const if (_maxSelectDepth>=0) { int depth = i->depth(); while(i && depth > _maxSelectDepth) { - i = i->tqparent(); + i = i->parent(); depth--; } } @@ -1544,7 +1544,7 @@ TreeMapItem* TreeMapWidget::visibleItem(TreeMapItem* i) const /* Must have a visible area */ while(i && ((i->tqitemRect().width() <1) || (i->tqitemRect().height() <1))) { - TreeMapItem* p = i->tqparent(); + TreeMapItem* p = i->parent(); if (!p) break; int idx = p->tqchildren()->findRef(i); idx--; @@ -1644,13 +1644,13 @@ TreeMapItem* TreeMapWidget::setTmpSelected(TreeMapItem* item, bool selected) } -bool TreeMapWidget::clearSelection(TreeMapItem* tqparent) +bool TreeMapWidget::clearSelection(TreeMapItem* parent) { TreeMapItemList old = _selection; TreeMapItem* i=_selection.first(); while (i) { - if (i->isChildOf(tqparent)) { + if (i->isChildOf(parent)) { _selection.remove(); i = _selection.current(); } @@ -1738,11 +1738,11 @@ TreeMapItem* TreeMapWidget::setTmpRangeSelection(TreeMapItem* i1, TreeMapItem* commonParent = i1; while (commonParent && !i2->isChildOf(commonParent)) { i1 = commonParent; - commonParent = commonParent->tqparent(); + commonParent = commonParent->parent(); } if (!commonParent) return changed; - while (i2 && i2->tqparent() != commonParent) - i2 = i2->tqparent(); + while (i2 && i2->parent() != commonParent) + i2 = i2->parent(); if (!i2) return changed; TreeMapItemList* list = commonParent->tqchildren(); @@ -1935,7 +1935,7 @@ void TreeMapWidget::mouseDoubleClickEvent( TQMouseEvent* e ) /* returns -1 if nothing visible found */ int nextVisible(TreeMapItem* i) { - TreeMapItem* p = i->tqparent(); + TreeMapItem* p = i->parent(); if (!p || p->tqitemRect().isEmpty()) return -1; int idx = p->tqchildren()->findRef(i); @@ -1953,7 +1953,7 @@ int nextVisible(TreeMapItem* i) /* returns -1 if nothing visible found */ int prevVisible(TreeMapItem* i) { - TreeMapItem* p = i->tqparent(); + TreeMapItem* p = i->parent(); if (!p || p->tqitemRect().isEmpty()) return -1; int idx = p->tqchildren()->findRef(i); @@ -2024,7 +2024,7 @@ void TreeMapWidget::keyPressEvent( TQKeyEvent* e ) } TreeMapItem* old = _current, *newItem; - TreeMapItem* p = _current->tqparent(); + TreeMapItem* p = _current->parent(); bool goBack; if (_current->sorting(&goBack) == -1) { @@ -2184,7 +2184,7 @@ void TreeMapWidget::drawItem(TQPainter* p, TreeMapItem* i; if (_markNo>0) { - for(i = item;i;i=i->tqparent()) + for(i = item;i;i=i->parent()) if (i->isMarked(_markNo)) break; isSelected = (i!=0); @@ -2906,7 +2906,7 @@ void TreeMapWidget::selectionActivated(int id) TreeMapItem* i = _menuItem; id -= _selectionID; while (id>0 && i) { - i=i->tqparent(); + i=i->parent(); id--; } if (i) @@ -2928,7 +2928,7 @@ void TreeMapWidget::addSelectionItems(TQPopupMenu* popup, TQString name = i->text(0); if (name.isEmpty()) break; popup->insertItem(i->text(0), id++); - i = i->tqparent(); + i = i->parent(); } } @@ -2939,7 +2939,7 @@ void TreeMapWidget::fieldStopActivated(int id) TreeMapItem* i = _menuItem; id -= _fieldStopID+1; while (id>0 && i) { - i=i->tqparent(); + i=i->parent(); id--; } if (i) @@ -2971,7 +2971,7 @@ void TreeMapWidget::addFieldStopItems(TQPopupMenu* popup, popup->setItemChecked(id, true); foundFieldStop = true; } - i = i->tqparent(); + i = i->parent(); } } diff --git a/konq-plugins/fsview/treemap.h b/konq-plugins/fsview/treemap.h index 8ce6aca..0aa5a9d 100644 --- a/konq-plugins/fsview/treemap.h +++ b/konq-plugins/fsview/treemap.h @@ -237,8 +237,8 @@ public: HAlternate, VAlternate, Horizontal, Vertical }; - TreeMapItem(TreeMapItem* tqparent = 0, double value = 1.0 ); - TreeMapItem(TreeMapItem* tqparent, double value, + TreeMapItem(TreeMapItem* parent = 0, double value = 1.0 ); + TreeMapItem(TreeMapItem* parent, double value, TQString text1, TQString text2 = TQString(), TQString text3 = TQString(), TQString text4 = TQString()); virtual ~TreeMapItem(); @@ -261,9 +261,9 @@ public: bool initialized(); /** - * Adds an item to a tqparent. + * Adds an item to a parent. * When no sorting is used, the item is appended (drawn at bottom). - * This is only needed if the tqparent was not already specified in the + * This is only needed if the parent was not already specified in the * construction of the item. */ void addItem(TreeMapItem*); @@ -282,7 +282,7 @@ public: /** * Parent Item */ - TreeMapItem* tqparent() const { return _parent; } + TreeMapItem* parent() const { return _parent; } /** * Temporary rectangle used for drawing this item the last time. @@ -401,7 +401,7 @@ public: */ enum SelectionMode { Single, Multi, Extended, NoSelection }; - TreeMapWidget(TreeMapItem* base, TQWidget* tqparent=0, const char* name=0); + TreeMapWidget(TreeMapItem* base, TQWidget* parent=0, const char* name=0); ~TreeMapWidget(); /** @@ -428,7 +428,7 @@ public: /** * Returns the item possible for selection. this returns the - * given item itself or a tqparent thereof, + * given item itself or a parent thereof, * depending on setting of maxSelectDepth(). */ TreeMapItem* possibleSelection(TreeMapItem*) const; @@ -453,17 +453,17 @@ public: /** * Clear selection of all selected items which are tqchildren of - * tqparent. When tqparent == 0, clears whole selection + * parent. When parent == 0, clears whole selection * Returns true if selection changed. */ - bool clearSelection(TreeMapItem* tqparent = 0); + bool clearSelection(TreeMapItem* parent = 0); /** * Selects or unselects items in a range. * This is needed internally for Shift-Click in Extented mode. * Range means for a hierarchical widget: * - select/unselect i1 and i2 according selected - * - search common tqparent of i1 and i2, and select/unselect the + * - search common parent of i1 and i2, and select/unselect the * range of direct tqchildren between but excluding the child * leading to i1 and the child leading to i2. */ @@ -520,12 +520,12 @@ public: * If a tqchildren value() is almost the parents sum(), * it can happen that the border to be drawn for visibilty of * nesting relations takes to much space, and the - * tqparent/child size relation can not be mapped to a correct + * parent/child size relation can not be mapped to a correct * area size relation. * * Either * (1) Ignore the incorrect drawing, or - * (2) Skip drawing of the tqparent level alltogether. + * (2) Skip drawing of the parent level alltogether. */ void setSkipIncorrectBorder(bool enable = true); bool skipIncorrectBorder() const { return _skipIncorrectBorder; } diff --git a/konq-plugins/khtmlsettingsplugin/settingsplugin.cpp b/konq-plugins/khtmlsettingsplugin/settingsplugin.cpp index 3d52c5b..d9f5219 100644 --- a/konq-plugins/khtmlsettingsplugin/settingsplugin.cpp +++ b/konq-plugins/khtmlsettingsplugin/settingsplugin.cpp @@ -39,9 +39,9 @@ static const KAboutData aboutdata("khtmlsettingsplugin", I18N_NOOP("HTML Setting K_EXPORT_COMPONENT_FACTORY( libkhtmlsettingsplugin, SettingsPluginFactory( &aboutdata ) ) -SettingsPlugin::SettingsPlugin( TQObject* tqparent, const char* name, +SettingsPlugin::SettingsPlugin( TQObject* parent, const char* name, const TQStringList & ) - : KParts::Plugin( tqparent, name ), mConfig(0) + : KParts::Plugin( parent, name ), mConfig(0) { setInstance(SettingsPluginFactory::instance()); @@ -118,13 +118,13 @@ SettingsPlugin::~SettingsPlugin() void SettingsPlugin::showPopup() { - if( !tqparent() || !tqparent()->inherits("KHTMLPart")) + if( !parent() || !parent()->inherits("KHTMLPart")) return; if (!mConfig) mConfig = new KConfig("settingspluginrc", false, false); - KHTMLPart *part = static_cast<KHTMLPart *>( tqparent() ); + KHTMLPart *part = static_cast<KHTMLPart *>( parent() ); KProtocolManager::reparseConfiguration(); bool cookies = cookiesEnabled( part->url().url() ); @@ -159,28 +159,28 @@ void SettingsPlugin::showPopup() void SettingsPlugin::toggleJava() { - if( tqparent() && tqparent()->inherits("KHTMLPart")) + if( parent() && parent()->inherits("KHTMLPart")) { - KHTMLPart *part = static_cast<KHTMLPart *>(tqparent()); + KHTMLPart *part = static_cast<KHTMLPart *>(parent()); part->setJavaEnabled( ((KToggleAction*)actionCollection()->action("java"))->isChecked() ); } } void SettingsPlugin::toggleJavascript() { - if( tqparent() && tqparent()->inherits("KHTMLPart")) + if( parent() && parent()->inherits("KHTMLPart")) { - KHTMLPart *part = static_cast<KHTMLPart *>(tqparent()); + KHTMLPart *part = static_cast<KHTMLPart *>(parent()); part->setJScriptEnabled( ((KToggleAction*)actionCollection()->action("javascript"))->isChecked() ); } } void SettingsPlugin::toggleCookies() { - if( !tqparent() || !tqparent()->inherits("KHTMLPart")) + if( !parent() || !parent()->inherits("KHTMLPart")) return; - KHTMLPart *part = static_cast<KHTMLPart *>( tqparent() ); + KHTMLPart *part = static_cast<KHTMLPart *>( parent() ); TQString advice; bool enable = ((KToggleAction*)actionCollection()->action("cookies"))->isChecked(); @@ -203,18 +203,18 @@ void SettingsPlugin::toggleCookies() void SettingsPlugin::togglePlugins() { - if( tqparent() && tqparent()->inherits("KHTMLPart")) + if( parent() && parent()->inherits("KHTMLPart")) { - KHTMLPart *part = static_cast<KHTMLPart *>(tqparent()); + KHTMLPart *part = static_cast<KHTMLPart *>(parent()); part->setPluginsEnabled( ((KToggleAction*)actionCollection()->action("plugins"))->isChecked() ); } } void SettingsPlugin::toggleImageLoading() { - if( tqparent() && tqparent()->inherits("KHTMLPart")) + if( parent() && parent()->inherits("KHTMLPart")) { - KHTMLPart *part = static_cast<KHTMLPart *>(tqparent()); + KHTMLPart *part = static_cast<KHTMLPart *>(parent()); part->setAutoloadImages( ((KToggleAction*)actionCollection()->action("imageloading"))->isChecked() ); } } diff --git a/konq-plugins/khtmlsettingsplugin/settingsplugin.h b/konq-plugins/khtmlsettingsplugin/settingsplugin.h index 77fdc09..d70e60e 100644 --- a/konq-plugins/khtmlsettingsplugin/settingsplugin.h +++ b/konq-plugins/khtmlsettingsplugin/settingsplugin.h @@ -30,7 +30,7 @@ class SettingsPlugin : public KParts::Plugin Q_OBJECT TQ_OBJECT public: - SettingsPlugin( TQObject* tqparent, const char* name, + SettingsPlugin( TQObject* parent, const char* name, const TQStringList & ); virtual ~SettingsPlugin(); diff --git a/konq-plugins/kimgalleryplugin/imgallerydialog.cpp b/konq-plugins/kimgalleryplugin/imgallerydialog.cpp index 7e07835..671b90e 100644 --- a/konq-plugins/kimgalleryplugin/imgallerydialog.cpp +++ b/konq-plugins/kimgalleryplugin/imgallerydialog.cpp @@ -44,9 +44,9 @@ Boston, MA 02110-1301, USA. #include "imgallerydialog.h" #include "imgallerydialog.moc" -KIGPDialog::KIGPDialog(TQWidget *tqparent, const TQString& path, const char *name ) +KIGPDialog::KIGPDialog(TQWidget *parent, const TQString& path, const char *name ) : KDialogBase( IconList, i18n("Configure"), Default|Ok|Cancel, - Ok, tqparent, name, true, true ), + Ok, parent, name, true, true ), m_dialogOk( false ) { m_path = path; diff --git a/konq-plugins/kimgalleryplugin/imgallerydialog.h b/konq-plugins/kimgalleryplugin/imgallerydialog.h index f22c06b..a8e2a8d 100644 --- a/konq-plugins/kimgalleryplugin/imgallerydialog.h +++ b/konq-plugins/kimgalleryplugin/imgallerydialog.h @@ -42,7 +42,7 @@ class KIGPDialog : public KDialogBase TQ_OBJECT public: - KIGPDialog(TQWidget *tqparent=0, const TQString& path=0, const char *name=0 ); + KIGPDialog(TQWidget *parent=0, const TQString& path=0, const char *name=0 ); ~KIGPDialog(); bool isDialogOk() const; diff --git a/konq-plugins/kimgalleryplugin/imgalleryplugin.cpp b/konq-plugins/kimgalleryplugin/imgalleryplugin.cpp index 2b33df4..fde2131 100644 --- a/konq-plugins/kimgalleryplugin/imgalleryplugin.cpp +++ b/konq-plugins/kimgalleryplugin/imgalleryplugin.cpp @@ -48,8 +48,8 @@ Boston, MA 02110-1301, USA. typedef KGenericFactory<KImGalleryPlugin> KImGalleryPluginFactory; K_EXPORT_COMPONENT_FACTORY( libkimgallery, KImGalleryPluginFactory( "imgalleryplugin" ) ) -KImGalleryPlugin::KImGalleryPlugin( TQObject* tqparent, const char* name, const TQStringList & ) - : KParts::Plugin( tqparent, name ), m_commentMap(0) +KImGalleryPlugin::KImGalleryPlugin( TQObject* parent, const char* name, const TQStringList & ) + : KParts::Plugin( parent, name ), m_commentMap(0) { new KAction( i18n( "&Create Image Gallery..." ), "imagegallery", CTRL+Key_I, this, TQT_SLOT( slotExecute() ), actionCollection(), "create_img_gallery" ); @@ -58,12 +58,12 @@ KImGalleryPlugin::KImGalleryPlugin( TQObject* tqparent, const char* name, const void KImGalleryPlugin::slotExecute() { m_progressDlg=0L; - if ( !tqparent() || !tqparent()->inherits("KonqDirPart")) + if ( !parent() || !parent()->inherits("KonqDirPart")) { KMessageBox::sorry( 0L, i18n("Could not create the plugin, please report a bug.")); return; } - m_part = static_cast<KonqDirPart *>(tqparent()); + m_part = static_cast<KonqDirPart *>(parent()); if (!m_part->url().isLocalFile()) { //TODO support remote URLs too? KMessageBox::sorry(m_part->widget(), i18n("Creating an image gallery works only on local folders.")); return; @@ -249,9 +249,9 @@ bool KImGalleryPlugin::createHtml(const KURL& url, const TQString& sourceDirName if(m_cancelled) return false; - if( !tqparent() || !tqparent()->inherits("KonqDirPart")) + if( !parent() || !parent()->inherits("KonqDirPart")) return false; - KonqDirPart * part = static_cast<KonqDirPart *>(tqparent()); + KonqDirPart * part = static_cast<KonqDirPart *>(parent()); TQStringList subDirList; if (m_recurseSubDirectories && (recursionLevel >= 0)) { //recursionLevel == 0 means endless @@ -431,7 +431,7 @@ bool KImGalleryPlugin::createThumb( const TQString& imgName, const TQString& sou //kdDebug(90170) << "srcURL: " << srcURL << endl; KURL destURL = KURL::fromPathOrURL(imgGalleryDir + TQString::tqfromLatin1("/images/") + imgName); //kdDebug(90170) << "destURL: " << destURL << endl; - KIO::NetAccess::copy(srcURL, destURL, static_cast<KParts::Part *>(tqparent())->widget()); + KIO::NetAccess::copy(srcURL, destURL, static_cast<KParts::Part *>(parent())->widget()); } const TQString imgNameFormat = imgName + extension(imageFormat); diff --git a/konq-plugins/kimgalleryplugin/imgalleryplugin.h b/konq-plugins/kimgalleryplugin/imgalleryplugin.h index 0139ae3..1a6cd1d 100644 --- a/konq-plugins/kimgalleryplugin/imgalleryplugin.h +++ b/konq-plugins/kimgalleryplugin/imgalleryplugin.h @@ -37,7 +37,7 @@ class KImGalleryPlugin : public KParts::Plugin Q_OBJECT TQ_OBJECT public: - KImGalleryPlugin( TQObject* tqparent, const char* name, + KImGalleryPlugin( TQObject* parent, const char* name, const TQStringList & ); ~KImGalleryPlugin() {} diff --git a/konq-plugins/kuick/kcmkuick/kcmkuick.cpp b/konq-plugins/kuick/kcmkuick/kcmkuick.cpp index de544bf..27459ee 100644 --- a/konq-plugins/kuick/kcmkuick/kcmkuick.cpp +++ b/konq-plugins/kuick/kcmkuick/kcmkuick.cpp @@ -33,8 +33,8 @@ typedef KGenericFactory<KCMKuick, TQWidget> KuickFactory; K_EXPORT_COMPONENT_FACTORY ( kcm_kuick, KuickFactory( "kcmkuick" ) ) -KCMKuick::KCMKuick(TQWidget *tqparent, const char *name, const TQStringList &) -:KCModule(tqparent, name) +KCMKuick::KCMKuick(TQWidget *parent, const char *name, const TQStringList &) +:KCModule(parent, name) { KAboutData *ab=new KAboutData( "kcmkuick", I18N_NOOP("KCM Kuick"), "0.2",I18N_NOOP("KControl module for Kuick's configuration"), KAboutData::License_GPL, diff --git a/konq-plugins/kuick/kcmkuick/kcmkuick.h b/konq-plugins/kuick/kcmkuick/kcmkuick.h index 6ff97eb..634548c 100644 --- a/konq-plugins/kuick/kcmkuick/kcmkuick.h +++ b/konq-plugins/kuick/kcmkuick/kcmkuick.h @@ -27,7 +27,7 @@ class KCMKuick TQ_OBJECT public: - KCMKuick (TQWidget *tqparent, const char *name, const TQStringList &); + KCMKuick (TQWidget *parent, const char *name, const TQStringList &); ~KCMKuick(); void load(); void load(const TQString &); diff --git a/konq-plugins/kuick/kdirmenu.cpp b/konq-plugins/kuick/kdirmenu.cpp index 22d45b4..b9fa89d 100644 --- a/konq-plugins/kuick/kdirmenu.cpp +++ b/konq-plugins/kuick/kdirmenu.cpp @@ -34,9 +34,9 @@ TQMap<TQString, TQPixmap> *KDirMenu::_icons = 0; -KDirMenu::KDirMenu ( TQWidget *tqparent, const KURL &_src, +KDirMenu::KDirMenu ( TQWidget *parent, const KURL &_src, const TQString &_path, const TQString &_name, bool /*showfile*/ ) - : TQPopupMenu(tqparent), + : TQPopupMenu(parent), path(_path), name(_name), src( _src ), diff --git a/konq-plugins/kuick/kdirmenu.h b/konq-plugins/kuick/kdirmenu.h index cdc2933..979fdf6 100644 --- a/konq-plugins/kuick/kdirmenu.h +++ b/konq-plugins/kuick/kdirmenu.h @@ -32,7 +32,7 @@ class KDirMenu : public TQPopupMenu { Q_OBJECT TQ_OBJECT public: - KDirMenu( TQWidget *tqparent, const KURL &src, const TQString &_path, + KDirMenu( TQWidget *parent, const KURL &src, const TQString &_path, const TQString &name, bool showfiles = false ); ~KDirMenu( ); void setPath( const TQString &_path); diff --git a/konq-plugins/kuick/kimcontactmenu.cpp b/konq-plugins/kuick/kimcontactmenu.cpp index e711df2..77ef7a4 100644 --- a/konq-plugins/kuick/kimcontactmenu.cpp +++ b/konq-plugins/kuick/kimcontactmenu.cpp @@ -34,8 +34,8 @@ #include "kimcontactmenu.h" -KIMContactMenu::KIMContactMenu( TQWidget *tqparent, KIMProxy *proxy ) - : TQPopupMenu( tqparent), mProxy( proxy ) +KIMContactMenu::KIMContactMenu( TQWidget *parent, KIMProxy *proxy ) + : TQPopupMenu( parent), mProxy( proxy ) { #ifdef KIMCONTACTS_USE_KABC m_addressBook = KABC::StdAddressBook::self( false ); diff --git a/konq-plugins/kuick/kimcontactmenu.h b/konq-plugins/kuick/kimcontactmenu.h index 2f1c0bb..2b90a77 100644 --- a/konq-plugins/kuick/kimcontactmenu.h +++ b/konq-plugins/kuick/kimcontactmenu.h @@ -36,7 +36,7 @@ class KIMContactMenu : public TQPopupMenu Q_OBJECT TQ_OBJECT public: - KIMContactMenu( TQWidget *tqparent, KIMProxy *proxy ); + KIMContactMenu( TQWidget *parent, KIMProxy *proxy ); ~KIMContactMenu(); protected slots: // populate menus if not already populated diff --git a/konq-plugins/kuick/kmetamenu.cpp b/konq-plugins/kuick/kmetamenu.cpp index 90682ac..aa4f0dd 100644 --- a/konq-plugins/kuick/kmetamenu.cpp +++ b/konq-plugins/kuick/kmetamenu.cpp @@ -36,9 +36,9 @@ #include "kimcontactmenu.h" #include "kmetamenu.moc" -KMetaMenu::KMetaMenu( TQWidget *tqparent, const KURL &url, +KMetaMenu::KMetaMenu( TQWidget *parent, const KURL &url, const TQString &text, const TQString &key, KIMProxy *imProxy ) -: TQPopupMenu( tqparent), +: TQPopupMenu( parent), m_root( 0 ), m_home( 0 ), m_etc( 0 ), m_current( 0 ), m_browse( 0 ) { int recent_no; group = key; @@ -51,7 +51,7 @@ KMetaMenu::KMetaMenu( TQWidget *tqparent, const KURL &url, u.setPath(TQDir::homeDirPath()); if ( kapp->authorizeURLAction("list", u, u) ) { - m_home = new KDirMenu( tqparent, url, u.path() , text ); + m_home = new KDirMenu( parent, url, u.path() , text ); insertItem( SmallIcon( "kfm_home" ), i18n("&Home Folder"), m_home); dirList << u.path(); @@ -62,7 +62,7 @@ KMetaMenu::KMetaMenu( TQWidget *tqparent, const KURL &url, u.setPath(TQDir::rootDirPath()); if ( kapp->authorizeURLAction("list", u, u) ) { - m_root = new KDirMenu( tqparent, url, u.path() , text ); + m_root = new KDirMenu( parent, url, u.path() , text ); insertItem( SmallIcon( "folder_red" ), i18n("&Root Folder"), m_root); dirList << u.path(); @@ -75,7 +75,7 @@ KMetaMenu::KMetaMenu( TQWidget *tqparent, const KURL &url, if ( TQFileInfo( confDir ).isWritable() && kapp->authorizeURLAction("list", u, u) ) { - m_etc = new KDirMenu( tqparent, url, confDir, text ); + m_etc = new KDirMenu( parent, url, confDir, text ); insertItem( SmallIcon( "folder_yellow" ) , i18n("&System Configuration"), m_etc); dirList << confDir; @@ -93,7 +93,7 @@ KMetaMenu::KMetaMenu( TQWidget *tqparent, const KURL &url, //(#60192) { // Also add current working directory - m_current = new KDirMenu( tqparent, url, url.path(), text ); + m_current = new KDirMenu( parent, url, url.path(), text ); insertItem( SmallIcon( "folder" ), i18n( "&Current Folder" ), m_current ); @@ -103,7 +103,7 @@ KMetaMenu::KMetaMenu( TQWidget *tqparent, const KURL &url, if ( imProxy ) { - m_contacts = new KIMContactMenu( tqparent, imProxy ); + m_contacts = new KIMContactMenu( parent, imProxy ); int item = insertItem( SmallIconSet( "personal" ), i18n( "C&ontact" ), m_contacts ); connect ( m_contacts, TQT_SIGNAL( contactChosen( const TQString &) ), TQT_SIGNAL( contactChosen( const TQString & ) ) ); if ( !imProxy->initialize() || imProxy->fileTransferContacts().isEmpty() ) diff --git a/konq-plugins/kuick/kmetamenu.h b/konq-plugins/kuick/kmetamenu.h index a15878b..92e0598 100644 --- a/konq-plugins/kuick/kmetamenu.h +++ b/konq-plugins/kuick/kmetamenu.h @@ -38,7 +38,7 @@ class KMetaMenu : public TQPopupMenu { TQ_OBJECT public: - KMetaMenu( TQWidget *tqparent, const KURL &url, const TQString &text, + KMetaMenu( TQWidget *parent, const KURL &url, const TQString &text, const TQString &key, KIMProxy * imProxy = 0L ); KMetaMenu(); ~KMetaMenu(); diff --git a/konq-plugins/microformat/konqmficon.cpp b/konq-plugins/microformat/konqmficon.cpp index 1816b08..341cc2e 100644 --- a/konq-plugins/microformat/konqmficon.cpp +++ b/konq-plugins/microformat/konqmficon.cpp @@ -41,11 +41,11 @@ typedef KGenericFactory<KonqMFIcon> KonqMFIconFactory; K_EXPORT_COMPONENT_FACTORY(libmfkonqmficon, KonqMFIconFactory("mfkonqmficon")) -KonqMFIcon::KonqMFIcon(TQObject *tqparent, const char *name, const TQStringList &) -: KParts::Plugin(tqparent, name), PluginBase(), m_part(0), m_mfIcon(0), m_statusBarEx(0), m_menu(0) { +KonqMFIcon::KonqMFIcon(TQObject *parent, const char *name, const TQStringList &) +: KParts::Plugin(parent, name), PluginBase(), m_part(0), m_mfIcon(0), m_statusBarEx(0), m_menu(0) { KGlobal::locale()->insertCatalogue("mf_konqplugin"); - m_part = dynamic_cast<KHTMLPart*>(tqparent); + m_part = dynamic_cast<KHTMLPart*>(parent); if (!m_part) { kdDebug() << "couldn't get part" << endl; return; diff --git a/konq-plugins/microformat/konqmficon.h b/konq-plugins/microformat/konqmficon.h index 8213f8f..3b4bb7f 100644 --- a/konq-plugins/microformat/konqmficon.h +++ b/konq-plugins/microformat/konqmficon.h @@ -43,7 +43,7 @@ class KonqMFIcon : public KParts::Plugin, PluginBase { Q_OBJECT TQ_OBJECT public: - KonqMFIcon(TQObject *tqparent, const char *name, const TQStringList &); + KonqMFIcon(TQObject *parent, const char *name, const TQStringList &); ~KonqMFIcon(); diff --git a/konq-plugins/minitools/minitoolsplugin.cpp b/konq-plugins/minitools/minitoolsplugin.cpp index 2346831..60eb724 100644 --- a/konq-plugins/minitools/minitoolsplugin.cpp +++ b/konq-plugins/minitools/minitoolsplugin.cpp @@ -42,9 +42,9 @@ typedef KGenericFactory<MinitoolsPlugin> MinitoolsPluginFactory; K_EXPORT_COMPONENT_FACTORY( libminitoolsplugin, MinitoolsPluginFactory("minitoolsplugin") ) -MinitoolsPlugin::MinitoolsPlugin(TQObject* tqparent, const char* name, const TQStringList &) - : KParts::Plugin(tqparent, name) { - m_part = (tqparent && tqparent->inherits( "KHTMLPart" )) ? static_cast<KHTMLPart*>(tqparent) : 0L; +MinitoolsPlugin::MinitoolsPlugin(TQObject* parent, const char* name, const TQStringList &) + : KParts::Plugin(parent, name) { + m_part = (parent && parent->inherits( "KHTMLPart" )) ? static_cast<KHTMLPart*>(parent) : 0L; m_pMinitoolsMenu = new KActionMenu(i18n("&Minitools"), "minitools", actionCollection(), "minitools"); diff --git a/konq-plugins/minitools/minitoolsplugin.h b/konq-plugins/minitools/minitoolsplugin.h index 8607efe..6e286e6 100644 --- a/konq-plugins/minitools/minitoolsplugin.h +++ b/konq-plugins/minitools/minitoolsplugin.h @@ -37,7 +37,7 @@ class MinitoolsPlugin : public KParts::Plugin { TQ_OBJECT public: - MinitoolsPlugin( TQObject* tqparent, const char* name, const TQStringList & ); + MinitoolsPlugin( TQObject* parent, const char* name, const TQStringList & ); ~MinitoolsPlugin(); protected slots: diff --git a/konq-plugins/rellinks/plugin_rellinks.cpp b/konq-plugins/rellinks/plugin_rellinks.cpp index d3576d7..7b2d61b 100644 --- a/konq-plugins/rellinks/plugin_rellinks.cpp +++ b/konq-plugins/rellinks/plugin_rellinks.cpp @@ -61,8 +61,8 @@ K_EXPORT_COMPONENT_FACTORY( librellinksplugin, RelLinksFactory("rellinks") ) #endif /** Constructor of the plugin. */ -RelLinksPlugin::RelLinksPlugin(TQObject *tqparent, const char *name, const TQStringList &) - : KParts::Plugin( tqparent, name ), +RelLinksPlugin::RelLinksPlugin(TQObject *parent, const char *name, const TQStringList &) + : KParts::Plugin( parent, name ), m_part(0), m_viewVisible(false) { @@ -74,7 +74,7 @@ RelLinksPlugin::RelLinksPlugin(TQObject *tqparent, const char *name, const TQStr kaction_map["home"]->setWhatsThis( i18n("<p>This link references a home page or the top of some hierarchy.</p>") ); kaction_map["up"] = new KAction( i18n("&Up"), "1uparrow", KShortcut("Ctrl+Alt+U"), this, TQT_SLOT(goUp()), actionCollection(), "rellinks_up" ); - kaction_map["up"]->setWhatsThis( i18n("<p>This link references the immediate tqparent of the current document.</p>") ); + kaction_map["up"]->setWhatsThis( i18n("<p>This link references the immediate parent of the current document.</p>") ); bool isRTL = TQApplication::reverseLayout(); @@ -175,7 +175,7 @@ RelLinksPlugin::RelLinksPlugin(TQObject *tqparent, const char *name, const TQStr disableAll(); // When the rendering of the HTML is done, we update the site navigation bar - m_part = dynamic_cast<KHTMLPart *>(tqparent); + m_part = dynamic_cast<KHTMLPart *>(parent); if (!m_part) return; @@ -364,7 +364,7 @@ void RelLinksPlugin::updateToolbar() { void RelLinksPlugin::guessRelations() { - m_part = dynamic_cast<KHTMLPart *>(tqparent()); + m_part = dynamic_cast<KHTMLPart *>(parent()); if (!m_part || m_part->document().isNull() ) return; @@ -422,7 +422,7 @@ void RelLinksPlugin::guessRelations() /** Menu links */ void RelLinksPlugin::goToLink(const TQString & rel, int id) { // have the KHTML part open it - KHTMLPart *part = dynamic_cast<KHTMLPart *>(tqparent()); + KHTMLPart *part = dynamic_cast<KHTMLPart *>(parent()); if (!part) return; @@ -571,7 +571,7 @@ TQString RelLinksPlugin::getLinkType(const TQString &lrel) { // ...known relations... if (lrel == "top" || lrel == "origin" || lrel == "start") return "home"; - if (lrel == "tqparent") + if (lrel == "parent") return "up"; if (lrel == "first") return "begin"; diff --git a/konq-plugins/rellinks/plugin_rellinks.h b/konq-plugins/rellinks/plugin_rellinks.h index c6e0942..e5dfd8c 100644 --- a/konq-plugins/rellinks/plugin_rellinks.h +++ b/konq-plugins/rellinks/plugin_rellinks.h @@ -60,7 +60,7 @@ class RelLinksPlugin : public KParts::Plugin { TQ_OBJECT public: /** Constructor */ - RelLinksPlugin( TQObject *tqparent, const char *name, const TQStringList & ); + RelLinksPlugin( TQObject *parent, const char *name, const TQStringList & ); /** Destructor */ virtual ~RelLinksPlugin(); diff --git a/konq-plugins/rsync/rsyncconfigdialog.cpp b/konq-plugins/rsync/rsyncconfigdialog.cpp index 1bf9341..f123645 100644 --- a/konq-plugins/rsync/rsyncconfigdialog.cpp +++ b/konq-plugins/rsync/rsyncconfigdialog.cpp @@ -100,12 +100,12 @@ /* * RsyncConfigDialog implementation */ -RsyncConfigDialog::RsyncConfigDialog(TQWidget* tqparent, const char* name, +RsyncConfigDialog::RsyncConfigDialog(TQWidget* parent, const char* name, const TQString& caption, const TQString& text, const TQString& localfolder, const TQString& remotefolder, int syncmode, bool modal) : KDialogBase(KDialogBase::Plain, caption, KDialogBase::Cancel | KDialogBase::Ok, - KDialogBase::Ok, tqparent, name, modal), + KDialogBase::Ok, parent, name, modal), mAutoClose(true), mAutoReset(false), mCancelled(false), diff --git a/konq-plugins/rsync/rsyncconfigdialog.h b/konq-plugins/rsync/rsyncconfigdialog.h index 44ab118..20a8a2a 100644 --- a/konq-plugins/rsync/rsyncconfigdialog.h +++ b/konq-plugins/rsync/rsyncconfigdialog.h @@ -40,7 +40,7 @@ class RsyncConfigDialog : public KDialogBase TQ_OBJECT public: - RsyncConfigDialog(TQWidget* tqparent = 0, const char* name = 0, + RsyncConfigDialog(TQWidget* parent = 0, const char* name = 0, const TQString& caption = TQString(), const TQString& text = TQString(), const TQString& localfolder = TQString(), diff --git a/konq-plugins/rsync/rsyncplugin.cpp b/konq-plugins/rsync/rsyncplugin.cpp index a0987ff..3f8c23d 100644 --- a/konq-plugins/rsync/rsyncplugin.cpp +++ b/konq-plugins/rsync/rsyncplugin.cpp @@ -106,13 +106,13 @@ typedef KGenericFactory<RsyncPlugin> RsyncPluginFactory; K_EXPORT_COMPONENT_FACTORY(librsyncplugin, RsyncPluginFactory("rsyncplugin")) -RsyncPlugin::RsyncPlugin (TQObject* tqparent, const char* name, +RsyncPlugin::RsyncPlugin (TQObject* parent, const char* name, const TQStringList&) - :KParts::Plugin (tqparent, name), + :KParts::Plugin (parent, name), m_pSyncNow(0), m_pSyncSetup(0) { - m_part = ::tqqt_cast<KonqDirPart*>(tqparent); + m_part = ::tqqt_cast<KonqDirPart*>(parent); if ( !m_part || !m_part->scrollWidget() ) return; diff --git a/konq-plugins/rsync/rsyncplugin.h b/konq-plugins/rsync/rsyncplugin.h index 6c58d0d..d06eaf1 100644 --- a/konq-plugins/rsync/rsyncplugin.h +++ b/konq-plugins/rsync/rsyncplugin.h @@ -52,7 +52,7 @@ class RsyncPlugin : public KParts::Plugin public: - RsyncPlugin (TQObject* tqparent, const char* name, const TQStringList &); + RsyncPlugin (TQObject* parent, const char* name, const TQStringList &); virtual ~RsyncPlugin(); protected: diff --git a/konq-plugins/searchbar/searchbar.cpp b/konq-plugins/searchbar/searchbar.cpp index aa9dc27..a820d87 100644 --- a/konq-plugins/searchbar/searchbar.cpp +++ b/konq-plugins/searchbar/searchbar.cpp @@ -57,9 +57,9 @@ K_EXPORT_COMPONENT_FACTORY(libsearchbarplugin, SearchBarPluginFactory("searchbarplugin")) -SearchBarPlugin::SearchBarPlugin(TQObject *tqparent, const char *name, +SearchBarPlugin::SearchBarPlugin(TQObject *parent, const char *name, const TQStringList &) : - KParts::Plugin(tqparent, name), + KParts::Plugin(parent, name), m_searchCombo(0), m_searchMode(UseSearchProvider), m_urlEnterLock(false), @@ -94,7 +94,7 @@ SearchBarPlugin::SearchBarPlugin(TQObject *tqparent, const char *name, configurationChanged(); - KParts::MainWindow *mainWin = static_cast<KParts::MainWindow*>(TQT_TQWIDGET(tqparent)); + KParts::MainWindow *mainWin = static_cast<KParts::MainWindow*>(TQT_TQWIDGET(parent)); //Grab the part manager. Don't know of any other way, and neither does Tronical, so.. KParts::PartManager *partMan = static_cast<KParts::PartManager*>(mainWin->child(0, "KParts::PartManager")); @@ -546,8 +546,8 @@ void SearchBarPlugin::focusSearchbar() #endif // USE_QT4 } -SearchBarCombo::SearchBarCombo(TQWidget *tqparent, const char *name) : - KHistoryCombo(tqparent, name), +SearchBarCombo::SearchBarCombo(TQWidget *parent, const char *name) : + KHistoryCombo(parent, name), m_pluginActive(true) { connect(this, TQT_SIGNAL(cleared()), TQT_SLOT(historyCleared())); diff --git a/konq-plugins/searchbar/searchbar.h b/konq-plugins/searchbar/searchbar.h index 3f032ed..15ade36 100644 --- a/konq-plugins/searchbar/searchbar.h +++ b/konq-plugins/searchbar/searchbar.h @@ -48,7 +48,7 @@ class SearchBarCombo : public KHistoryCombo /** * Constructor. */ - SearchBarCombo(TQWidget *tqparent, const char *name); + SearchBarCombo(TQWidget *parent, const char *name); /** * Returns the icon currently displayed in the combo box. @@ -113,7 +113,7 @@ class SearchBarPlugin : public KParts::Plugin /** Possible search modes */ enum SearchModes { FindInThisPage = 0, UseSearchProvider }; - SearchBarPlugin(TQObject *tqparent, const char *name, + SearchBarPlugin(TQObject *parent, const char *name, const TQStringList &); virtual ~SearchBarPlugin(); diff --git a/konq-plugins/sidebar/delicious/bookmarkListItem.cpp b/konq-plugins/sidebar/delicious/bookmarkListItem.cpp index 21dbcaf..6f5d663 100644 --- a/konq-plugins/sidebar/delicious/bookmarkListItem.cpp +++ b/konq-plugins/sidebar/delicious/bookmarkListItem.cpp @@ -24,8 +24,8 @@ #include <kglobal.h> #include <klocale.h> -BookmarkListItem::BookmarkListItem( TQListView *tqparent, const TQString & url, const TQString & desc, time_t time ) - : KListViewItem( tqparent ), m_desc( desc ) +BookmarkListItem::BookmarkListItem( TQListView *parent, const TQString & url, const TQString & desc, time_t time ) + : KListViewItem( parent ), m_desc( desc ) { m_url = KURL::fromPathOrURL( url ); m_dateTime.setTime_t( time ); diff --git a/konq-plugins/sidebar/delicious/bookmarkListItem.h b/konq-plugins/sidebar/delicious/bookmarkListItem.h index 3e37ea4..5b4c8c7 100644 --- a/konq-plugins/sidebar/delicious/bookmarkListItem.h +++ b/konq-plugins/sidebar/delicious/bookmarkListItem.h @@ -34,7 +34,7 @@ class TQString; class BookmarkListItem: public KListViewItem { public: - BookmarkListItem( TQListView *tqparent, const TQString & url, const TQString & desc, time_t time ); + BookmarkListItem( TQListView *parent, const TQString & url, const TQString & desc, time_t time ); KURL url() const; TQDateTime date() const; TQString desc() const; diff --git a/konq-plugins/sidebar/delicious/mainWidget.cpp b/konq-plugins/sidebar/delicious/mainWidget.cpp index 929ded4..3f3b03a 100644 --- a/konq-plugins/sidebar/delicious/mainWidget.cpp +++ b/konq-plugins/sidebar/delicious/mainWidget.cpp @@ -42,8 +42,8 @@ #include <kconfig.h> #include <kinputdialog.h> -MainWidget::MainWidget( KConfig * config, TQWidget * tqparent ) - : MainWidget_base( tqparent ), m_config( config ) +MainWidget::MainWidget( KConfig * config, TQWidget * parent ) + : MainWidget_base( parent ), m_config( config ) { loadTags(); diff --git a/konq-plugins/sidebar/delicious/mainWidget.h b/konq-plugins/sidebar/delicious/mainWidget.h index e77cfc5..a6ed2a3 100644 --- a/konq-plugins/sidebar/delicious/mainWidget.h +++ b/konq-plugins/sidebar/delicious/mainWidget.h @@ -40,7 +40,7 @@ class MainWidget: public MainWidget_base Q_OBJECT TQ_OBJECT public: - MainWidget( KConfig * config, TQWidget * tqparent ); + MainWidget( KConfig * config, TQWidget * parent ); ~MainWidget(); /** diff --git a/konq-plugins/sidebar/delicious/plugin.cpp b/konq-plugins/sidebar/delicious/plugin.cpp index 23244b7..3ed6c09 100644 --- a/konq-plugins/sidebar/delicious/plugin.cpp +++ b/konq-plugins/sidebar/delicious/plugin.cpp @@ -27,10 +27,10 @@ #include <klocale.h> #include <kglobal.h> -KonqSidebarDelicious::KonqSidebarDelicious( KInstance *instance, TQObject *tqparent, +KonqSidebarDelicious::KonqSidebarDelicious( KInstance *instance, TQObject *parent, TQWidget *widgetParent, TQString &desktopName_, const char* name ) - : KonqSidebarPlugin( instance, tqparent, widgetParent, desktopName_, name ), + : KonqSidebarPlugin( instance, parent, widgetParent, desktopName_, name ), DCOPObject( "sidebar-delicious" ) { diff --git a/konq-plugins/sidebar/delicious/plugin.h b/konq-plugins/sidebar/delicious/plugin.h index 4e220da..23234a2 100644 --- a/konq-plugins/sidebar/delicious/plugin.h +++ b/konq-plugins/sidebar/delicious/plugin.h @@ -43,7 +43,7 @@ class KonqSidebarDelicious: public KonqSidebarPlugin, DCOPObject // TQ_OBJECT K_DCOP public: - KonqSidebarDelicious( KInstance * instance, TQObject * tqparent, TQWidget * widgetParent, + KonqSidebarDelicious( KInstance * instance, TQObject * parent, TQWidget * widgetParent, TQString & desktopName_, const char * name = 0 ); ~KonqSidebarDelicious(); virtual void * provides( const TQString & ); diff --git a/konq-plugins/sidebar/delicious/tagListItem.cpp b/konq-plugins/sidebar/delicious/tagListItem.cpp index a8b98cd..bc050d9 100644 --- a/konq-plugins/sidebar/delicious/tagListItem.cpp +++ b/konq-plugins/sidebar/delicious/tagListItem.cpp @@ -21,8 +21,8 @@ #include "tagListItem.h" -TagListItem::TagListItem( TQListView * tqparent, const TQString & tagName, int count ) - : TQCheckListItem( tqparent, tagName, TQCheckListItem::CheckBox ), m_name( tagName ), m_count( count ) +TagListItem::TagListItem( TQListView * parent, const TQString & tagName, int count ) + : TQCheckListItem( parent, tagName, TQCheckListItem::CheckBox ), m_name( tagName ), m_count( count ) { } diff --git a/konq-plugins/sidebar/delicious/tagListItem.h b/konq-plugins/sidebar/delicious/tagListItem.h index f60e0b4..27a045d 100644 --- a/konq-plugins/sidebar/delicious/tagListItem.h +++ b/konq-plugins/sidebar/delicious/tagListItem.h @@ -30,7 +30,7 @@ class TagListItem: public TQObject, public TQCheckListItem Q_OBJECT TQ_OBJECT public: - TagListItem( TQListView * tqparent, const TQString & tagName, int count = 1 ); + TagListItem( TQListView * parent, const TQString & tagName, int count = 1 ); int count() const; TQString name() const; void setName( const TQString & name ); diff --git a/konq-plugins/sidebar/mediaplayer/controls.cpp b/konq-plugins/sidebar/mediaplayer/controls.cpp index 63d91ac..5b110a0 100644 --- a/konq-plugins/sidebar/mediaplayer/controls.cpp +++ b/konq-plugins/sidebar/mediaplayer/controls.cpp @@ -23,15 +23,15 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "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 @@ -76,8 +76,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/konq-plugins/sidebar/mediaplayer/controls.h b/konq-plugins/sidebar/mediaplayer/controls.h index 73a8340..762b3eb 100644 --- a/konq-plugins/sidebar/mediaplayer/controls.h +++ b/konq-plugins/sidebar/mediaplayer/controls.h @@ -43,10 +43,10 @@ class 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: @@ -75,7 +75,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/konq-plugins/sidebar/mediaplayer/engine.cpp b/konq-plugins/sidebar/mediaplayer/engine.cpp index 8f01888..e4590b6 100644 --- a/konq-plugins/sidebar/mediaplayer/engine.cpp +++ b/konq-plugins/sidebar/mediaplayer/engine.cpp @@ -71,8 +71,8 @@ public: KURL file; }; -Engine::Engine(TQObject *tqparent) - : TQObject(tqparent) +Engine::Engine(TQObject *parent) + : TQObject(parent) , d(new EnginePrivate) { } diff --git a/konq-plugins/sidebar/mediaplayer/engine.h b/konq-plugins/sidebar/mediaplayer/engine.h index c1d129f..fd15efe 100644 --- a/konq-plugins/sidebar/mediaplayer/engine.h +++ b/konq-plugins/sidebar/mediaplayer/engine.h @@ -46,7 +46,7 @@ Q_OBJECT TQ_OBJECT public: - Engine(TQObject *tqparent=0); + Engine(TQObject *parent=0); ~Engine(); Arts::PlayObject playObject() const; diff --git a/konq-plugins/sidebar/mediaplayer/mediaplayer.cpp b/konq-plugins/sidebar/mediaplayer/mediaplayer.cpp index 8ea041f..2de09af 100644 --- a/konq-plugins/sidebar/mediaplayer/mediaplayer.cpp +++ b/konq-plugins/sidebar/mediaplayer/mediaplayer.cpp @@ -27,8 +27,8 @@ #include <kdemacros.h> #include "mediawidget.h" -KonqSidebar_MediaPlayer::KonqSidebar_MediaPlayer(KInstance *instance,TQObject *tqparent,TQWidget *widgetParent, TQString &desktopName_, const char* name): - KonqSidebarPlugin(instance,tqparent,widgetParent,desktopName_,name) +KonqSidebar_MediaPlayer::KonqSidebar_MediaPlayer(KInstance *instance,TQObject *parent,TQWidget *widgetParent, TQString &desktopName_, const char* name): + KonqSidebarPlugin(instance,parent,widgetParent,desktopName_,name) { widget=new KSB_MediaWidget(widgetParent); } diff --git a/konq-plugins/sidebar/mediaplayer/mediaplayer.h b/konq-plugins/sidebar/mediaplayer/mediaplayer.h index 2213ef2..f03c882 100644 --- a/konq-plugins/sidebar/mediaplayer/mediaplayer.h +++ b/konq-plugins/sidebar/mediaplayer/mediaplayer.h @@ -29,7 +29,7 @@ class KonqSidebar_MediaPlayer: public KonqSidebarPlugin Q_OBJECT TQ_OBJECT public: - KonqSidebar_MediaPlayer(KInstance *instance,TQObject *tqparent,TQWidget *widgetParent, TQString &desktopName_, const char* name=0); + KonqSidebar_MediaPlayer(KInstance *instance,TQObject *parent,TQWidget *widgetParent, TQString &desktopName_, const char* name=0); ~KonqSidebar_MediaPlayer(); virtual void *provides(const TQString &); void emitStatusBarText (const TQString &); diff --git a/konq-plugins/sidebar/mediaplayer/mediawidget.cpp b/konq-plugins/sidebar/mediaplayer/mediawidget.cpp index 436b678..5130cbb 100644 --- a/konq-plugins/sidebar/mediaplayer/mediawidget.cpp +++ b/konq-plugins/sidebar/mediaplayer/mediawidget.cpp @@ -32,7 +32,7 @@ #include <tqslider.h> #include <tqtooltip.h> -KSB_MediaWidget::KSB_MediaWidget(TQWidget *tqparent):KSB_MediaWidget_skel(tqparent) +KSB_MediaWidget::KSB_MediaWidget(TQWidget *parent):KSB_MediaWidget_skel(parent) { player = new Player(TQT_TQOBJECT(this)); empty(); diff --git a/konq-plugins/sidebar/mediaplayer/mediawidget.h b/konq-plugins/sidebar/mediaplayer/mediawidget.h index 8e106a8..2a7e77a 100644 --- a/konq-plugins/sidebar/mediaplayer/mediawidget.h +++ b/konq-plugins/sidebar/mediaplayer/mediawidget.h @@ -26,7 +26,7 @@ class KSB_MediaWidget: public KSB_MediaWidget_skel Q_OBJECT TQ_OBJECT public: - KSB_MediaWidget(TQWidget *tqparent); + KSB_MediaWidget(TQWidget *parent); ~KSB_MediaWidget(){;} private: diff --git a/konq-plugins/sidebar/mediaplayer/player.cpp b/konq-plugins/sidebar/mediaplayer/player.cpp index c11b2b0..741a6b6 100644 --- a/konq-plugins/sidebar/mediaplayer/player.cpp +++ b/konq-plugins/sidebar/mediaplayer/player.cpp @@ -29,8 +29,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "engine.h" #include "player.h" -Player::Player(TQObject *tqparent) - : TQObject(tqparent) +Player::Player(TQObject *parent) + : TQObject(parent) , position(0) , unfinished(false) { diff --git a/konq-plugins/sidebar/mediaplayer/player.h b/konq-plugins/sidebar/mediaplayer/player.h index c0a9159..f17acc0 100644 --- a/konq-plugins/sidebar/mediaplayer/player.h +++ b/konq-plugins/sidebar/mediaplayer/player.h @@ -40,7 +40,7 @@ Q_OBJECT friend class KaboodlePart; public: - Player(TQObject *tqparent = 0); + Player(TQObject *parent = 0); ~Player(); /** diff --git a/konq-plugins/sidebar/metabar/src/configdialog.cpp b/konq-plugins/sidebar/metabar/src/configdialog.cpp index e6acdbd..2585c7b 100644 --- a/konq-plugins/sidebar/metabar/src/configdialog.cpp +++ b/konq-plugins/sidebar/metabar/src/configdialog.cpp @@ -56,9 +56,9 @@ ActionListItem::ActionListItem(TQListBox *listbox, const TQString &action, const setText(text); } -ConfigDialog::ConfigDialog(TQWidget *tqparent, const char *name) : TQDialog(tqparent, name) +ConfigDialog::ConfigDialog(TQWidget *parent, const char *name) : TQDialog(parent, name) { - topWidgetName = tqparent->tqtopLevelWidget()->name(); + topWidgetName = parent->tqtopLevelWidget()->name(); config = new KConfig("metabarrc"); iconConfig = new KConfig(locate("data", "metabar/iconsrc")); diff --git a/konq-plugins/sidebar/metabar/src/configdialog.h b/konq-plugins/sidebar/metabar/src/configdialog.h index 8417d15..4dc04f9 100644 --- a/konq-plugins/sidebar/metabar/src/configdialog.h +++ b/konq-plugins/sidebar/metabar/src/configdialog.h @@ -48,7 +48,7 @@ class ConfigDialog : public TQDialog TQ_OBJECT public: - ConfigDialog(TQWidget *tqparent = 0, const char *name = 0); + ConfigDialog(TQWidget *parent = 0, const char *name = 0); ~ConfigDialog(); protected: diff --git a/konq-plugins/sidebar/metabar/src/metabar.cpp b/konq-plugins/sidebar/metabar/src/metabar.cpp index bc7d978..6a020f0 100644 --- a/konq-plugins/sidebar/metabar/src/metabar.cpp +++ b/konq-plugins/sidebar/metabar/src/metabar.cpp @@ -7,8 +7,8 @@ #include "metabar.h" #include "metabar.moc" -Metabar::Metabar(KInstance *inst,TQObject *tqparent,TQWidget *widgetParent, TQString &desktopName, const char* name): - KonqSidebarPlugin(inst,tqparent,widgetParent,desktopName,name) +Metabar::Metabar(KInstance *inst,TQObject *parent,TQWidget *widgetParent, TQString &desktopName, const char* name): + KonqSidebarPlugin(inst,parent,widgetParent,desktopName,name) { KImageIO::registerFormats(); KGlobal::locale()->insertCatalogue( "konqsidebar_metabar" ); diff --git a/konq-plugins/sidebar/metabar/src/metabar.h b/konq-plugins/sidebar/metabar/src/metabar.h index bb2387b..530f687 100644 --- a/konq-plugins/sidebar/metabar/src/metabar.h +++ b/konq-plugins/sidebar/metabar/src/metabar.h @@ -16,7 +16,7 @@ class Metabar : public KonqSidebarPlugin TQ_OBJECT public: - Metabar(KInstance *inst,TQObject *tqparent,TQWidget *widgetParent, TQString &desktopName, const char* name=0); + Metabar(KInstance *inst,TQObject *parent,TQWidget *widgetParent, TQString &desktopName, const char* name=0); ~Metabar(); virtual TQWidget *getWidget(){ return widget; } diff --git a/konq-plugins/sidebar/metabar/src/metabarfunctions.cpp b/konq-plugins/sidebar/metabar/src/metabarfunctions.cpp index d184f58..f7bc152 100644 --- a/konq-plugins/sidebar/metabar/src/metabarfunctions.cpp +++ b/konq-plugins/sidebar/metabar/src/metabarfunctions.cpp @@ -32,7 +32,7 @@ #define RESIZE_SPEED 5 #define RESIZE_STEP 2 -MetabarFunctions::MetabarFunctions(KHTMLPart *html, TQObject *tqparent, const char* name) : TQObject(tqparent, name), m_html(html) +MetabarFunctions::MetabarFunctions(KHTMLPart *html, TQObject *parent, const char* name) : TQObject(parent, name), m_html(html) { timer = new TQTimer(this); connect(timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(animate())); @@ -187,9 +187,9 @@ void MetabarFunctions::show(DOM::DOMString item) DOM::HTMLDocument doc = m_html->htmlDocument(); DOM::HTMLElement node = static_cast<DOM::HTMLElement>(doc.getElementById(item)); if(!node.isNull()){ - DOM::HTMLElement tqparent = static_cast<DOM::HTMLElement>(node.parentNode()); + DOM::HTMLElement parent = static_cast<DOM::HTMLElement>(node.parentNode()); - DOM::CSSStyleDeclaration style = tqparent.style(); + DOM::CSSStyleDeclaration style = parent.style(); style.setProperty("display", "block", CSS_PRIORITY); } } @@ -199,9 +199,9 @@ void MetabarFunctions::hide(DOM::DOMString item) DOM::HTMLDocument doc = m_html->htmlDocument(); DOM::HTMLElement node = static_cast<DOM::HTMLElement>(doc.getElementById(item)); if(!node.isNull()){ - DOM::HTMLElement tqparent = static_cast<DOM::HTMLElement>(node.parentNode()); + DOM::HTMLElement parent = static_cast<DOM::HTMLElement>(node.parentNode()); - DOM::CSSStyleDeclaration style = tqparent.style(); + DOM::CSSStyleDeclaration style = parent.style(); style.setProperty("display", "none", CSS_PRIORITY); } } diff --git a/konq-plugins/sidebar/metabar/src/metabarfunctions.h b/konq-plugins/sidebar/metabar/src/metabarfunctions.h index 96742e5..71afce8 100644 --- a/konq-plugins/sidebar/metabar/src/metabarfunctions.h +++ b/konq-plugins/sidebar/metabar/src/metabarfunctions.h @@ -35,7 +35,7 @@ class MetabarFunctions : public TQObject TQ_OBJECT public: - MetabarFunctions(KHTMLPart *html, TQObject *tqparent = 0, const char* name=0); + MetabarFunctions(KHTMLPart *html, TQObject *parent = 0, const char* name=0); ~MetabarFunctions(); void toggle(DOM::DOMString item); diff --git a/konq-plugins/sidebar/metabar/src/metabarwidget.cpp b/konq-plugins/sidebar/metabar/src/metabarwidget.cpp index 2b01a02..0439c98 100644 --- a/konq-plugins/sidebar/metabar/src/metabarwidget.cpp +++ b/konq-plugins/sidebar/metabar/src/metabarwidget.cpp @@ -73,7 +73,7 @@ #define EVENT_TYPE DOM::DOMString("click") #define ACTIVATION 1 -MetabarWidget::MetabarWidget(TQWidget *tqparent, const char *name) : TQWidget(tqparent, name) +MetabarWidget::MetabarWidget(TQWidget *parent, const char *name) : TQWidget(parent, name) { skip = false; loadComplete = false; @@ -419,8 +419,8 @@ void MetabarWidget::handleURLRequest(const KURL &url, const KParts::URLArgs &arg for(uint i = 0; i < list.length(); i++){ DOM::HTMLElement node = static_cast<DOM::HTMLElement>(list.item(i)); if(!node.isNull()){ - DOM::HTMLElement tqparent = static_cast<DOM::HTMLElement>(node.parentNode()); - DOM::CSSStyleDeclaration style = tqparent.style(); + DOM::HTMLElement parent = static_cast<DOM::HTMLElement>(node.parentNode()); + DOM::CSSStyleDeclaration style = parent.style(); DOM::DOMString display = style.getPropertyValue("display"); DOM::DOMString newDisplay = display == "none" ? "block" : "none"; @@ -436,8 +436,8 @@ void MetabarWidget::handleURLRequest(const KURL &url, const KParts::URLArgs &arg element.setAttribute("style", style); } - DOM::HTMLElement tqparent = static_cast<DOM::HTMLElement>(element.parentNode().parentNode()); - functions->adjustSize(tqparent.id()); + DOM::HTMLElement parent = static_cast<DOM::HTMLElement>(element.parentNode().parentNode()); + functions->adjustSize(parent.id()); } else if(protocol == "function"){ diff --git a/konq-plugins/sidebar/metabar/src/metabarwidget.h b/konq-plugins/sidebar/metabar/src/metabarwidget.h index 4f6d21b..34d0015 100644 --- a/konq-plugins/sidebar/metabar/src/metabarwidget.h +++ b/konq-plugins/sidebar/metabar/src/metabarwidget.h @@ -41,7 +41,7 @@ class MetabarWidget : public TQWidget TQ_OBJECT public: - MetabarWidget(TQWidget *tqparent = 0, const char* name=0); + MetabarWidget(TQWidget *parent = 0, const char* name=0); ~MetabarWidget(); void setFileItems(const KFileItemList &items, bool check = true); diff --git a/konq-plugins/sidebar/metabar/src/serviceloader.cpp b/konq-plugins/sidebar/metabar/src/serviceloader.cpp index 8ef445c..ef190f3 100644 --- a/konq-plugins/sidebar/metabar/src/serviceloader.cpp +++ b/konq-plugins/sidebar/metabar/src/serviceloader.cpp @@ -37,7 +37,7 @@ #include <kstandarddirs.h> -ServiceLoader::ServiceLoader(TQWidget *tqparent, const char *name) : TQObject(tqparent, name) +ServiceLoader::ServiceLoader(TQWidget *parent, const char *name) : TQObject(parent, name) { popups.setAutoDelete(true); } diff --git a/konq-plugins/sidebar/metabar/src/serviceloader.h b/konq-plugins/sidebar/metabar/src/serviceloader.h index 31f1366..c1f6433 100644 --- a/konq-plugins/sidebar/metabar/src/serviceloader.h +++ b/konq-plugins/sidebar/metabar/src/serviceloader.h @@ -41,7 +41,7 @@ class ServiceLoader : public TQObject TQ_OBJECT public: - ServiceLoader(TQWidget *tqparent, const char *name = 0); + ServiceLoader(TQWidget *parent, const char *name = 0); ~ServiceLoader(); void loadServices(const KFileItem item, DOM::DOMString &html, int &count); diff --git a/konq-plugins/sidebar/newsticker/configfeeds.cpp b/konq-plugins/sidebar/newsticker/configfeeds.cpp index 5fbc533..dd038b6 100644 --- a/konq-plugins/sidebar/newsticker/configfeeds.cpp +++ b/konq-plugins/sidebar/newsticker/configfeeds.cpp @@ -29,7 +29,7 @@ namespace KSB_News { -ConfigFeeds::ConfigFeeds(TQWidget* tqparent, const char* name) : ConfigFeedsBase(tqparent, name) +ConfigFeeds::ConfigFeeds(TQWidget* parent, const char* name) : ConfigFeedsBase(parent, name) { } diff --git a/konq-plugins/sidebar/newsticker/configfeeds.h b/konq-plugins/sidebar/newsticker/configfeeds.h index 5ca80a7..e0e78ad 100644 --- a/konq-plugins/sidebar/newsticker/configfeeds.h +++ b/konq-plugins/sidebar/newsticker/configfeeds.h @@ -44,7 +44,7 @@ namespace KSB_News { TQ_OBJECT public: - ConfigFeeds(TQWidget* tqparent, const char* name = 0); + ConfigFeeds(TQWidget* parent, const char* name = 0); }; diff --git a/konq-plugins/sidebar/newsticker/norsswidget.cpp b/konq-plugins/sidebar/newsticker/norsswidget.cpp index 35ee14d..99e8fb4 100644 --- a/konq-plugins/sidebar/newsticker/norsswidget.cpp +++ b/konq-plugins/sidebar/newsticker/norsswidget.cpp @@ -37,8 +37,8 @@ namespace KSB_News { - NoRSSWidget::NoRSSWidget(TQWidget *tqparent, const char *name) - : TQWidget(tqparent, name) { + NoRSSWidget::NoRSSWidget(TQWidget *parent, const char *name) + : TQWidget(parent, name) { TQVBoxLayout *topLayout = new TQVBoxLayout(this); diff --git a/konq-plugins/sidebar/newsticker/norsswidget.h b/konq-plugins/sidebar/newsticker/norsswidget.h index 70ee265..9d2b133 100644 --- a/konq-plugins/sidebar/newsticker/norsswidget.h +++ b/konq-plugins/sidebar/newsticker/norsswidget.h @@ -36,7 +36,7 @@ namespace KSB_News { TQ_OBJECT public: - NoRSSWidget(TQWidget *tqparent = 0, const char *name = 0); + NoRSSWidget(TQWidget *parent = 0, const char *name = 0); private slots: void slotBtnClicked(); diff --git a/konq-plugins/sidebar/newsticker/nspanel.cpp b/konq-plugins/sidebar/newsticker/nspanel.cpp index e58d0c4..56a7c52 100644 --- a/konq-plugins/sidebar/newsticker/nspanel.cpp +++ b/konq-plugins/sidebar/newsticker/nspanel.cpp @@ -35,8 +35,8 @@ namespace KSB_News { //////////////////////////////////////////////////////////////// // ListBox including ToolTip for item //////////////////////////////////////////////////////////////// - TTListBox::TTListBox(TQWidget *tqparent, const char *name, WFlags f) - : KListBox(tqparent, name, f), + TTListBox::TTListBox(TQWidget *parent, const char *name, WFlags f) + : KListBox(parent, name, f), TQToolTip(this) { } @@ -61,9 +61,9 @@ namespace KSB_News { - NSPanel::NSPanel(TQObject *tqparent, const char *name, const TQString &key, + NSPanel::NSPanel(TQObject *parent, const char *name, const TQString &key, DCOPRef *rssservice) - :TQObject(tqparent, name) + :TQObject(parent, name) ,DCOPObject(TQString(TQString("sidebar-newsticker-")+key).latin1()) ,m_listbox() ,m_pixmap() diff --git a/konq-plugins/sidebar/newsticker/nspanel.h b/konq-plugins/sidebar/newsticker/nspanel.h index 01cf1e2..f920199 100644 --- a/konq-plugins/sidebar/newsticker/nspanel.h +++ b/konq-plugins/sidebar/newsticker/nspanel.h @@ -44,7 +44,7 @@ namespace KSB_News { //////////////////////////////////////////////////////////////// class TTListBox : public KListBox, TQToolTip { public: - TTListBox (TQWidget *tqparent = 0, const char *name = 0, WFlags f = 0); + TTListBox (TQWidget *parent = 0, const char *name = 0, WFlags f = 0); void clear(); protected: @@ -59,7 +59,7 @@ namespace KSB_News { K_DCOP public: - NSPanel(TQObject *tqparent, const char *name, const TQString &key, + NSPanel(TQObject *parent, const char *name, const TQString &key, DCOPRef *rssservice); ~NSPanel(); diff --git a/konq-plugins/sidebar/newsticker/nsstacktabwidget.cpp b/konq-plugins/sidebar/newsticker/nsstacktabwidget.cpp index f8a1c92..6bc6d1a 100644 --- a/konq-plugins/sidebar/newsticker/nsstacktabwidget.cpp +++ b/konq-plugins/sidebar/newsticker/nsstacktabwidget.cpp @@ -50,8 +50,8 @@ namespace KSB_News { - NSStackTabWidget::NSStackTabWidget(TQWidget *tqparent, const char *name, - TQPixmap appIcon) : TQWidget(tqparent, name) { + NSStackTabWidget::NSStackTabWidget(TQWidget *parent, const char *name, + TQPixmap appIcon) : TQWidget(parent, name) { currentPage = 0; tqlayout = new TQVBoxLayout(this); diff --git a/konq-plugins/sidebar/newsticker/nsstacktabwidget.h b/konq-plugins/sidebar/newsticker/nsstacktabwidget.h index 49650e7..08f0f22 100644 --- a/konq-plugins/sidebar/newsticker/nsstacktabwidget.h +++ b/konq-plugins/sidebar/newsticker/nsstacktabwidget.h @@ -50,7 +50,7 @@ namespace KSB_News { TQ_OBJECT public: - NSStackTabWidget(TQWidget *tqparent = 0, const char *name = 0, + NSStackTabWidget(TQWidget *parent = 0, const char *name = 0, TQPixmap appIcon = TQPixmap()); void addStackTab(NSPanel *nsp, TQWidget *page); void delStackTab(NSPanel *nsp); diff --git a/konq-plugins/sidebar/newsticker/sidebar_news.cpp b/konq-plugins/sidebar/newsticker/sidebar_news.cpp index d59413d..3e1178f 100644 --- a/konq-plugins/sidebar/newsticker/sidebar_news.cpp +++ b/konq-plugins/sidebar/newsticker/sidebar_news.cpp @@ -46,10 +46,10 @@ namespace KSB_News { - KonqSidebar_News::KonqSidebar_News(KInstance *inst, TQObject *tqparent, + KonqSidebar_News::KonqSidebar_News(KInstance *inst, TQObject *parent, TQWidget *widgetParent, TQString &desktopName, const char* name) - : KonqSidebarPlugin(inst, tqparent, widgetParent, desktopName, name), + : KonqSidebarPlugin(inst, parent, widgetParent, desktopName, name), DCOPObject("sidebar-newsticker") { // get the application icon diff --git a/konq-plugins/sidebar/newsticker/sidebar_news.h b/konq-plugins/sidebar/newsticker/sidebar_news.h index 1c92c0e..a0f7e05 100644 --- a/konq-plugins/sidebar/newsticker/sidebar_news.h +++ b/konq-plugins/sidebar/newsticker/sidebar_news.h @@ -48,7 +48,7 @@ namespace KSB_News { K_DCOP public: - KonqSidebar_News(KInstance *instance, TQObject *tqparent, + KonqSidebar_News(KInstance *instance, TQObject *parent, TQWidget *widgetParent, TQString &desktopName_, const char* name=0); ~KonqSidebar_News(); diff --git a/konq-plugins/uachanger/uachangerplugin.cpp b/konq-plugins/uachanger/uachangerplugin.cpp index f76f0de..d376d73 100644 --- a/konq-plugins/uachanger/uachangerplugin.cpp +++ b/konq-plugins/uachanger/uachangerplugin.cpp @@ -50,9 +50,9 @@ K_EXPORT_COMPONENT_FACTORY (libuachangerplugin, UAChangerPluginFactory (&aboutda #define TQFL1(x) TQString::tqfromLatin1(x) -UAChangerPlugin::UAChangerPlugin( TQObject* tqparent, const char* name, +UAChangerPlugin::UAChangerPlugin( TQObject* parent, const char* name, const TQStringList & ) - :KParts::Plugin( tqparent, name ), + :KParts::Plugin( parent, name ), m_bSettingsLoaded(false), m_part(0L), m_config(0L) { setInstance(UAChangerPlugin::instance()); @@ -65,9 +65,9 @@ UAChangerPlugin::UAChangerPlugin( TQObject* tqparent, const char* name, m_pUAMenu->setEnabled ( false ); - if ( tqparent && tqparent->inherits( "KHTMLPart" ) ) + if ( parent && parent->inherits( "KHTMLPart" ) ) { - m_part = static_cast<KHTMLPart*>(tqparent); + m_part = static_cast<KHTMLPart*>(parent); connect( m_part, TQT_SIGNAL(started(KIO::Job*)), this, TQT_SLOT(slotStarted(KIO::Job*)) ); } diff --git a/konq-plugins/uachanger/uachangerplugin.h b/konq-plugins/uachanger/uachangerplugin.h index ef5abd4..3f97516 100644 --- a/konq-plugins/uachanger/uachangerplugin.h +++ b/konq-plugins/uachanger/uachangerplugin.h @@ -44,7 +44,7 @@ class UAChangerPlugin : public KParts::Plugin TQ_OBJECT public: - UAChangerPlugin( TQObject* tqparent, const char* name, + UAChangerPlugin( TQObject* parent, const char* name, const TQStringList & ); ~UAChangerPlugin(); diff --git a/konq-plugins/validators/plugin_validators.cpp b/konq-plugins/validators/plugin_validators.cpp index 6bd4fee..fe61ae3 100644 --- a/konq-plugins/validators/plugin_validators.cpp +++ b/konq-plugins/validators/plugin_validators.cpp @@ -44,9 +44,9 @@ static const KAboutData aboutdata("validatorsplugin", I18N_NOOP("Validate Web Pa K_EXPORT_COMPONENT_FACTORY( libvalidatorsplugin, PluginValidatorsFactory( &aboutdata ) ) -PluginValidators::PluginValidators( TQObject* tqparent, const char* name, +PluginValidators::PluginValidators( TQObject* parent, const char* name, const TQStringList & ) - : Plugin( tqparent, name ), m_configDialog(0), m_part(0) + : Plugin( parent, name ), m_configDialog(0), m_part(0) { setInstance(PluginValidatorsFactory::instance()); @@ -71,14 +71,14 @@ PluginValidators::PluginValidators( TQObject* tqparent, const char* name, m_menu->setEnabled( false ); - if ( tqparent && tqparent->inherits( "KHTMLPart" )) + if ( parent && parent->inherits( "KHTMLPart" )) { m_menu->insert( new KAction( i18n( "C&onfigure Validator..." ), "configure", 0, this, TQT_SLOT(slotConfigure()), actionCollection(), "configure") ); - m_part = static_cast<KHTMLPart *>( tqparent ); + m_part = static_cast<KHTMLPart *>( parent ); m_configDialog = new ValidatorsDialog( m_part->widget() ); setURLs(); @@ -90,7 +90,7 @@ PluginValidators::PluginValidators( TQObject* tqparent, const char* name, PluginValidators::~PluginValidators() { delete m_configDialog; -// Dont' delete the action. KActionCollection as tqparent does the job already +// Dont' delete the action. KActionCollection as parent does the job already // and not deleting it at this point also ensures that in case we are not unplugged // from the GUI yet and the ~KXMLGUIClient destructor will do so it won't hit a // dead pointer. The kxmlgui factory keeps references to the actions, but it does not @@ -140,8 +140,8 @@ void PluginValidators::slotConfigure() void PluginValidators::validateURL(const KURL &url, const KURL &uploadUrl) { - // The tqparent is assumed to be a KHTMLPart - if ( !tqparent()->inherits("KHTMLPart") ) + // The parent is assumed to be a KHTMLPart + if ( !parent()->inherits("KHTMLPart") ) { TQString title = i18n( "Cannot Validate Source" ); TQString text = i18n( "You cannot validate anything except web pages with " diff --git a/konq-plugins/validators/plugin_validators.h b/konq-plugins/validators/plugin_validators.h index 6743d99..2df1e23 100644 --- a/konq-plugins/validators/plugin_validators.h +++ b/konq-plugins/validators/plugin_validators.h @@ -43,7 +43,7 @@ class PluginValidators : public KParts::Plugin Q_OBJECT TQ_OBJECT public: - PluginValidators( TQObject* tqparent, const char* name, + PluginValidators( TQObject* parent, const char* name, const TQStringList & ); virtual ~PluginValidators(); diff --git a/konq-plugins/validators/validatorsdialog.cpp b/konq-plugins/validators/validatorsdialog.cpp index bd0e4d9..864de55 100644 --- a/konq-plugins/validators/validatorsdialog.cpp +++ b/konq-plugins/validators/validatorsdialog.cpp @@ -29,8 +29,8 @@ #include "validatorsdialog.h" #include "validatorsdialog.moc" -ValidatorsDialog::ValidatorsDialog(TQWidget *tqparent, const char *name ) - : KDialogBase( tqparent, name, false, i18n("Configure"), Ok|Cancel, Ok, true ) +ValidatorsDialog::ValidatorsDialog(TQWidget *parent, const char *name ) + : KDialogBase( parent, name, false, i18n("Configure"), Ok|Cancel, Ok, true ) { setCaption(i18n("Configure Validating Servers")); setMinimumWidth(300); diff --git a/konq-plugins/validators/validatorsdialog.h b/konq-plugins/validators/validatorsdialog.h index 345323a..2376a1e 100644 --- a/konq-plugins/validators/validatorsdialog.h +++ b/konq-plugins/validators/validatorsdialog.h @@ -31,7 +31,7 @@ class ValidatorsDialog : public KDialogBase TQ_OBJECT public: - ValidatorsDialog(TQWidget *tqparent=0, const char *name=0 ); + ValidatorsDialog(TQWidget *parent=0, const char *name=0 ); ~ValidatorsDialog(); const TQString getWWWValidatorUrl() const {return m_WWWValidatorCB->currentText();} diff --git a/konq-plugins/webarchiver/archivedialog.cpp b/konq-plugins/webarchiver/archivedialog.cpp index 802b2fe..b72ca42 100644 --- a/konq-plugins/webarchiver/archivedialog.cpp +++ b/konq-plugins/webarchiver/archivedialog.cpp @@ -49,9 +49,9 @@ #define CONTENT_TYPE "<meta http-equiv=\"content-type\" content=\"text/html; charset=utf-8\">" -ArchiveDialog::ArchiveDialog(TQWidget *tqparent, const TQString &filename, +ArchiveDialog::ArchiveDialog(TQWidget *parent, const TQString &filename, KHTMLPart *part) : - KDialogBase(tqparent, "WebArchiveDialog", false, i18n("Web Archiver"), + KDialogBase(parent, "WebArchiveDialog", false, i18n("Web Archiver"), KDialogBase::Ok | KDialogBase::Cancel | KDialogBase::User1 ), m_bPreserveWS(false), m_tmpFile(0), m_url(part->url()) { diff --git a/konq-plugins/webarchiver/archivedialog.h b/konq-plugins/webarchiver/archivedialog.h index d82b9b0..1a42868 100644 --- a/konq-plugins/webarchiver/archivedialog.h +++ b/konq-plugins/webarchiver/archivedialog.h @@ -44,7 +44,7 @@ class ArchiveDialog : public KDialogBase Q_OBJECT TQ_OBJECT public: - ArchiveDialog(TQWidget *tqparent, const TQString &targetFilename, KHTMLPart *part); + ArchiveDialog(TQWidget *parent, const TQString &targetFilename, KHTMLPart *part); ~ArchiveDialog(); void archive(); diff --git a/konq-plugins/webarchiver/plugin_webarchiver.cpp b/konq-plugins/webarchiver/plugin_webarchiver.cpp index 0b6ed68..85d43ee 100644 --- a/konq-plugins/webarchiver/plugin_webarchiver.cpp +++ b/konq-plugins/webarchiver/plugin_webarchiver.cpp @@ -50,9 +50,9 @@ typedef KGenericFactory<PluginWebArchiver> PluginWebArchiverFactory; K_EXPORT_COMPONENT_FACTORY( libwebarchiverplugin, PluginWebArchiverFactory( "webarchiver" ) ) -PluginWebArchiver::PluginWebArchiver( TQObject* tqparent, const char* name, +PluginWebArchiver::PluginWebArchiver( TQObject* parent, const char* name, const TQStringList & ) - : Plugin( tqparent, name ) + : Plugin( parent, name ) { (void) new KAction( i18n("Archive &Web Page..."), "webarchiver", 0, @@ -67,9 +67,9 @@ PluginWebArchiver::~PluginWebArchiver() void PluginWebArchiver::slotSaveToArchive() { // ## Unicode ok? - if( !tqparent() || !tqparent()->inherits("KHTMLPart")) + if( !parent() || !parent()->inherits("KHTMLPart")) return; - KHTMLPart *part = static_cast<KHTMLPart *>( tqparent() ); + KHTMLPart *part = static_cast<KHTMLPart *>( parent() ); TQString archiveName = TQString::fromUtf8(part->htmlDocument().title().string().utf8()); diff --git a/konq-plugins/webarchiver/plugin_webarchiver.h b/konq-plugins/webarchiver/plugin_webarchiver.h index 338eec8..754e26b 100644 --- a/konq-plugins/webarchiver/plugin_webarchiver.h +++ b/konq-plugins/webarchiver/plugin_webarchiver.h @@ -31,7 +31,7 @@ class PluginWebArchiver : public KParts::Plugin TQ_OBJECT public: - PluginWebArchiver( TQObject* tqparent, const char* name, + PluginWebArchiver( TQObject* parent, const char* name, const TQStringList & ); virtual ~PluginWebArchiver(); diff --git a/ksig/ksig.cpp b/ksig/ksig.cpp index 422e985..88fe29f 100644 --- a/ksig/ksig.cpp +++ b/ksig/ksig.cpp @@ -36,7 +36,7 @@ // public methods //////////////////////////////////////////////////////////////////////////////// -KSig::KSig(TQWidget *tqparent, const char *name) : KMainWindow(tqparent, name), +KSig::KSig(TQWidget *parent, const char *name) : KMainWindow(parent, name), changed(false) { setupActions(); diff --git a/ksig/ksig.h b/ksig/ksig.h index b1c4ef1..3ed892d 100644 --- a/ksig/ksig.h +++ b/ksig/ksig.h @@ -31,7 +31,7 @@ class KSig : public KMainWindow TQ_OBJECT public: - KSig(TQWidget *tqparent = 0, const char *name = 0); + KSig(TQWidget *parent = 0, const char *name = 0); virtual ~KSig(); private: diff --git a/ksig/siglistview.cpp b/ksig/siglistview.cpp index aaf6ec2..4bbc693 100644 --- a/ksig/siglistview.cpp +++ b/ksig/siglistview.cpp @@ -29,10 +29,10 @@ SigListView *SigListView::listView = 0; // public members //////////////////////////////////////////////////////////////////////////////// -SigListView *SigListView::instance(TQWidget *tqparent, const char *name) +SigListView *SigListView::instance(TQWidget *parent, const char *name) { if(!listView) - listView = new SigListView(tqparent, name); + listView = new SigListView(parent, name); return(listView); } @@ -108,7 +108,7 @@ const SigListViewItem *SigListView::currentItem() const // protected members //////////////////////////////////////////////////////////////////////////////// -SigListView::SigListView(TQWidget *tqparent, const char *name) : KListView(tqparent, name) +SigListView::SigListView(TQWidget *parent, const char *name) : KListView(parent, name) { addColumn(i18n("Signatures")); diff --git a/ksig/siglistview.h b/ksig/siglistview.h index be84e5f..eeadbd2 100644 --- a/ksig/siglistview.h +++ b/ksig/siglistview.h @@ -39,7 +39,7 @@ class SigListView : public KListView Q_OBJECT TQ_OBJECT public: - static SigListView *instance(TQWidget *tqparent = 0, const char *name = 0); + static SigListView *instance(TQWidget *parent = 0, const char *name = 0); void load(); void save(); @@ -58,7 +58,7 @@ public slots: void clear() {} protected: - SigListView(TQWidget *tqparent = 0, const char *name = 0); + SigListView(TQWidget *parent = 0, const char *name = 0); virtual ~SigListView(); private: diff --git a/ksig/siglistviewitem.cpp b/ksig/siglistviewitem.cpp index e2ef5ea..7f6d12f 100644 --- a/ksig/siglistviewitem.cpp +++ b/ksig/siglistviewitem.cpp @@ -74,7 +74,7 @@ void SigListViewItem::nodeToText(const TQDomNode &n, TQString &s) // private members //////////////////////////////////////////////////////////////////////////////// -SigListViewItem::SigListViewItem(TQListView *tqparent, TQDomDocument document, TQDomElement signatureElement) : KListViewItem(tqparent) +SigListViewItem::SigListViewItem(TQListView *parent, TQDomDocument document, TQDomElement signatureElement) : KListViewItem(parent) { emptySigString = i18n("<empty signature>"); diff --git a/ksig/siglistviewitem.h b/ksig/siglistviewitem.h index 0641576..2b51edd 100644 --- a/ksig/siglistviewitem.h +++ b/ksig/siglistviewitem.h @@ -39,7 +39,7 @@ private: * created using SigListView::createItem(). This is accessible to * SigListView because SigListView is a friend class. */ - SigListViewItem(TQListView *tqparent, TQDomDocument document, TQDomElement signatureElement); + SigListViewItem(TQListView *parent, TQDomDocument document, TQDomElement signatureElement); /** * Renders the data back to the DOM element. diff --git a/ksig/standardtext.cpp b/ksig/standardtext.cpp index 1788d7b..3800eef 100644 --- a/ksig/standardtext.cpp +++ b/ksig/standardtext.cpp @@ -20,7 +20,7 @@ #include "standardtext.h" -StandardText::StandardText(TQWidget *tqparent, const char *name, bool modal, WFlags fl) : StandardTextBase(tqparent, name, modal, fl) +StandardText::StandardText(TQWidget *parent, const char *name, bool modal, WFlags fl) : StandardTextBase(parent, name, modal, fl) { } diff --git a/ksig/standardtext.h b/ksig/standardtext.h index 1ea3667..16469b1 100644 --- a/ksig/standardtext.h +++ b/ksig/standardtext.h @@ -24,7 +24,7 @@ class StandardText : public StandardTextBase Q_OBJECT TQ_OBJECT public: - StandardText(TQWidget *tqparent = 0, const char *name = 0, bool modal = false, WFlags fl = 0); + StandardText(TQWidget *parent = 0, const char *name = 0, bool modal = false, WFlags fl = 0); virtual ~StandardText(); void setLabel(const TQString &text); 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 diff --git a/renamedlgplugins/audio/audiopreview.cpp b/renamedlgplugins/audio/audiopreview.cpp index 18e25d1..e0af544 100644 --- a/renamedlgplugins/audio/audiopreview.cpp +++ b/renamedlgplugins/audio/audiopreview.cpp @@ -33,8 +33,8 @@ #include "audiopreview.h" -AudioPreview::AudioPreview( TQWidget *tqparent, const char *name, const TQString &fileName, const TQString &mimeType) - : TQVBox( tqparent, name ) +AudioPreview::AudioPreview( TQWidget *parent, const char *name, const TQString &fileName, const TQString &mimeType) + : TQVBox( parent, name ) { m_isTempFile = false; pic = 0; diff --git a/renamedlgplugins/audio/audiopreview.h b/renamedlgplugins/audio/audiopreview.h index 751233c..017bd7b 100644 --- a/renamedlgplugins/audio/audiopreview.h +++ b/renamedlgplugins/audio/audiopreview.h @@ -34,7 +34,7 @@ class AudioPreview : public TQVBox Q_OBJECT TQ_OBJECT public: - AudioPreview(TQWidget *tqparent, const char *name, const TQString &fileName, const TQString &mimeType); + AudioPreview(TQWidget *parent, const char *name, const TQString &fileName, const TQString &mimeType); ~AudioPreview(); private slots: diff --git a/renamedlgplugins/images/imagevisualizer.cpp b/renamedlgplugins/images/imagevisualizer.cpp index e9fe6c2..e347dc4 100644 --- a/renamedlgplugins/images/imagevisualizer.cpp +++ b/renamedlgplugins/images/imagevisualizer.cpp @@ -30,8 +30,8 @@ #include "imagevisualizer.h" -ImageVisualizer::ImageVisualizer( TQWidget *tqparent, const char *name, const TQString &fileName ) - : TQVBox( tqparent, name ) +ImageVisualizer::ImageVisualizer( TQWidget *parent, const char *name, const TQString &fileName ) + : TQVBox( parent, name ) { pic = 0; description = 0; diff --git a/renamedlgplugins/images/imagevisualizer.h b/renamedlgplugins/images/imagevisualizer.h index 867efea..88c1a0b 100644 --- a/renamedlgplugins/images/imagevisualizer.h +++ b/renamedlgplugins/images/imagevisualizer.h @@ -29,7 +29,7 @@ class ImageVisualizer : public TQVBox Q_OBJECT TQ_OBJECT public: - ImageVisualizer(TQWidget *tqparent, const char *name, const TQString &fileName ); + ImageVisualizer(TQWidget *parent, const char *name, const TQString &fileName ); private: void loadImage( const TQString& path ); |