diff options
Diffstat (limited to 'languages/cpp')
158 files changed, 569 insertions, 569 deletions
diff --git a/languages/cpp/addattributedialog.cpp b/languages/cpp/addattributedialog.cpp index 84929a22..fcc59880 100644 --- a/languages/cpp/addattributedialog.cpp +++ b/languages/cpp/addattributedialog.cpp @@ -41,8 +41,8 @@ #include <tqtextstream.h> AddAttributeDialog::AddAttributeDialog( CppSupportPart* cppSupport, ClassDom klass, - TQWidget* tqparent, const char* name, bool modal, WFlags fl ) -: AddAttributeDialogBase( tqparent, name, modal, fl ), m_cppSupport( cppSupport ), m_klass( klass ), m_count( 0 ) + TQWidget* parent, const char* name, bool modal, WFlags fl ) +: AddAttributeDialogBase( parent, name, modal, fl ), m_cppSupport( cppSupport ), m_klass( klass ), m_count( 0 ) { access->insertStringList( TQStringList() << "Public" << "Protected" << "Private" ); diff --git a/languages/cpp/addattributedialog.h b/languages/cpp/addattributedialog.h index ffe2a92d..948eefa7 100644 --- a/languages/cpp/addattributedialog.h +++ b/languages/cpp/addattributedialog.h @@ -32,7 +32,7 @@ class AddAttributeDialog : public AddAttributeDialogBase TQ_OBJECT public: AddAttributeDialog( CppSupportPart* cppSupport, ClassDom klass, - TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); ~AddAttributeDialog(); virtual void addAttribute(); diff --git a/languages/cpp/addmethoddialog.cpp b/languages/cpp/addmethoddialog.cpp index 80397074..b7ffe02c 100644 --- a/languages/cpp/addmethoddialog.cpp +++ b/languages/cpp/addmethoddialog.cpp @@ -44,8 +44,8 @@ #include <tqtextstream.h> AddMethodDialog::AddMethodDialog( CppSupportPart* cppSupport, ClassDom klass, - TQWidget* tqparent, const char* name, bool modal, WFlags fl ) -: AddMethodDialogBase( tqparent, name, modal, fl ), m_cppSupport( cppSupport ), m_klass( klass ), m_count( 0 ) + TQWidget* parent, const char* name, bool modal, WFlags fl ) +: AddMethodDialogBase( parent, name, modal, fl ), m_cppSupport( cppSupport ), m_klass( klass ), m_count( 0 ) { TQString fileName = m_klass->fileName(); diff --git a/languages/cpp/addmethoddialog.h b/languages/cpp/addmethoddialog.h index 70ab9958..f0bb1f2d 100644 --- a/languages/cpp/addmethoddialog.h +++ b/languages/cpp/addmethoddialog.h @@ -32,7 +32,7 @@ class AddMethodDialog : public AddMethodDialogBase TQ_OBJECT public: AddMethodDialog( CppSupportPart* cppSupport, ClassDom klass, - TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); ~AddMethodDialog(); virtual void addMethod(); diff --git a/languages/cpp/app_templates/kapp/appview.cpp b/languages/cpp/app_templates/kapp/appview.cpp index 5b42a36a..5f9d906a 100644 --- a/languages/cpp/app_templates/kapp/appview.cpp +++ b/languages/cpp/app_templates/kapp/appview.cpp @@ -13,8 +13,8 @@ #include <krun.h> #include <klocale.h> -%{APPNAME}View::%{APPNAME}View(TQWidget *tqparent) - : TQWidget(tqparent), +%{APPNAME}View::%{APPNAME}View(TQWidget *parent) + : TQWidget(parent), DCOPObject("%{APPNAME}Iface") { // setup our tqlayout manager to automatically add our widgets diff --git a/languages/cpp/app_templates/kapp/appview.h b/languages/cpp/app_templates/kapp/appview.h index 2eab2322..a32c35a0 100644 --- a/languages/cpp/app_templates/kapp/appview.h +++ b/languages/cpp/app_templates/kapp/appview.h @@ -29,7 +29,7 @@ public: /** * Default constructor */ - %{APPNAME}View(TQWidget *tqparent); + %{APPNAME}View(TQWidget *parent); /** * Destructor diff --git a/languages/cpp/app_templates/kapp/pref.cpp b/languages/cpp/app_templates/kapp/pref.cpp index 3d720a65..673df14e 100644 --- a/languages/cpp/app_templates/kapp/pref.cpp +++ b/languages/cpp/app_templates/kapp/pref.cpp @@ -22,8 +22,8 @@ m_pageTwo = new %{APPNAME}PrefPageTwo(frame); } -%{APPNAME}PrefPageOne::%{APPNAME}PrefPageOne(TQWidget *tqparent) - : TQFrame(tqparent) +%{APPNAME}PrefPageOne::%{APPNAME}PrefPageOne(TQWidget *parent) + : TQFrame(parent) { TQHBoxLayout *tqlayout = new TQHBoxLayout(this); tqlayout->setAutoAdd(true); @@ -31,8 +31,8 @@ new TQLabel(i18n("Add something here"), this); } -%{APPNAME}PrefPageTwo::%{APPNAME}PrefPageTwo(TQWidget *tqparent) - : TQFrame(tqparent) +%{APPNAME}PrefPageTwo::%{APPNAME}PrefPageTwo(TQWidget *parent) + : TQFrame(parent) { TQHBoxLayout *tqlayout = new TQHBoxLayout(this); tqlayout->setAutoAdd(true); diff --git a/languages/cpp/app_templates/kapp/pref.h b/languages/cpp/app_templates/kapp/pref.h index 23798000..b22ab262 100644 --- a/languages/cpp/app_templates/kapp/pref.h +++ b/languages/cpp/app_templates/kapp/pref.h @@ -26,7 +26,7 @@ class %{APPNAME}PrefPageOne : public TQFrame Q_OBJECT TQ_OBJECT public: - %{APPNAME}PrefPageOne(TQWidget *tqparent = 0); + %{APPNAME}PrefPageOne(TQWidget *parent = 0); }; class %{APPNAME}PrefPageTwo : public TQFrame @@ -34,7 +34,7 @@ class %{APPNAME}PrefPageTwo : public TQFrame Q_OBJECT TQ_OBJECT public: - %{APPNAME}PrefPageTwo(TQWidget *tqparent = 0); + %{APPNAME}PrefPageTwo(TQWidget *parent = 0); }; #endif // _%{APPNAMEUC}PREF_H_ diff --git a/languages/cpp/app_templates/kateplugin/plugin_app.cpp b/languages/cpp/app_templates/kateplugin/plugin_app.cpp index 8c729f72..1a40df32 100644 --- a/languages/cpp/app_templates/kateplugin/plugin_app.cpp +++ b/languages/cpp/app_templates/kateplugin/plugin_app.cpp @@ -33,15 +33,15 @@ 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 KatePlugin%{APPNAME}( tqparent, name ); + return new KatePlugin%{APPNAME}( parent, name ); } KInstance* KatePluginFactory::s_instance = 0L; -KatePlugin%{APPNAME}::KatePlugin%{APPNAME}( TQObject* tqparent, const char* name ) - : Kate::Plugin ( (Kate::Application*)tqparent, name ) +KatePlugin%{APPNAME}::KatePlugin%{APPNAME}( TQObject* parent, const char* name ) + : Kate::Plugin ( (Kate::Application*)parent, name ) { } diff --git a/languages/cpp/app_templates/kateplugin/plugin_app.h b/languages/cpp/app_templates/kateplugin/plugin_app.h index 2183e88e..53e46d06 100644 --- a/languages/cpp/app_templates/kateplugin/plugin_app.h +++ b/languages/cpp/app_templates/kateplugin/plugin_app.h @@ -23,7 +23,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; @@ -35,7 +35,7 @@ class KatePlugin%{APPNAME} : public Kate::Plugin, Kate::PluginViewInterface TQ_OBJECT public: - KatePlugin%{APPNAME}( TQObject* tqparent = 0, const char* name = 0 ); + KatePlugin%{APPNAME}( TQObject* parent = 0, const char* name = 0 ); virtual ~KatePlugin%{APPNAME}(); void addView (Kate::MainWindow *win); diff --git a/languages/cpp/app_templates/kateplugin2/plugin_app.cpp b/languages/cpp/app_templates/kateplugin2/plugin_app.cpp index 1670f252..18595d10 100644 --- a/languages/cpp/app_templates/kateplugin2/plugin_app.cpp +++ b/languages/cpp/app_templates/kateplugin2/plugin_app.cpp @@ -37,15 +37,15 @@ 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 KatePlugin%{APPNAME}( tqparent, name ); + return new KatePlugin%{APPNAME}( parent, name ); } KInstance* KatePluginFactory::s_instance = 0L; -KatePlugin%{APPNAME}::KatePlugin%{APPNAME}( TQObject* tqparent, const char* name ) - : Kate::Plugin ( (Kate::Application*)tqparent, name ) +KatePlugin%{APPNAME}::KatePlugin%{APPNAME}( TQObject* parent, const char* name ) + : Kate::Plugin ( (Kate::Application*)parent, name ) { } @@ -114,7 +114,7 @@ void KatePlugin%{APPNAME}::slotApplyConfig( %{APPNAME}ConfigPage* p ) /** * %{APPNAME}ConfigPage */ -%{APPNAME}ConfigPage::%{APPNAME}ConfigPage (TQObject* tqparent /*= 0L*/, TQWidget *parentWidget /*= 0L*/) +%{APPNAME}ConfigPage::%{APPNAME}ConfigPage (TQObject* parent /*= 0L*/, TQWidget *parentWidget /*= 0L*/) : Kate::PluginConfigPage( parentWidget ) { TQVBoxLayout* lo = new TQVBoxLayout( this, 0, 0, "config_page_layout" ); diff --git a/languages/cpp/app_templates/kateplugin2/plugin_app.h b/languages/cpp/app_templates/kateplugin2/plugin_app.h index 3550a344..297c0b4c 100644 --- a/languages/cpp/app_templates/kateplugin2/plugin_app.h +++ b/languages/cpp/app_templates/kateplugin2/plugin_app.h @@ -27,7 +27,7 @@ public: 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; @@ -39,7 +39,7 @@ class KatePlugin%{APPNAME} : public Kate::Plugin, Kate::PluginViewInterface, Kat TQ_OBJECT public: - KatePlugin%{APPNAME}( TQObject* tqparent = 0, const char* name = 0 ); + KatePlugin%{APPNAME}( TQObject* parent = 0, const char* name = 0 ); virtual ~KatePlugin%{APPNAME}(); void addView (Kate::MainWindow *win); @@ -71,7 +71,7 @@ class %{APPNAME}ConfigPage : public Kate::PluginConfigPage friend class KatePlugin%{APPNAME}; public: - %{APPNAME}ConfigPage (TQObject* tqparent = 0L, TQWidget *parentWidget = 0L); + %{APPNAME}ConfigPage (TQObject* parent = 0L, TQWidget *parentWidget = 0L); ~%{APPNAME}ConfigPage (); /** Reimplemented from Kate::PluginConfigPage; just emits configPageApplyRequest( this ). */ diff --git a/languages/cpp/app_templates/kcmodule/module.cpp b/languages/cpp/app_templates/kcmodule/module.cpp index 4e9d3ca5..bb15b923 100644 --- a/languages/cpp/app_templates/kcmodule/module.cpp +++ b/languages/cpp/app_templates/kcmodule/module.cpp @@ -11,8 +11,8 @@ typedef KGenericFactory<%{APPNAME}, TQWidget> %{APPNAME}Factory; K_EXPORT_COMPONENT_FACTORY( kcm_%{APPNAME}, %{APPNAME}Factory("kcm%{APPNAMELC}")) -%{APPNAME}::%{APPNAME}(TQWidget *tqparent, const char *name, const TQStringList&) - : KCModule(tqparent, name), myAboutData(0) +%{APPNAME}::%{APPNAME}(TQWidget *parent, const char *name, const TQStringList&) + : KCModule(parent, name), myAboutData(0) { // place widgets here load(); diff --git a/languages/cpp/app_templates/kcmodule/module.h b/languages/cpp/app_templates/kcmodule/module.h index 57542aae..8be473a9 100644 --- a/languages/cpp/app_templates/kcmodule/module.h +++ b/languages/cpp/app_templates/kcmodule/module.h @@ -12,7 +12,7 @@ class %{APPNAME}: public KCModule TQ_OBJECT public: - %{APPNAME}( TQWidget *tqparent=0, const char *name=0, const TQStringList& = TQStringList() ); + %{APPNAME}( TQWidget *parent=0, const char *name=0, const TQStringList& = TQStringList() ); ~%{APPNAME}(); virtual void load(); diff --git a/languages/cpp/app_templates/kconfig35/appview.cpp b/languages/cpp/app_templates/kconfig35/appview.cpp index 0c82dd25..6123db0b 100644 --- a/languages/cpp/app_templates/kconfig35/appview.cpp +++ b/languages/cpp/app_templates/kconfig35/appview.cpp @@ -6,8 +6,8 @@ #include <klocale.h> #include <tqlabel.h> -%{APPNAMELC}View::%{APPNAMELC}View(TQWidget *tqparent) - : %{APPNAMELC}view_base(tqparent) +%{APPNAMELC}View::%{APPNAMELC}View(TQWidget *parent) + : %{APPNAMELC}view_base(parent) { settingsChanged(); } diff --git a/languages/cpp/app_templates/kconfig35/appview.h b/languages/cpp/app_templates/kconfig35/appview.h index 897072a6..338cfaa9 100644 --- a/languages/cpp/app_templates/kconfig35/appview.h +++ b/languages/cpp/app_templates/kconfig35/appview.h @@ -27,7 +27,7 @@ public: /** * Default constructor */ - %{APPNAMELC}View(TQWidget *tqparent); + %{APPNAMELC}View(TQWidget *parent); /** * Destructor diff --git a/languages/cpp/app_templates/kde4app/kapp4view.h b/languages/cpp/app_templates/kde4app/kapp4view.h index c4ce6517..c8851bdc 100644 --- a/languages/cpp/app_templates/kde4app/kapp4view.h +++ b/languages/cpp/app_templates/kde4app/kapp4view.h @@ -27,7 +27,7 @@ public: /** * Default constructor */ - %{APPNAME}View(TQWidget *tqparent); + %{APPNAME}View(TQWidget *parent); /** * Destructor diff --git a/languages/cpp/app_templates/kdevlang/kdevlang_part.cpp b/languages/cpp/app_templates/kdevlang/kdevlang_part.cpp index 1ca8f046..364ec0d7 100644 --- a/languages/cpp/app_templates/kdevlang/kdevlang_part.cpp +++ b/languages/cpp/app_templates/kdevlang/kdevlang_part.cpp @@ -21,8 +21,8 @@ typedef KGenericFactory<%{APPNAME}Part> %{APPNAME}Factory; K_EXPORT_COMPONENT_FACTORY( libkdev%{APPNAMELC}, %{APPNAME}Factory( "kdev%{APPNAMELC}" ) ); static const KDevPluginInfo data("kdev%{APPNAMELC}"); -%{APPNAME}Part::%{APPNAME}Part(TQObject *tqparent, const char *name, const TQStringList& ) -: KDevLanguageSupport(&data, tqparent, name ? name : "%{APPNAME}Part" ) +%{APPNAME}Part::%{APPNAME}Part(TQObject *parent, const char *name, const TQStringList& ) +: KDevLanguageSupport(&data, parent, name ? name : "%{APPNAME}Part" ) { setInstance(%{APPNAME}Factory::instance()); setXMLFile("kdevlang_%{APPNAMELC}.rc"); diff --git a/languages/cpp/app_templates/kdevlang/kdevlang_part.h b/languages/cpp/app_templates/kdevlang/kdevlang_part.h index 234107bb..e8b4d15a 100644 --- a/languages/cpp/app_templates/kdevlang/kdevlang_part.h +++ b/languages/cpp/app_templates/kdevlang/kdevlang_part.h @@ -20,7 +20,7 @@ class %{APPNAME}Part : public KDevLanguageSupport Q_OBJECT TQ_OBJECT public: - %{APPNAME}Part(TQObject *tqparent, const char *name, const TQStringList &); + %{APPNAME}Part(TQObject *parent, const char *name, const TQStringList &); ~%{APPNAME}Part(); protected: virtual Features features(); diff --git a/languages/cpp/app_templates/kdevpart/globalconfig.cpp b/languages/cpp/app_templates/kdevpart/globalconfig.cpp index 54e56426..cddf3e7e 100644 --- a/languages/cpp/app_templates/kdevpart/globalconfig.cpp +++ b/languages/cpp/app_templates/kdevpart/globalconfig.cpp @@ -3,8 +3,8 @@ #include "%{APPNAMELC}part.h" -%{APPNAME}GlobalConfig::%{APPNAME}GlobalConfig(%{APPNAME}Part *part, TQWidget *tqparent, const char *name) - : %{APPNAME}GlobalConfigBase(tqparent, name), m_part(part) +%{APPNAME}GlobalConfig::%{APPNAME}GlobalConfig(%{APPNAME}Part *part, TQWidget *parent, const char *name) + : %{APPNAME}GlobalConfigBase(parent, name), m_part(part) { } diff --git a/languages/cpp/app_templates/kdevpart/globalconfig.h b/languages/cpp/app_templates/kdevpart/globalconfig.h index f08bd1bd..b7bfc732 100644 --- a/languages/cpp/app_templates/kdevpart/globalconfig.h +++ b/languages/cpp/app_templates/kdevpart/globalconfig.h @@ -11,7 +11,7 @@ class %{APPNAME}GlobalConfig: public %{APPNAME}GlobalConfigBase Q_OBJECT TQ_OBJECT public: - %{APPNAME}GlobalConfig(%{APPNAME}Part *part, TQWidget *tqparent = 0, const char *name = 0); + %{APPNAME}GlobalConfig(%{APPNAME}Part *part, TQWidget *parent = 0, const char *name = 0); public slots: void accept(); diff --git a/languages/cpp/app_templates/kdevpart/kdevpart_part.cpp b/languages/cpp/app_templates/kdevpart/kdevpart_part.cpp index 96ddb6ca..082549c4 100644 --- a/languages/cpp/app_templates/kdevpart/kdevpart_part.cpp +++ b/languages/cpp/app_templates/kdevpart/kdevpart_part.cpp @@ -28,8 +28,8 @@ K_EXPORT_COMPONENT_FACTORY( libkdev%{APPNAMELC}, %{APPNAME}Factory( data ) ); #define GLOBALDOC_OPTIONS 1 #define PROJECTDOC_OPTIONS 2 -%{APPNAME}Part::%{APPNAME}Part(TQObject *tqparent, const char *name, const TQStringList &/*args*/) - : KDevPlugin(&data, tqparent, name ? name : "%{APPNAME}Part") +%{APPNAME}Part::%{APPNAME}Part(TQObject *parent, const char *name, const TQStringList &/*args*/) + : KDevPlugin(&data, parent, name ? name : "%{APPNAME}Part") { setInstance(%{APPNAME}Factory::instance()); setXMLFile("kdev%{APPNAMELC}.rc"); diff --git a/languages/cpp/app_templates/kdevpart/kdevpart_part.h b/languages/cpp/app_templates/kdevpart/kdevpart_part.h index ddedde17..05494c1d 100644 --- a/languages/cpp/app_templates/kdevpart/kdevpart_part.h +++ b/languages/cpp/app_templates/kdevpart/kdevpart_part.h @@ -21,7 +21,7 @@ class %{APPNAME}Part: public KDevPlugin Q_OBJECT TQ_OBJECT public: - %{APPNAME}Part(TQObject *tqparent, const char *name, const TQStringList &args); + %{APPNAME}Part(TQObject *parent, const char *name, const TQStringList &args); ~%{APPNAME}Part(); private slots: diff --git a/languages/cpp/app_templates/kdevpart/projectconfig.cpp b/languages/cpp/app_templates/kdevpart/projectconfig.cpp index a3bc8b8c..42a9f3e7 100644 --- a/languages/cpp/app_templates/kdevpart/projectconfig.cpp +++ b/languages/cpp/app_templates/kdevpart/projectconfig.cpp @@ -3,8 +3,8 @@ #include "%{APPNAMELC}part.h" -%{APPNAME}ProjectConfig::%{APPNAME}ProjectConfig(%{APPNAME}Part *part, TQWidget *tqparent, const char *name) - : %{APPNAME}ProjectConfigBase(tqparent, name), m_part(part) +%{APPNAME}ProjectConfig::%{APPNAME}ProjectConfig(%{APPNAME}Part *part, TQWidget *parent, const char *name) + : %{APPNAME}ProjectConfigBase(parent, name), m_part(part) { } diff --git a/languages/cpp/app_templates/kdevpart/projectconfig.h b/languages/cpp/app_templates/kdevpart/projectconfig.h index 2d13ce14..fe77464b 100644 --- a/languages/cpp/app_templates/kdevpart/projectconfig.h +++ b/languages/cpp/app_templates/kdevpart/projectconfig.h @@ -11,7 +11,7 @@ class %{APPNAME}ProjectConfig: public %{APPNAME}ProjectConfigBase Q_OBJECT TQ_OBJECT public: - %{APPNAME}ProjectConfig(%{APPNAME}Part *part, TQWidget *tqparent = 0, const char *name = 0); + %{APPNAME}ProjectConfig(%{APPNAME}Part *part, TQWidget *parent = 0, const char *name = 0); public slots: void accept(); diff --git a/languages/cpp/app_templates/kdevpart2/globalconfig.cpp b/languages/cpp/app_templates/kdevpart2/globalconfig.cpp index 54e56426..cddf3e7e 100644 --- a/languages/cpp/app_templates/kdevpart2/globalconfig.cpp +++ b/languages/cpp/app_templates/kdevpart2/globalconfig.cpp @@ -3,8 +3,8 @@ #include "%{APPNAMELC}part.h" -%{APPNAME}GlobalConfig::%{APPNAME}GlobalConfig(%{APPNAME}Part *part, TQWidget *tqparent, const char *name) - : %{APPNAME}GlobalConfigBase(tqparent, name), m_part(part) +%{APPNAME}GlobalConfig::%{APPNAME}GlobalConfig(%{APPNAME}Part *part, TQWidget *parent, const char *name) + : %{APPNAME}GlobalConfigBase(parent, name), m_part(part) { } diff --git a/languages/cpp/app_templates/kdevpart2/globalconfig.h b/languages/cpp/app_templates/kdevpart2/globalconfig.h index f08bd1bd..b7bfc732 100644 --- a/languages/cpp/app_templates/kdevpart2/globalconfig.h +++ b/languages/cpp/app_templates/kdevpart2/globalconfig.h @@ -11,7 +11,7 @@ class %{APPNAME}GlobalConfig: public %{APPNAME}GlobalConfigBase Q_OBJECT TQ_OBJECT public: - %{APPNAME}GlobalConfig(%{APPNAME}Part *part, TQWidget *tqparent = 0, const char *name = 0); + %{APPNAME}GlobalConfig(%{APPNAME}Part *part, TQWidget *parent = 0, const char *name = 0); public slots: void accept(); diff --git a/languages/cpp/app_templates/kdevpart2/kdevpart_part.cpp b/languages/cpp/app_templates/kdevpart2/kdevpart_part.cpp index 96ddb6ca..082549c4 100644 --- a/languages/cpp/app_templates/kdevpart2/kdevpart_part.cpp +++ b/languages/cpp/app_templates/kdevpart2/kdevpart_part.cpp @@ -28,8 +28,8 @@ K_EXPORT_COMPONENT_FACTORY( libkdev%{APPNAMELC}, %{APPNAME}Factory( data ) ); #define GLOBALDOC_OPTIONS 1 #define PROJECTDOC_OPTIONS 2 -%{APPNAME}Part::%{APPNAME}Part(TQObject *tqparent, const char *name, const TQStringList &/*args*/) - : KDevPlugin(&data, tqparent, name ? name : "%{APPNAME}Part") +%{APPNAME}Part::%{APPNAME}Part(TQObject *parent, const char *name, const TQStringList &/*args*/) + : KDevPlugin(&data, parent, name ? name : "%{APPNAME}Part") { setInstance(%{APPNAME}Factory::instance()); setXMLFile("kdev%{APPNAMELC}.rc"); diff --git a/languages/cpp/app_templates/kdevpart2/kdevpart_part.h b/languages/cpp/app_templates/kdevpart2/kdevpart_part.h index ddedde17..05494c1d 100644 --- a/languages/cpp/app_templates/kdevpart2/kdevpart_part.h +++ b/languages/cpp/app_templates/kdevpart2/kdevpart_part.h @@ -21,7 +21,7 @@ class %{APPNAME}Part: public KDevPlugin Q_OBJECT TQ_OBJECT public: - %{APPNAME}Part(TQObject *tqparent, const char *name, const TQStringList &args); + %{APPNAME}Part(TQObject *parent, const char *name, const TQStringList &args); ~%{APPNAME}Part(); private slots: diff --git a/languages/cpp/app_templates/kdevpart2/projectconfig.cpp b/languages/cpp/app_templates/kdevpart2/projectconfig.cpp index a3bc8b8c..42a9f3e7 100644 --- a/languages/cpp/app_templates/kdevpart2/projectconfig.cpp +++ b/languages/cpp/app_templates/kdevpart2/projectconfig.cpp @@ -3,8 +3,8 @@ #include "%{APPNAMELC}part.h" -%{APPNAME}ProjectConfig::%{APPNAME}ProjectConfig(%{APPNAME}Part *part, TQWidget *tqparent, const char *name) - : %{APPNAME}ProjectConfigBase(tqparent, name), m_part(part) +%{APPNAME}ProjectConfig::%{APPNAME}ProjectConfig(%{APPNAME}Part *part, TQWidget *parent, const char *name) + : %{APPNAME}ProjectConfigBase(parent, name), m_part(part) { } diff --git a/languages/cpp/app_templates/kdevpart2/projectconfig.h b/languages/cpp/app_templates/kdevpart2/projectconfig.h index 2d13ce14..fe77464b 100644 --- a/languages/cpp/app_templates/kdevpart2/projectconfig.h +++ b/languages/cpp/app_templates/kdevpart2/projectconfig.h @@ -11,7 +11,7 @@ class %{APPNAME}ProjectConfig: public %{APPNAME}ProjectConfigBase Q_OBJECT TQ_OBJECT public: - %{APPNAME}ProjectConfig(%{APPNAME}Part *part, TQWidget *tqparent = 0, const char *name = 0); + %{APPNAME}ProjectConfig(%{APPNAME}Part *part, TQWidget *parent = 0, const char *name = 0); public slots: void accept(); diff --git a/languages/cpp/app_templates/kfileplugin/kfile_plugin.cpp b/languages/cpp/app_templates/kfileplugin/kfile_plugin.cpp index 5ccbec50..db259cb3 100644 --- a/languages/cpp/app_templates/kfileplugin/kfile_plugin.cpp +++ b/languages/cpp/app_templates/kfileplugin/kfile_plugin.cpp @@ -13,9 +13,9 @@ typedef KGenericFactory<%{APPNAME}Plugin> %{APPNAME}Factory; K_EXPORT_COMPONENT_FACTORY(kfile_%{APPNAME}, %{APPNAME}Factory( "kfile_%{APPNAMELC}" )) -%{APPNAME}Plugin::%{APPNAME}Plugin(TQObject *tqparent, const char *name, +%{APPNAME}Plugin::%{APPNAME}Plugin(TQObject *parent, const char *name, const TQStringList &args) - : KFilePlugin(tqparent, name, args) + : KFilePlugin(parent, name, args) { //add the mimetype here - example: //KFileMimeTypeInfo* info = addMimeTypeInfo( "text/html" ); diff --git a/languages/cpp/app_templates/kfileplugin/kfile_plugin.h b/languages/cpp/app_templates/kfileplugin/kfile_plugin.h index 93303359..f2ed7408 100644 --- a/languages/cpp/app_templates/kfileplugin/kfile_plugin.h +++ b/languages/cpp/app_templates/kfileplugin/kfile_plugin.h @@ -16,7 +16,7 @@ class %{APPNAME}Plugin: public KFilePlugin TQ_OBJECT public: - %{APPNAME}Plugin( TQObject *tqparent, const char *name, const TQStringList& args ); + %{APPNAME}Plugin( TQObject *parent, const char *name, const TQStringList& args ); virtual bool readInfo( KFileMetaInfo& info, uint what); }; diff --git a/languages/cpp/app_templates/khello2/widget.cpp b/languages/cpp/app_templates/khello2/widget.cpp index 40e2d2bb..266e894f 100644 --- a/languages/cpp/app_templates/khello2/widget.cpp +++ b/languages/cpp/app_templates/khello2/widget.cpp @@ -4,8 +4,8 @@ #include "%{APPNAMELC}widget.h" -%{APPNAME}Widget::%{APPNAME}Widget(TQWidget* tqparent, const char* name, WFlags fl) - : %{APPNAME}WidgetBase(tqparent,name,fl) +%{APPNAME}Widget::%{APPNAME}Widget(TQWidget* parent, const char* name, WFlags fl) + : %{APPNAME}WidgetBase(parent,name,fl) {} %{APPNAME}Widget::~%{APPNAME}Widget() diff --git a/languages/cpp/app_templates/khello2/widget.h b/languages/cpp/app_templates/khello2/widget.h index 3773456b..ed436a38 100644 --- a/languages/cpp/app_templates/khello2/widget.h +++ b/languages/cpp/app_templates/khello2/widget.h @@ -11,7 +11,7 @@ class %{APPNAME}Widget : public %{APPNAME}WidgetBase TQ_OBJECT public: - %{APPNAME}Widget(TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 ); + %{APPNAME}Widget(TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); ~%{APPNAME}Widget(); /*$PUBLIC_FUNCTIONS$*/ diff --git a/languages/cpp/app_templates/kicker/applet.cpp b/languages/cpp/app_templates/kicker/applet.cpp index d609fa26..29ec3d1d 100644 --- a/languages/cpp/app_templates/kicker/applet.cpp +++ b/languages/cpp/app_templates/kicker/applet.cpp @@ -10,8 +10,8 @@ #include "%{APPNAMELC}.h" -%{APPNAME}::%{APPNAME}(const TQString& configFile, Type type, int actions, TQWidget *tqparent, const char *name) - : KPanelApplet(configFile, type, actions, tqparent, name) +%{APPNAME}::%{APPNAME}(const TQString& configFile, Type type, int actions, TQWidget *parent, const char *name) + : KPanelApplet(configFile, type, actions, parent, name) { // Get the current application configuration handle ksConfig = config(); @@ -62,11 +62,11 @@ void %{APPNAME}::resizeEvent(TQResizeEvent *e) extern "C" { - KPanelApplet* init( TQWidget *tqparent, const TQString& configFile) + KPanelApplet* init( TQWidget *parent, const TQString& configFile) { KGlobal::locale()->insertCatalogue("%{APPNAMELC}"); return new %{APPNAME}(configFile, KPanelApplet::Normal, KPanelApplet::About | KPanelApplet::Help | KPanelApplet::Preferences, - tqparent, "%{APPNAMELC}"); + parent, "%{APPNAMELC}"); } } diff --git a/languages/cpp/app_templates/kicker/applet.h b/languages/cpp/app_templates/kicker/applet.h index b11b1aa9..1c134399 100644 --- a/languages/cpp/app_templates/kicker/applet.h +++ b/languages/cpp/app_templates/kicker/applet.h @@ -24,11 +24,11 @@ public: * @param configFile The configFile handed over in the factory function. * @param Type The applet @ref type(). * @param actions Standard RMB menu actions supported by the applet (see @ref action() ). - * @param tqparent The pointer to the tqparent widget handed over in the factory function. + * @param parent The pointer to the parent widget handed over in the factory function. * @param name A TQt object name for your applet. **/ %{APPNAME}(const TQString& configFile, Type t = Normal, int actions = 0, - TQWidget *tqparent = 0, const char *name = 0); + TQWidget *parent = 0, const char *name = 0); /** destructor */ ~%{APPNAME}(); diff --git a/languages/cpp/app_templates/kmake/mainviewimp.cpp b/languages/cpp/app_templates/kmake/mainviewimp.cpp index 5e953b0d..8a0de706 100644 --- a/languages/cpp/app_templates/kmake/mainviewimp.cpp +++ b/languages/cpp/app_templates/kmake/mainviewimp.cpp @@ -3,8 +3,8 @@ #include <tqlabel.h> #include <klocale.h> -MainViewImp::MainViewImp(TQWidget* tqparent, const char* name, WFlags fl) -: MainView(tqparent,name,fl) +MainViewImp::MainViewImp(TQWidget* parent, const char* name, WFlags fl) +: MainView(parent,name,fl) { } diff --git a/languages/cpp/app_templates/kmake/mainviewimp.h b/languages/cpp/app_templates/kmake/mainviewimp.h index 1a8af0b8..bcd627d0 100644 --- a/languages/cpp/app_templates/kmake/mainviewimp.h +++ b/languages/cpp/app_templates/kmake/mainviewimp.h @@ -9,7 +9,7 @@ class MainViewImp : public MainView TQ_OBJECT public: - MainViewImp(TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 ); + MainViewImp(TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); ~MainViewImp(); public slots: diff --git a/languages/cpp/app_templates/kofficepart/kopart_factory.cpp b/languages/cpp/app_templates/kofficepart/kopart_factory.cpp index d020ed5e..86287a3f 100644 --- a/languages/cpp/app_templates/kofficepart/kopart_factory.cpp +++ b/languages/cpp/app_templates/kofficepart/kopart_factory.cpp @@ -23,8 +23,8 @@ extern "C" KInstance* %{APPNAME}Factory::s_global = 0L; KAboutData* %{APPNAME}Factory::s_aboutData = 0L; -%{APPNAME}Factory::%{APPNAME}Factory( TQObject* tqparent, const char* name ) - : KoFactory( tqparent, name ) +%{APPNAME}Factory::%{APPNAME}Factory( TQObject* parent, const char* name ) + : KoFactory( parent, name ) { global(); } @@ -37,14 +37,14 @@ KAboutData* %{APPNAME}Factory::s_aboutData = 0L; s_global = 0L; } -KParts::Part* %{APPNAME}Factory::createPartObject( TQWidget *parentWidget, const char *widgetName, TQObject* tqparent, const char* name, const char* classname, const TQStringList & ) +KParts::Part* %{APPNAME}Factory::createPartObject( TQWidget *parentWidget, const char *widgetName, TQObject* parent, const char* name, const char* classname, const TQStringList & ) { // If classname is "KoDocument", our host is a koffice application // otherwise, the host wants us as a simple part, so switch to readonly and single view. bool bWantKoDocument = ( strcmp( classname, "KoDocument" ) == 0 ); // parentWidget and widgetName are used by KoDocument for the "readonly+singleView" case. - %{APPNAME}Part *part = new %{APPNAME}Part( parentWidget, widgetName, tqparent, name, !bWantKoDocument ); + %{APPNAME}Part *part = new %{APPNAME}Part( parentWidget, widgetName, parent, name, !bWantKoDocument ); if ( !bWantKoDocument ) part->setReadWrite( false ); diff --git a/languages/cpp/app_templates/kofficepart/kopart_factory.h b/languages/cpp/app_templates/kofficepart/kopart_factory.h index b0f934d9..9e820797 100644 --- a/languages/cpp/app_templates/kofficepart/kopart_factory.h +++ b/languages/cpp/app_templates/kofficepart/kopart_factory.h @@ -16,10 +16,10 @@ class %{APPNAME}Factory : public KoFactory Q_OBJECT TQ_OBJECT public: - %{APPNAME}Factory( TQObject* tqparent = 0, const char* name = 0 ); + %{APPNAME}Factory( TQObject* parent = 0, const char* name = 0 ); ~%{APPNAME}Factory(); - virtual KParts::Part *createPartObject( TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject *tqparent = 0, const char *name = 0, const char *classname = "KoDocument", const TQStringList &args = TQStringList() ); + virtual KParts::Part *createPartObject( TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject *parent = 0, const char *name = 0, const char *classname = "KoDocument", const TQStringList &args = TQStringList() ); static KInstance* global(); diff --git a/languages/cpp/app_templates/kofficepart/kopart_part.cpp b/languages/cpp/app_templates/kofficepart/kopart_part.cpp index fe8c0cca..a1196404 100644 --- a/languages/cpp/app_templates/kofficepart/kopart_part.cpp +++ b/languages/cpp/app_templates/kofficepart/kopart_part.cpp @@ -8,8 +8,8 @@ #include <tqpainter.h> -%{APPNAME}Part::%{APPNAME}Part( TQWidget *parentWidget, const char *widgetName, TQObject* tqparent, const char* name, bool singleViewMode ) - : KoDocument( parentWidget, widgetName, tqparent, name, singleViewMode ) +%{APPNAME}Part::%{APPNAME}Part( TQWidget *parentWidget, const char *widgetName, TQObject* parent, const char* name, bool singleViewMode ) + : KoDocument( parentWidget, widgetName, parent, name, singleViewMode ) { } @@ -19,9 +19,9 @@ bool %{APPNAME}Part::initDoc( InitDocFlags flags, TQWidget* parentWidget ) return TRUE; } -KoView* %{APPNAME}Part::createViewInstance( TQWidget* tqparent, const char* name ) +KoView* %{APPNAME}Part::createViewInstance( TQWidget* parent, const char* name ) { - return new %{APPNAME}View( this, tqparent, name ); + return new %{APPNAME}View( this, parent, name ); } bool %{APPNAME}Part::loadOasis( const TQDomDocument & doc, KoOasisStyles& oasisStyles, const TQDomDocument & settings, KoStore* store ) diff --git a/languages/cpp/app_templates/kofficepart/kopart_part.h b/languages/cpp/app_templates/kofficepart/kopart_part.h index fc67a523..21ad460a 100644 --- a/languages/cpp/app_templates/kofficepart/kopart_part.h +++ b/languages/cpp/app_templates/kofficepart/kopart_part.h @@ -13,7 +13,7 @@ class %{APPNAME}Part : public KoDocument Q_OBJECT TQ_OBJECT public: - %{APPNAME}Part( TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject* tqparent = 0, const char* name = 0, bool singleViewMode = false ); + %{APPNAME}Part( TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject* parent = 0, const char* name = 0, bool singleViewMode = false ); virtual void paintContent( TQPainter& painter, const TQRect& rect, bool transparent = FALSE, double zoomX = 1.0, double zoomY = 1.0 ); @@ -25,7 +25,7 @@ public: virtual bool saveOasis( KoStore* store, KoXmlWriter* manifestWriter ); protected: - virtual KoView* createViewInstance( TQWidget* tqparent, const char* name ); + virtual KoView* createViewInstance( TQWidget* parent, const char* name ); }; #endif diff --git a/languages/cpp/app_templates/kofficepart/kopart_view.cpp b/languages/cpp/app_templates/kofficepart/kopart_view.cpp index 240251f9..f32707a8 100644 --- a/languages/cpp/app_templates/kofficepart/kopart_view.cpp +++ b/languages/cpp/app_templates/kofficepart/kopart_view.cpp @@ -13,8 +13,8 @@ #include <klocale.h> #include <kdebug.h> -%{APPNAME}View::%{APPNAME}View( %{APPNAME}Part* part, TQWidget* tqparent, const char* name ) - : KoView( part, tqparent, name ) +%{APPNAME}View::%{APPNAME}View( %{APPNAME}Part* part, TQWidget* parent, const char* name ) + : KoView( part, parent, name ) { setInstance( %{APPNAME}Factory::global() ); setXMLFile( "%{APPNAMELC}.rc" ); diff --git a/languages/cpp/app_templates/kofficepart/kopart_view.h b/languages/cpp/app_templates/kofficepart/kopart_view.h index bcaac2e1..2b97fe4f 100644 --- a/languages/cpp/app_templates/kofficepart/kopart_view.h +++ b/languages/cpp/app_templates/kofficepart/kopart_view.h @@ -18,7 +18,7 @@ class %{APPNAME}View : public KoView Q_OBJECT TQ_OBJECT public: - %{APPNAME}View( %{APPNAME}Part* part, TQWidget* tqparent = 0, const char* name = 0 ); + %{APPNAME}View( %{APPNAME}Part* part, TQWidget* parent = 0, const char* name = 0 ); protected slots: void cut(); diff --git a/languages/cpp/app_templates/konqnavpanel/konqnavpanel.cpp b/languages/cpp/app_templates/konqnavpanel/konqnavpanel.cpp index 4f0d7557..ae9a85a6 100644 --- a/languages/cpp/app_templates/konqnavpanel/konqnavpanel.cpp +++ b/languages/cpp/app_templates/konqnavpanel/konqnavpanel.cpp @@ -7,8 +7,8 @@ #include "%{APPNAMELC}.h" #include "%{APPNAMELC}.moc" -%{APPNAME}::%{APPNAME}(KInstance *inst,TQObject *tqparent,TQWidget *widgetParent, TQString &desktopName, const char* name): - KonqSidebarPlugin(inst,tqparent,widgetParent,desktopName,name) +%{APPNAME}::%{APPNAME}(KInstance *inst,TQObject *parent,TQWidget *widgetParent, TQString &desktopName, const char* name): + KonqSidebarPlugin(inst,parent,widgetParent,desktopName,name) { widget=new TQLabel("Init Value",widgetParent); } diff --git a/languages/cpp/app_templates/konqnavpanel/konqnavpanel.h b/languages/cpp/app_templates/konqnavpanel/konqnavpanel.h index b219619b..83c5c2c4 100644 --- a/languages/cpp/app_templates/konqnavpanel/konqnavpanel.h +++ b/languages/cpp/app_templates/konqnavpanel/konqnavpanel.h @@ -21,12 +21,12 @@ public: * Construct a @ref KonqSidebarPlugin. * * @param inst The sidebar's kinstance class. - * @param tqparent The sidebar internal button info class responsible for this plugin. + * @param parent The sidebar internal button info class responsible for this plugin. * @param widgetParent The container which will contain the plugins widget. * @param desktopName The filename of the configuration file. * @param name A TQt object name for your plugin. **/ - %{APPNAME}(KInstance *inst,TQObject *tqparent,TQWidget *widgetParent, TQString &desktopName, const char* name=0); + %{APPNAME}(KInstance *inst,TQObject *parent,TQWidget *widgetParent, TQString &desktopName, const char* name=0); /** destructor */ ~%{APPNAME}(); diff --git a/languages/cpp/app_templates/kpartapp/app_part.cpp b/languages/cpp/app_templates/kpartapp/app_part.cpp index 479a6782..1f3992af 100644 --- a/languages/cpp/app_templates/kpartapp/app_part.cpp +++ b/languages/cpp/app_templates/kpartapp/app_part.cpp @@ -13,8 +13,8 @@ #include <tqmultilineedit.h> %{APPNAME}Part::%{APPNAME}Part( TQWidget *parentWidget, const char *widgetName, - TQObject *tqparent, const char *name ) - : KParts::ReadWritePart(tqparent, name) + TQObject *parent, const char *name ) + : KParts::ReadWritePart(parent, name) { // we need an instance setInstance( %{APPNAME}PartFactory::instance() ); @@ -74,7 +74,7 @@ void %{APPNAME}Part::setModified(bool modified) else save->setEnabled(false); - // in any event, we want our tqparent to do it's thing + // in any event, we want our parent to do it's thing ReadWritePart::setModified(modified); } @@ -165,11 +165,11 @@ KAboutData* %{APPNAME}PartFactory::s_about = 0L; } KParts::Part* %{APPNAME}PartFactory::createPartObject( TQWidget *parentWidget, const char *widgetName, - TQObject *tqparent, const char *name, + TQObject *parent, const char *name, const char *classname, const TQStringList &args ) { // Create an instance of our Part - %{APPNAME}Part* obj = new %{APPNAME}Part( parentWidget, widgetName, tqparent, name ); + %{APPNAME}Part* obj = new %{APPNAME}Part( parentWidget, widgetName, parent, name ); // See if we are to be read-write or not if (TQCString(classname) == "KParts::ReadOnlyPart") diff --git a/languages/cpp/app_templates/kpartapp/app_part.h b/languages/cpp/app_templates/kpartapp/app_part.h index 3a481c5c..30f99b04 100644 --- a/languages/cpp/app_templates/kpartapp/app_part.h +++ b/languages/cpp/app_templates/kpartapp/app_part.h @@ -27,7 +27,7 @@ public: * Default constructor */ %{APPNAME}Part(TQWidget *parentWidget, const char *widgetName, - TQObject *tqparent, const char *name); + TQObject *parent, const char *name); /** * Destructor @@ -76,7 +76,7 @@ public: %{APPNAME}PartFactory(); virtual ~%{APPNAME}PartFactory(); virtual KParts::Part* createPartObject( TQWidget *parentWidget, const char *widgetName, - TQObject *tqparent, const char *name, + TQObject *parent, const char *name, const char *classname, const TQStringList &args ); static KInstance* instance(); diff --git a/languages/cpp/app_templates/kpartplugin/plugin_app.cpp b/languages/cpp/app_templates/kpartplugin/plugin_app.cpp index dac6dc20..61e3ca0e 100644 --- a/languages/cpp/app_templates/kpartplugin/plugin_app.cpp +++ b/languages/cpp/app_templates/kpartplugin/plugin_app.cpp @@ -8,8 +8,8 @@ #include <klocale.h> #include <kglobal.h> -Plugin%{APPNAME}::Plugin%{APPNAME}( TQObject* tqparent, const char* name ) - : Plugin( tqparent, name ) +Plugin%{APPNAME}::Plugin%{APPNAME}( TQObject* parent, const char* name ) + : Plugin( parent, name ) { // Instantiate all of your actions here. These will appear in // Konqueror's menu and toolbars. @@ -27,7 +27,7 @@ void Plugin%{APPNAME}::slotAction() // This plugin assumes KHTMLPart. If your plugin can handle more // than this or a different Part than this, simply delete or // change the following block. - if ( !tqparent()->inherits("KHTMLPart") ) + if ( !parent()->inherits("KHTMLPart") ) { TQString title( i18n( "Cannot Translate Source" ) ); TQString text( i18n( "You cannot translate anything except web pages " @@ -37,9 +37,9 @@ void Plugin%{APPNAME}::slotAction() return; } - // Get a handle on our tqparent so we may get the necessary data for + // Get a handle on our parent so we may get the necessary data for // processing - KHTMLPart *part = dynamic_cast<KHTMLPart *>(tqparent()); + KHTMLPart *part = dynamic_cast<KHTMLPart *>(parent()); // This plugin only uses the URL. You may use whatever data you // need. @@ -83,9 +83,9 @@ void Plugin%{APPNAME}::slotAction() s_instance = 0; } -TQObject* %{APPNAME}Factory::createObject( TQObject* tqparent, const char* name, const char*, const TQStringList & ) +TQObject* %{APPNAME}Factory::createObject( TQObject* parent, const char* name, const char*, const TQStringList & ) { - return new Plugin%{APPNAME}( tqparent, name ); + return new Plugin%{APPNAME}( parent, name ); } KInstance *%{APPNAME}Factory::instance() diff --git a/languages/cpp/app_templates/kpartplugin/plugin_app.h b/languages/cpp/app_templates/kpartplugin/plugin_app.h index 3d637d1b..cff0a63c 100644 --- a/languages/cpp/app_templates/kpartplugin/plugin_app.h +++ b/languages/cpp/app_templates/kpartplugin/plugin_app.h @@ -10,7 +10,7 @@ class Plugin%{APPNAME} : public KParts::Plugin Q_OBJECT TQ_OBJECT public: - Plugin%{APPNAME}( TQObject* tqparent = 0, const char* name = 0 ); + Plugin%{APPNAME}( TQObject* parent = 0, const char* name = 0 ); virtual ~Plugin%{APPNAME}(); public slots: @@ -25,7 +25,7 @@ public: %{APPNAME}Factory(); virtual ~%{APPNAME}Factory(); - 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() ); static KInstance* instance(); diff --git a/languages/cpp/app_templates/kscons_kmdi/app_part.cpp b/languages/cpp/app_templates/kscons_kmdi/app_part.cpp index 0818d856..06a6409c 100644 --- a/languages/cpp/app_templates/kscons_kmdi/app_part.cpp +++ b/languages/cpp/app_templates/kscons_kmdi/app_part.cpp @@ -18,8 +18,8 @@ typedef KParts::GenericFactory<%{APPNAMELC}Part> %{APPNAMELC}PartFactory; K_EXPORT_COMPONENT_FACTORY( lib%{APPNAMELC}part, %{APPNAMELC}PartFactory ); %{APPNAMELC}Part::%{APPNAMELC}Part( TQWidget *parentWidget, const char *widgetName, - TQObject *tqparent, const char *name, const TQStringList & /*args*/) - : KParts::ReadWritePart(tqparent) + TQObject *parent, const char *name, const TQStringList & /*args*/) + : KParts::ReadWritePart(parent) { // we need an instance setInstance( %{APPNAMELC}PartFactory::instance() ); @@ -88,7 +88,7 @@ void %{APPNAMELC}Part::setModified(bool modified) else save->setEnabled(false); - // in any event, we want our tqparent to do it's thing + // in any event, we want our parent to do it's thing ReadWritePart::setModified(modified); } diff --git a/languages/cpp/app_templates/kscons_kmdi/app_part.h b/languages/cpp/app_templates/kscons_kmdi/app_part.h index fabeedbc..5ab44003 100644 --- a/languages/cpp/app_templates/kscons_kmdi/app_part.h +++ b/languages/cpp/app_templates/kscons_kmdi/app_part.h @@ -29,7 +29,7 @@ public: * Default constructor */ %{APPNAMELC}Part(TQWidget *parentWidget, const char *widgetName, - TQObject *tqparent, const char *name, const TQStringList & /*args*/); + TQObject *parent, const char *name, const TQStringList & /*args*/); /** * Destructor diff --git a/languages/cpp/app_templates/kscons_kmdi/kmdikonsole.cpp b/languages/cpp/app_templates/kscons_kmdi/kmdikonsole.cpp index d0c856ec..5bd6b949 100644 --- a/languages/cpp/app_templates/kscons_kmdi/kmdikonsole.cpp +++ b/languages/cpp/app_templates/kscons_kmdi/kmdikonsole.cpp @@ -12,7 +12,7 @@ #include "kmdikonsole.h" -kmdikonsole::kmdikonsole(TQWidget *tqparent, const char *name) : TQVBox(tqparent, name) +kmdikonsole::kmdikonsole(TQWidget *parent, const char *name) : TQVBox(parent, name) { m_haskonsole = false; respawn(); diff --git a/languages/cpp/app_templates/kscons_kmdi/kmdikonsole.h b/languages/cpp/app_templates/kscons_kmdi/kmdikonsole.h index e97175c1..727e9675 100644 --- a/languages/cpp/app_templates/kscons_kmdi/kmdikonsole.h +++ b/languages/cpp/app_templates/kscons_kmdi/kmdikonsole.h @@ -11,7 +11,7 @@ class kmdikonsole : public TQVBox TQ_OBJECT public: - kmdikonsole( TQWidget* tqparent, const char* name=0); + kmdikonsole( TQWidget* parent, const char* name=0); ~kmdikonsole(); public slots: diff --git a/languages/cpp/app_templates/kscons_kxt/appview.cpp b/languages/cpp/app_templates/kscons_kxt/appview.cpp index a474e605..f2dd28a3 100644 --- a/languages/cpp/app_templates/kscons_kxt/appview.cpp +++ b/languages/cpp/app_templates/kscons_kxt/appview.cpp @@ -6,8 +6,8 @@ #include <klocale.h> #include <tqlabel.h> -%{APPNAME}View::%{APPNAME}View(TQWidget *tqparent) - : %{APPNAME}view_base(tqparent) +%{APPNAME}View::%{APPNAME}View(TQWidget *parent) + : %{APPNAME}view_base(parent) { settingsChanged(); } diff --git a/languages/cpp/app_templates/kscons_kxt/appview.h b/languages/cpp/app_templates/kscons_kxt/appview.h index 8d4517bd..56a6edd3 100644 --- a/languages/cpp/app_templates/kscons_kxt/appview.h +++ b/languages/cpp/app_templates/kscons_kxt/appview.h @@ -27,7 +27,7 @@ public: /** * Default constructor */ - %{APPNAME}View(TQWidget *tqparent); + %{APPNAME}View(TQWidget *parent); /** * Destructor diff --git a/languages/cpp/app_templates/kscreensaver/kscreensaver.cpp b/languages/cpp/app_templates/kscreensaver/kscreensaver.cpp index 855fb657..efdbf40b 100644 --- a/languages/cpp/app_templates/kscreensaver/kscreensaver.cpp +++ b/languages/cpp/app_templates/kscreensaver/kscreensaver.cpp @@ -33,8 +33,8 @@ extern "C" //----------------------------------------------------------------------------- //! dialog to setup screen saver parameters -%{APPNAME}Setup::%{APPNAME}Setup( TQWidget *tqparent, const char *name ) - : %{APPNAME}UI( tqparent, name, TRUE ) +%{APPNAME}Setup::%{APPNAME}Setup( TQWidget *parent, const char *name ) + : %{APPNAME}UI( parent, name, TRUE ) { /// @todo //Connect your signals and slots here to configure the screen saver. diff --git a/languages/cpp/app_templates/kscreensaver/kscreensaver.h b/languages/cpp/app_templates/kscreensaver/kscreensaver.h index c8511d34..fc2fd650 100644 --- a/languages/cpp/app_templates/kscreensaver/kscreensaver.h +++ b/languages/cpp/app_templates/kscreensaver/kscreensaver.h @@ -23,7 +23,7 @@ class %{APPNAME}Setup : public %{APPNAME}UI Q_OBJECT TQ_OBJECT public: - %{APPNAME}Setup( TQWidget *tqparent = NULL, const char *name = NULL ); + %{APPNAME}Setup( TQWidget *parent = NULL, const char *name = NULL ); private slots: void slotOkPressed(); diff --git a/languages/cpp/app_templates/kxt/appview.cpp b/languages/cpp/app_templates/kxt/appview.cpp index 0c82dd25..6123db0b 100644 --- a/languages/cpp/app_templates/kxt/appview.cpp +++ b/languages/cpp/app_templates/kxt/appview.cpp @@ -6,8 +6,8 @@ #include <klocale.h> #include <tqlabel.h> -%{APPNAMELC}View::%{APPNAMELC}View(TQWidget *tqparent) - : %{APPNAMELC}view_base(tqparent) +%{APPNAMELC}View::%{APPNAMELC}View(TQWidget *parent) + : %{APPNAMELC}view_base(parent) { settingsChanged(); } diff --git a/languages/cpp/app_templates/kxt/appview.h b/languages/cpp/app_templates/kxt/appview.h index 897072a6..338cfaa9 100644 --- a/languages/cpp/app_templates/kxt/appview.h +++ b/languages/cpp/app_templates/kxt/appview.h @@ -27,7 +27,7 @@ public: /** * Default constructor */ - %{APPNAMELC}View(TQWidget *tqparent); + %{APPNAMELC}View(TQWidget *parent); /** * Destructor diff --git a/languages/cpp/app_templates/opieapp/example.cpp b/languages/cpp/app_templates/opieapp/example.cpp index 6636116e..6a0d616e 100644 --- a/languages/cpp/app_templates/opieapp/example.cpp +++ b/languages/cpp/app_templates/opieapp/example.cpp @@ -6,11 +6,11 @@ typedef OApplicationFactory<%{APPNAME}> %{APPNAME}Factory; OPIE_EXPORT_APP( %{APPNAME}Factory ) /* - * Constructs a %{APPNAME} which is a child of 'tqparent', with the + * Constructs a %{APPNAME} which is a child of 'parent', with the * name 'name' and widget flags set to 'f' */ -%{APPNAME}::%{APPNAME}( TQWidget* tqparent, const char* name, WFlags fl ) - : %{APPNAME}Base( tqparent, name, fl ) +%{APPNAME}::%{APPNAME}( TQWidget* parent, const char* name, WFlags fl ) + : %{APPNAME}Base( parent, name, fl ) { connect(quit, TQT_SIGNAL(clicked()), this, TQT_SLOT(goodBye())); } diff --git a/languages/cpp/app_templates/opieapp/example.h b/languages/cpp/app_templates/opieapp/example.h index 0a8320c9..7da09f5a 100644 --- a/languages/cpp/app_templates/opieapp/example.h +++ b/languages/cpp/app_templates/opieapp/example.h @@ -11,7 +11,7 @@ public: static TQString appName() { return TQString::tqfromLatin1("%{APPNAMELC}" ); } - %{APPNAME}( TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 ); + %{APPNAME}( TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); ~%{APPNAME}(); private slots: diff --git a/languages/cpp/app_templates/opieapplet/simpleimpl.cpp b/languages/cpp/app_templates/opieapplet/simpleimpl.cpp index cc2a6a17..9a181745 100644 --- a/languages/cpp/app_templates/opieapplet/simpleimpl.cpp +++ b/languages/cpp/app_templates/opieapplet/simpleimpl.cpp @@ -8,8 +8,8 @@ #include "%{APPNAMELC}.h" -%{APPNAME}::%{APPNAME}(TQWidget *tqparent) - : TQWidget( tqparent, "%{APPNAME} Applet" ) { +%{APPNAME}::%{APPNAME}(TQWidget *parent) + : TQWidget( parent, "%{APPNAME} Applet" ) { /* * we will load an Image, scale it for the right usage * remember your applet might be used by different @@ -89,12 +89,12 @@ void %{APPNAME}::paintEvent( TQPaintEvent* ) { /* * For the taskbar interface return a Widget */ -TQWidget* %{APPNAME}Impl::applet( TQWidget* tqparent ) { +TQWidget* %{APPNAME}Impl::applet( TQWidget* parent ) { /* * There are problems with ownership. So we add * our ownlist and clear this; */ - %{APPNAME}* ap = new %{APPNAME}( tqparent ); + %{APPNAME}* ap = new %{APPNAME}( parent ); m_applets.append( ap ); return ap; diff --git a/languages/cpp/app_templates/opieapplet/simpleimpl.h b/languages/cpp/app_templates/opieapplet/simpleimpl.h index 855aed57..311d7c14 100644 --- a/languages/cpp/app_templates/opieapplet/simpleimpl.h +++ b/languages/cpp/app_templates/opieapplet/simpleimpl.h @@ -42,7 +42,7 @@ class %{APPNAME} : public TQWidget { Q_OBJECT TQ_OBJECT public: - %{APPNAME}(TQWidget *tqparent); + %{APPNAME}(TQWidget *parent); ~%{APPNAME}(); private: void mousePressEvent( TQMouseEvent* ); @@ -58,7 +58,7 @@ public: TQRESULT queryInterface( const TQUuid&, TQUnknownInterface** ); - TQWidget *applet( TQWidget* tqparent ); + TQWidget *applet( TQWidget* parent ); int position()const; /* diff --git a/languages/cpp/app_templates/opieinput/simpleimpl.cpp b/languages/cpp/app_templates/opieinput/simpleimpl.cpp index ea178e59..6a7bef4f 100644 --- a/languages/cpp/app_templates/opieinput/simpleimpl.cpp +++ b/languages/cpp/app_templates/opieinput/simpleimpl.cpp @@ -102,10 +102,10 @@ void %{APPNAME}::slotCtrl(bool b){ delete m_icn; } -TQWidget *%{APPNAME}Impl::inputMethod( TQWidget *tqparent, TQt::WFlags f ) +TQWidget *%{APPNAME}Impl::inputMethod( TQWidget *parent, TQt::WFlags f ) { if ( !m_pickboard ) - m_pickboard = new %{APPNAME}( tqparent, f ); + m_pickboard = new %{APPNAME}( parent, f ); return m_pickboard; } diff --git a/languages/cpp/app_templates/opieinput/simpleimpl.h b/languages/cpp/app_templates/opieinput/simpleimpl.h index 76af8138..ab41e38d 100644 --- a/languages/cpp/app_templates/opieinput/simpleimpl.h +++ b/languages/cpp/app_templates/opieinput/simpleimpl.h @@ -37,7 +37,7 @@ public: TQ_REFCOUNT #endif - virtual TQWidget *inputMethod( TQWidget *tqparent, TQt::WFlags f ); + virtual TQWidget *inputMethod( TQWidget *parent, TQt::WFlags f ); virtual void resetState(); virtual TQPixmap *icon(); virtual TQString name(); diff --git a/languages/cpp/app_templates/opiemenu/simpleimpl.h b/languages/cpp/app_templates/opiemenu/simpleimpl.h index 61c3cc5b..71d7afa4 100644 --- a/languages/cpp/app_templates/opiemenu/simpleimpl.h +++ b/languages/cpp/app_templates/opiemenu/simpleimpl.h @@ -26,7 +26,7 @@ public: /* virtual TQString tr( const char* ) const; virtual TQString tr( const char*, const char* ) const; */ - virtual TQPopupMenu *popup ( TQWidget *tqparent ) const; + virtual TQPopupMenu *popup ( TQWidget *parent ) const; virtual void activated ( ); }; diff --git a/languages/cpp/app_templates/opienet/simpleiface.cpp b/languages/cpp/app_templates/opienet/simpleiface.cpp index 9b38bc77..e98148d2 100644 --- a/languages/cpp/app_templates/opienet/simpleiface.cpp +++ b/languages/cpp/app_templates/opienet/simpleiface.cpp @@ -1,9 +1,9 @@ #include "%{APPNAMELC}iface.h" -%{APPNAME}Interface::%{APPNAME}Interface( TQObject* tqparent, +%{APPNAME}Interface::%{APPNAME}Interface( TQObject* parent, const char* name, bool status ) - : Interface(tqparent, name, status ) + : Interface(parent, name, status ) { } diff --git a/languages/cpp/app_templates/opienet/simpleiface.h b/languages/cpp/app_templates/opienet/simpleiface.h index c38d884f..d998de8f 100644 --- a/languages/cpp/app_templates/opienet/simpleiface.h +++ b/languages/cpp/app_templates/opienet/simpleiface.h @@ -8,7 +8,7 @@ class %{APPNAME}Interface : public Interface { TQ_OBJECT public: - %{APPNAME}Interface(TQObject* tqparent, const char* name = "vpn", bool up = false ); + %{APPNAME}Interface(TQObject* parent, const char* name = "vpn", bool up = false ); ~%{APPNAME}Interface(); public slots: diff --git a/languages/cpp/app_templates/opietoday/exampleplugin.cpp b/languages/cpp/app_templates/opietoday/exampleplugin.cpp index d3dc37ab..12d702b6 100644 --- a/languages/cpp/app_templates/opietoday/exampleplugin.cpp +++ b/languages/cpp/app_templates/opietoday/exampleplugin.cpp @@ -36,7 +36,7 @@ TQString %{APPNAME}::pixmapNameConfig() const { } // No config widget yet, look at the datebook plugin for an example of that -TodayConfigWidget* %{APPNAME}::configWidget( TQWidget* /*tqparent*/ ) { +TodayConfigWidget* %{APPNAME}::configWidget( TQWidget* /*parent*/ ) { return 0l; } diff --git a/languages/cpp/app_templates/opietoday/examplepluginwidget.cpp b/languages/cpp/app_templates/opietoday/examplepluginwidget.cpp index 98b19f9a..2f491481 100644 --- a/languages/cpp/app_templates/opietoday/examplepluginwidget.cpp +++ b/languages/cpp/app_templates/opietoday/examplepluginwidget.cpp @@ -3,8 +3,8 @@ #include "%{APPNAMELC}widget.h" -%{APPNAME}Widget::%{APPNAME}Widget( TQWidget *tqparent, const char* name) - : TQWidget(tqparent, name ) { +%{APPNAME}Widget::%{APPNAME}Widget( TQWidget *parent, const char* name) + : TQWidget(parent, name ) { m_exampleLabel = 0l; m_layout = 0l; diff --git a/languages/cpp/app_templates/opietoday/examplepluginwidget.h b/languages/cpp/app_templates/opietoday/examplepluginwidget.h index f5e35d4e..f079013e 100644 --- a/languages/cpp/app_templates/opietoday/examplepluginwidget.h +++ b/languages/cpp/app_templates/opietoday/examplepluginwidget.h @@ -11,7 +11,7 @@ class %{APPNAME}Widget : public TQWidget { TQ_OBJECT public: - %{APPNAME}Widget( TQWidget *tqparent, const char *name ); + %{APPNAME}Widget( TQWidget *parent, const char *name ); ~%{APPNAME}Widget(); void refresh(); diff --git a/languages/cpp/app_templates/qtopia4app/example.cpp b/languages/cpp/app_templates/qtopia4app/example.cpp index 12c3f634..735f7e03 100644 --- a/languages/cpp/app_templates/qtopia4app/example.cpp +++ b/languages/cpp/app_templates/qtopia4app/example.cpp @@ -2,8 +2,8 @@ #include "%{APPNAMELC}.h" #include <tqpushbutton.h> -%{APPNAME}Base::%{APPNAME}Base( TQWidget *tqparent, TQt::WFlags f ) - : TQWidget( tqparent, f ) +%{APPNAME}Base::%{APPNAME}Base( TQWidget *parent, TQt::WFlags f ) + : TQWidget( parent, f ) { setupUi( this ); } @@ -13,11 +13,11 @@ } /* - * Constructs a %{APPNAME} which is a child of 'tqparent', with the + * Constructs a %{APPNAME} which is a child of 'parent', with the * name 'name' and widget flags set to 'f' */ -%{APPNAME}::%{APPNAME}( TQWidget *tqparent, TQt::WFlags f ) - : %{APPNAME}Base( tqparent, f ) +%{APPNAME}::%{APPNAME}( TQWidget *parent, TQt::WFlags f ) + : %{APPNAME}Base( parent, f ) { connect(quit, TQT_SIGNAL(clicked()), this, TQT_SLOT(goodBye())); } diff --git a/languages/cpp/app_templates/qtopia4app/example.h b/languages/cpp/app_templates/qtopia4app/example.h index e4c44a8f..0b174641 100644 --- a/languages/cpp/app_templates/qtopia4app/example.h +++ b/languages/cpp/app_templates/qtopia4app/example.h @@ -6,7 +6,7 @@ class %{APPNAME}Base : public TQWidget, public Ui_%{APPNAME}Base { public: - %{APPNAME}Base( TQWidget *tqparent = 0, TQt::WFlags f = 0 ); + %{APPNAME}Base( TQWidget *parent = 0, TQt::WFlags f = 0 ); virtual ~%{APPNAME}Base(); }; @@ -15,7 +15,7 @@ class %{APPNAME} : public %{APPNAME}Base Q_OBJECT TQ_OBJECT public: - %{APPNAME}( TQWidget *tqparent = 0, TQt::WFlags f = 0 ); + %{APPNAME}( TQWidget *parent = 0, TQt::WFlags f = 0 ); virtual ~%{APPNAME}(); private slots: diff --git a/languages/cpp/app_templates/qtopiaapp/example.cpp b/languages/cpp/app_templates/qtopiaapp/example.cpp index 85082508..d68f6c6d 100644 --- a/languages/cpp/app_templates/qtopiaapp/example.cpp +++ b/languages/cpp/app_templates/qtopiaapp/example.cpp @@ -3,11 +3,11 @@ #include <tqpushbutton.h> /* - * Constructs a %{APPNAME} which is a child of 'tqparent', with the + * Constructs a %{APPNAME} which is a child of 'parent', with the * name 'name' and widget flags set to 'f' */ -%{APPNAME}::%{APPNAME}( TQWidget* tqparent, const char* name, WFlags fl ) - : %{APPNAME}Base( tqparent, name, fl ) +%{APPNAME}::%{APPNAME}( TQWidget* parent, const char* name, WFlags fl ) + : %{APPNAME}Base( parent, name, fl ) { connect(quit, TQT_SIGNAL(clicked()), this, TQT_SLOT(goodBye())); } diff --git a/languages/cpp/app_templates/qtopiaapp/example.h b/languages/cpp/app_templates/qtopiaapp/example.h index 64abf97c..84f90cfd 100644 --- a/languages/cpp/app_templates/qtopiaapp/example.h +++ b/languages/cpp/app_templates/qtopiaapp/example.h @@ -9,7 +9,7 @@ class %{APPNAME} : public %{APPNAME}Base TQ_OBJECT public: - %{APPNAME}( TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 ); + %{APPNAME}( TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); ~%{APPNAME}(); private slots: diff --git a/languages/cpp/ast_utils.cpp b/languages/cpp/ast_utils.cpp index 8db2e754..050d4c24 100644 --- a/languages/cpp/ast_utils.cpp +++ b/languages/cpp/ast_utils.cpp @@ -63,8 +63,8 @@ void scopeOfNode( AST* ast, TQStringList& scope ) if ( !ast ) return ; - if ( ast->tqparent() ) - scopeOfNode( ast->tqparent(), scope ); + if ( ast->parent() ) + scopeOfNode( ast->parent(), scope ); TQString s; switch ( ast->nodeType() ) diff --git a/languages/cpp/ccconfigwidget.cpp b/languages/cpp/ccconfigwidget.cpp index 7bf2601e..e786fb87 100644 --- a/languages/cpp/ccconfigwidget.cpp +++ b/languages/cpp/ccconfigwidget.cpp @@ -60,8 +60,8 @@ using namespace std; -CCConfigWidget::CCConfigWidget( CppSupportPart* part, TQWidget* tqparent, const char* name ) - : CCConfigWidgetBase( tqparent, name ) +CCConfigWidget::CCConfigWidget( CppSupportPart* part, TQWidget* parent, const char* name ) + : CCConfigWidgetBase( parent, name ) { m_pPart = part; connect( m_pPart->codeRepository(), TQT_SIGNAL( catalogRegistered( Catalog* ) ), diff --git a/languages/cpp/ccconfigwidget.h b/languages/cpp/ccconfigwidget.h index 3cf2f89b..3e7fe0bf 100644 --- a/languages/cpp/ccconfigwidget.h +++ b/languages/cpp/ccconfigwidget.h @@ -26,7 +26,7 @@ class CCConfigWidget : public CCConfigWidgetBase TQ_OBJECT public: - CCConfigWidget( CppSupportPart* part, TQWidget* tqparent = 0, const char* name = 0 ); + CCConfigWidget( CppSupportPart* part, TQWidget* parent = 0, const char* name = 0 ); virtual ~CCConfigWidget( ); public slots: diff --git a/languages/cpp/classgeneratorconfig.cpp b/languages/cpp/classgeneratorconfig.cpp index 963faa71..70ad5d10 100644 --- a/languages/cpp/classgeneratorconfig.cpp +++ b/languages/cpp/classgeneratorconfig.cpp @@ -21,8 +21,8 @@ #include "cppsupportfactory.h" #include "classgeneratorconfig.h" -ClassGeneratorConfig::ClassGeneratorConfig( TQWidget* tqparent, const char* name, WFlags fl ) - : ClassGeneratorConfigBase( tqparent, name, fl ) +ClassGeneratorConfig::ClassGeneratorConfig( TQWidget* parent, const char* name, WFlags fl ) + : ClassGeneratorConfigBase( parent, name, fl ) { readConfig(); currTemplate = &cppHeaderText; @@ -34,8 +34,8 @@ ClassGeneratorConfig::ClassGeneratorConfig( TQString v_cppHeaderText, TQString v TQString v_gtkHeaderText, TQString v_gtkSourceText, NameCase v_fileCase, NameCase v_defCase, NameCase v_superCase, bool v_showAuthor, bool v_genDoc, bool v_reformat, - TQWidget* tqparent, const char* name, WFlags fl ) - : ClassGeneratorConfigBase( tqparent, name, fl ), + TQWidget* parent, const char* name, WFlags fl ) + : ClassGeneratorConfigBase( parent, name, fl ), cppHeaderText( v_cppHeaderText ), cppSourceText( v_cppSourceText ), objcHeaderText( v_objcHeaderText ), objcSourceText( v_objcSourceText ), gtkHeaderText( v_gtkHeaderText ), gtkSourceText( v_gtkSourceText ) diff --git a/languages/cpp/classgeneratorconfig.h b/languages/cpp/classgeneratorconfig.h index f9a82752..bbe59e24 100644 --- a/languages/cpp/classgeneratorconfig.h +++ b/languages/cpp/classgeneratorconfig.h @@ -22,14 +22,14 @@ class ClassGeneratorConfig : public ClassGeneratorConfigBase public: enum NameCase { LowerCase, UpperCase, SameAsClassCase, SameAsFileCase }; - ClassGeneratorConfig( TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 ); + ClassGeneratorConfig( TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); ClassGeneratorConfig( TQString v_cppHeaderText, TQString v_cppSourceText, TQString v_objcHeaderText, TQString v_objcSourceText, TQString v_gtkHeaderText, TQString v_gtkSourceText, NameCase v_fileCase, NameCase v_defCase, NameCase v_superCase, bool v_showAuthor, bool v_genDoc, bool v_reformat, - TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 ); + TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); ~ClassGeneratorConfig(); /*$PUBLIC_FUNCTIONS$*/ diff --git a/languages/cpp/compiler/gccoptions/gccoptionsplugin.cpp b/languages/cpp/compiler/gccoptions/gccoptionsplugin.cpp index 533f6ad7..4add5992 100644 --- a/languages/cpp/compiler/gccoptions/gccoptionsplugin.cpp +++ b/languages/cpp/compiler/gccoptions/gccoptionsplugin.cpp @@ -29,7 +29,7 @@ K_EXPORT_COMPONENT_FACTORY( libkdevgccoptions, KGenericFactory<GccOptionsPlugin> class GeneralTab : public TQWidget { public: - GeneralTab( GccOptionsPlugin::Type type, TQWidget *tqparent = 0, const char *name = 0 ); + GeneralTab( GccOptionsPlugin::Type type, TQWidget *parent = 0, const char *name = 0 ); ~GeneralTab(); void readFlags( TQStringList *str ); @@ -43,7 +43,7 @@ private: class OptimizationTab : public TQWidget { public: - OptimizationTab( GccOptionsPlugin::Type type, TQWidget *tqparent = 0, const char *name = 0 ); + OptimizationTab( GccOptionsPlugin::Type type, TQWidget *parent = 0, const char *name = 0 ); ~OptimizationTab(); void readFlags( TQStringList *str ); @@ -58,7 +58,7 @@ private: class G77Tab : public TQWidget { public: - G77Tab( TQWidget *tqparent = 0, const char *name = 0 ); + G77Tab( TQWidget *parent = 0, const char *name = 0 ); ~G77Tab(); void readFlags( TQStringList *str ); @@ -72,7 +72,7 @@ private: class Warnings1Tab : public TQWidget { public: - Warnings1Tab( GccOptionsPlugin::Type type, TQWidget *tqparent = 0, const char *name = 0 ); + Warnings1Tab( GccOptionsPlugin::Type type, TQWidget *parent = 0, const char *name = 0 ); ~Warnings1Tab(); void readFlags( TQStringList *str ); @@ -87,7 +87,7 @@ private: class Warnings2Tab : public TQWidget { public: - Warnings2Tab( GccOptionsPlugin::Type type, TQWidget *tqparent = 0, const char *name = 0 ); + Warnings2Tab( GccOptionsPlugin::Type type, TQWidget *parent = 0, const char *name = 0 ); ~Warnings2Tab(); void readFlags( TQStringList *str ); @@ -98,8 +98,8 @@ private: }; -GeneralTab::GeneralTab( GccOptionsPlugin::Type type, TQWidget *tqparent, const char *name ) - : TQWidget( tqparent, name ), controller( new FlagCheckBoxController ) +GeneralTab::GeneralTab( GccOptionsPlugin::Type type, TQWidget *parent, const char *name ) + : TQWidget( parent, name ), controller( new FlagCheckBoxController ) { TQBoxLayout * tqlayout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() ); tqlayout->setAutoAdd( true ); @@ -164,8 +164,8 @@ void GeneralTab::writeFlags( TQStringList *list ) } -OptimizationTab::OptimizationTab( GccOptionsPlugin::Type type, TQWidget *tqparent, const char *name ) - : TQWidget( tqparent, name ) +OptimizationTab::OptimizationTab( GccOptionsPlugin::Type type, TQWidget *parent, const char *name ) + : TQWidget( parent, name ) { TQBoxLayout * tqlayout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() ); tqlayout->setAutoAdd( true ); @@ -261,8 +261,8 @@ void OptimizationTab::writeFlags( TQStringList *list ) } -G77Tab::G77Tab( TQWidget *tqparent, const char *name ) - : TQWidget( tqparent, name ), controller( new FlagCheckBoxController ) +G77Tab::G77Tab( TQWidget *parent, const char *name ) + : TQWidget( parent, name ), controller( new FlagCheckBoxController ) { TQBoxLayout * tqlayout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() ); tqlayout->setAutoAdd( true ); @@ -316,8 +316,8 @@ void G77Tab::writeFlags( TQStringList *list ) } -Warnings1Tab::Warnings1Tab( GccOptionsPlugin::Type type, TQWidget *tqparent, const char *name ) - : TQWidget( tqparent, name ), controller( new FlagCheckBoxController ) +Warnings1Tab::Warnings1Tab( GccOptionsPlugin::Type type, TQWidget *parent, const char *name ) + : TQWidget( parent, name ), controller( new FlagCheckBoxController ) { TQBoxLayout * tqlayout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() ); tqlayout->setAutoAdd( true ); @@ -414,8 +414,8 @@ void Warnings1Tab::writeFlags( TQStringList *list ) } -Warnings2Tab::Warnings2Tab( GccOptionsPlugin::Type type, TQWidget *tqparent, const char *name ) - : TQWidget( tqparent, name ) +Warnings2Tab::Warnings2Tab( GccOptionsPlugin::Type type, TQWidget *parent, const char *name ) + : TQWidget( parent, name ) { TQBoxLayout * tqlayout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() ); tqlayout->setAutoAdd( true ); @@ -572,8 +572,8 @@ void Warnings2Tab::writeFlags( TQStringList *list ) // Last but not least... :-) -GccOptionsDialog::GccOptionsDialog( GccOptionsPlugin::Type type, TQWidget *tqparent, const char *name ) - : KDialogBase( Tabbed, GccOptionsPlugin::captionForType( type ), Ok | Cancel, Ok, tqparent, name, true ) +GccOptionsDialog::GccOptionsDialog( GccOptionsPlugin::Type type, TQWidget *parent, const char *name ) + : KDialogBase( Tabbed, GccOptionsPlugin::captionForType( type ), Ok | Cancel, Ok, parent, name, true ) { TQVBox * vbox; @@ -649,8 +649,8 @@ TQString GccOptionsDialog::flags() const } -GccOptionsPlugin::GccOptionsPlugin( TQObject *tqparent, const char *name, const TQStringList &args ) - : KDevCompilerOptions( tqparent, name ) +GccOptionsPlugin::GccOptionsPlugin( TQObject *parent, const char *name, const TQStringList &args ) + : KDevCompilerOptions( parent, name ) { gcctype = Unknown; @@ -688,11 +688,11 @@ TQString GccOptionsPlugin::captionForType( Type type ) } -TQString GccOptionsPlugin::exec( TQWidget *tqparent, const TQString &flags ) +TQString GccOptionsPlugin::exec( TQWidget *parent, const TQString &flags ) { if ( gcctype == Unknown ) return TQString(); - GccOptionsDialog *dlg = new GccOptionsDialog( gcctype, tqparent, "gcc options dialog" ); + GccOptionsDialog *dlg = new GccOptionsDialog( gcctype, parent, "gcc options dialog" ); TQString newFlags = flags; dlg->setFlags( flags ); if ( dlg->exec() == TQDialog::Accepted ) diff --git a/languages/cpp/compiler/gccoptions/gccoptionsplugin.h b/languages/cpp/compiler/gccoptions/gccoptionsplugin.h index 0ac93c23..d5a0d644 100644 --- a/languages/cpp/compiler/gccoptions/gccoptionsplugin.h +++ b/languages/cpp/compiler/gccoptions/gccoptionsplugin.h @@ -31,12 +31,12 @@ class GccOptionsPlugin : public KDevCompilerOptions public: enum Type { GCC, GPP, G77, Unknown }; - GccOptionsPlugin( TQObject *tqparent, const char *name, const TQStringList &args ); + GccOptionsPlugin( TQObject *parent, const char *name, const TQStringList &args ); ~GccOptionsPlugin(); static TQString captionForType(Type type); - virtual TQString exec(TQWidget *tqparent, const TQString &flags); + virtual TQString exec(TQWidget *parent, const TQString &flags); private: Type gcctype; @@ -46,7 +46,7 @@ private: class GccOptionsDialog : public KDialogBase { public: - GccOptionsDialog( GccOptionsPlugin::Type type, TQWidget *tqparent=0, const char *name=0 ); + GccOptionsDialog( GccOptionsPlugin::Type type, TQWidget *parent=0, const char *name=0 ); ~GccOptionsDialog(); void setFlags(const TQString &flags); diff --git a/languages/cpp/cppcodecompletion.cpp b/languages/cpp/cppcodecompletion.cpp index 846aec77..be16ec28 100644 --- a/languages/cpp/cppcodecompletion.cpp +++ b/languages/cpp/cppcodecompletion.cpp @@ -348,7 +348,7 @@ struct PopupFillerHelpStruct { TQMap<TQString, TQPopupMenu*> m_namespacePopupCache; - void insertItem( TQPopupMenu* tqparent, SimpleTypeImpl::MemberInfo d , TQString prefix ) { + void insertItem( TQPopupMenu* parent, SimpleTypeImpl::MemberInfo d , TQString prefix ) { Q_UNUSED(prefix); TQString memType = d.memberTypeToString(); @@ -357,12 +357,12 @@ struct PopupFillerHelpStruct { memType = "enum"; TQString txt = i18n( "Jump to %1 %2" ).tqarg( memType ).tqarg( cleanForMenu( d.name ) ); - int id = tqparent->insertItem( txt, receiver, TQT_SLOT( popupAction( int ) ) ); + int id = parent->insertItem( txt, receiver, TQT_SLOT( popupAction( int ) ) ); receiver->m_popupActions.insert( id, d.decl ); } - void insertItem ( TQPopupMenu* tqparent, TypeDesc d , TQString prefix ) { + void insertItem ( TQPopupMenu* parent, TypeDesc d , TQString prefix ) { Debug dbg( "#insert# ", 10 ); TQString txt1, txt2; @@ -374,14 +374,14 @@ struct PopupFillerHelpStruct { for ( SimpleTypeNamespace::SlaveList::iterator it = slaves.begin(); it != slaves.end(); ++it ) { SimpleTypeCodeModel* cm = dynamic_cast<SimpleTypeCodeModel*>( ( *it ).first.first.resolved().data() ); if ( cm && cm->item() ) { - TQPopupMenu * m = PopupTracker::createPopup( tqparent ); + TQPopupMenu * m = PopupTracker::createPopup( parent ); TQString scope = cm->scope().join("::"); TQMap< TQString, TQPopupMenu* >::iterator it = m_namespacePopupCache.find( scope ); if( it != m_namespacePopupCache.end() ) { - tqparent->insertItem( "Imported Namespace " + scope, *it ); + parent->insertItem( "Imported Namespace " + scope, *it ); delete m; } else { - tqparent->insertItem( "Imported Namespace " + scope, m ); + parent->insertItem( "Imported Namespace " + scope, m ); insertItem( m, ( new SimpleTypeCachedCodeModel( cm->item() ) ) ->desc(), prefix ); m_namespacePopupCache.insert( scope, m ); @@ -390,7 +390,7 @@ struct PopupFillerHelpStruct { SimpleTypeNamespace* cn = dynamic_cast<SimpleTypeNamespace*>( ( *it ).first.first.resolved().data() ); if( cn ) { TypePointer t = new SimpleTypeNamespace( cn ); //To avoid endless recursion, this needs to be done(the dynamic-cast above fails) - insertItem( tqparent, t->desc(), prefix ); + insertItem( parent, t->desc(), prefix ); } } } @@ -423,7 +423,7 @@ struct PopupFillerHelpStruct { int sLine, sCol, eLine, eCol; i->getStartPosition( &sLine, &sCol ); i->getEndPosition( &eLine, &eCol ); - insertItem( tqparent, (new SimpleTypeCodeModel( i ))->desc(), prefix + " " + (*it)->name() + TQString(" (%1 Lines): ").tqarg( eLine - sLine ) ); ///SimpleTypeCodeModel is used instead of SimpleTypeCachedNodeModel, so the detection at (1) does not trigger, this avoids endless recursion. + insertItem( parent, (new SimpleTypeCodeModel( i ))->desc(), prefix + " " + (*it)->name() + TQString(" (%1 Lines): ").tqarg( eLine - sLine ) ); ///SimpleTypeCodeModel is used instead of SimpleTypeCachedNodeModel, so the detection at (1) does not trigger, this avoids endless recursion. } } @@ -447,12 +447,12 @@ struct PopupFillerHelpStruct { } } - int id = tqparent->insertItem( txt1, receiver, TQT_SLOT( popupAction( int ) ) ); + int id = parent->insertItem( txt1, receiver, TQT_SLOT( popupAction( int ) ) ); if ( d.resolved() ) receiver->m_popupActions.insert( id, d.resolved() ->getDeclarationInfo() ); if ( !txt2.isEmpty() ) { - int id2 = tqparent->insertItem( txt2, receiver, TQT_SLOT( popupDefinitionAction( int ) ) ); + int id2 = parent->insertItem( txt2, receiver, TQT_SLOT( popupDefinitionAction( int ) ) ); if ( d.resolved() ) receiver->m_popupDefinitionActions.insert( id2, d.resolved() ->getDeclarationInfo() ); } @@ -523,7 +523,7 @@ struct PopupClassViewFillerHelpStruct { return false; } - void insertItem( TQPopupMenu* tqparent, SimpleTypeImpl::MemberInfo d , TQString prefix ) { + void insertItem( TQPopupMenu* parent, SimpleTypeImpl::MemberInfo d , TQString prefix ) { Q_UNUSED(prefix); FileDom f = receiver->m_pSupport->codeModel() ->fileByName( d.decl.file ); if ( !f ) @@ -537,12 +537,12 @@ struct PopupClassViewFillerHelpStruct { memType = "enum"; TQString txt = i18n( "Show %1 %2" ).tqarg( memType ).tqarg( cleanForMenu( d.name ) ); - int id = tqparent->insertItem( txt, receiver, TQT_SLOT( popupClassViewAction( int ) ) ); + int id = parent->insertItem( txt, receiver, TQT_SLOT( popupClassViewAction( int ) ) ); receiver->m_popupClassViewActions.insert( id, dom ); } - void insertItem ( TQPopupMenu* tqparent, TypeDesc d , TQString prefix ) { + void insertItem ( TQPopupMenu* parent, TypeDesc d , TQString prefix ) { Debug dbg( "#insert# ", 10 ); TQString txt; @@ -565,12 +565,12 @@ struct PopupClassViewFillerHelpStruct { for ( SimpleTypeNamespace::SlaveList::iterator it = slaves.begin(); it != slaves.end(); ++it ) { SimpleTypeCodeModel* cm = dynamic_cast<SimpleTypeCodeModel*>( ( *it ).first.first.resolved().data() ); if ( cm && cm->item() ) { - insertItem( tqparent, ( new SimpleTypeCachedCodeModel( cm->item() ) ) ->desc(), prefix ); + insertItem( parent, ( new SimpleTypeCachedCodeModel( cm->item() ) ) ->desc(), prefix ); } else { SimpleTypeNamespace* cn = dynamic_cast<SimpleTypeNamespace*>( ( *it ).first.first.resolved().data() ); if( cn ) { TypePointer t = new SimpleTypeNamespace( cn ); //to avoid endless recursion (caching would be better) - insertItem( tqparent, t->desc(), prefix ); + insertItem( parent, t->desc(), prefix ); } } } @@ -596,7 +596,7 @@ struct PopupClassViewFillerHelpStruct { } } - int id = tqparent->insertItem( txt, receiver, TQT_SLOT( popupClassViewAction( int ) ) ); + int id = parent->insertItem( txt, receiver, TQT_SLOT( popupClassViewAction( int ) ) ); if ( dom ) receiver->m_popupClassViewActions.insert( id, dom ); @@ -612,13 +612,13 @@ class PopupFiller { PopupFiller( HelpStruct str , TQString dAdd, int maxCount = 100 ) : struk( str ), depthAdd( dAdd ), s( maxCount ) {} - void fillIncludes( const DeclarationInfo& decl, TQPopupMenu* tqparent, bool& needSeparator ) { + void fillIncludes( const DeclarationInfo& decl, TQPopupMenu* parent, bool& needSeparator ) { if( !struk.receiver->getIncludeFiles()[ HashedString( decl.file ) ] ) { TQString file = decl.file; //The include-file seems to be missing if( needSeparator ) { needSeparator = false; - tqparent->insertSeparator(); + parent->insertSeparator(); } TQString includeFile = file; @@ -644,7 +644,7 @@ class PopupFiller { //kdDebug( 9007 ) << "found include-file \"" << includeFile << "\"" << endl; } - int id = tqparent->insertItem( i18n( "#include \"%1\" ( defines %2 )" ).tqarg ( includeFile ).tqarg( decl.name ), struk.receiver, TQT_SLOT( popupAction( int ) ) ); + int id = parent->insertItem( i18n( "#include \"%1\" ( defines %2 )" ).tqarg ( includeFile ).tqarg( decl.name ), struk.receiver, TQT_SLOT( popupAction( int ) ) ); DeclarationInfo fakeDec; fakeDec.name = decl.name; fakeDec.file = includeFile; @@ -653,7 +653,7 @@ class PopupFiller { } } - void fill( TQPopupMenu * tqparent, LocateResult d, TQString prefix = "", const DeclarationInfo & sourceVariable = DeclarationInfo() ) { + void fill( TQPopupMenu * parent, LocateResult d, TQString prefix = "", const DeclarationInfo & sourceVariable = DeclarationInfo() ) { Debug dbg( "#fl# ", 10 ) ; @@ -673,29 +673,29 @@ class PopupFiller { /*int id = m->insertItem( i18n("jump to variable-declaration \"%1\"").tqarg( type.sourceVariable.name ) , this, TQT_SLOT( popupAction( int ) ) ); m_popupActions.insert( id, type.sourceVariable );*/ - struk.insertItem( tqparent, f, prefix ); + struk.insertItem( parent, f, prefix ); - tqparent->insertSeparator(); + parent->insertSeparator(); if ( !sourceVariable.comment.isEmpty() ) { - TQPopupMenu * m = PopupTracker::createPopup( tqparent ); - tqparent->insertItem( i18n( "Comment on %1" ).tqarg( sourceVariable.name ), m ); + TQPopupMenu * m = PopupTracker::createPopup( parent ); + parent->insertItem( i18n( "Comment on %1" ).tqarg( sourceVariable.name ), m ); TQStringList ls = prepareTextForMenu( sourceVariable.comment, 15, 100 ); for ( TQStringList::iterator it = ls.begin(); it != ls.end(); ++it ) { m->insertItem( *it, 0, TQT_SLOT( popupClassViewAction( int ) ) ); } - tqparent->insertSeparator(); + parent->insertSeparator(); } } - struk.insertItem( tqparent, d, prefix ); + struk.insertItem( parent, d, prefix ); if( d->resolved() && !d->resolved()->specialization().isEmpty() ) { - SimpleType p = d->resolved()->tqparent(); + SimpleType p = d->resolved()->parent(); LocateResult r = p->locateDecType( d->name() ); if( r ) { - TQPopupMenu * m = PopupTracker::createPopup( tqparent ); - tqparent->insertItem( i18n( "Specialized from \"%1\"" ).tqarg( cleanForMenu( r->fullNameChain() ) ), m ); + TQPopupMenu * m = PopupTracker::createPopup( parent ); + parent->insertItem( i18n( "Specialized from \"%1\"" ).tqarg( cleanForMenu( r->fullNameChain() ) ), m ); fill( m, r ); } } @@ -703,11 +703,11 @@ class PopupFiller { TypeDesc::TemplateParams p = d->templateParams(); for ( TypeDesc::TemplateParams::iterator it = p.begin(); it != p.end(); ++it ) { //if( (*it)->resolved() ) { - TQPopupMenu * m = PopupTracker::createPopup( tqparent ); - tqparent->insertItem( i18n( "Template-param \"%1\"" ).tqarg( cleanForMenu( ( *it ) ->fullNameChain() ) ), m ); + TQPopupMenu * m = PopupTracker::createPopup( parent ); + parent->insertItem( i18n( "Template-param \"%1\"" ).tqarg( cleanForMenu( ( *it ) ->fullNameChain() ) ), m ); fill( m, **it ); /*} else { - fill( tqparent, **it, prefix + depthAdd ); + fill( parent, **it, prefix + depthAdd ); }*/ } @@ -715,16 +715,16 @@ class PopupFiller { if ( d->resolved() ->asFunction() ) { LocateResult rt = d->resolved() ->locateDecType( d->resolved() ->asFunction() ->getReturnType() ); if ( rt ) { - TQPopupMenu * m = PopupTracker::createPopup( tqparent ); - tqparent->insertItem( i18n( "Return-type \"%1\"" ).tqarg( cleanForMenu( rt->fullNameChain() ) ), m ); + TQPopupMenu * m = PopupTracker::createPopup( parent ); + parent->insertItem( i18n( "Return-type \"%1\"" ).tqarg( cleanForMenu( rt->fullNameChain() ) ), m ); fill( m, rt ); } TQValueList<TypeDesc> args = d->resolved() ->asFunction() ->getArgumentTypes(); TQStringList argNames = d->resolved() ->asFunction() ->getArgumentNames(); if ( !args.isEmpty() ) { - TQPopupMenu * m = PopupTracker::createPopup( tqparent ); - tqparent->insertItem( i18n( "Argument-types" ), m ); + TQPopupMenu * m = PopupTracker::createPopup( parent ); + parent->insertItem( i18n( "Argument-types" ), m ); TQStringList::iterator it2 = argNames.begin(); for ( TQValueList<TypeDesc>::iterator it = args.begin(); it != args.end(); ++it ) { LocateResult at = d->resolved() ->locateDecType( *it ); @@ -745,8 +745,8 @@ class PopupFiller { if ( d.trace() ) { TQValueList<TQPair<SimpleTypeImpl::MemberInfo, TypeDesc> > trace = d.trace() ->trace(); if ( !trace.isEmpty() ) { - TQPopupMenu * m = PopupTracker::createPopup( tqparent ); - tqparent->insertItem( i18n( "Trace" ), m ); + TQPopupMenu * m = PopupTracker::createPopup( parent ); + parent->insertItem( i18n( "Trace" ), m ); for ( TQValueList<TQPair<SimpleTypeImpl::MemberInfo, TypeDesc> >::iterator it = trace.begin(); it != trace.end(); ++it ) { TQPopupMenu * mo = PopupTracker::createPopup( m ); @@ -778,21 +778,21 @@ class PopupFiller { if ( d->resolved() ) { TQValueList<LocateResult> bases = d->resolved() ->getBases(); for ( TQValueList<LocateResult>::iterator it = bases.begin(); it != bases.end(); ++it ) { - TQPopupMenu * m = PopupTracker::createPopup( tqparent ); - tqparent->insertItem( i18n( "Base-class \"%1\"" ).tqarg( cleanForMenu( ( *it ) ->fullNameChain() ) ), m ); + TQPopupMenu * m = PopupTracker::createPopup( parent ); + parent->insertItem( i18n( "Base-class \"%1\"" ).tqarg( cleanForMenu( ( *it ) ->fullNameChain() ) ), m ); fill( m, *it ); } - if ( d->resolved() ->tqparent() && d->resolved() ->tqparent() ->desc() ) { - TQPopupMenu * m = PopupTracker::createPopup( tqparent ); - tqparent->insertItem( i18n( "Nested in \"%1\"" ).tqarg( cleanForMenu( d->resolved() ->tqparent() ->fullTypeResolved() ) ), m ); - fill( m, d->resolved() ->tqparent() ->desc() ); + if ( d->resolved() ->parent() && d->resolved() ->parent() ->desc() ) { + TQPopupMenu * m = PopupTracker::createPopup( parent ); + parent->insertItem( i18n( "Nested in \"%1\"" ).tqarg( cleanForMenu( d->resolved() ->parent() ->fullTypeResolved() ) ), m ); + fill( m, d->resolved() ->parent() ->desc() ); } if ( !d->resolved() ->comment().isEmpty() ) { - tqparent->insertSeparator(); - TQPopupMenu * m = PopupTracker::createPopup( tqparent ); - tqparent->insertItem( i18n( "Comment on %1" ).tqarg( cleanForMenu( d->name() ) ), m ); + parent->insertSeparator(); + TQPopupMenu * m = PopupTracker::createPopup( parent ); + parent->insertItem( i18n( "Comment on %1" ).tqarg( cleanForMenu( d->name() ) ), m ); TQStringList ls = prepareTextForMenu( d->resolved() ->comment(), 15, 100 ); for ( TQStringList::iterator it = ls.begin(); it != ls.end(); ++it ) { m->insertItem( *it, 0, TQT_SLOT( popupClassViewAction( int ) ) ); @@ -809,14 +809,14 @@ class PopupFiller { if ( !trace.isEmpty() ) { for ( TQValueList<TQPair<SimpleTypeImpl::MemberInfo, TypeDesc> >::iterator it = trace.begin(); it != trace.end(); ++it ) { if( struk.shouldShowIncludeMenu() && struk.receiver->cppSupport()->codeCompletionConfig()->preProcessAllHeaders() && !(*it).first.decl.file.operator TQString().isEmpty() ) - fillIncludes( (*it).first.decl, tqparent, needSeparator ); + fillIncludes( (*it).first.decl, parent, needSeparator ); } } } //Show the include-file for the item itself if( d->resolved() && !d->resolved()->isNamespace() && struk.receiver->cppSupport() ) { - fillIncludes( d->resolved()->getDeclarationInfo(), tqparent, needSeparator ); + fillIncludes( d->resolved()->getDeclarationInfo(), parent, needSeparator ); } } } @@ -1691,7 +1691,7 @@ void CppCodeCompletion::slotTextHint( int line, int column, TQString &text ) { } text += "type: \"" + type.resultType->fullTypeResolved() + "\""; } - if( type.resultType->tqparent()) text += "\nnested in: \"" + type.resultType->tqparent()->fullTypeResolvedWithScope() + "\""; + if( type.resultType->parent()) text += "\nnested in: \"" + type.resultType->parent()->fullTypeResolvedWithScope() + "\""; DeclarationInfo i = type.resultType->getDeclarationInfo(); if( i ) text += "\n" + i.locationToText(); @@ -2790,7 +2790,7 @@ void CppCodeCompletion::completeText( bool invokedOnDemand /*= false*/ ) { } if( !t->isNamespace() || invokedOnDemand || alwaysIncludeNamespaces ) computeCompletionEntryList( t, entryList, t->scope(), false, depth ); - t = t->tqparent(); + t = t->parent(); depth++; } } @@ -2807,7 +2807,7 @@ void CppCodeCompletion::completeText( bool invokedOnDemand /*= false*/ ) { } if ( ( (t->isNamespace() && invokedOnDemand) || alwaysIncludeNamespaces ) || ( first && isInstance ) ) computeCompletionEntryList( t, entryList, t->scope(), t->isNamespace() ? true : isInstance, depth ); - t = t->tqparent(); + t = t->parent(); depth++; first = false; } @@ -2890,7 +2890,7 @@ void CppCodeCompletion::completeText( bool invokedOnDemand /*= false*/ ) { if ( method ) signatureList += computeSignatureList( method ); if ( t ) - t = t->tqparent(); + t = t->parent(); } while ( !ready && s ); if ( !signatureList.isEmpty() ) { @@ -3293,7 +3293,7 @@ FunctionDefinitionAST * CppCodeCompletion::functionDefinition( AST* node ) { while ( node ) { if ( node->nodeType() == NodeType_FunctionDefinition ) return static_cast<FunctionDefinitionAST*>( node ); - node = node->tqparent(); + node = node->parent(); } return 0; } @@ -3360,7 +3360,7 @@ TQString codeModelAccessToString( CodeModelItem::Access access ) { #define MAXCOMMENTCOLUMNS 45 -TQString CppCodeCompletion::commentFromItem( const SimpleType& tqparent, const ItemDom& item ) { +TQString CppCodeCompletion::commentFromItem( const SimpleType& parent, const ItemDom& item ) { --m_maxComments; static TQString maxReached = " "; if( m_maxComments < 0 ) { @@ -3371,8 +3371,8 @@ TQString CppCodeCompletion::commentFromItem( const SimpleType& tqparent, const I item->getStartPosition( &line, &col ); - if ( !tqparent->scope().isEmpty() ) { - ret += "Container: " + tqparent->fullTypeResolvedWithScope(); + if ( !parent->scope().isEmpty() ) { + ret += "Container: " + parent->fullTypeResolvedWithScope(); } if ( item->isEnum() ) { @@ -3451,7 +3451,7 @@ TQString CppCodeCompletion::commentFromItem( const SimpleType& tqparent, const I ret += "\nKind: Typedef"; if ( t ) { ret += "\nType: " + t->type(); - LocateResult r = tqparent->locateDecType( t->type() ); + LocateResult r = parent->locateDecType( t->type() ); if ( r.desc().resolved() ) ret += "\nResolved type: " + r.desc().resolved() ->fullTypeResolvedWithScope(); else @@ -3469,7 +3469,7 @@ TQString CppCodeCompletion::commentFromItem( const SimpleType& tqparent, const I return ret; } -TQString CppCodeCompletion::commentFromTag( const SimpleType& tqparent, Tag& tag ) { +TQString CppCodeCompletion::commentFromTag( const SimpleType& parent, Tag& tag ) { --m_maxComments; static TQString maxReached = " "; if( m_maxComments < 0 ) { @@ -3480,8 +3480,8 @@ TQString CppCodeCompletion::commentFromTag( const SimpleType& tqparent, Tag& tag tag.getStartPosition( &line, &col ); TQString ret; // = tag.comment(); - if ( !tqparent->scope().isEmpty() ) { - ret += "Container: " + tqparent->fullTypeResolvedWithScope(); + if ( !parent->scope().isEmpty() ) { + ret += "Container: " + parent->fullTypeResolvedWithScope(); } /* if( tag.kind() == Tag::Kind_Enum ) { @@ -3571,7 +3571,7 @@ TQString CppCodeCompletion::commentFromTag( const SimpleType& tqparent, Tag& tag if ( tag.kind() == Tag::Kind_Typedef ) { ret += "\nKind: Typedef"; ret += "\nType: " + tagType( tag ); - LocateResult r = tqparent->locateDecType( tagType( tag ) ); + LocateResult r = parent->locateDecType( tagType( tag ) ); if ( r.desc().resolved() ) ret += "\nResolved type: " + r.desc().resolved() ->fullTypeResolvedWithScope(); else @@ -3962,7 +3962,7 @@ void CppCodeCompletion::computeCompletionEntryList( SimpleType type, TQValueList computeCompletionEntryList( type, entryList, scope->namespaceList(), isInstance, depth ); } -void CppCodeCompletion::computeCompletionEntryList( TQString tqparent, SimpleType type, TQValueList< CodeCompletionEntry > & entryList, const ClassList & lst, bool isInstance, int depth ) { +void CppCodeCompletion::computeCompletionEntryList( TQString parent, SimpleType type, TQValueList< CodeCompletionEntry > & entryList, const ClassList & lst, bool isInstance, int depth ) { Debug d( "#cel#" ); if ( !safetyCounter || !d ) return ; @@ -3981,7 +3981,7 @@ void CppCodeCompletion::computeCompletionEntryList( TQString tqparent, SimpleTyp if ( isInstance ) continue; - entry.userdata = TQString( "%1%2%3%4%5" ).tqarg( CodeModelItem::Public ).tqarg( depth ).tqarg( tqparent ).tqarg( 6 ); + entry.userdata = TQString( "%1%2%3%4%5" ).tqarg( CodeModelItem::Public ).tqarg( depth ).tqarg( parent ).tqarg( 6 ); entryList << entry; @@ -3993,7 +3993,7 @@ void CppCodeCompletion::computeCompletionEntryList( TQString tqparent, SimpleTyp } } -void CppCodeCompletion::computeCompletionEntryList( TQString tqparent, SimpleType type, TQValueList< CodeCompletionEntry > & entryList, const TypeAliasList & lst, bool isInstance, int depth ) { +void CppCodeCompletion::computeCompletionEntryList( TQString parent, SimpleType type, TQValueList< CodeCompletionEntry > & entryList, const TypeAliasList & lst, bool isInstance, int depth ) { Debug d( "#cel#" ); if ( !safetyCounter || !d ) return ; @@ -4015,7 +4015,7 @@ void CppCodeCompletion::computeCompletionEntryList( TQString tqparent, SimpleTyp entry.prefix = stringMult( depth, " " ) + entry.prefix.stripWhiteSpace(); entry.text = klass->name(); entry.comment = commentFromItem( type, klass.data() ); - entry.userdata = TQString( "%1%2%3%4%5" ).tqarg( CodeModelItem::Public ).tqarg( depth ).tqarg( tqparent ).tqarg( 5 ); + entry.userdata = TQString( "%1%2%3%4%5" ).tqarg( CodeModelItem::Public ).tqarg( depth ).tqarg( parent ).tqarg( 5 ); entryList << entry; } } diff --git a/languages/cpp/cppcodecompletion.h b/languages/cpp/cppcodecompletion.h index 4b619984..27bfc1b6 100644 --- a/languages/cpp/cppcodecompletion.h +++ b/languages/cpp/cppcodecompletion.h @@ -52,9 +52,9 @@ public: static uint pendingPopups; - static TQPopupMenu* createPopup( TQWidget* tqparent ) { + static TQPopupMenu* createPopup( TQWidget* parent ) { if( !pt ) pt = new PopupTracker(); - TQPopupMenu* m = new TQPopupMenu( tqparent ); + TQPopupMenu* m = new TQPopupMenu( parent ); ++pendingPopups; connect( m, TQT_SIGNAL(destroyed()), pt, TQT_SLOT(destroyedPopup()) ); return m; @@ -189,8 +189,8 @@ private: bool functionContains( FunctionDom f , int line, int col ); void getFunctionBody( FunctionDom f , int& line, int& col ); void selectItem( ItemDom item ); - void addTypePopups( TQPopupMenu* tqparent, TypeDesc d, TQString depthAdd, TQString prefix = "" ); - void addTypeClassPopups( TQPopupMenu* tqparent, TypeDesc d, TQString depthAdd, TQString prefix = "" ); + void addTypePopups( TQPopupMenu* parent, TypeDesc d, TQString depthAdd, TQString prefix = "" ); + void addTypeClassPopups( TQPopupMenu* parent, TypeDesc d, TQString depthAdd, TQString prefix = "" ); TQValueList<TQStringList> computeSignatureList( CppEvaluation::EvaluationResult function ); void integratePart( KParts::Part* part ); void setupCodeInformationRepository(); @@ -235,8 +235,8 @@ private: void computeCompletionEntryList( SimpleType type, TQValueList<CodeCompletionEntry>& entryList, NamespaceDom scope, bool isInstance, int depth ); void computeCompletionEntryList( SimpleType type, TQValueList<CodeCompletionEntry>& entryList, const FunctionList& methods, bool isInstance, int depth ); void computeCompletionEntryList( SimpleType type, TQValueList<CodeCompletionEntry>& entryList, const VariableList& attributes, bool isInstance, int depth ); - void computeCompletionEntryList( TQString tqparent, SimpleType type, TQValueList<CodeCompletionEntry>& entryList, const ClassList& lst, bool isInstance, int depth ); - void computeCompletionEntryList( TQString tqparent, SimpleType type, TQValueList<CodeCompletionEntry>& entryList, const TypeAliasList& lst, bool isInstance, int depth ); + void computeCompletionEntryList( TQString parent, SimpleType type, TQValueList<CodeCompletionEntry>& entryList, const ClassList& lst, bool isInstance, int depth ); + void computeCompletionEntryList( TQString parent, SimpleType type, TQValueList<CodeCompletionEntry>& entryList, const TypeAliasList& lst, bool isInstance, int depth ); void computeCompletionEntryList( SimpleType type, TQValueList<CodeCompletionEntry>& entryList, const NamespaceList& lst, bool isInstance, int depth ); SimpleContext* computeContext( FunctionDefinitionAST* ast, int line, int col, int lineOffset, int colOffset ); @@ -298,8 +298,8 @@ private: //If more then the given count of comments were requested, all following ones will be blank.(Performance-reasons) void setMaxComments( int count ); - TQString commentFromItem( const SimpleType& tqparent, const ItemDom& item ); - TQString commentFromTag( const SimpleType& tqparent, Tag& tag ); + TQString commentFromItem( const SimpleType& parent, const ItemDom& item ); + TQString commentFromTag( const SimpleType& parent, Tag& tag ); ItemDom m_cachedFromContext; ///Can be a function or a class, representing the position from where the last completion was started. Necessary as long as all imports are put into the global namespace. diff --git a/languages/cpp/cppevaluation.cpp b/languages/cpp/cppevaluation.cpp index a20c2339..bb3e354b 100644 --- a/languages/cpp/cppevaluation.cpp +++ b/languages/cpp/cppevaluation.cpp @@ -433,7 +433,7 @@ EvaluationResult ExpressionEvaluation::evaluateAtomicExpression( TypeDesc expr, } depth++; - if( !ready ) current = current->tqparent(); + if( !ready ) current = current->parent(); } } /* @@ -455,7 +455,7 @@ EvaluationResult ExpressionEvaluation::evaluateAtomicExpression( TypeDesc expr, if( !bestRet || /** Did we find a constructor within a class? */ - (type->resolved() && ( bestRet->resolved() && type->resolved()->desc() == bestRet->resolved()->tqparent()->desc() && bestRet->resolved()->asFunction() ) ) ) { + (type->resolved() && ( bestRet->resolved() && type->resolved()->desc() == bestRet->resolved()->parent()->desc() && bestRet->resolved()->asFunction() ) ) ) { /*if ( type && type->resolved() ) {*/ EvaluationResult ret = type; diff --git a/languages/cpp/cppimplementationwidget.cpp b/languages/cpp/cppimplementationwidget.cpp index bd727d95..75d01b5f 100644 --- a/languages/cpp/cppimplementationwidget.cpp +++ b/languages/cpp/cppimplementationwidget.cpp @@ -37,14 +37,14 @@ #include <filetemplate.h> CppImplementationWidget::CppImplementationWidget( KDevLanguageSupport *part, - TQWidget *tqparent, const char *name, bool modal ) - : ImplementationWidget( part, tqparent, name, modal ) + TQWidget *parent, const char *name, bool modal ) + : ImplementationWidget( part, parent, name, modal ) {} TQStringList CppImplementationWidget::createClassFiles() { - TQString template_h = "#ifndef $DEFTEXT$_H\n#define $DEFTEXT$_H\n\n#include \"$BASEINCLUDE$\"\n\nclass $CLASSNAME$: public $BASECLASSNAME$ {\nQ_OBJECT\nTQ_OBJECT\npublic:\n $CLASSNAME$(TQWidget *tqparent = 0, const char *name = 0);\n};\n\n#endif\n"; - TQString template_cpp = "#include \"$CLASSINCLUDE$\"\n\n$CLASSNAME$::$CLASSNAME$(TQWidget *tqparent, const char *name)\n :$BASECLASSNAME$(tqparent, name)\n{\n}\n"; + TQString template_h = "#ifndef $DEFTEXT$_H\n#define $DEFTEXT$_H\n\n#include \"$BASEINCLUDE$\"\n\nclass $CLASSNAME$: public $BASECLASSNAME$ {\nQ_OBJECT\nTQ_OBJECT\npublic:\n $CLASSNAME$(TQWidget *parent = 0, const char *name = 0);\n};\n\n#endif\n"; + TQString template_cpp = "#include \"$CLASSINCLUDE$\"\n\n$CLASSNAME$::$CLASSNAME$(TQWidget *parent, const char *name)\n :$BASECLASSNAME$(parent, name)\n{\n}\n"; if ( m_part->project() ->options() == KDevProject::UsesAutotoolsBuildSystem ) template_cpp += "\n#include \"$TQMOCINCLUDE$\"\n"; diff --git a/languages/cpp/cppimplementationwidget.h b/languages/cpp/cppimplementationwidget.h index da1ef71b..c766156e 100644 --- a/languages/cpp/cppimplementationwidget.h +++ b/languages/cpp/cppimplementationwidget.h @@ -32,7 +32,7 @@ class CppImplementationWidget : public ImplementationWidget Q_OBJECT TQ_OBJECT public: - CppImplementationWidget( KDevLanguageSupport *part, TQWidget* tqparent = 0, const char* name = 0, bool modal = false ); + CppImplementationWidget( KDevLanguageSupport *part, TQWidget* parent = 0, const char* name = 0, bool modal = false ); protected: virtual TQStringList createClassFiles(); diff --git a/languages/cpp/cppnewclassdlg.cpp b/languages/cpp/cppnewclassdlg.cpp index db4d0160..65fb9c76 100644 --- a/languages/cpp/cppnewclassdlg.cpp +++ b/languages/cpp/cppnewclassdlg.cpp @@ -57,8 +57,8 @@ TQString TQRegExp_escape( const TQString& str ) return TQRegExp::escape( str ); } -CppNewClassDialog::CppNewClassDialog( CppSupportPart *part, TQWidget *tqparent, const char *name ) - : CppNewClassDialogBase( tqparent, name ), myModel( 0 ) +CppNewClassDialog::CppNewClassDialog( CppSupportPart *part, TQWidget *parent, const char *name ) + : CppNewClassDialogBase( parent, name ), myModel( 0 ) { headerModified = false; baseincludeModified = false; @@ -377,8 +377,8 @@ void CppNewClassDialog::checkTQWidgetInheritance( int val ) basename_edit->setText( TQWIDGET_OBJECT_NAME_STRING ); } /* constructors_cpp_edit->append(classname_edit->text() + "::" + classname_edit->text() + - "(TQWidget *tqparent, const char *name):\n TQWidget(tqparent, name)\n{\n}\n"); - constructors_h_edit->append(classname_edit->text() + "(TQWidget *tqparent, const char *name);\n");*/ + "(TQWidget *parent, const char *name):\n TQWidget(parent, name)\n{\n}\n"); + constructors_h_edit->append(classname_edit->text() + "(TQWidget *parent, const char *name);\n");*/ } if ( val && ( baseclasses_view->childCount() > 1 ) ) @@ -952,21 +952,21 @@ void CppNewClassDialog::addToConstructorsList( TQCheckListItem *myClass, Functio new PCheckListItem<FunctionDom>( method, myClass, m_part->formatModelItem( method.data() ), TQCheckListItem::RadioButton ); } -void CppNewClassDialog::addToMethodsList( TQListViewItem *tqparent, FunctionDom method ) +void CppNewClassDialog::addToMethodsList( TQListViewItem *parent, FunctionDom method ) { - PCheckListItem<FunctionDom> *it = new PCheckListItem<FunctionDom>( method, tqparent, m_part->formatModelItem( method.data() ), TQCheckListItem::CheckBox ); + PCheckListItem<FunctionDom> *it = new PCheckListItem<FunctionDom>( method, parent, m_part->formatModelItem( method.data() ), TQCheckListItem::CheckBox ); method->isAbstract() ? it->setText( 1, i18n( "replace" ) ) : it->setText( 1, i18n( "extend" ) ); } -void CppNewClassDialog::addToUpgradeList( TQListViewItem *tqparent, FunctionDom method, TQString modifier ) +void CppNewClassDialog::addToUpgradeList( TQListViewItem *parent, FunctionDom method, TQString modifier ) { - PListViewItem<FunctionDom> *it = new PListViewItem<FunctionDom>( method, tqparent, m_part->formatModelItem( method.data() ) ); + PListViewItem<FunctionDom> *it = new PListViewItem<FunctionDom>( method, parent, m_part->formatModelItem( method.data() ) ); it->setText( 1, modifier ); } -void CppNewClassDialog::addToUpgradeList( TQListViewItem *tqparent, VariableDom attr, TQString modifier ) +void CppNewClassDialog::addToUpgradeList( TQListViewItem *parent, VariableDom attr, TQString modifier ) { - PListViewItem<VariableDom> *it = new PListViewItem<VariableDom>( attr, tqparent, m_part->formatModelItem( attr.data() ) ); + PListViewItem<VariableDom> *it = new PListViewItem<VariableDom>( attr, parent, m_part->formatModelItem( attr.data() ) ); it->setText( 1, modifier ); } @@ -1244,13 +1244,13 @@ void CppNewClassDialog::to_constructors_list_clicked() PCheckListItem<FunctionDom> *curr; if ( ( curr = dynamic_cast<PCheckListItem<FunctionDom>* >( it.current() ) ) ) { - if ( curr->isOn() && curr->tqparent() ) + if ( curr->isOn() && curr->parent() ) { //fill the base classes list base += base.isEmpty() ? ": " : ", "; - base += curr->tqparent() ->text( 0 ); + base += curr->parent() ->text( 0 ); PCheckListItem<ClassDom> *p; - if ( ( p = dynamic_cast<PCheckListItem<ClassDom>* >( curr->tqparent() ) ) ) + if ( ( p = dynamic_cast<PCheckListItem<ClassDom>* >( curr->parent() ) ) ) { base += p->templateAddition; } @@ -1507,7 +1507,7 @@ void CppNewClassDialog::ClassGenerator::common_text() PCheckListItem<FunctionDom> *curr; if ( ( curr = dynamic_cast<PCheckListItem<FunctionDom>* >( it.current() ) ) ) { - if ( curr->isOn() && ( curr->tqparent() ) && ( curr->tqparent() ->tqparent() ) ) + if ( curr->isOn() && ( curr->parent() ) && ( curr->parent() ->parent() ) ) { TQString * adv_h = 0; if ( curr->item() ->access() == CodeModelItem::Private ) @@ -1519,9 +1519,9 @@ void CppNewClassDialog::ClassGenerator::common_text() // if (advCpp.isEmpty()) advCpp += "\n\n"; - TQString bcName = curr->tqparent() ->tqparent() ->text( 0 ); + TQString bcName = curr->parent() ->parent() ->text( 0 ); PListViewItem<ClassDom> *bc; - if ( ( bc = dynamic_cast<PListViewItem<ClassDom>* >( curr->tqparent() ->tqparent() ) ) ) + if ( ( bc = dynamic_cast<PListViewItem<ClassDom>* >( curr->parent() ->parent() ) ) ) { bcName += bc->templateAddition; } @@ -1540,7 +1540,7 @@ void CppNewClassDialog::ClassGenerator::common_text() PListViewItem<FunctionDom> *curr_m; if ( ( curr = dynamic_cast<PListViewItem<VariableDom>* >( ita.current() ) ) ) { - if ( ( !curr->text( 2 ).isEmpty() ) && ( curr->tqparent() ) && ( curr->tqparent() ->tqparent() ) ) + if ( ( !curr->text( 2 ).isEmpty() ) && ( curr->parent() ) && ( curr->parent() ->parent() ) ) { TQString * adv_h = 0; if ( curr->text( 2 ) == "private" ) @@ -1553,12 +1553,12 @@ void CppNewClassDialog::ClassGenerator::common_text() /* if ((*adv_h).isEmpty()) *adv_h += "\n\n";*/ if ( adv_h ) - *adv_h += TQString( " using " ) + curr->tqparent() ->tqparent() ->text( 0 ) + "::" + curr->item() ->name() + ";\n"; + *adv_h += TQString( " using " ) + curr->parent() ->parent() ->text( 0 ) + "::" + curr->item() ->name() + ";\n"; } } else if ( ( curr_m = dynamic_cast<PListViewItem<FunctionDom>* >( ita.current() ) ) ) { - if ( ( !curr_m->text( 2 ).isEmpty() ) && ( curr_m->tqparent() ) && ( curr_m->tqparent() ->tqparent() ) ) + if ( ( !curr_m->text( 2 ).isEmpty() ) && ( curr_m->parent() ) && ( curr_m->parent() ->parent() ) ) { TQString * adv_h = 0; if ( curr_m->text( 2 ) == "private" ) @@ -1574,7 +1574,7 @@ void CppNewClassDialog::ClassGenerator::common_text() TQString methodName = curr_m->item() ->name(); if ( !methodName.contains( TQRegExp( "^[a-zA-z_]" ) ) ) methodName = "operator" + methodName; - *adv_h += " using " + curr_m->tqparent() ->tqparent() ->text( 0 ) + "::" + methodName + ";\n"; + *adv_h += " using " + curr_m->parent() ->parent() ->text( 0 ) + "::" + methodName + ";\n"; } } ++ita; @@ -1707,26 +1707,26 @@ void CppNewClassDialog::ClassGenerator::gen_implementation() { if( dlg.m_part->qtBuildConfig()->version() == 3 ) { - argsH = "TQWidget *tqparent = 0, const char *name = 0"; - argsCpp = "TQWidget *tqparent, const char *name"; + argsH = "TQWidget *parent = 0, const char *name = 0"; + argsCpp = "TQWidget *parent, const char *name"; } else { - argsH = "TQWidget *tqparent = 0"; - argsCpp = "TQWidget *tqparent"; + argsH = "TQWidget *parent = 0"; + argsCpp = "TQWidget *parent"; } } else if ( qobject ) { if( dlg.m_part->qtBuildConfig()->version() == 3 ) { - argsH = "TQObject *tqparent = 0, const char *name = 0"; - argsCpp = "TQObject *tqparent, const char *name"; + argsH = "TQObject *parent = 0, const char *name = 0"; + argsCpp = "TQObject *parent, const char *name"; } else { - argsH = "TQObject *tqparent = 0"; - argsCpp = "TQObject *tqparent"; + argsH = "TQObject *parent = 0"; + argsCpp = "TQObject *parent"; } } else @@ -1739,16 +1739,16 @@ void CppNewClassDialog::ClassGenerator::gen_implementation() if ( childClass && ( dlg.baseclasses_view->childCount() == 0 ) ) { if( dlg.m_part->qtBuildConfig()->version() == 3 ) - baseInitializer = " : TQWidget(tqparent, name)"; + baseInitializer = " : TQWidget(parent, name)"; else - baseInitializer = " : TQWidget(tqparent)"; + baseInitializer = " : TQWidget(parent)"; } else if ( qobject && ( dlg.baseclasses_view->childCount() == 0 ) ) { if( dlg.m_part->qtBuildConfig()->version() == 3 ) - baseInitializer = " : TQObject(tqparent, name)"; + baseInitializer = " : TQObject(parent, name)"; else - baseInitializer = " : TQObject(tqparent)"; + baseInitializer = " : TQObject(parent)"; } else if ( dlg.baseclasses_view->childCount() != 0 ) { @@ -1766,16 +1766,16 @@ void CppNewClassDialog::ClassGenerator::gen_implementation() if ( childClass && ( baseInitializer == " : " ) ) { if( dlg.m_part->qtBuildConfig()->version() == 3 ) - baseInitializer += it.current()->text( 0 ) + "(tqparent, name)"; + baseInitializer += it.current()->text( 0 ) + "(parent, name)"; else - baseInitializer += it.current()->text( 0 ) + "(tqparent)"; + baseInitializer += it.current()->text( 0 ) + "(parent)"; } else if ( qobject && ( baseInitializer == " : " ) ) { if( dlg.m_part->qtBuildConfig()->version() == 3 ) - baseInitializer += it.current()->text( 0 ) + "(tqparent, name)"; + baseInitializer += it.current()->text( 0 ) + "(parent, name)"; else - baseInitializer += it.current()->text( 0 ) + "(tqparent)"; + baseInitializer += it.current()->text( 0 ) + "(parent)"; } else { diff --git a/languages/cpp/cppnewclassdlg.h b/languages/cpp/cppnewclassdlg.h index 39e9e458..55563f0c 100644 --- a/languages/cpp/cppnewclassdlg.h +++ b/languages/cpp/cppnewclassdlg.h @@ -35,36 +35,36 @@ class PCheckListItem: public TQCheckListItem { public: - PCheckListItem ( T item, TQCheckListItem * tqparent, const TQString & text, Type tt = Controller ) : - TQCheckListItem ( tqparent, text, tt ), m_item( item ) + PCheckListItem ( T item, TQCheckListItem * parent, const TQString & text, Type tt = Controller ) : + TQCheckListItem ( parent, text, tt ), m_item( item ) {} - PCheckListItem ( T item, TQCheckListItem * tqparent, TQListViewItem * after, const TQString & text, Type tt = Controller ) : - TQCheckListItem ( tqparent, after, text, tt ), m_item( item ) + PCheckListItem ( T item, TQCheckListItem * parent, TQListViewItem * after, const TQString & text, Type tt = Controller ) : + TQCheckListItem ( parent, after, text, tt ), m_item( item ) {} - PCheckListItem ( T item, TQListViewItem * tqparent, const TQString & text, Type tt = Controller ) : - TQCheckListItem ( tqparent, text, tt ), m_item( item ) + PCheckListItem ( T item, TQListViewItem * parent, const TQString & text, Type tt = Controller ) : + TQCheckListItem ( parent, text, tt ), m_item( item ) {} - PCheckListItem ( T item, TQListViewItem * tqparent, TQListViewItem * after, const TQString & text, Type tt = Controller ) : - TQCheckListItem ( tqparent, after, text, tt ), m_item( item ) + PCheckListItem ( T item, TQListViewItem * parent, TQListViewItem * after, const TQString & text, Type tt = Controller ) : + TQCheckListItem ( parent, after, text, tt ), m_item( item ) {} - PCheckListItem ( T item, TQListView * tqparent, const TQString & text, Type tt = Controller ) : - TQCheckListItem ( tqparent, text, tt ), m_item( item ) + PCheckListItem ( T item, TQListView * parent, const TQString & text, Type tt = Controller ) : + TQCheckListItem ( parent, text, tt ), m_item( item ) {} - PCheckListItem ( T item, TQListView * tqparent, TQListViewItem * after, const TQString & text, Type tt = Controller ) : - TQCheckListItem ( tqparent, after, text, tt ), m_item( item ) + PCheckListItem ( T item, TQListView * parent, TQListViewItem * after, const TQString & text, Type tt = Controller ) : + TQCheckListItem ( parent, after, text, tt ), m_item( item ) {} - PCheckListItem ( T item, TQListViewItem * tqparent, const TQString & text, const TQPixmap & p ) : - TQCheckListItem ( tqparent, text, p ), m_item( item ) + PCheckListItem ( T item, TQListViewItem * parent, const TQString & text, const TQPixmap & p ) : + TQCheckListItem ( parent, text, p ), m_item( item ) {} - PCheckListItem ( T item, TQListView * tqparent, const TQString & text, const TQPixmap & p ) : - TQCheckListItem ( tqparent, text, p ), m_item( item ) + PCheckListItem ( T item, TQListView * parent, const TQString & text, const TQPixmap & p ) : + TQCheckListItem ( parent, text, p ), m_item( item ) {} T item() @@ -83,20 +83,20 @@ class PListViewItem: public TQListViewItem { public: - PListViewItem ( T item, TQListViewItem * tqparent, TQListViewItem * after, const TQString & text ) : - TQListViewItem ( tqparent, after, text ), m_item( item ) + PListViewItem ( T item, TQListViewItem * parent, TQListViewItem * after, const TQString & text ) : + TQListViewItem ( parent, after, text ), m_item( item ) {} - PListViewItem ( T item, TQListViewItem * tqparent, const TQString & text ) : - TQListViewItem ( tqparent, text ), m_item( item ) + PListViewItem ( T item, TQListViewItem * parent, const TQString & text ) : + TQListViewItem ( parent, text ), m_item( item ) {} - PListViewItem ( T item, TQListView * tqparent, const TQString & text ) : - TQListViewItem ( tqparent, text ), m_item( item ) + PListViewItem ( T item, TQListView * parent, const TQString & text ) : + TQListViewItem ( parent, text ), m_item( item ) {} - PListViewItem ( T item, TQListView * tqparent, TQListViewItem * after, const TQString & text ) : - TQListViewItem ( tqparent, after, text ), m_item( item ) + PListViewItem ( T item, TQListView * parent, TQListViewItem * after, const TQString & text ) : + TQListViewItem ( parent, after, text ), m_item( item ) {} T item() @@ -116,7 +116,7 @@ class CppNewClassDialog : public CppNewClassDialogBase TQ_OBJECT public: - CppNewClassDialog( CppSupportPart *part, TQWidget *tqparent = 0, const char *name = 0 ); + CppNewClassDialog( CppSupportPart *part, TQWidget *parent = 0, const char *name = 0 ); ~CppNewClassDialog(); protected: @@ -168,9 +168,9 @@ protected: void parseClass( TQString clName, TQString inheritance ); void parsePCSClass( TQString clName, TQString inheritance ); void addToConstructorsList( TQCheckListItem *myClass, FunctionDom method ); - void addToMethodsList( TQListViewItem *tqparent, FunctionDom method ); - void addToUpgradeList( TQListViewItem *tqparent, FunctionDom method, TQString modifier ); - void addToUpgradeList( TQListViewItem *tqparent, VariableDom attr, TQString modifier ); + void addToMethodsList( TQListViewItem *parent, FunctionDom method ); + void addToUpgradeList( TQListViewItem *parent, FunctionDom method, TQString modifier ); + void addToUpgradeList( TQListViewItem *parent, VariableDom attr, TQString modifier ); void clearConstructorsList( bool clean = false ); void clearMethodsList( bool clean = false ); void clearUpgradeList( bool clean = false ); diff --git a/languages/cpp/cppnewclassdlgbase.ui b/languages/cpp/cppnewclassdlgbase.ui index 31d25e2c..c4d68a70 100644 --- a/languages/cpp/cppnewclassdlgbase.ui +++ b/languages/cpp/cppnewclassdlgbase.ui @@ -413,7 +413,7 @@ Namespace1::Namespace2::...::NamespaceN</string> <enum>StrongFocus</enum> </property> <property name="whatsThis" stdset="0"> - <string>Insert the base class which your new class will be derived from. If you have checked 'Generate QWidget child class' the new class will be derived from QWidget. If no base class is named, the new class will not have a tqparent class. You can also use template classes here (like BaseClass<int, int>)</string> + <string>Insert the base class which your new class will be derived from. If you have checked 'Generate QWidget child class' the new class will be derived from QWidget. If no base class is named, the new class will not have a parent class. You can also use template classes here (like BaseClass<int, int>)</string> </property> </widget> <widget class="KLineEdit" row="0" column="2"> diff --git a/languages/cpp/cppsupportpart.cpp b/languages/cpp/cppsupportpart.cpp index 204195aa..9cae9c77 100644 --- a/languages/cpp/cppsupportpart.cpp +++ b/languages/cpp/cppsupportpart.cpp @@ -191,8 +191,8 @@ public: }; -CppSupportPart::CppSupportPart( TQObject *tqparent, const char *name, const TQStringList &args ) -: KDevLanguageSupport( CppSupportFactory::info(), tqparent, name ? name : "KDevCppSupport" ), m_backgroundParser(0), +CppSupportPart::CppSupportPart( TQObject *parent, const char *name, const TQStringList &args ) +: KDevLanguageSupport( CppSupportFactory::info(), parent, name ? name : "KDevCppSupport" ), m_backgroundParser(0), m_activeDocument( 0 ), m_activeView( 0 ), m_activeSelection( 0 ), m_activeEditor( 0 ), m_activeViewCursor( 0 ), m_projectClosed( true ), m_projectClosing( false ), m_valid( false ), m_isTyping( false ), m_hadErrors( false ), _jd(0) @@ -1705,7 +1705,7 @@ void CppSupportPart::slotNeedTextHint( int line, int column, TQString& textHint { while ( node && node->nodeType() != NodeType_FunctionDefinition ) - node = node->tqparent(); + node = node->parent(); if ( node ) { @@ -1747,7 +1747,7 @@ void CppSupportPart::MakeMemberHelper( TQString& text, int& atLine, int& atColum { if ( currentNode->nodeType() == NodeType_Declarator ) declarator = ( DeclaratorAST* ) currentNode; - currentNode = currentNode->tqparent(); + currentNode = currentNode->parent(); } SimpleDeclarationAST* decl = currentNode ? ( SimpleDeclarationAST* ) currentNode : 0; @@ -3136,7 +3136,7 @@ TQString CppSupportPart::findHeaderSimple( const TQString &header ) return TQString(); } -UIBlockTester::UIBlockTesterThread::UIBlockTesterThread( UIBlockTester& tqparent ) : TQThread(), m_parent( tqparent ), m_stop(false) { +UIBlockTester::UIBlockTesterThread::UIBlockTesterThread( UIBlockTester& parent ) : TQThread(), m_parent( parent ), m_stop(false) { } void UIBlockTester::UIBlockTesterThread::run() { diff --git a/languages/cpp/cppsupportpart.h b/languages/cpp/cppsupportpart.h index 650831e8..906a2694 100644 --- a/languages/cpp/cppsupportpart.h +++ b/languages/cpp/cppsupportpart.h @@ -42,7 +42,7 @@ class UIBlockTester : public TQObject { TQ_OBJECT class UIBlockTesterThread : public TQThread { public: - UIBlockTesterThread( UIBlockTester& tqparent ); + UIBlockTesterThread( UIBlockTester& parent ); void run(); void stop(); private: @@ -159,7 +159,7 @@ class CppSupportPart : public KDevLanguageSupport TQ_OBJECT public: - CppSupportPart( TQObject *tqparent, const char *name, const TQStringList &args ); + CppSupportPart( TQObject *parent, const char *name, const TQStringList &args ); virtual ~CppSupportPart(); bool isValid() const diff --git a/languages/cpp/creategettersetterdialog.cpp b/languages/cpp/creategettersetterdialog.cpp index 5b5dae69..e63fcf23 100644 --- a/languages/cpp/creategettersetterdialog.cpp +++ b/languages/cpp/creategettersetterdialog.cpp @@ -19,8 +19,8 @@ #include "creategettersetterconfiguration.h" CreateGetterSetterDialog::CreateGetterSetterDialog( CppSupportPart* part, ClassDom aClass, - VariableDom aVar, TQWidget *tqparent, const char *pName ) -: CreateGetterSetterDialogBase( tqparent, pName ), m_part( part ), m_class( aClass ), m_var( aVar ) + VariableDom aVar, TQWidget *parent, const char *pName ) +: CreateGetterSetterDialogBase( parent, pName ), m_part( part ), m_class( aClass ), m_var( aVar ) { TQString name = aVar->name(); setCaption( "Create methods for " + name ); diff --git a/languages/cpp/creategettersetterdialog.h b/languages/cpp/creategettersetterdialog.h index 8f609c33..ac4e4997 100644 --- a/languages/cpp/creategettersetterdialog.h +++ b/languages/cpp/creategettersetterdialog.h @@ -26,7 +26,7 @@ class CreateGetterSetterDialog: public CreateGetterSetterDialogBase Q_OBJECT TQ_OBJECT public: - CreateGetterSetterDialog(CppSupportPart* part, ClassDom aClass, VariableDom var, TQWidget *tqparent = 0, const char *name = 0); + CreateGetterSetterDialog(CppSupportPart* part, ClassDom aClass, VariableDom var, TQWidget *parent = 0, const char *name = 0); protected slots: void accept(); diff --git a/languages/cpp/createpcsdialog.cpp b/languages/cpp/createpcsdialog.cpp index a5b328c4..93c5d754 100644 --- a/languages/cpp/createpcsdialog.cpp +++ b/languages/cpp/createpcsdialog.cpp @@ -132,13 +132,13 @@ private: class PCSListViewItem: public KListViewItem { public: - PCSListViewItem( KService::Ptr ptr, KDevPCSImporter* importer, TQListViewItem* tqparent ) - : KListViewItem( tqparent ), m_importer( importer ) + PCSListViewItem( KService::Ptr ptr, KDevPCSImporter* importer, TQListViewItem* parent ) + : KListViewItem( parent ), m_importer( importer ) { init( ptr ); } - PCSListViewItem( KService::Ptr ptr, KDevPCSImporter* importer, TQListView* tqparent ) - : KListViewItem( tqparent ), m_importer( importer ) + PCSListViewItem( KService::Ptr ptr, KDevPCSImporter* importer, TQListView* parent ) + : KListViewItem( parent ), m_importer( importer ) { init( ptr ); } @@ -196,8 +196,8 @@ public: -CreatePCSDialog::CreatePCSDialog( CppSupportPart* part, TQWidget* tqparent, const char* name, bool modal, WFlags fl ) - : CreatePCSDialogBase( tqparent, name, modal, fl ), m_part( part ), m_jobData( 0 ) +CreatePCSDialog::CreatePCSDialog( CppSupportPart* part, TQWidget* parent, const char* name, bool modal, WFlags fl ) + : CreatePCSDialogBase( parent, name, modal, fl ), m_part( part ), m_jobData( 0 ) { helpButton()->hide(); diff --git a/languages/cpp/createpcsdialog.h b/languages/cpp/createpcsdialog.h index e9371434..cdb30538 100644 --- a/languages/cpp/createpcsdialog.h +++ b/languages/cpp/createpcsdialog.h @@ -22,7 +22,7 @@ class CreatePCSDialog : public CreatePCSDialogBase TQ_OBJECT public: - CreatePCSDialog( CppSupportPart* part, TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + CreatePCSDialog( CppSupportPart* part, TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); ~CreatePCSDialog(); /*$PUBLIC_FUNCTIONS$*/ diff --git a/languages/cpp/debugger/dbgpsdlg.cpp b/languages/cpp/debugger/dbgpsdlg.cpp index fe04ffd4..64f4dcee 100644 --- a/languages/cpp/debugger/dbgpsdlg.cpp +++ b/languages/cpp/debugger/dbgpsdlg.cpp @@ -50,8 +50,8 @@ namespace GDBDebugger // For use with the internal debugger, but this dialog doesn't know anything // about why it's doing it. -Dbg_PS_Dialog::Dbg_PS_Dialog(TQWidget *tqparent, const char *name) - : KDialog(tqparent, name, true), // modal +Dbg_PS_Dialog::Dbg_PS_Dialog(TQWidget *parent, const char *name) + : KDialog(parent, name, true), // modal psProc_(0), pids_(new KListView(this)), pidLines_(TQString()) diff --git a/languages/cpp/debugger/dbgpsdlg.h b/languages/cpp/debugger/dbgpsdlg.h index 273bb7b8..82e73606 100644 --- a/languages/cpp/debugger/dbgpsdlg.h +++ b/languages/cpp/debugger/dbgpsdlg.h @@ -34,7 +34,7 @@ class Dbg_PS_Dialog : public KDialog TQ_OBJECT public: - Dbg_PS_Dialog( TQWidget *tqparent=0, const char *name=0 ); + Dbg_PS_Dialog( TQWidget *parent=0, const char *name=0 ); ~Dbg_PS_Dialog(); int pidSelected(); diff --git a/languages/cpp/debugger/dbgtoolbar.cpp b/languages/cpp/debugger/dbgtoolbar.cpp index 58cea851..9a3f4e02 100644 --- a/languages/cpp/debugger/dbgtoolbar.cpp +++ b/languages/cpp/debugger/dbgtoolbar.cpp @@ -68,7 +68,7 @@ namespace GDBDebugger class DbgMoveHandle : public TQFrame { public: - DbgMoveHandle(DbgToolBar *tqparent=0, const char * name=0, WFlags f=0); + DbgMoveHandle(DbgToolBar *parent=0, const char * name=0, WFlags f=0); virtual ~DbgMoveHandle(); virtual void mousePressEvent(TQMouseEvent *e); @@ -83,9 +83,9 @@ private: // ************************************************************************** -DbgMoveHandle::DbgMoveHandle(DbgToolBar *tqparent, const char * name, WFlags f) - : TQFrame(tqparent, name, f), - toolBar_(tqparent), +DbgMoveHandle::DbgMoveHandle(DbgToolBar *parent, const char * name, WFlags f) + : TQFrame(parent, name, f), + toolBar_(parent), offset_(TQPoint(0,0)), moving_(false) { @@ -111,9 +111,9 @@ void DbgMoveHandle::mousePressEvent(TQMouseEvent *e) KPopupMenu *menu = new KPopupMenu(this); menu->insertTitle(i18n("Debug Toolbar")); menu->insertItem(i18n("Dock to Panel"), - tqparent(), TQT_SLOT(slotDock())); + parent(), TQT_SLOT(slotDock())); menu->insertItem(i18n("Dock to Panel && Iconify KDevelop"), - tqparent(), TQT_SLOT(slotIconifyAndDock())); + parent(), TQT_SLOT(slotIconifyAndDock())); menu->popup(e->globalPos()); } else { moving_ = true; @@ -159,7 +159,7 @@ class DbgButton : public TQPushButton { public: DbgButton(const TQPixmap &pixmap, const TQString &text, - DbgToolBar *tqparent, const char *name=0); + DbgToolBar *parent, const char *name=0); virtual ~DbgButton() {}; void drawButtonLabel(TQPainter *painter); TQSize tqsizeHint() const; @@ -171,8 +171,8 @@ private: // ************************************************************************** DbgButton::DbgButton(const TQPixmap& pixmap, const TQString& text, - DbgToolBar* tqparent, const char* name) - : TQPushButton(tqparent, name), + DbgToolBar* parent, const char* name) + : TQPushButton(parent, name), pixmap_(pixmap) { setText(text); @@ -217,8 +217,8 @@ TQSize DbgButton::tqsizeHint() const // ************************************************************************** // ************************************************************************** -DbgDocker::DbgDocker(TQWidget* tqparent, DbgToolBar* toolBar, const TQPixmap& pixmap) : - KSystemTray(tqparent, "DbgDocker"), +DbgDocker::DbgDocker(TQWidget* parent, DbgToolBar* toolBar, const TQPixmap& pixmap) : + KSystemTray(parent, "DbgDocker"), toolBar_(toolBar) { setPixmap(pixmap); @@ -258,7 +258,7 @@ void DbgDocker::mousePressEvent(TQMouseEvent *e) // ************************************************************************** DbgToolBar::DbgToolBar(DebuggerPart* part, - TQWidget* tqparent, const char* name) + TQWidget* parent, const char* name) : TQFrame(0, name), part_(part), activeWindow_(0), @@ -268,10 +268,10 @@ DbgToolBar::DbgToolBar(DebuggerPart* part, appIsActive_(false), docked_(false), docker_(0), - dockWindow_(new KSystemTray(tqparent)) + dockWindow_(new KSystemTray(parent)) { winModule_ = new KWinModule(TQT_TQOBJECT(this)); - docker_ = new DbgDocker(tqparent, this, BarIcon("dbgnext")); + docker_ = new DbgDocker(parent, this, BarIcon("dbgnext")); connect(docker_, TQT_SIGNAL(clicked()), part_, TQT_SLOT(slotStepOver())); // Must have noFocus set so that we can see what window was active. diff --git a/languages/cpp/debugger/dbgtoolbar.h b/languages/cpp/debugger/dbgtoolbar.h index 427120d9..a163af0c 100644 --- a/languages/cpp/debugger/dbgtoolbar.h +++ b/languages/cpp/debugger/dbgtoolbar.h @@ -36,7 +36,7 @@ class DbgDocker : public KSystemTray TQ_OBJECT public: - DbgDocker(TQWidget *tqparent, DbgToolBar *toolBar, const TQPixmap &pixmap); + DbgDocker(TQWidget *parent, DbgToolBar *toolBar, const TQPixmap &pixmap); virtual ~DbgDocker() {}; virtual void mousePressEvent(TQMouseEvent *e); @@ -54,7 +54,7 @@ class DbgToolBar : public TQFrame TQ_OBJECT public: - DbgToolBar(DebuggerPart *part, TQWidget* tqparent, const char* name=0); + DbgToolBar(DebuggerPart *part, TQWidget* parent, const char* name=0); virtual ~DbgToolBar(); private slots: diff --git a/languages/cpp/debugger/debuggerconfigwidget.cpp b/languages/cpp/debugger/debuggerconfigwidget.cpp index 2fbc6a88..409329f7 100644 --- a/languages/cpp/debugger/debuggerconfigwidget.cpp +++ b/languages/cpp/debugger/debuggerconfigwidget.cpp @@ -27,8 +27,8 @@ namespace GDBDebugger { -DebuggerConfigWidget::DebuggerConfigWidget(DebuggerPart* part, TQWidget *tqparent, const char *name) - : DebuggerConfigWidgetBase(tqparent, name), dom(*part->projectDom()) +DebuggerConfigWidget::DebuggerConfigWidget(DebuggerPart* part, TQWidget *parent, const char *name) + : DebuggerConfigWidgetBase(parent, name), dom(*part->projectDom()) { gdbPath_edit->setMode(KFile::File|KFile::ExistingOnly|KFile::LocalOnly); diff --git a/languages/cpp/debugger/debuggerconfigwidget.h b/languages/cpp/debugger/debuggerconfigwidget.h index cdd2479d..d17d1202 100644 --- a/languages/cpp/debugger/debuggerconfigwidget.h +++ b/languages/cpp/debugger/debuggerconfigwidget.h @@ -29,7 +29,7 @@ class DebuggerConfigWidget : public DebuggerConfigWidgetBase TQ_OBJECT public: - DebuggerConfigWidget( DebuggerPart* part, TQWidget *tqparent=0, const char *name=0 ); + DebuggerConfigWidget( DebuggerPart* part, TQWidget *parent=0, const char *name=0 ); ~DebuggerConfigWidget(); public slots: diff --git a/languages/cpp/debugger/debuggerpart.cpp b/languages/cpp/debugger/debuggerpart.cpp index 43d6990e..b74b9d63 100644 --- a/languages/cpp/debugger/debuggerpart.cpp +++ b/languages/cpp/debugger/debuggerpart.cpp @@ -76,8 +76,8 @@ static const KDevPluginInfo data("kdevdebugger"); typedef KDevGenericFactory<DebuggerPart> DebuggerFactory; K_EXPORT_COMPONENT_FACTORY( libkdevdebugger, DebuggerFactory( data ) ) -DebuggerPart::DebuggerPart( TQObject *tqparent, const char *name, const TQStringList & ) : - KDevPlugin( &data, tqparent, name ? name : "DebuggerPart" ), +DebuggerPart::DebuggerPart( TQObject *parent, const char *name, const TQStringList & ) : + KDevPlugin( &data, parent, name ? name : "DebuggerPart" ), controller(0), previousDebuggerState_(s_dbgNotStarted), justRestarted_(false), needRebuild_(true), running_(false) diff --git a/languages/cpp/debugger/debuggerpart.h b/languages/cpp/debugger/debuggerpart.h index 71d56568..6981265f 100644 --- a/languages/cpp/debugger/debuggerpart.h +++ b/languages/cpp/debugger/debuggerpart.h @@ -50,7 +50,7 @@ class DebuggerPart : public KDevPlugin, virtual public DebuggerDCOPInterface TQ_OBJECT public: - DebuggerPart( TQObject *tqparent, const char *name, const TQStringList & ); + DebuggerPart( TQObject *parent, const char *name, const TQStringList & ); ~DebuggerPart(); virtual void restorePartialProjectSession(const TQDomElement* el); virtual void savePartialProjectSession(TQDomElement* el); diff --git a/languages/cpp/debugger/debuggertracingdialog.cpp b/languages/cpp/debugger/debuggertracingdialog.cpp index 0af77613..6bf70f3b 100644 --- a/languages/cpp/debugger/debuggertracingdialog.cpp +++ b/languages/cpp/debugger/debuggertracingdialog.cpp @@ -14,8 +14,8 @@ namespace GDBDebugger DebuggerTracingDialog ::DebuggerTracingDialog(Breakpoint* bp, - TQWidget* tqparent, const char* name) - : DebuggerTracingDialogBase(tqparent, name), bp_(bp) + TQWidget* parent, const char* name) + : DebuggerTracingDialogBase(parent, name), bp_(bp) { expressions->setButtons(KEditListBox::Add | KEditListBox::Remove); diff --git a/languages/cpp/debugger/debuggertracingdialog.h b/languages/cpp/debugger/debuggertracingdialog.h index e0e8dc48..4cbffe36 100644 --- a/languages/cpp/debugger/debuggertracingdialog.h +++ b/languages/cpp/debugger/debuggertracingdialog.h @@ -26,7 +26,7 @@ namespace GDBDebugger TQ_OBJECT public: DebuggerTracingDialog(Breakpoint* bp, - TQWidget* tqparent, const char* name = 0); + TQWidget* parent, const char* name = 0); private slots: void enableOrDisable(int); diff --git a/languages/cpp/debugger/disassemblewidget.cpp b/languages/cpp/debugger/disassemblewidget.cpp index 6b848a27..562aa1ae 100644 --- a/languages/cpp/debugger/disassemblewidget.cpp +++ b/languages/cpp/debugger/disassemblewidget.cpp @@ -35,8 +35,8 @@ namespace GDBDebugger /***************************************************************************/ /***************************************************************************/ -DisassembleWidget::DisassembleWidget(GDBController* controller, TQWidget *tqparent, const char *name) - : TQTextEdit(tqparent, name), controller_(controller), +DisassembleWidget::DisassembleWidget(GDBController* controller, TQWidget *parent, const char *name) + : TQTextEdit(parent, name), controller_(controller), active_(false), lower_(0), upper_(0), diff --git a/languages/cpp/debugger/disassemblewidget.h b/languages/cpp/debugger/disassemblewidget.h index 33f29da9..18dc3a7a 100644 --- a/languages/cpp/debugger/disassemblewidget.h +++ b/languages/cpp/debugger/disassemblewidget.h @@ -36,7 +36,7 @@ class DisassembleWidget : public TQTextEdit TQ_OBJECT public: - DisassembleWidget( GDBController* controller, TQWidget *tqparent=0, const char *name=0 ); + DisassembleWidget( GDBController* controller, TQWidget *parent=0, const char *name=0 ); virtual ~DisassembleWidget(); public slots: diff --git a/languages/cpp/debugger/framestackwidget.cpp b/languages/cpp/debugger/framestackwidget.cpp index 28fd076e..639ab74b 100644 --- a/languages/cpp/debugger/framestackwidget.cpp +++ b/languages/cpp/debugger/framestackwidget.cpp @@ -39,9 +39,9 @@ namespace GDBDebugger { FramestackWidget::FramestackWidget(GDBController* controller, - TQWidget *tqparent, + TQWidget *parent, const char *name, WFlags f) - : TQListView(tqparent, name, f), + : TQListView(parent, name, f), viewedThread_(0), controller_(controller), mayUpdate_( false ) @@ -493,10 +493,10 @@ void FramestackWidget::drawContentsOffset( TQPainter * p, int ox, int oy, // ************************************************************************** // ************************************************************************** -FrameStackItem::FrameStackItem(FramestackWidget *tqparent, +FrameStackItem::FrameStackItem(FramestackWidget *parent, unsigned frameNo, const TQString &name) - : TQListViewItem(tqparent, tqparent->lastChild()), + : TQListViewItem(parent, parent->lastChild()), frameNo_(frameNo), threadNo_(-1) { @@ -505,12 +505,12 @@ FrameStackItem::FrameStackItem(FramestackWidget *tqparent, // ************************************************************************** -FrameStackItem::FrameStackItem(ThreadStackItem *tqparent, +FrameStackItem::FrameStackItem(ThreadStackItem *parent, unsigned frameNo, const TQString &name) - : TQListViewItem(tqparent, tqparent->lastChild()), + : TQListViewItem(parent, parent->lastChild()), frameNo_(frameNo), - threadNo_(tqparent->threadNo()) + threadNo_(parent->threadNo()) { setText(0, name); } @@ -554,8 +554,8 @@ void FrameStackItem::setOpen(bool open) // ************************************************************************** // ************************************************************************** -ThreadStackItem::ThreadStackItem(FramestackWidget *tqparent, unsigned threadNo) -: TQListViewItem(tqparent), +ThreadStackItem::ThreadStackItem(FramestackWidget *parent, unsigned threadNo) +: TQListViewItem(parent), threadNo_(threadNo) { setText(0, i18n("Thread %1").tqarg(threadNo_)); diff --git a/languages/cpp/debugger/framestackwidget.h b/languages/cpp/debugger/framestackwidget.h index 5d0b98e7..631c440f 100644 --- a/languages/cpp/debugger/framestackwidget.h +++ b/languages/cpp/debugger/framestackwidget.h @@ -33,7 +33,7 @@ class FramestackWidget; class ThreadStackItem : public TQListViewItem { public: - ThreadStackItem(FramestackWidget *tqparent, + ThreadStackItem(FramestackWidget *parent, unsigned threadNo); virtual ~ThreadStackItem(); @@ -59,10 +59,10 @@ private: class FrameStackItem : public TQListViewItem { public: - FrameStackItem(FramestackWidget *tqparent, + FrameStackItem(FramestackWidget *parent, unsigned frameNo, const TQString &name); - FrameStackItem(ThreadStackItem *tqparent, + FrameStackItem(ThreadStackItem *parent, unsigned frameNo, const TQString &name); virtual ~FrameStackItem(); @@ -95,7 +95,7 @@ class FramestackWidget : public TQListView public: FramestackWidget( GDBController* controller, - TQWidget *tqparent=0, + TQWidget *parent=0, const char *name=0, WFlags f=0 ); virtual ~FramestackWidget(); diff --git a/languages/cpp/debugger/gdbbreakpointwidget.cpp b/languages/cpp/debugger/gdbbreakpointwidget.cpp index dffdf5d4..10d8a749 100644 --- a/languages/cpp/debugger/gdbbreakpointwidget.cpp +++ b/languages/cpp/debugger/gdbbreakpointwidget.cpp @@ -100,9 +100,9 @@ private: /***************************************************************************/ /***************************************************************************/ -BreakpointTableRow::BreakpointTableRow(TQTable* tqparent, EditType editType, +BreakpointTableRow::BreakpointTableRow(TQTable* parent, EditType editType, Breakpoint* bp) : - TQTableItem(tqparent, editType, ""), + TQTableItem(parent, editType, ""), m_breakpoint(bp) { appendEmptyRow(); @@ -146,7 +146,7 @@ void BreakpointTableRow::appendEmptyRow() ComplexEditCell* act = new ComplexEditCell(table()); table()->setItem(row, Tracing, act); TQObject::connect(act, TQT_SIGNAL(edit(TQTableItem*)), - table()->tqparent(), TQT_SLOT(editTracing(TQTableItem*))); + table()->parent(), TQT_SLOT(editTracing(TQTableItem*))); } /***************************************************************************/ @@ -196,8 +196,8 @@ void BreakpointTableRow::setRow() /***************************************************************************/ GDBBreakpointWidget::GDBBreakpointWidget(GDBController* controller, - TQWidget *tqparent, const char *name) : -TQHBox(tqparent, name), + TQWidget *parent, const char *name) : +TQHBox(parent, name), controller_(controller) { m_table = new GDBTable(0, numCols, this, name); diff --git a/languages/cpp/debugger/gdbbreakpointwidget.h b/languages/cpp/debugger/gdbbreakpointwidget.h index 2379a318..c1a0c7fe 100644 --- a/languages/cpp/debugger/gdbbreakpointwidget.h +++ b/languages/cpp/debugger/gdbbreakpointwidget.h @@ -48,7 +48,7 @@ class GDBBreakpointWidget : public TQHBox public: GDBBreakpointWidget( GDBController* controller, - TQWidget* tqparent=0, const char* name=0 ); + TQWidget* parent=0, const char* name=0 ); virtual ~GDBBreakpointWidget(); void reset(); diff --git a/languages/cpp/debugger/gdboutputwidget.cpp b/languages/cpp/debugger/gdboutputwidget.cpp index fe5059cb..7648fdf2 100644 --- a/languages/cpp/debugger/gdboutputwidget.cpp +++ b/languages/cpp/debugger/gdboutputwidget.cpp @@ -39,8 +39,8 @@ namespace GDBDebugger /***************************************************************************/ -GDBOutputWidget::GDBOutputWidget( TQWidget *tqparent, const char *name) : - TQWidget(tqparent, name), +GDBOutputWidget::GDBOutputWidget( TQWidget *parent, const char *name) : + TQWidget(parent, name), m_userGDBCmdEditor(0), m_Interrupt(0), m_gdbView(0), diff --git a/languages/cpp/debugger/gdboutputwidget.h b/languages/cpp/debugger/gdboutputwidget.h index 171fdb86..ed841d9b 100644 --- a/languages/cpp/debugger/gdboutputwidget.h +++ b/languages/cpp/debugger/gdboutputwidget.h @@ -38,7 +38,7 @@ class GDBOutputWidget : public TQWidget TQ_OBJECT public: - GDBOutputWidget( TQWidget *tqparent=0, const char *name=0 ); + GDBOutputWidget( TQWidget *parent=0, const char *name=0 ); ~GDBOutputWidget(); void savePartialProjectSession(TQDomElement* el); @@ -119,9 +119,9 @@ class OutputText : public TQTextEdit Q_OBJECT TQ_OBJECT public: - OutputText(GDBOutputWidget* tqparent) - : TQTextEdit(tqparent), - parent_(tqparent) + OutputText(GDBOutputWidget* parent) + : TQTextEdit(parent), + parent_(parent) {} TQPopupMenu* createPopupMenu(const TQPoint& pos); diff --git a/languages/cpp/debugger/gdbparser.h b/languages/cpp/debugger/gdbparser.h index 08e5cda7..a56c082d 100644 --- a/languages/cpp/debugger/gdbparser.h +++ b/languages/cpp/debugger/gdbparser.h @@ -35,7 +35,7 @@ public: static void destroy(); private: - void parseArray(TrimmableItem *tqparent, const char *buf); + void parseArray(TrimmableItem *parent, const char *buf); const char *skipTokenEnd(const char *buf) const; const char *skipTokenValue(const char *buf) const; diff --git a/languages/cpp/debugger/gdbtable.cpp b/languages/cpp/debugger/gdbtable.cpp index c4b16da8..c9c1bf2f 100644 --- a/languages/cpp/debugger/gdbtable.cpp +++ b/languages/cpp/debugger/gdbtable.cpp @@ -11,13 +11,13 @@ namespace GDBDebugger { -GDBTable::GDBTable(TQWidget *tqparent, const char *name) - : TQTable(tqparent, name) +GDBTable::GDBTable(TQWidget *parent, const char *name) + : TQTable(parent, name) { } -GDBTable::GDBTable(int nr, int nc, TQWidget * tqparent, const char * name) - : TQTable(nr, nc, tqparent, name) +GDBTable::GDBTable(int nr, int nc, TQWidget * parent, const char * name) + : TQTable(nr, nc, parent, name) { } diff --git a/languages/cpp/debugger/gdbtable.h b/languages/cpp/debugger/gdbtable.h index 55374380..da1e7a0e 100644 --- a/languages/cpp/debugger/gdbtable.h +++ b/languages/cpp/debugger/gdbtable.h @@ -19,8 +19,8 @@ class GDBTable : public TQTable Q_OBJECT TQ_OBJECT public: - GDBTable(TQWidget *tqparent = 0, const char *name = 0); - GDBTable( int numRows, int numCols, TQWidget * tqparent = 0, const char * name = 0 ); + GDBTable(TQWidget *parent = 0, const char *name = 0); + GDBTable( int numRows, int numCols, TQWidget * parent = 0, const char * name = 0 ); ~GDBTable(); virtual void keyPressEvent ( TQKeyEvent * e ); diff --git a/languages/cpp/debugger/label_with_double_click.cpp b/languages/cpp/debugger/label_with_double_click.cpp index deaab3cc..f08c7358 100644 --- a/languages/cpp/debugger/label_with_double_click.cpp +++ b/languages/cpp/debugger/label_with_double_click.cpp @@ -1,8 +1,8 @@ #include "label_with_double_click.h" -LabelWithDoubleClick::LabelWithDoubleClick(const TQString& s, TQWidget* tqparent) -: TQLabel(s, tqparent) +LabelWithDoubleClick::LabelWithDoubleClick(const TQString& s, TQWidget* parent) +: TQLabel(s, parent) {} void LabelWithDoubleClick::mouseDoubleClickEvent(TQMouseEvent*) diff --git a/languages/cpp/debugger/label_with_double_click.h b/languages/cpp/debugger/label_with_double_click.h index 616ad903..ebff3d92 100644 --- a/languages/cpp/debugger/label_with_double_click.h +++ b/languages/cpp/debugger/label_with_double_click.h @@ -9,7 +9,7 @@ class LabelWithDoubleClick : public TQLabel Q_OBJECT TQ_OBJECT public: - LabelWithDoubleClick(const TQString& s, TQWidget* tqparent); + LabelWithDoubleClick(const TQString& s, TQWidget* parent); signals: void doubleClicked(); diff --git a/languages/cpp/debugger/memviewdlg.cpp b/languages/cpp/debugger/memviewdlg.cpp index c594d134..48c2ddd4 100644 --- a/languages/cpp/debugger/memviewdlg.cpp +++ b/languages/cpp/debugger/memviewdlg.cpp @@ -79,8 +79,8 @@ namespace GDBDebugger TQPushButton* okButton; TQPushButton* cancelButton; - MemoryRangeSelector(TQWidget* tqparent) - : TQWidget(tqparent) + MemoryRangeSelector(TQWidget* parent) + : TQWidget(parent) { TQVBoxLayout* l = new TQVBoxLayout(this); @@ -127,8 +127,8 @@ namespace GDBDebugger MemoryView::MemoryView(GDBController* controller, - TQWidget* tqparent, const char* name) - : TQWidget(tqparent, name), + TQWidget* parent, const char* name) + : TQWidget(parent, name), controller_(controller), // New memory view can be created only when debugger is active, // so don't set s_appNotStarted here. @@ -403,9 +403,9 @@ namespace GDBDebugger ViewerWidget::ViewerWidget(GDBController* controller, - TQWidget* tqparent, + TQWidget* parent, const char* name) - : TQWidget(tqparent, name), + : TQWidget(parent, name), controller_(controller) { setIcon(SmallIcon("math_brace")); diff --git a/languages/cpp/debugger/memviewdlg.h b/languages/cpp/debugger/memviewdlg.h index 991efbb3..ecdb304f 100644 --- a/languages/cpp/debugger/memviewdlg.h +++ b/languages/cpp/debugger/memviewdlg.h @@ -37,7 +37,7 @@ namespace GDBDebugger TQ_OBJECT public: ViewerWidget(GDBController* controller, - TQWidget* tqparent, const char* name); + TQWidget* parent, const char* name); public slots: /** Adds a new memory view to *this, initially showing @@ -68,7 +68,7 @@ namespace GDBDebugger TQ_OBJECT public: MemoryView(GDBController* controller, - TQWidget* tqparent, const char* name = 0); + TQWidget* parent, const char* name = 0); void debuggerStateChanged(int state); diff --git a/languages/cpp/debugger/stty.cpp b/languages/cpp/debugger/stty.cpp index 07b848d9..52ff7a24 100644 --- a/languages/cpp/debugger/stty.cpp +++ b/languages/cpp/debugger/stty.cpp @@ -346,11 +346,11 @@ bool STTY::findExternalTTY(const TQString &termApp) ::exit(1); } - // tqparent process + // parent process if (pid <= 0) ::exit(1); - // Open the communication between us (the tqparent) and the + // Open the communication between us (the parent) and the // child (the process running on a tty console) fifo_fd = ::open(fifo, O_RDONLY); if (fifo_fd < 0) diff --git a/languages/cpp/debugger/variablewidget.cpp b/languages/cpp/debugger/variablewidget.cpp index 2b9e4de3..581b3cb8 100644 --- a/languages/cpp/debugger/variablewidget.cpp +++ b/languages/cpp/debugger/variablewidget.cpp @@ -77,8 +77,8 @@ namespace GDBDebugger VariableWidget::VariableWidget(GDBController* controller, GDBBreakpointWidget* breakpointWidget, - TQWidget *tqparent, const char *name) -: TQWidget(tqparent, name) + TQWidget *parent, const char *name) +: TQWidget(parent, name) { setIcon(SmallIcon("math_brace")); setCaption(i18n("Variable Tree")); @@ -197,11 +197,11 @@ void VariableWidget::focusInEvent(TQFocusEvent */*e*/) // ************************************************************************** // ************************************************************************** -VariableTree::VariableTree(VariableWidget *tqparent, +VariableTree::VariableTree(VariableWidget *parent, GDBController* controller, GDBBreakpointWidget* breakpointWidget, const char *name) - : KListView(tqparent, name), + : KListView(parent, name), TQToolTip( viewport() ), controller_(controller), breakpointWidget_(breakpointWidget), @@ -244,7 +244,7 @@ void VariableTree::slotContextMenu(KListView *, TQListViewItem *item) setSelected(item, true); // Need to select this item. - if (item->tqparent()) + if (item->parent()) { KPopupMenu popup(this); KPopupMenu format(this); @@ -360,7 +360,7 @@ void VariableTree::slotContextMenu(KListView *, TQListViewItem *item) { if (VarItem *item = dynamic_cast<VarItem*>(currentItem())) { - ((VariableWidget*)tqparent())-> + ((VariableWidget*)parent())-> slotEvaluateExpression(item->gdbExpression()); } } @@ -368,7 +368,7 @@ void VariableTree::slotContextMenu(KListView *, TQListViewItem *item) { if (VarItem *item = dynamic_cast<VarItem*>(currentItem())) { - ((VariableWidget*)tqparent())-> + ((VariableWidget*)parent())-> slotAddWatchVariable(item->gdbExpression()); } } @@ -547,8 +547,8 @@ void VariableTree::slotEvaluateExpression(const TQString &expression) TQListViewItem *VariableTree::findRoot(TQListViewItem *item) const { - while (item->tqparent()) - item = item->tqparent(); + while (item->parent()) + item = item->parent(); return item; } @@ -1018,15 +1018,15 @@ void VariableTree::handleAddressComputed(const GDBMI::ResultRecord& r) // ************************************************************************** // ************************************************************************** -TrimmableItem::TrimmableItem(VariableTree *tqparent) - : KListViewItem (tqparent, tqparent->lastChild()) +TrimmableItem::TrimmableItem(VariableTree *parent) + : KListViewItem (parent, parent->lastChild()) { } // ************************************************************************** -TrimmableItem::TrimmableItem(TrimmableItem *tqparent) - : KListViewItem (tqparent, tqparent->lastChild()) +TrimmableItem::TrimmableItem(TrimmableItem *parent) + : KListViewItem (parent, parent->lastChild()) { } @@ -1044,7 +1044,7 @@ void TrimmableItem::paintCell(TQPainter *p, const TQColorGroup &cg, if ( !p ) return; // make toplevel item (watch and frame items) names bold - if (column == 0 && !tqparent()) + if (column == 0 && !parent()) { TQFont f = p->font(); f.setBold(true); @@ -1069,10 +1069,10 @@ TQListViewItem *TrimmableItem::lastChild() const int VarItem::varobjIndex = 0; -VarItem::VarItem(TrimmableItem *tqparent, +VarItem::VarItem(TrimmableItem *parent, const TQString& expression, bool frozen) - : TrimmableItem (tqparent), + : TrimmableItem (parent), expression_(expression), highlight_(false), oldSpecialRepresentationSet_(false), @@ -1116,9 +1116,9 @@ VarItem::VarItem(TrimmableItem *tqparent, createVarobj(); } -VarItem::VarItem(TrimmableItem *tqparent, const GDBMI::Value& varobj, +VarItem::VarItem(TrimmableItem *parent, const GDBMI::Value& varobj, format_t format, bool baseClassMember) -: TrimmableItem (tqparent), +: TrimmableItem (parent), highlight_(false), oldSpecialRepresentationSet_(false), format_(format), @@ -1394,7 +1394,7 @@ void VarItem::createChildren(const GDBMI::ResultRecord& r, { kdDebug(9012) << "Creating new varobj " << exp << " " << baseObject << "\n"; - // Propagate format from tqparent. + // Propagate format from parent. VarItem* v = 0; v = new VarItem(this, tqchildren[i], format_, baseObject); } @@ -1469,10 +1469,10 @@ TQString VarItem::displayName() const if (expression_[0] != '*') return expression_; - if (const VarItem* tqparent = - dynamic_cast<const VarItem*>(TrimmableItem::tqparent())) + if (const VarItem* parent = + dynamic_cast<const VarItem*>(TrimmableItem::parent())) { - return "*" + tqparent->displayName(); + return "*" + parent->displayName(); } else { @@ -1504,24 +1504,24 @@ TQString VarItem::gdbExpression() const // - number, for array element // - identifier, for member, // - ***intentifier, for derefenreced pointer. - const VarItem* tqparent = dynamic_cast<const VarItem*>(TrimmableItem::tqparent()); + const VarItem* parent = dynamic_cast<const VarItem*>(TrimmableItem::parent()); bool ok = false; expression_.toInt(&ok); if (ok) { - // Array, tqparent always exists. - return tqparent->gdbExpression() + "[" + expression_ + "]"; + // Array, parent always exists. + return parent->gdbExpression() + "[" + expression_ + "]"; } else if (expression_[0] == '*') { - if (tqparent) + if (parent) { // For MI, expression_ can be "*0" (meaing // references 0-th element of some array). - // So, we really need to get to the tqparent to computed the right + // So, we really need to get to the parent to computed the right // gdb expression. - return "*" + tqparent->gdbExpression(); + return "*" + parent->gdbExpression(); } else { @@ -1532,14 +1532,14 @@ TQString VarItem::gdbExpression() const } else { - if (tqparent) + if (parent) /* This is varitem corresponds to a base suboject, - the expression should cast tqparent to the base's + the expression should cast parent to the base's type. */ if (baseClassMember_) - return "((" + expression_ + ")" + tqparent->gdbExpression() + ")"; + return "((" + expression_ + ")" + parent->gdbExpression() + ")"; else - return tqparent->gdbExpression() + "." + expression_; + return parent->gdbExpression() + "." + expression_; else return expression_; } @@ -1877,7 +1877,7 @@ VariableTree* VarItem::varTree() const void VarItem::unhookFromGdb() { // Unhook tqchildren first, so that child varitems are deleted - // before tqparent. Strictly speaking, we can avoid calling + // before parent. Strictly speaking, we can avoid calling // -var-delete on child varitems, but that's a bit cheesy, for(TQListViewItem* child = firstChild(); child; child = child->nextSibling()) @@ -1931,8 +1931,8 @@ bool VarItem::isAlive() const // ************************************************************************** // ************************************************************************** -VarFrameRoot::VarFrameRoot(VariableTree *tqparent, int frameNo, int threadNo) - : TrimmableItem (tqparent), +VarFrameRoot::VarFrameRoot(VariableTree *parent, int frameNo, int threadNo) + : TrimmableItem (parent), needLocals_(false), frameNo_(frameNo), threadNo_(threadNo), @@ -1956,8 +1956,8 @@ void VarFrameRoot::setOpen(bool open) if (frameOpened && needLocals_) { needLocals_ = false; - VariableTree* tqparent = static_cast<VariableTree*>(listView()); - tqparent->updateCurrentFrame(); + VariableTree* parent = static_cast<VariableTree*>(listView()); + parent->updateCurrentFrame(); } } @@ -1978,8 +1978,8 @@ void VarFrameRoot::setDirty() // ************************************************************************** // ************************************************************************** -WatchRoot::WatchRoot(VariableTree *tqparent) - : TrimmableItem(tqparent) +WatchRoot::WatchRoot(VariableTree *parent) + : TrimmableItem(parent) { setText(0, i18n("Watch")); setOpen(true); diff --git a/languages/cpp/debugger/variablewidget.h b/languages/cpp/debugger/variablewidget.h index d56e8977..2e5e6c38 100644 --- a/languages/cpp/debugger/variablewidget.h +++ b/languages/cpp/debugger/variablewidget.h @@ -57,7 +57,7 @@ class VariableWidget : public TQWidget public: VariableWidget( GDBController* controller, GDBBreakpointWidget* breakpointWidget, - TQWidget *tqparent=0, const char *name=0 ); + TQWidget *parent=0, const char *name=0 ); VariableTree *varTree() const { return varTree_; } @@ -88,7 +88,7 @@ class VariableTree : public KListView, public TQToolTip Q_OBJECT TQ_OBJECT public: - VariableTree(VariableWidget *tqparent, + VariableTree(VariableWidget *parent, GDBController* controller, GDBBreakpointWidget* breakpointWidget, const char *name=0 ); @@ -207,8 +207,8 @@ private: class TrimmableItem : public KListViewItem { public: - TrimmableItem(VariableTree *tqparent); - TrimmableItem(TrimmableItem *tqparent); + TrimmableItem(VariableTree *parent); + TrimmableItem(TrimmableItem *parent); virtual ~TrimmableItem(); @@ -235,11 +235,11 @@ public: /** Creates top-level variable item from the specified expression. Optionally, alternative display name can be provided. */ - VarItem( TrimmableItem *tqparent, + VarItem( TrimmableItem *parent, const TQString& expression, bool frozen = false); - VarItem( TrimmableItem *tqparent, const GDBMI::Value& varobj, + VarItem( TrimmableItem *parent, const GDBMI::Value& varobj, format_t format, bool baseClassMember); virtual ~VarItem(); @@ -373,7 +373,7 @@ private: private: // The gdb expression for this varItem relatively to - // tqparent VarItem. + // parent VarItem. TQString expression_; bool highlight_; @@ -418,7 +418,7 @@ private: class VarFrameRoot : public TrimmableItem { public: - VarFrameRoot(VariableTree *tqparent, int frameNo, int threadNo); + VarFrameRoot(VariableTree *parent, int frameNo, int threadNo); virtual ~VarFrameRoot(); void setOpen(bool open); @@ -456,7 +456,7 @@ private: class WatchRoot : public TrimmableItem { public: - WatchRoot(VariableTree *tqparent); + WatchRoot(VariableTree *parent); virtual ~WatchRoot(); }; diff --git a/languages/cpp/doc/libc.toc b/languages/cpp/doc/libc.toc index 626558da..53e996aa 100644 --- a/languages/cpp/doc/libc.toc +++ b/languages/cpp/doc/libc.toc @@ -455,7 +455,7 @@ <tocsect3 name="18.2.1 openlog" url="chapters_18.html#SEC385"/> <tocsect3 name="18.2.2 syslog, vsyslog" url="chapters_18.html#SEC386"/> <tocsect3 name="18.2.3 closelog" url="chapters_18.html#SEC387"/> - <tocsect3 name="18.2.4 setlogtqmask" url="chapters_18.html#SEC388"/> + <tocsect3 name="18.2.4 setlogmask" url="chapters_18.html#SEC388"/> <tocsect3 name="18.2.5 Syslog Example" url="chapters_18.html#SEC389"/> </tocsect2> </tocsect1> diff --git a/languages/cpp/pcsimporter/customimporter/kdevcustomimporter.cpp b/languages/cpp/pcsimporter/customimporter/kdevcustomimporter.cpp index 930bcfef..38a41eb8 100644 --- a/languages/cpp/pcsimporter/customimporter/kdevcustomimporter.cpp +++ b/languages/cpp/pcsimporter/customimporter/kdevcustomimporter.cpp @@ -19,9 +19,9 @@ K_EXPORT_COMPONENT_FACTORY( libkdevcustompcsimporter, KGenericFactory<KDevCustomImporter>( "kdevcustompcsimporter" ) ) -KDevCustomImporter::KDevCustomImporter( TQObject* tqparent, const char* name, const TQStringList & // args +KDevCustomImporter::KDevCustomImporter( TQObject* parent, const char* name, const TQStringList & // args ) - : KDevPCSImporter( tqparent, name ) + : KDevPCSImporter( parent, name ) {} @@ -75,9 +75,9 @@ TQStringList KDevCustomImporter::includePaths() return m_settings->dirs(); } -TQWidget* KDevCustomImporter::createSettingsPage( TQWidget* tqparent, const char* name ) +TQWidget* KDevCustomImporter::createSettingsPage( TQWidget* parent, const char* name ) { - m_settings = new SettingsDialog( tqparent, name ); + m_settings = new SettingsDialog( parent, name ); return m_settings; } diff --git a/languages/cpp/pcsimporter/customimporter/kdevcustomimporter.h b/languages/cpp/pcsimporter/customimporter/kdevcustomimporter.h index 0aea3974..501ae0ea 100644 --- a/languages/cpp/pcsimporter/customimporter/kdevcustomimporter.h +++ b/languages/cpp/pcsimporter/customimporter/kdevcustomimporter.h @@ -21,14 +21,14 @@ class KDevCustomImporter : public KDevPCSImporter Q_OBJECT TQ_OBJECT public: - KDevCustomImporter(TQObject* tqparent = 0, const char* name = 0, const TQStringList &args = TQStringList()); + KDevCustomImporter(TQObject* parent = 0, const char* name = 0, const TQStringList &args = TQStringList()); ~KDevCustomImporter(); virtual TQString dbName() const; virtual TQStringList fileList(); virtual TQStringList includePaths(); - virtual TQWidget* createSettingsPage(TQWidget* tqparent, const char* name); + virtual TQWidget* createSettingsPage(TQWidget* parent, const char* name); protected: TQStringList fileList( const TQString& path ); diff --git a/languages/cpp/pcsimporter/customimporter/settingsdialog.cpp b/languages/cpp/pcsimporter/customimporter/settingsdialog.cpp index 5845ff83..9994dcdd 100644 --- a/languages/cpp/pcsimporter/customimporter/settingsdialog.cpp +++ b/languages/cpp/pcsimporter/customimporter/settingsdialog.cpp @@ -34,8 +34,8 @@ #include <cstdlib> -SettingsDialog::SettingsDialog( TQWidget* tqparent, const char* name, WFlags fl ) - : SettingsDialogBase( tqparent, name, fl ) +SettingsDialog::SettingsDialog( TQWidget* parent, const char* name, WFlags fl ) + : SettingsDialogBase( parent, name, fl ) { KURLRequester * req = new KURLRequester( this ); req->setMode( KFile::Directory ); diff --git a/languages/cpp/pcsimporter/customimporter/settingsdialog.h b/languages/cpp/pcsimporter/customimporter/settingsdialog.h index 3d683f99..7b920a7d 100644 --- a/languages/cpp/pcsimporter/customimporter/settingsdialog.h +++ b/languages/cpp/pcsimporter/customimporter/settingsdialog.h @@ -22,7 +22,7 @@ class SettingsDialog : public SettingsDialogBase TQ_OBJECT public: - SettingsDialog(TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 ); + SettingsDialog(TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); ~SettingsDialog(); bool isValidTQtDir( const TQString& path ) const; diff --git a/languages/cpp/pcsimporter/kdelibsimporter/kdevkdelibsimporter.cpp b/languages/cpp/pcsimporter/kdelibsimporter/kdevkdelibsimporter.cpp index d487ab35..f85b4ded 100644 --- a/languages/cpp/pcsimporter/kdelibsimporter/kdevkdelibsimporter.cpp +++ b/languages/cpp/pcsimporter/kdelibsimporter/kdevkdelibsimporter.cpp @@ -23,8 +23,8 @@ K_EXPORT_COMPONENT_FACTORY( libkdevkdelibsimporter, KGenericFactory<KDevKDELibsImporter>( "kdevkdelibsimporter" ) ) -KDevKDELibsImporter::KDevKDELibsImporter( TQObject * tqparent, const char * name, const TQStringList& ) - : KDevPCSImporter( tqparent, name ) +KDevKDELibsImporter::KDevKDELibsImporter( TQObject * parent, const char * name, const TQStringList& ) + : KDevPCSImporter( parent, name ) {} KDevKDELibsImporter::~KDevKDELibsImporter() @@ -109,9 +109,9 @@ TQStringList KDevKDELibsImporter::includePaths() return includePaths; } -TQWidget * KDevKDELibsImporter::createSettingsPage( TQWidget * tqparent, const char * name ) +TQWidget * KDevKDELibsImporter::createSettingsPage( TQWidget * parent, const char * name ) { - m_settings = new SettingsDialog( tqparent, name ); + m_settings = new SettingsDialog( parent, name ); return m_settings; } //kate: indent-mode csands; tab-width 4; space-indent off; diff --git a/languages/cpp/pcsimporter/kdelibsimporter/kdevkdelibsimporter.h b/languages/cpp/pcsimporter/kdelibsimporter/kdevkdelibsimporter.h index 1e2c8254..47671869 100644 --- a/languages/cpp/pcsimporter/kdelibsimporter/kdevkdelibsimporter.h +++ b/languages/cpp/pcsimporter/kdelibsimporter/kdevkdelibsimporter.h @@ -22,14 +22,14 @@ class KDevKDELibsImporter : public KDevPCSImporter Q_OBJECT TQ_OBJECT public: - KDevKDELibsImporter( TQObject* tqparent=0, const char* name=0, const TQStringList& args=TQStringList() ); + KDevKDELibsImporter( TQObject* parent=0, const char* name=0, const TQStringList& args=TQStringList() ); virtual ~KDevKDELibsImporter(); virtual TQString dbName() const { return TQString::tqfromLatin1("KDElibs"); } virtual TQStringList fileList(); virtual TQStringList includePaths(); - virtual TQWidget* createSettingsPage( TQWidget* tqparent, const char* name=0 ); + virtual TQWidget* createSettingsPage( TQWidget* parent, const char* name=0 ); private: TQStringList fileList( const TQString& path ); diff --git a/languages/cpp/pcsimporter/kdelibsimporter/settingsdialog.cpp b/languages/cpp/pcsimporter/kdelibsimporter/settingsdialog.cpp index a9a24c48..57d16676 100644 --- a/languages/cpp/pcsimporter/kdelibsimporter/settingsdialog.cpp +++ b/languages/cpp/pcsimporter/kdelibsimporter/settingsdialog.cpp @@ -38,8 +38,8 @@ TQListBoxItem* TQListBox_selectedItem( TQListBox* cpTQListBox ) return 0; } -SettingsDialog::SettingsDialog( TQWidget* tqparent, const char* name, WFlags fl ) -: SettingsDialogBase( tqparent, name, fl ) +SettingsDialog::SettingsDialog( TQWidget* parent, const char* name, WFlags fl ) +: SettingsDialogBase( parent, name, fl ) { KApplication::kApplication()->dirs()->addResourceType("include","include"); TQStringList kdedirs=KApplication::kApplication()->dirs()->findDirs("include",""); diff --git a/languages/cpp/pcsimporter/kdelibsimporter/settingsdialog.h b/languages/cpp/pcsimporter/kdelibsimporter/settingsdialog.h index 7de31292..afe38e8d 100644 --- a/languages/cpp/pcsimporter/kdelibsimporter/settingsdialog.h +++ b/languages/cpp/pcsimporter/kdelibsimporter/settingsdialog.h @@ -20,7 +20,7 @@ class SettingsDialog : public SettingsDialogBase TQ_OBJECT public: - SettingsDialog(TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 ); + SettingsDialog(TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); ~SettingsDialog(); /*$PUBLIC_FUNCTIONS$*/ diff --git a/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.cpp b/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.cpp index e26872e2..c73b7456 100644 --- a/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.cpp +++ b/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.cpp @@ -24,8 +24,8 @@ K_EXPORT_COMPONENT_FACTORY( libkdevqt4importer, KGenericFactory<KDevQt4Importer>( "kdevqt4importer" ) ) -KDevQt4Importer::KDevQt4Importer( TQObject * tqparent, const char * name, const TQStringList& ) - : KDevPCSImporter( tqparent, name ) +KDevQt4Importer::KDevQt4Importer( TQObject * parent, const char * name, const TQStringList& ) + : KDevPCSImporter( parent, name ) { m_qtfile = 0; } @@ -99,9 +99,9 @@ TQStringList KDevQt4Importer::includePaths() return includePaths; } -TQWidget * KDevQt4Importer::createSettingsPage( TQWidget * tqparent, const char * name ) +TQWidget * KDevQt4Importer::createSettingsPage( TQWidget * parent, const char * name ) { - m_settings = new SettingsDialog( tqparent, name ); + m_settings = new SettingsDialog( parent, name ); return m_settings; } diff --git a/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.h b/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.h index 0da1185d..3b9c6cb9 100644 --- a/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.h +++ b/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.h @@ -23,14 +23,14 @@ class KDevQt4Importer : public KDevPCSImporter Q_OBJECT TQ_OBJECT public: - KDevQt4Importer( TQObject* tqparent=0, const char* name=0, const TQStringList& args=TQStringList() ); + KDevQt4Importer( TQObject* parent=0, const char* name=0, const TQStringList& args=TQStringList() ); virtual ~KDevQt4Importer(); virtual TQString dbName() const { return TQString::tqfromLatin1("TQt4"); } virtual TQStringList fileList(); virtual TQStringList includePaths(); - virtual TQWidget* createSettingsPage( TQWidget* tqparent, const char* name=0 ); + virtual TQWidget* createSettingsPage( TQWidget* parent, const char* name=0 ); private: TQGuardedPtr<SettingsDialog> m_settings; diff --git a/languages/cpp/pcsimporter/qt4importer/settingsdialog.cpp b/languages/cpp/pcsimporter/qt4importer/settingsdialog.cpp index 75fad7f3..10288502 100644 --- a/languages/cpp/pcsimporter/qt4importer/settingsdialog.cpp +++ b/languages/cpp/pcsimporter/qt4importer/settingsdialog.cpp @@ -36,8 +36,8 @@ TQListBoxItem* TQListBox_selectedItem(TQListBox* cpTQListBox) return 0; } -SettingsDialog::SettingsDialog(TQWidget* tqparent, const char* name, WFlags fl) - : SettingsDialogBase(tqparent,name,fl) +SettingsDialog::SettingsDialog(TQWidget* parent, const char* name, WFlags fl) + : SettingsDialogBase(parent,name,fl) { TQStringList qtdirs; qtdirs.push_back( ::getenv("TQTDIR") + TQString("/include") ); diff --git a/languages/cpp/pcsimporter/qt4importer/settingsdialog.h b/languages/cpp/pcsimporter/qt4importer/settingsdialog.h index 9a28b2ad..bd4ce565 100644 --- a/languages/cpp/pcsimporter/qt4importer/settingsdialog.h +++ b/languages/cpp/pcsimporter/qt4importer/settingsdialog.h @@ -20,7 +20,7 @@ class SettingsDialog : public SettingsDialogBase TQ_OBJECT public: - SettingsDialog(TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 ); + SettingsDialog(TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); ~SettingsDialog(); /*$PUBLIC_FUNCTIONS$*/ diff --git a/languages/cpp/pcsimporter/qtimporter/kdevqtimporter.cpp b/languages/cpp/pcsimporter/qtimporter/kdevqtimporter.cpp index ea9bfb52..62eb38fd 100644 --- a/languages/cpp/pcsimporter/qtimporter/kdevqtimporter.cpp +++ b/languages/cpp/pcsimporter/qtimporter/kdevqtimporter.cpp @@ -20,8 +20,8 @@ K_EXPORT_COMPONENT_FACTORY( libkdevqtimporter, KGenericFactory<KDevQtImporter>( "kdevqtimporter" ) ) -KDevQtImporter::KDevQtImporter( TQObject * tqparent, const char * name, const TQStringList& ) - : KDevPCSImporter( tqparent, name ) +KDevQtImporter::KDevQtImporter( TQObject * parent, const char * name, const TQStringList& ) + : KDevPCSImporter( parent, name ) {} KDevQtImporter::~KDevQtImporter() @@ -64,9 +64,9 @@ TQStringList KDevQtImporter::includePaths() return includePaths; } -TQWidget * KDevQtImporter::createSettingsPage( TQWidget * tqparent, const char * name ) +TQWidget * KDevQtImporter::createSettingsPage( TQWidget * parent, const char * name ) { - m_settings = new SettingsDialog( tqparent, name ); + m_settings = new SettingsDialog( parent, name ); return m_settings; } diff --git a/languages/cpp/pcsimporter/qtimporter/kdevqtimporter.h b/languages/cpp/pcsimporter/qtimporter/kdevqtimporter.h index ebbc7ab4..7504b649 100644 --- a/languages/cpp/pcsimporter/qtimporter/kdevqtimporter.h +++ b/languages/cpp/pcsimporter/qtimporter/kdevqtimporter.h @@ -22,14 +22,14 @@ class KDevQtImporter : public KDevPCSImporter Q_OBJECT TQ_OBJECT public: - KDevQtImporter( TQObject* tqparent=0, const char* name=0, const TQStringList& args=TQStringList() ); + KDevQtImporter( TQObject* parent=0, const char* name=0, const TQStringList& args=TQStringList() ); virtual ~KDevQtImporter(); virtual TQString dbName() const { return TQString::tqfromLatin1("TQt"); } virtual TQStringList fileList(); virtual TQStringList includePaths(); - virtual TQWidget* createSettingsPage( TQWidget* tqparent, const char* name=0 ); + virtual TQWidget* createSettingsPage( TQWidget* parent, const char* name=0 ); private: TQGuardedPtr<SettingsDialog> m_settings; diff --git a/languages/cpp/pcsimporter/qtimporter/settingsdialog.cpp b/languages/cpp/pcsimporter/qtimporter/settingsdialog.cpp index 0c25753c..bcd62037 100644 --- a/languages/cpp/pcsimporter/qtimporter/settingsdialog.cpp +++ b/languages/cpp/pcsimporter/qtimporter/settingsdialog.cpp @@ -36,8 +36,8 @@ TQListBoxItem* TQListBox_selectedItem( TQListBox* cpTQListBox ) return 0; } -SettingsDialog::SettingsDialog( TQWidget* tqparent, const char* name, WFlags fl ) - : SettingsDialogBase( tqparent, name, fl ) +SettingsDialog::SettingsDialog( TQWidget* parent, const char* name, WFlags fl ) + : SettingsDialogBase( parent, name, fl ) { TQStringList qtdirs; qtdirs.push_back( ::getenv( "TQTDIR" ) + TQString("/include") ); diff --git a/languages/cpp/pcsimporter/qtimporter/settingsdialog.h b/languages/cpp/pcsimporter/qtimporter/settingsdialog.h index 9a28b2ad..bd4ce565 100644 --- a/languages/cpp/pcsimporter/qtimporter/settingsdialog.h +++ b/languages/cpp/pcsimporter/qtimporter/settingsdialog.h @@ -20,7 +20,7 @@ class SettingsDialog : public SettingsDialogBase TQ_OBJECT public: - SettingsDialog(TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 ); + SettingsDialog(TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); ~SettingsDialog(); /*$PUBLIC_FUNCTIONS$*/ diff --git a/languages/cpp/problemreporter.cpp b/languages/cpp/problemreporter.cpp index ea1c3dc6..af76638c 100644 --- a/languages/cpp/problemreporter.cpp +++ b/languages/cpp/problemreporter.cpp @@ -57,14 +57,14 @@ class ProblemItem: public KListViewItem { public: - ProblemItem( TQListView* tqparent, const TQString& problem, + ProblemItem( TQListView* parent, const TQString& problem, const TQString& file, const TQString& line, const TQString& column ) - : KListViewItem( tqparent, problem, file, line, column ) + : KListViewItem( parent, problem, file, line, column ) {} - ProblemItem( TQListViewItem* tqparent, const TQString& problem, + ProblemItem( TQListViewItem* parent, const TQString& problem, const TQString& file, const TQString& line, const TQString& column ) - : KListViewItem( tqparent, problem, file, line, column ) + : KListViewItem( parent, problem, file, line, column ) {} int compare( TQListViewItem* item, int column, bool ascending ) const @@ -82,8 +82,8 @@ public: }; -ProblemReporter::ProblemReporter( CppSupportPart* part, TQWidget* tqparent, const char* name ) -: TQWidget( tqparent, name ? name : "problemreporter" ), +ProblemReporter::ProblemReporter( CppSupportPart* part, TQWidget* parent, const char* name ) +: TQWidget( parent, name ? name : "problemreporter" ), m_cppSupport( part ), // m_document( 0 ), m_markIface( 0 ) diff --git a/languages/cpp/problemreporter.h b/languages/cpp/problemreporter.h index c2abb294..9efc3593 100644 --- a/languages/cpp/problemreporter.h +++ b/languages/cpp/problemreporter.h @@ -107,7 +107,7 @@ class ProblemReporter: public TQWidget Q_OBJECT TQ_OBJECT public: - ProblemReporter( CppSupportPart* part, TQWidget* tqparent = 0, const char* name = 0 ); + ProblemReporter( CppSupportPart* part, TQWidget* parent = 0, const char* name = 0 ); virtual ~ProblemReporter(); void removeAllProblems( const TQString& filename ); diff --git a/languages/cpp/simplecontext.cpp b/languages/cpp/simplecontext.cpp index 3d23f76c..225bfc84 100644 --- a/languages/cpp/simplecontext.cpp +++ b/languages/cpp/simplecontext.cpp @@ -27,7 +27,7 @@ SimpleType getGlobal( SimpleType t ) { SafetyCounter s( 50 ); while( !global.scope().isEmpty() && s ) { if( !s ) { kdDebug( 9007 ) << "error" << endl; break; } - global = global->tqparent(); + global = global->parent(); } if( !global.scope().isEmpty() ) {kdDebug( 9007 ) << "ERROR WITH GLOBAL SCOPE" << endl; return SimpleType(); } return global; diff --git a/languages/cpp/simpletype.cpp b/languages/cpp/simpletype.cpp index 2a2b27de..a5efb703 100644 --- a/languages/cpp/simpletype.cpp +++ b/languages/cpp/simpletype.cpp @@ -795,7 +795,7 @@ LocateResult SimpleTypeImpl::locateType( TypeDesc name , LocateMode mode , int d ///Ask parentsc if ( !scope().isEmpty() && dir != 1 && ! ( mode & ExcludeParents ) ) { - LocateResult rett = tqparent() ->locateType( resolveTemplateParams( name, mode & ExcludeBases ? ExcludeBases : mode ), mode & ForgetModeUpwards ? Normal : mode ); + LocateResult rett = parent() ->locateType( resolveTemplateParams( name, mode & ExcludeBases ? ExcludeBases : mode ), mode & ForgetModeUpwards ? Normal : mode ); if ( rett->resolved() ) return rett.increaseDepth(); else @@ -842,12 +842,12 @@ TypePointer SimpleTypeImpl::bigContainer() { return TypePointer( this ); } -SimpleType SimpleTypeImpl::tqparent() { +SimpleType SimpleTypeImpl::parent() { if ( m_parent ) { - //ifVerbose( dbg() << "\"" << str() << "\": returning tqparent" << endl; + //ifVerbose( dbg() << "\"" << str() << "\": returning parent" << endl; return SimpleType( m_parent ); } else { - ifVerbose( dbg() << "\"" << str() << "\": locating tqparent" << endl ); + ifVerbose( dbg() << "\"" << str() << "\": locating parent" << endl ); invalidateSecondaryCache(); TQStringList sc = scope(); @@ -855,13 +855,13 @@ SimpleType SimpleTypeImpl::tqparent() { sc.pop_back(); SimpleType r = SimpleType( sc, m_desc.includeFiles() ); if ( &( *r.get() ) == this ) { - kdDebug( 9007 ) << "error: self set as tqparent: " << m_scope.join( "::" ) << "(" << m_scope.count() << ")" << ", " << sc.join( "::" ) << "(" << sc.count() << ")" /* << kdBacktrace()*/ << endl; + kdDebug( 9007 ) << "error: self set as parent: " << m_scope.join( "::" ) << "(" << m_scope.count() << ")" << ", " << sc.join( "::" ) << "(" << sc.count() << ")" /* << kdBacktrace()*/ << endl; return SimpleType( new SimpleTypeImpl( "" ) ); } m_parent = r.get(); return r; } else { - ifVerbose( dbg() << "\"" << str() << "\"warning: returning tqparent of global scope!" << endl ); + ifVerbose( dbg() << "\"" << str() << "\"warning: returning parent of global scope!" << endl ); return SimpleType( new SimpleTypeImpl( "" ) ); } } @@ -934,8 +934,8 @@ TQString SimpleTypeImpl::fullTypeUnresolvedWithScope( ) { TQString SimpleTypeImpl::fullTypeResolvedWithScope( int depth ) { Q_UNUSED( depth ); - if ( !m_scope.isEmpty() && tqparent() ) { - return tqparent() ->fullTypeResolvedWithScope() + "::" + fullTypeResolved(); + if ( !m_scope.isEmpty() && parent() ) { + return parent() ->fullTypeResolvedWithScope() + "::" + fullTypeResolved(); } else { return fullTypeResolved(); } diff --git a/languages/cpp/simpletype.h b/languages/cpp/simpletype.h index d3b288c0..43e55280 100644 --- a/languages/cpp/simpletype.h +++ b/languages/cpp/simpletype.h @@ -42,7 +42,7 @@ class SimpleTypeFunctionInterface; typedef KSharedPtr<SimpleTypeImpl> TypePointer; -///if this is set, imported items will get their tqparent set to the node they were acquired through(which may increase the overall count of items, decrease the caching-performance, and may create other problems in locating stuff) +///if this is set, imported items will get their parent set to the node they were acquired through(which may increase the overall count of items, decrease the caching-performance, and may create other problems in locating stuff) //#define PHYSICAL_IMPORT enum Repository { @@ -322,7 +322,7 @@ class SimpleTypeImpl : public KShared { }; - ///Sets the tqparent of the given slave to either this class, or the proxy of this class + ///Sets the parent of the given slave to either this class, or the proxy of this class virtual void setSlaveParent( SimpleTypeImpl& slave ); void setMasterProxy( TypePointer t ) { @@ -480,19 +480,19 @@ class SimpleTypeImpl : public KShared { return ts; } - ///sets the tqparent-type(type this one is nested in) - void setParent( TypePointer tqparent ) { - if( tqparent == m_parent ) return; + ///sets the parent-type(type this one is nested in) + void setParent( TypePointer parent ) { + if( parent == m_parent ) return; invalidateSecondaryCache(); - if ( &( *tqparent ) == this ) { + if ( &( *parent ) == this ) { kdDebug( 9007 ) << "setSlaveParent error\n" << kdBacktrace() << endl; return ; } - m_parent = tqparent; + m_parent = parent; } - ///returns whether the type has template-parameters, or one of the tqparent-types has template-parameters. + ///returns whether the type has template-parameters, or one of the parent-types has template-parameters. bool usingTemplates() const { return !m_desc.templateParams().isEmpty() || ( m_parent && m_parent->usingTemplates() ); } @@ -617,7 +617,7 @@ class SimpleTypeImpl : public KShared { ExcludeParents = 16, ExcludeNestedTypes = 32, ExcludeNamespaces = 64, - ForgetModeUpwards = 128, ///forgets everything, even NoFail, while passing control to the tqparent + ForgetModeUpwards = 128, ///forgets everything, even NoFail, while passing control to the parent LocateBase = 4 + 8 + 32 + 64 + 128, ///searching in the scope visible while the base-declaration of a class NoFail = 256, TraceAliases = 512, ///Stores a copy whenever an alias is applied @@ -718,8 +718,8 @@ class SimpleTypeImpl : public KShared { ///Returns either itself, or the (namespace-)proxy this type is a slave of. TypePointer bigContainer(); - ///Returns the tqparent, eg. the SimpleType this one is nested in. - SimpleType tqparent(); + ///Returns the parent, eg. the SimpleType this one is nested in. + SimpleType parent(); ///this must be a reference, so the desc can be manipulated in-place from outside const TypeDesc& desc(); @@ -779,7 +779,7 @@ class SimpleTypeImpl : public KShared { ///Used to set the include-files that were used to find this type(needed for lazy evaluation of the base-classes) void setFindIncludeFiles( const IncludeFiles& files ); - ///Should be called within the tqparent-namespace/class + ///Should be called within the parent-namespace/class virtual void chooseSpecialization( MemberInfo& member ); }; diff --git a/languages/cpp/simpletypecatalog.h b/languages/cpp/simpletypecatalog.h index 69a920c7..e22a3fcf 100644 --- a/languages/cpp/simpletypecatalog.h +++ b/languages/cpp/simpletypecatalog.h @@ -100,7 +100,7 @@ protected: TypeDesc m_desc; TypePointer m_parent; - CatalogBuildInfo( Tag tag , const TypeDesc& desc, TypePointer tqparent ) : m_tag( tag ) , m_desc( desc ), m_parent( tqparent ) { + CatalogBuildInfo( Tag tag , const TypeDesc& desc, TypePointer parent ) : m_tag( tag ) , m_desc( desc ), m_parent( parent ) { } virtual TypePointer build(); diff --git a/languages/cpp/simpletypefunction.cpp b/languages/cpp/simpletypefunction.cpp index 4edaddba..0af7bdc8 100644 --- a/languages/cpp/simpletypefunction.cpp +++ b/languages/cpp/simpletypefunction.cpp @@ -572,8 +572,8 @@ TypePointer SimpleTypeCodeModel::CodeModelBuildInfo::build() { TypeDesc SimpleTypeCodeModelFunction::getReturnType() { if ( item() ) { IncludeFiles files; - if( tqparent() ) - files = tqparent()->getFindIncludeFiles(); + if( parent() ) + files = parent()->getFindIncludeFiles(); if ( FunctionModel* m = dynamic_cast<FunctionModel*>( & ( *item() ) ) ) { TypeDesc d = m->resultType(); d.setIncludeFiles( files ); @@ -597,8 +597,8 @@ TQValueList<TypeDesc> SimpleTypeCodeModelFunction::getArgumentTypes() { if ( item() ) { IncludeFiles files; - if( tqparent() ) - files = tqparent()->getFindIncludeFiles(); + if( parent() ) + files = parent()->getFindIncludeFiles(); if ( FunctionModel* m = dynamic_cast<FunctionModel*>( & ( *item() ) ) ) { ArgumentList l = m->argumentList(); for ( ArgumentList::iterator it = l.begin(); it != l.end(); ++it ) { @@ -642,7 +642,7 @@ TQStringList SimpleTypeCodeModelFunction::getArgumentDefaults() { //SimpleTypeCodeModelFunction::CodeModelFunctionBuildInfo implementation -SimpleTypeCodeModelFunction::CodeModelFunctionBuildInfo::CodeModelFunctionBuildInfo( FunctionDefinitionList items, TypeDesc& desc, TypePointer tqparent ) : m_desc( desc ), m_parent( tqparent ) { +SimpleTypeCodeModelFunction::CodeModelFunctionBuildInfo::CodeModelFunctionBuildInfo( FunctionDefinitionList items, TypeDesc& desc, TypePointer parent ) : m_desc( desc ), m_parent( parent ) { for ( FunctionDefinitionList::iterator it = items.begin(); it != items.end(); ++it ) { m_items << model_cast<FunctionDom> ( *it ); diff --git a/languages/cpp/simpletypefunction.h b/languages/cpp/simpletypefunction.h index 86f32a65..90b5fcab 100644 --- a/languages/cpp/simpletypefunction.h +++ b/languages/cpp/simpletypefunction.h @@ -139,7 +139,7 @@ public: ///paramInfo now contains the information for all implicit types } - return this->tqparent()->locateDecType( f->replaceTemplateParams( rt, paramInfo ) ); + return this->parent()->locateDecType( f->replaceTemplateParams( rt, paramInfo ) ); } else { ifVerbose( dbg() << "failed to find a fitting overloaded method" << endl ); } @@ -239,7 +239,7 @@ protected: TypeDesc m_desc; TypePointer m_parent; - CodeModelBuildInfo( ItemDom item, const TypeDesc& desc, TypePointer tqparent ) : m_item( item ), m_desc( desc ), m_parent( tqparent ) { + CodeModelBuildInfo( ItemDom item, const TypeDesc& desc, TypePointer parent ) : m_item( item ), m_desc( desc ), m_parent( parent ) { } virtual TypePointer build(); @@ -281,9 +281,9 @@ public: TypeDesc m_desc; TypePointer m_parent; - CodeModelFunctionBuildInfo( FunctionList items, TypeDesc& desc, TypePointer tqparent ) : m_items( items ), m_desc( desc ), m_parent( tqparent ) { + CodeModelFunctionBuildInfo( FunctionList items, TypeDesc& desc, TypePointer parent ) : m_items( items ), m_desc( desc ), m_parent( parent ) { } - CodeModelFunctionBuildInfo( FunctionDefinitionList items, TypeDesc& desc, TypePointer tqparent ); + CodeModelFunctionBuildInfo( FunctionDefinitionList items, TypeDesc& desc, TypePointer parent ); virtual TypePointer build(); }; @@ -317,7 +317,7 @@ public: TypeDesc m_desc; TypePointer m_parent; - CatalogFunctionBuildInfo( TQValueList<Tag> tags, TypeDesc& desc, TypePointer tqparent ) : m_tags( tags ), m_desc( desc ), m_parent( tqparent ) { + CatalogFunctionBuildInfo( TQValueList<Tag> tags, TypeDesc& desc, TypePointer parent ) : m_tags( tags ), m_desc( desc ), m_parent( parent ) { } virtual TypePointer build(); diff --git a/languages/cpp/simpletypenamespace.cpp b/languages/cpp/simpletypenamespace.cpp index 10e9b83d..f7937db1 100644 --- a/languages/cpp/simpletypenamespace.cpp +++ b/languages/cpp/simpletypenamespace.cpp @@ -159,7 +159,7 @@ SimpleTypeImpl::MemberInfo SimpleTypeNamespace::findMember( TypeDesc name, Membe if ( mem.memberType != MemberInfo::Namespace ) { #ifdef PHYSICAL_IMPORT TypePointer b = mem.build(); - if ( b && !( b->tqparent()->masterProxy().data() == this ) ) { + if ( b && !( b->parent()->masterProxy().data() == this ) ) { b = b ->clone(); //expensive, cache is not shared b->setParent( this ); @@ -169,7 +169,7 @@ SimpleTypeImpl::MemberInfo SimpleTypeNamespace::findMember( TypeDesc name, Membe if( mem.memberType == MemberInfo::NestedType ) chooseSpecialization( mem ); TypePointer b = mem.build(); - if( b && b->tqparent() && b->tqparent()->masterProxy().data() == this ) + if( b && b->parent() && b->parent()->masterProxy().data() == this ) b->setParent( this ); #endif return mem; diff --git a/languages/cpp/subclassing_template/subclass_qt4_template.cpp b/languages/cpp/subclassing_template/subclass_qt4_template.cpp index 3e96646a..4531fa69 100644 --- a/languages/cpp/subclassing_template/subclass_qt4_template.cpp +++ b/languages/cpp/subclassing_template/subclass_qt4_template.cpp @@ -2,8 +2,8 @@ #include "$NEWFILENAMELC$.h" -$NEWCLASS$::$NEWCLASS$(TQWidget* tqparent, TQt::WFlags fl) -: $TQTBASECLASS$( tqparent, fl ), Ui::$BASECLASS$() +$NEWCLASS$::$NEWCLASS$(TQWidget* parent, TQt::WFlags fl) +: $TQTBASECLASS$( parent, fl ), Ui::$BASECLASS$() { setupUi(this); } diff --git a/languages/cpp/subclassing_template/subclass_qt4_template.h b/languages/cpp/subclassing_template/subclass_qt4_template.h index 64ba390e..8895bceb 100644 --- a/languages/cpp/subclassing_template/subclass_qt4_template.h +++ b/languages/cpp/subclassing_template/subclass_qt4_template.h @@ -11,7 +11,7 @@ class $NEWCLASS$ : public $TQTBASECLASS$, private Ui::$BASECLASS$ TQ_OBJECT public: - $NEWCLASS$(TQWidget* tqparent = 0, TQt::WFlags fl = 0 ); + $NEWCLASS$(TQWidget* parent = 0, TQt::WFlags fl = 0 ); ~$NEWCLASS$(); /*$PUBLIC_FUNCTIONS$*/ diff --git a/languages/cpp/subclassing_template/subclass_template.cpp b/languages/cpp/subclassing_template/subclass_template.cpp index 8373a260..adc89082 100644 --- a/languages/cpp/subclassing_template/subclass_template.cpp +++ b/languages/cpp/subclassing_template/subclass_template.cpp @@ -2,8 +2,8 @@ #include "$NEWFILENAMELC$.h" -$NEWCLASS$::$NEWCLASS$(TQWidget* tqparent, const char* name$CAN_BE_MODAL_CPP1$, WFlags fl) -: $BASECLASS$(tqparent,name$CAN_BE_MODAL_CPP2$,fl) +$NEWCLASS$::$NEWCLASS$(TQWidget* parent, const char* name$CAN_BE_MODAL_CPP1$, WFlags fl) +: $BASECLASS$(parent,name$CAN_BE_MODAL_CPP2$,fl) { } diff --git a/languages/cpp/subclassing_template/subclass_template.h b/languages/cpp/subclassing_template/subclass_template.h index 7f9d2ae2..1451e471 100644 --- a/languages/cpp/subclassing_template/subclass_template.h +++ b/languages/cpp/subclassing_template/subclass_template.h @@ -10,7 +10,7 @@ class $NEWCLASS$ : public $BASECLASS$ TQ_OBJECT public: - $NEWCLASS$(TQWidget* tqparent = 0, const char* name = 0$CAN_BE_MODAL_H$, WFlags fl = 0 ); + $NEWCLASS$(TQWidget* parent = 0, const char* name = 0$CAN_BE_MODAL_H$, WFlags fl = 0 ); ~$NEWCLASS$(); /*$PUBLIC_FUNCTIONS$*/ diff --git a/languages/cpp/subclassingdlg.cpp b/languages/cpp/subclassingdlg.cpp index 72db362b..d4edb897 100644 --- a/languages/cpp/subclassingdlg.cpp +++ b/languages/cpp/subclassingdlg.cpp @@ -54,11 +54,11 @@ #define SLOT_HELP SlotItem(m_slotView,"help()","virtual","protected","void",false,true) -SlotItem::SlotItem(TQListView *tqparent,const TQString &methodName, +SlotItem::SlotItem(TQListView *parent,const TQString &methodName, const TQString &specifier, const TQString &access, const TQString &returnType, bool isFunc,bool callBaseClass) -: TQCheckListItem(tqparent,methodName,TQCheckListItem::CheckBox) +: TQCheckListItem(parent,methodName,TQCheckListItem::CheckBox) { setOn(true); m_methodName = methodName; @@ -94,9 +94,9 @@ void SlotItem::setAllreadyInSubclass() SubclassingDlg::SubclassingDlg(CppSupportPart* cppSupport, const TQString &formFile, - TQStringList &newFileNames, TQWidget* tqparent, + TQStringList &newFileNames, TQWidget* parent, const char* name,bool modal, WFlags fl) -: SubclassingDlgBase(tqparent,name,modal,fl), +: SubclassingDlgBase(parent,name,modal,fl), m_newFileNames(newFileNames), m_cppSupport( cppSupport ) { @@ -117,8 +117,8 @@ m_newFileNames(newFileNames), m_cppSupport( cppSupport ) SubclassingDlg::SubclassingDlg(CppSupportPart* cppSupport, const TQString &formFile, const TQString &filename, TQStringList &dummy, - TQWidget* tqparent, const char* name, bool modal, WFlags fl) -: SubclassingDlgBase(tqparent, name, modal, fl), + TQWidget* parent, const char* name, bool modal, WFlags fl) +: SubclassingDlgBase(parent, name, modal, fl), m_newFileNames(dummy), m_cppSupport( cppSupport ) { diff --git a/languages/cpp/subclassingdlg.h b/languages/cpp/subclassingdlg.h index e63dee7b..43fd06ad 100644 --- a/languages/cpp/subclassingdlg.h +++ b/languages/cpp/subclassingdlg.h @@ -23,7 +23,7 @@ class CppSupportPart; class SlotItem : public TQCheckListItem { public: - SlotItem( TQListView *tqparent, const TQString &text, + SlotItem( TQListView *parent, const TQString &text, const TQString &specifier, const TQString &Access, const TQString &returnType, bool isFunc, bool callBaseClass = false ); @@ -42,10 +42,10 @@ class SubclassingDlg : public SubclassingDlgBase { public: SubclassingDlg( CppSupportPart* cppSupport, const TQString &formFile, TQStringList &newFileNames, - TQWidget* tqparent = 0, const char* name = 0, + TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); SubclassingDlg( CppSupportPart* cppSupport, const TQString &formFile, const TQString &filename, TQStringList &dummy, - TQWidget* tqparent = 0, const char* name = 0, + TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); ~SubclassingDlg(); |