diff options
Diffstat (limited to 'lib')
126 files changed, 312 insertions, 312 deletions
diff --git a/lib/antlr/antlr/TokenStreamBasicFilter.hpp b/lib/antlr/antlr/TokenStreamBasicFilter.hpp index 353014a4..bcdb131c 100644 --- a/lib/antlr/antlr/TokenStreamBasicFilter.hpp +++ b/lib/antlr/antlr/TokenStreamBasicFilter.hpp @@ -34,7 +34,7 @@ public: void discard(int ttype); - void discard(const BitSet& tqmask); + void discard(const BitSet& mask); RefToken nextToken(); }; diff --git a/lib/antlr/antlr/TokenStreamHiddenTokenFilter.hpp b/lib/antlr/antlr/TokenStreamHiddenTokenFilter.hpp index 867a4101..ed007a7a 100644 --- a/lib/antlr/antlr/TokenStreamHiddenTokenFilter.hpp +++ b/lib/antlr/antlr/TokenStreamHiddenTokenFilter.hpp @@ -69,7 +69,7 @@ public: void hide(int m); - void hide(const BitSet& tqmask); + void hide(const BitSet& mask); protected: RefToken LA(int i); diff --git a/lib/antlr/src/TokenStreamBasicFilter.cpp b/lib/antlr/src/TokenStreamBasicFilter.cpp index ac6156da..982e8645 100644 --- a/lib/antlr/src/TokenStreamBasicFilter.cpp +++ b/lib/antlr/src/TokenStreamBasicFilter.cpp @@ -24,9 +24,9 @@ void TokenStreamBasicFilter::discard(int ttype) discardMask.add(ttype); } -void TokenStreamBasicFilter::discard(const BitSet& tqmask) +void TokenStreamBasicFilter::discard(const BitSet& mask) { - discardMask = tqmask; + discardMask = mask; } RefToken TokenStreamBasicFilter::nextToken() diff --git a/lib/antlr/src/TokenStreamHiddenTokenFilter.cpp b/lib/antlr/src/TokenStreamHiddenTokenFilter.cpp index 90d48d5a..431df0c3 100644 --- a/lib/antlr/src/TokenStreamHiddenTokenFilter.cpp +++ b/lib/antlr/src/TokenStreamHiddenTokenFilter.cpp @@ -94,9 +94,9 @@ void TokenStreamHiddenTokenFilter::hide(int m) hideMask.add(m); } -void TokenStreamHiddenTokenFilter::hide(const BitSet& tqmask) +void TokenStreamHiddenTokenFilter::hide(const BitSet& mask) { - hideMask = tqmask; + hideMask = mask; } RefToken TokenStreamHiddenTokenFilter::LA(int) diff --git a/lib/cppparser/ast.cpp b/lib/cppparser/ast.cpp index 8fe6b82f..334ac62a 100644 --- a/lib/cppparser/ast.cpp +++ b/lib/cppparser/ast.cpp @@ -178,14 +178,14 @@ void AST::getEndPosition( int* line, int* col ) const * col = m_endColumn; } -void AST::setParent( AST* tqparent ) +void AST::setParent( AST* parent ) { #ifndef CPPPARSER_NO_CHILDREN if( m_parent ) m_parent->removeChild( this ); #endif - m_parent = tqparent; + m_parent = parent; #ifndef CPPPARSER_NO_CHILDREN if( m_parent ) diff --git a/lib/cppparser/ast.h b/lib/cppparser/ast.h index ccea98e2..3e53a285 100644 --- a/lib/cppparser/ast.h +++ b/lib/cppparser/ast.h @@ -253,8 +253,8 @@ public: int nodeType() const { return m_nodeType; } void setNodeType( int nodeType ) { m_nodeType = nodeType; } - AST* tqparent() { return m_parent; } - void setParent( AST* tqparent ); + AST* parent() { return m_parent; } + void setParent( AST* parent ); void setStartPosition( int line, int col ); void getStartPosition( int* line, int* col ) const; diff --git a/lib/interfaces/codemodel.h b/lib/interfaces/codemodel.h index f85ff4c3..343c6169 100644 --- a/lib/interfaces/codemodel.h +++ b/lib/interfaces/codemodel.h @@ -706,10 +706,10 @@ public: virtual bool isClass() const { return true; } - /**@return The scope of the class. Scope is a string list composed from names of tqparent classes and namespaces.*/ + /**@return The scope of the class. Scope is a string list composed from names of parent classes and namespaces.*/ TQStringList scope() const { return m_scope; } /**Sets the scope of this class. - @param scope The scope - a list of tqparent classes and namespaces.*/ + @param scope The scope - a list of parent classes and namespaces.*/ void setScope( const TQStringList& scope ) { m_scope = scope; } /**@return The list of base class names.*/ @@ -1256,7 +1256,7 @@ public: virtual bool isFunction() const { return true; } /**@return The scope of the function. Scope is a string list composed - from names of tqparent functions, classes and namespaces.*/ + from names of parent functions, classes and namespaces.*/ TQStringList scope() const { return m_scope; } /**Sets the scope of the function. diff --git a/lib/interfaces/extensions/Mainpage.dox b/lib/interfaces/extensions/Mainpage.dox index 5906ccfe..d306a1e8 100644 --- a/lib/interfaces/extensions/Mainpage.dox +++ b/lib/interfaces/extensions/Mainpage.dox @@ -38,8 +38,8 @@ those should be loaded at a time. This can be accomplished by: @code class KDevMyExtension: public KDevPlugin { public: - KDevMyExtension(const KDevPluginInfo *info, QObject* tqparent, const char* name) - :KDevPlugin(info, tqparent, name) {} + KDevMyExtension(const KDevPluginInfo *info, QObject* parent, const char* name) + :KDevPlugin(info, parent, name) {} virtual void doSomething() = 0; }; diff --git a/lib/interfaces/extensions/codebrowserfrontend.h b/lib/interfaces/extensions/codebrowserfrontend.h index 2ce7090b..6084496f 100644 --- a/lib/interfaces/extensions/codebrowserfrontend.h +++ b/lib/interfaces/extensions/codebrowserfrontend.h @@ -30,8 +30,8 @@ class KDevCodeBrowserFrontend : public KDevPlugin { TQ_OBJECT public: - KDevCodeBrowserFrontend(const KDevPluginInfo *info, TQObject *tqparent=0, const char *name=0 ) - :KDevPlugin(info, tqparent, name ? name : "CodeBrowserFrontend") {} + KDevCodeBrowserFrontend(const KDevPluginInfo *info, TQObject *parent=0, const char *name=0 ) + :KDevPlugin(info, parent, name ? name : "CodeBrowserFrontend") {} ///Used by the quickopen-plugin to notify extensions that it jumped to a searched item virtual bool jumpedToItem( ItemDom item ) = 0; diff --git a/lib/interfaces/extensions/kdevappfrontend.h b/lib/interfaces/extensions/kdevappfrontend.h index bd6dc559..9bac0ff8 100644 --- a/lib/interfaces/extensions/kdevappfrontend.h +++ b/lib/interfaces/extensions/kdevappfrontend.h @@ -66,11 +66,11 @@ public: plugin information in various places like "about application" dialog, plugin selector dialog, etc. Plugin does not take ownership on info object, also its lifetime should be equal to the lifetime of the plugin. - @param tqparent The tqparent object for the plugin. Parent object must implement @ref KDevApi + @param parent The parent object for the plugin. Parent object must implement @ref KDevApi interface. Otherwise the plugin will not be constructed. @param name The internal name which identifies the plugin.*/ - KDevAppFrontend(const KDevPluginInfo *info, TQObject *tqparent=0, const char *name=0 ) - :KDevPlugin(info, tqparent, name ? name : "KDevAppFrontend") {} + KDevAppFrontend(const KDevPluginInfo *info, TQObject *parent=0, const char *name=0 ) + :KDevPlugin(info, parent, name ? name : "KDevAppFrontend") {} /**@return Whether the application is currently running.*/ virtual bool isRunning() = 0; diff --git a/lib/interfaces/extensions/kdevcreatefile.h b/lib/interfaces/extensions/kdevcreatefile.h index fd11b993..031c7ffc 100644 --- a/lib/interfaces/extensions/kdevcreatefile.h +++ b/lib/interfaces/extensions/kdevcreatefile.h @@ -119,11 +119,11 @@ public: plugin information in various places like "about application" dialog, plugin selector dialog, etc. Plugin does not take ownership on info object, also its lifetime should be equal to the lifetime of the plugin. - @param tqparent The tqparent object for the plugin. Parent object must implement @ref KDevApi + @param parent The parent object for the plugin. Parent object must implement @ref KDevApi interface. Otherwise the plugin will not be constructed. @param name The internal name which identifies the plugin.*/ - KDevCreateFile(const KDevPluginInfo *info, TQObject * tqparent = 0, const char * name = 0) - :KDevPlugin(info, tqparent, name) {} + KDevCreateFile(const KDevPluginInfo *info, TQObject * parent = 0, const char * name = 0) + :KDevPlugin(info, parent, name) {} /**Creates a new file, within or without the project. Supply as much information as you know. Leave what you don't know as TQString(). diff --git a/lib/interfaces/extensions/kdevdifffrontend.cpp b/lib/interfaces/extensions/kdevdifffrontend.cpp index a3af79d4..745703e4 100644 --- a/lib/interfaces/extensions/kdevdifffrontend.cpp +++ b/lib/interfaces/extensions/kdevdifffrontend.cpp @@ -21,8 +21,8 @@ #include "kdevdifffrontend.h" -KDevDiffFrontend::KDevDiffFrontend(const KDevPluginInfo *info, TQObject *tqparent, const char *name) - : KDevPlugin(info, tqparent, name ? name : "KDevDiffFrontend") +KDevDiffFrontend::KDevDiffFrontend(const KDevPluginInfo *info, TQObject *parent, const char *name) + : KDevPlugin(info, parent, name ? name : "KDevDiffFrontend") { } diff --git a/lib/interfaces/extensions/kdevdifffrontend.h b/lib/interfaces/extensions/kdevdifffrontend.h index b1158cb4..ecf360ad 100644 --- a/lib/interfaces/extensions/kdevdifffrontend.h +++ b/lib/interfaces/extensions/kdevdifffrontend.h @@ -55,11 +55,11 @@ public: plugin information in various places like "about application" dialog, plugin selector dialog, etc. Plugin does not take ownership on info object, also its lifetime should be equal to the lifetime of the plugin. - @param tqparent The tqparent object for the plugin. Parent object must implement @ref KDevApi + @param parent The parent object for the plugin. Parent object must implement @ref KDevApi interface. Otherwise the plugin will not be constructed. @param name The internal name which identifies the plugin.*/ - KDevDiffFrontend( const KDevPluginInfo *info, TQObject *tqparent=0, const char *name=0 ) - :KDevPlugin(info, tqparent, name ? name : "KDevDiffFrontend") {} + KDevDiffFrontend( const KDevPluginInfo *info, TQObject *parent=0, const char *name=0 ) + :KDevPlugin(info, parent, name ? name : "KDevDiffFrontend") {} /**Displays the patch. @param diff A string which contains a patch in unified format.*/ diff --git a/lib/interfaces/extensions/kdevmakefrontend.h b/lib/interfaces/extensions/kdevmakefrontend.h index cc136536..c1d0319b 100644 --- a/lib/interfaces/extensions/kdevmakefrontend.h +++ b/lib/interfaces/extensions/kdevmakefrontend.h @@ -63,11 +63,11 @@ public: plugin information in various places like "about application" dialog, plugin selector dialog, etc. Plugin does not take ownership on info object, also its lifetime should be equal to the lifetime of the plugin. - @param tqparent The tqparent object for the plugin. Parent object must implement @ref KDevApi + @param parent The parent object for the plugin. Parent object must implement @ref KDevApi interface. Otherwise the plugin will not be constructed. @param name The internal name which identifies the plugin.*/ - KDevMakeFrontend(const KDevPluginInfo *info, TQObject *tqparent=0, const char *name=0 ) - :KDevPlugin(info, tqparent, name ? name : "KDevMakeFrontend") {} + KDevMakeFrontend(const KDevPluginInfo *info, TQObject *parent=0, const char *name=0 ) + :KDevPlugin(info, parent, name ? name : "KDevMakeFrontend") {} /**@return The widget where the make output is shown.*/ virtual TQWidget* widget() { return 0L; } diff --git a/lib/interfaces/extensions/kdevquickopen.h b/lib/interfaces/extensions/kdevquickopen.h index e66e01b3..f4f6358c 100644 --- a/lib/interfaces/extensions/kdevquickopen.h +++ b/lib/interfaces/extensions/kdevquickopen.h @@ -51,11 +51,11 @@ public: plugin information in various places like "about application" dialog, plugin selector dialog, etc. Plugin does not take ownership on info object, also its lifetime should be equal to the lifetime of the plugin. - @param tqparent The tqparent object for the plugin. Parent object must implement @ref KDevApi + @param parent The parent object for the plugin. Parent object must implement @ref KDevApi interface. Otherwise the plugin will not be constructed. @param name The internal name which identifies the plugin.*/ - KDevQuickOpen(const KDevPluginInfo *info, TQObject* tqparent, const char* name) - :KDevPlugin(info, tqparent, name) {} + KDevQuickOpen(const KDevPluginInfo *info, TQObject* parent, const char* name) + :KDevPlugin(info, parent, name) {} /**Shows the file selection dialog. @param text A list of urls to open.*/ @@ -116,11 +116,11 @@ public: plugin information in various places like "about application" dialog, plugin selector dialog, etc. Plugin does not take ownership on info object, also its lifetime should be equal to the lifetime of the plugin. - @param tqparent The tqparent object for the plugin. Parent object must implement @ref KDevApi + @param parent The parent object for the plugin. Parent object must implement @ref KDevApi interface. Otherwise the plugin will not be constructed. @param name The internal name which identifies the plugin.*/ - KDevQuickOpen(const KDevPluginInfo *info, TQObject* tqparent, const char* name) - :KDevPlugin(info, tqparent, name) {} + KDevQuickOpen(const KDevPluginInfo *info, TQObject* parent, const char* name) + :KDevPlugin(info, parent, name) {} /**Shows the file selection dialog. @param text A list of urls to open.*/ diff --git a/lib/interfaces/extensions/kdevsourceformatter.h b/lib/interfaces/extensions/kdevsourceformatter.h index 0542fbf1..5ca33079 100644 --- a/lib/interfaces/extensions/kdevsourceformatter.h +++ b/lib/interfaces/extensions/kdevsourceformatter.h @@ -51,11 +51,11 @@ public: plugin information in various places like "about application" dialog, plugin selector dialog, etc. Plugin does not take ownership on info object, also its lifetime should be equal to the lifetime of the plugin. - @param tqparent The tqparent object for the plugin. Parent object must implement @ref KDevApi + @param parent The parent object for the plugin. Parent object must implement @ref KDevApi interface. Otherwise the plugin will not be constructed. @param name The internal name which identifies the plugin.*/ - KDevSourceFormatter(const KDevPluginInfo *info, TQObject* tqparent, const char* name) - :KDevPlugin(info, tqparent, name) {} + KDevSourceFormatter(const KDevPluginInfo *info, TQObject* parent, const char* name) + :KDevPlugin(info, parent, name) {} /**Formats the source. @param text A string with a code. diff --git a/lib/interfaces/extensions/kdevversioncontrol.h b/lib/interfaces/extensions/kdevversioncontrol.h index 63656c9e..ba6c0d70 100644 --- a/lib/interfaces/extensions/kdevversioncontrol.h +++ b/lib/interfaces/extensions/kdevversioncontrol.h @@ -144,11 +144,11 @@ public: plugin information in various places like "about application" dialog, plugin selector dialog, etc. Plugin does not take ownership on info object, also its lifetime should be equal to the lifetime of the plugin. - @param tqparent The tqparent object for the plugin. Parent object must implement @ref KDevApi + @param parent The parent object for the plugin. Parent object must implement @ref KDevApi interface. Otherwise the plugin will not be constructed. @param name The internal name which identifies the plugin.*/ - KDevVersionControl(const KDevPluginInfo *info, TQObject *tqparent, const char *name ) - :KDevPlugin(info, tqparent, name ) {} + KDevVersionControl(const KDevPluginInfo *info, TQObject *parent, const char *name ) + :KDevPlugin(info, parent, name ) {} /**Creates a new project in the passed path @p dir. This should instantiate VCS infrastructure and import a project into the VCS in that directory. @@ -188,10 +188,10 @@ class KDevVCSFileInfoProvider: public TQObject TQ_OBJECT public: /**Constructor. - @param tqparent The tqparent VCS plugin. + @param parent The parent VCS plugin. @param name The name of a provider object.*/ - KDevVCSFileInfoProvider(KDevVersionControl *tqparent, const char *name) - : TQObject( tqparent, name ), m_owner(tqparent) {} + KDevVCSFileInfoProvider(KDevVersionControl *parent, const char *name) + : TQObject( parent, name ), m_owner(parent) {} /**Gets the status for local files in the specified directory: the info are collected locally so they are necessarily in sync with the repository diff --git a/lib/interfaces/external/designer.cpp b/lib/interfaces/external/designer.cpp index 06c28d50..606fd2b4 100644 --- a/lib/interfaces/external/designer.cpp +++ b/lib/interfaces/external/designer.cpp @@ -20,8 +20,8 @@ namespace KInterfaceDesigner{ -Designer::Designer(TQObject *tqparent, const char *name) - :KParts::ReadWritePart(tqparent, name) +Designer::Designer(TQObject *parent, const char *name) + :KParts::ReadWritePart(parent, name) { } diff --git a/lib/interfaces/external/designer.h b/lib/interfaces/external/designer.h index 72d7508a..9f0c0064 100644 --- a/lib/interfaces/external/designer.h +++ b/lib/interfaces/external/designer.h @@ -67,7 +67,7 @@ class Designer: public KParts::ReadWritePart{ Q_OBJECT TQ_OBJECT public: - Designer(TQObject *tqparent, const char *name); + Designer(TQObject *parent, const char *name); /**Reimplement this to be able to open projects.*/ virtual void openProject(const TQString &projectFile) = 0; diff --git a/lib/interfaces/extras/kdevcompileroptions.cpp b/lib/interfaces/extras/kdevcompileroptions.cpp index 08f5d19f..22c701f1 100644 --- a/lib/interfaces/extras/kdevcompileroptions.cpp +++ b/lib/interfaces/extras/kdevcompileroptions.cpp @@ -1,7 +1,7 @@ #include "kdevcompileroptions.h" -KDevCompilerOptions::KDevCompilerOptions( TQObject * tqparent, const char * name ) - :TQObject(tqparent, name) +KDevCompilerOptions::KDevCompilerOptions( TQObject * parent, const char * name ) + :TQObject(parent, name) { } diff --git a/lib/interfaces/extras/kdevcompileroptions.h b/lib/interfaces/extras/kdevcompileroptions.h index 15d9a066..220956f5 100644 --- a/lib/interfaces/extras/kdevcompileroptions.h +++ b/lib/interfaces/extras/kdevcompileroptions.h @@ -34,7 +34,7 @@ Used by build systems to give users a compiler options configuration dialog. Common use case: @code -static KDevCompilerOptions *createCompilerOptions( const TQString &name, TQObject *tqparent ) +static KDevCompilerOptions *createCompilerOptions( const TQString &name, TQObject *parent ) { KService::Ptr service = KService::serviceByDesktopName( name ); if ( !service ) @@ -49,7 +49,7 @@ static KDevCompilerOptions *createCompilerOptions( const TQString &name, TQObjec if (prop.isValid()) args = TQStringList::split(" ", prop.toString()); - TQObject *obj = factory->create(tqparent, service->name().latin1(), + TQObject *obj = factory->create(parent, service->name().latin1(), "KDevCompilerOptions", args); if (!obj->inherits("KDevCompilerOptions")) @@ -60,11 +60,11 @@ static KDevCompilerOptions *createCompilerOptions( const TQString &name, TQObjec } ... -KDevCompilerOptions *plugin = createCompilerOptions(compilerName, tqparent); +KDevCompilerOptions *plugin = createCompilerOptions(compilerName, parent); TQString flags = ""; //old compiler flags if ( plugin ) { - flags = plugin->exec( tqparent, flags ); //new compiler flags are returned + flags = plugin->exec( parent, flags ); //new compiler flags are returned delete plugin; } @endcode @@ -75,7 +75,7 @@ class KDevCompilerOptions : public TQObject TQ_OBJECT public: - KDevCompilerOptions( TQObject *tqparent=0, const char *name=0 ); + KDevCompilerOptions( TQObject *parent=0, const char *name=0 ); /** * Opens a dialog which allows the user to configure the @@ -85,7 +85,7 @@ public: * be returned as a string. If the dialog was cancelled, * TQString() is returned. */ - virtual TQString exec(TQWidget *tqparent, const TQString &flags) = 0; + virtual TQString exec(TQWidget *parent, const TQString &flags) = 0; }; #endif diff --git a/lib/interfaces/extras/kdevvcsintegrator.cpp b/lib/interfaces/extras/kdevvcsintegrator.cpp index cb3cb263..5a6ab429 100644 --- a/lib/interfaces/extras/kdevvcsintegrator.cpp +++ b/lib/interfaces/extras/kdevvcsintegrator.cpp @@ -18,8 +18,8 @@ */ #include "kdevvcsintegrator.h" -KDevVCSIntegrator::KDevVCSIntegrator(TQObject *tqparent, const char *name) - :TQObject(tqparent, name) +KDevVCSIntegrator::KDevVCSIntegrator(TQObject *parent, const char *name) + :TQObject(parent, name) { } diff --git a/lib/interfaces/extras/kdevvcsintegrator.h b/lib/interfaces/extras/kdevvcsintegrator.h index e13798e2..b5098e6c 100644 --- a/lib/interfaces/extras/kdevvcsintegrator.h +++ b/lib/interfaces/extras/kdevvcsintegrator.h @@ -35,7 +35,7 @@ VCS Integration Dialog. Usually it is created as: @code class MyVCSDialog: public TQWidget, public VCSDialog { - MyVCSDialog(TQWidget *tqparent = 0, const char *name = 0); + MyVCSDialog(TQWidget *parent = 0, const char *name = 0); virtual void accept() { ... } virtual void init(const TQString &projectName, const TQString &projectLocation) { ... } virtual TQWidget *self() { @@ -53,7 +53,7 @@ public: /**Init integration dialog with the project name and location.*/ virtual void init(const TQString &projectName, const TQString &projectLocation) = 0; /**Reimplement to return an actual integration widget. Use TQWidgets for that, not - TQDialogs because integrator dialogs are usually have tqparent containers.*/ + TQDialogs because integrator dialogs are usually have parent containers.*/ virtual TQWidget *self() = 0; }; @@ -66,12 +66,12 @@ class KDevVCSIntegrator: public TQObject { Q_OBJECT TQ_OBJECT public: - KDevVCSIntegrator(TQObject *tqparent = 0, const char *name = 0); + KDevVCSIntegrator(TQObject *parent = 0, const char *name = 0); /**Reimplement to return a dialog to fetch the project from VCS.*/ - virtual VCSDialog *fetcher(TQWidget *tqparent) = 0; + virtual VCSDialog *fetcher(TQWidget *parent) = 0; /**Reimplement to return a dialog to integrate the project into VCS.*/ - virtual VCSDialog *integrator(TQWidget *tqparent) = 0; + virtual VCSDialog *integrator(TQWidget *parent) = 0; }; #endif diff --git a/lib/interfaces/kdevcore.cpp b/lib/interfaces/kdevcore.cpp index 700693d6..dda66cbf 100644 --- a/lib/interfaces/kdevcore.cpp +++ b/lib/interfaces/kdevcore.cpp @@ -285,8 +285,8 @@ const ProjectModelItem* ProjectModelItemContext::item() const // class KDevCore /////////////////////////////////////////////////////////////////////////////// -KDevCore::KDevCore( TQObject *tqparent, const char *name ) - : TQObject( tqparent, name ) +KDevCore::KDevCore( TQObject *parent, const char *name ) + : TQObject( parent, name ) { new KDevCoreIface(this); } diff --git a/lib/interfaces/kdevcore.h b/lib/interfaces/kdevcore.h index 09fba17c..7e3aa6ee 100644 --- a/lib/interfaces/kdevcore.h +++ b/lib/interfaces/kdevcore.h @@ -303,9 +303,9 @@ class KDevCore: public TQObject TQ_OBJECT public: /**Constructor - @param tqparent The TQObject that's the tqparent of this class. + @param parent The TQObject that's the parent of this class. @param name The name of the class.*/ - KDevCore(TQObject *tqparent=0, const char *name=0); + KDevCore(TQObject *parent=0, const char *name=0); /**Destructor.*/ virtual ~KDevCore(); diff --git a/lib/interfaces/kdevdesignerintegration.cpp b/lib/interfaces/kdevdesignerintegration.cpp index c95cfbe9..0ba325ab 100644 --- a/lib/interfaces/kdevdesignerintegration.cpp +++ b/lib/interfaces/kdevdesignerintegration.cpp @@ -24,8 +24,8 @@ public: KDevDesignerIntegrationIface *m_iface; }; -KDevDesignerIntegration::KDevDesignerIntegration(TQObject *tqparent, const char *name) - : TQObject(tqparent, name) +KDevDesignerIntegration::KDevDesignerIntegration(TQObject *parent, const char *name) + : TQObject(parent, name) { dptr = new KDevDesignerIntegrationPrivate(); diff --git a/lib/interfaces/kdevdesignerintegration.h b/lib/interfaces/kdevdesignerintegration.h index 6cd8fffb..99b9dbc0 100644 --- a/lib/interfaces/kdevdesignerintegration.h +++ b/lib/interfaces/kdevdesignerintegration.h @@ -54,9 +54,9 @@ Q_OBJECT TQ_OBJECT public: /**Constructor. - @param tqparent Parent object. + @param parent Parent object. @param name Internal name.*/ - KDevDesignerIntegration(TQObject *tqparent = 0, const char *name = 0); + KDevDesignerIntegration(TQObject *parent = 0, const char *name = 0); /**Destructor.*/ ~KDevDesignerIntegration(); diff --git a/lib/interfaces/kdevgenericfactory.h b/lib/interfaces/kdevgenericfactory.h index 4199d14a..f928d815 100644 --- a/lib/interfaces/kdevgenericfactory.h +++ b/lib/interfaces/kdevgenericfactory.h @@ -51,8 +51,8 @@ static const KDevPluginInfo data("KDevDummyPlugin"); typedef KDevGenericFactory<DummyPlugin> DummyPluginFactory; K_EXPORT_COMPONENT_FACTORY(libkdevdummyplugin, DummyPluginFactory( data ) ) -DummyPlugin::DummyPlugin(TQObject *tqparent, const char *name, const TQStringList & ) - :KDevPlugin(&data, tqparent, name) +DummyPlugin::DummyPlugin(TQObject *parent, const char *name, const TQStringList & ) + :KDevPlugin(&data, parent, name) { } @endcode diff --git a/lib/interfaces/kdevlanguagesupport.cpp b/lib/interfaces/kdevlanguagesupport.cpp index b0449d6b..aa5b560c 100644 --- a/lib/interfaces/kdevlanguagesupport.cpp +++ b/lib/interfaces/kdevlanguagesupport.cpp @@ -29,8 +29,8 @@ #include "kdevdesignerintegration.h" #include "kdevlanguagesupport.h" -KDevLanguageSupport::KDevLanguageSupport(const KDevPluginInfo *info, TQObject *tqparent, const char *name) - : KDevPlugin(info, tqparent, name ? name : "KDevLanguageSupport" ) +KDevLanguageSupport::KDevLanguageSupport(const KDevPluginInfo *info, TQObject *parent, const char *name) + : KDevPlugin(info, parent, name ? name : "KDevLanguageSupport" ) { } diff --git a/lib/interfaces/kdevlanguagesupport.h b/lib/interfaces/kdevlanguagesupport.h index 765fde79..87c91a41 100644 --- a/lib/interfaces/kdevlanguagesupport.h +++ b/lib/interfaces/kdevlanguagesupport.h @@ -91,10 +91,10 @@ public: plugin information in various places like "about application" dialog, plugin selector dialog, etc. Plugin does not take ownership on info object, also its lifetime should be equal to the lifetime of the plugin. - @param tqparent The tqparent object for the plugin. Parent object must implement @ref KDevApi + @param parent The parent object for the plugin. Parent object must implement @ref KDevApi interface. Otherwise the plugin will not be constructed. @param name The internal name which identifies the plugin.*/ - KDevLanguageSupport(const KDevPluginInfo *info, TQObject *tqparent, const char *name); + KDevLanguageSupport(const KDevPluginInfo *info, TQObject *parent, const char *name); /**Destructor.*/ ~KDevLanguageSupport(); diff --git a/lib/interfaces/kdevpartcontroller.cpp b/lib/interfaces/kdevpartcontroller.cpp index 09a47493..58f1dc2a 100644 --- a/lib/interfaces/kdevpartcontroller.cpp +++ b/lib/interfaces/kdevpartcontroller.cpp @@ -20,8 +20,8 @@ #include "kdevpartcontroller.h" #include "katedocumentmanagerinterface.h" -KDevPartController::KDevPartController(TQWidget *tqparent) - : KParts::PartManager(tqparent) +KDevPartController::KDevPartController(TQWidget *parent) + : KParts::PartManager(parent) { new KDevPartControllerIface(this); new KateDocumentManagerInterface(this); diff --git a/lib/interfaces/kdevpartcontroller.h b/lib/interfaces/kdevpartcontroller.h index e2ff8069..37abf603 100644 --- a/lib/interfaces/kdevpartcontroller.h +++ b/lib/interfaces/kdevpartcontroller.h @@ -60,8 +60,8 @@ class KDevPartController: public KParts::PartManager public: /**Constructor. - @param tqparent The tqparent object.*/ - KDevPartController(TQWidget *tqparent); + @param parent The parent object.*/ + KDevPartController(TQWidget *parent); /**Call this before a call to @ref editDocument to set the encoding of the document to be opened. diff --git a/lib/interfaces/kdevplugin.cpp b/lib/interfaces/kdevplugin.cpp index d2a40332..5b4de199 100644 --- a/lib/interfaces/kdevplugin.cpp +++ b/lib/interfaces/kdevplugin.cpp @@ -54,11 +54,11 @@ struct KDevPlugin::Private // class KDevPlugin /////////////////////////////////////////////////////////////////////////////// -KDevPlugin::KDevPlugin(const KDevPluginInfo *info, TQObject *tqparent, const char *name) - :TQObject(tqparent, name), d(new Private) +KDevPlugin::KDevPlugin(const KDevPluginInfo *info, TQObject *parent, const char *name) + :TQObject(parent, name), d(new Private) { - assert(tqparent->inherits( "KDevApi" )); - m_api = static_cast<KDevApi *>( tqparent ); + assert(parent->inherits( "KDevApi" )); + m_api = static_cast<KDevApi *>( parent ); actionCollection()->setHighlightingEnabled( true ); diff --git a/lib/interfaces/kdevplugin.h b/lib/interfaces/kdevplugin.h index 249ff808..36c4e576 100644 --- a/lib/interfaces/kdevplugin.h +++ b/lib/interfaces/kdevplugin.h @@ -116,10 +116,10 @@ public: plugin information in various places like "about application" dialog, plugin selector dialog, etc. Plugin does not take ownership on info object, also its lifetime should be equal to the lifetime of the plugin. - @param tqparent The tqparent object for the plugin. Parent object must implement @ref KDevApi + @param parent The parent object for the plugin. Parent object must implement @ref KDevApi interface. Otherwise the plugin will not be constructed. @param name The internal name which identifies the plugin.*/ - KDevPlugin(const KDevPluginInfo *info, TQObject *tqparent, const char *name = 0); + KDevPlugin(const KDevPluginInfo *info, TQObject *parent, const char *name = 0); /**Destructs a plugin.*/ virtual ~KDevPlugin(); @@ -183,7 +183,7 @@ public: They belong to the application rc file (kdeveloprc) @note Project session file is useful for settings which cannot be shared between developers. If a setting should be shared, modify projectDom instead. - @param el The tqparent DOM element for plugins session settings.*/ + @param el The parent DOM element for plugins session settings.*/ virtual void restorePartialProjectSession(const TQDomElement* el); /**Saves session settings. diff --git a/lib/interfaces/kdevproject.cpp b/lib/interfaces/kdevproject.cpp index fe495ea1..e8616df1 100644 --- a/lib/interfaces/kdevproject.cpp +++ b/lib/interfaces/kdevproject.cpp @@ -37,8 +37,8 @@ struct KDevProject::Private { KDevProjectIface *m_iface; }; -KDevProject::KDevProject(const KDevPluginInfo *info, TQObject *tqparent, const char *name) - : KDevPlugin(info, tqparent, name), d(new KDevProject::Private()) +KDevProject::KDevProject(const KDevPluginInfo *info, TQObject *parent, const char *name) + : KDevPlugin(info, parent, name), d(new KDevProject::Private()) { connect( this, TQT_SIGNAL(addedFilesToProject(const TQStringList& )), this, TQT_SLOT(buildFileMap()) ); connect( this, TQT_SIGNAL(removedFilesFromProject(const TQStringList& )), this, TQT_SLOT(buildFileMap()) ); diff --git a/lib/interfaces/kdevproject.h b/lib/interfaces/kdevproject.h index 62e936b4..edf206bd 100644 --- a/lib/interfaces/kdevproject.h +++ b/lib/interfaces/kdevproject.h @@ -56,10 +56,10 @@ public: plugin information in various places like "about application" dialog, plugin selector dialog, etc. Plugin does not take ownership on info object, also its lifetime should be equal to the lifetime of the plugin. - @param tqparent The tqparent object for the plugin. Parent object must implement @ref KDevApi + @param parent The parent object for the plugin. Parent object must implement @ref KDevApi interface. Otherwise the plugin will not be constructed. @param name The internal name which identifies the plugin.*/ - KDevProject(const KDevPluginInfo *info, TQObject *tqparent=0, const char *name=0); + KDevProject(const KDevPluginInfo *info, TQObject *parent=0, const char *name=0); /**Destructor.*/ virtual ~KDevProject(); diff --git a/lib/util/blockingkprocess.cpp b/lib/util/blockingkprocess.cpp index 2a99f23b..51845a5c 100644 --- a/lib/util/blockingkprocess.cpp +++ b/lib/util/blockingkprocess.cpp @@ -14,8 +14,8 @@ #include <tqapplication.h> #include <tqtimer.h> -BlockingKProcess::BlockingKProcess(TQObject *tqparent, const char *name) - : KProcess(tqparent, name) +BlockingKProcess::BlockingKProcess(TQObject *parent, const char *name) + : KProcess(parent, name) { m_stdOut = ""; m_stdErr = ""; diff --git a/lib/util/blockingkprocess.h b/lib/util/blockingkprocess.h index dd15002e..3db2c170 100644 --- a/lib/util/blockingkprocess.h +++ b/lib/util/blockingkprocess.h @@ -34,7 +34,7 @@ class BlockingKProcess : public KProcess TQ_OBJECT public: - BlockingKProcess(TQObject *tqparent, const char *name=0); + BlockingKProcess(TQObject *parent, const char *name=0); BlockingKProcess(); virtual ~BlockingKProcess(); diff --git a/lib/util/configwidgetproxy.h b/lib/util/configwidgetproxy.h index b91bf3f7..1c48d4c7 100644 --- a/lib/util/configwidgetproxy.h +++ b/lib/util/configwidgetproxy.h @@ -105,7 +105,7 @@ signals: /** * The proxy emits this signal to notify the client that a specific config page has been requested. * @param dlg The settings dialog. The client should connect to its okClicked() signal. - * @param page The setting page. The client should use this as tqparent to the config widget. + * @param page The setting page. The client should use this as parent to the config widget. * @param pagenumber The identifier set in createGlobalConfigPage() or createProjectConfigPage(). Identifies the requested config page. */ void insertConfigWidget( const KDialogBase * dlg, TQWidget * page, unsigned int pagenumber ); diff --git a/lib/util/domutil.h b/lib/util/domutil.h index 394b3600..db9cd184 100644 --- a/lib/util/domutil.h +++ b/lib/util/domutil.h @@ -205,17 +205,17 @@ public: static bool saveDOMFile(TQDomDocument &doc, TQString filename); /** - * Remove all child text nodes of tqparent described in pathExt + * Remove all child text nodes of parent described in pathExt */ static bool removeTextNodes(TQDomDocument doc,TQString pathExt); /** - * Add child text node to tqparent described in pathExt + * Add child text node to parent described in pathExt */ static bool appendText(TQDomDocument doc, TQString pathExt, TQString text); /** - * Replace all chilt text nodes of tqparent described in pathExt with one new. + * Replace all chilt text nodes of parent described in pathExt with one new. */ static bool replaceText(TQDomDocument doc, TQString pathExt, TQString text); diff --git a/lib/util/execcommand.cpp b/lib/util/execcommand.cpp index e1236474..9692b29e 100644 --- a/lib/util/execcommand.cpp +++ b/lib/util/execcommand.cpp @@ -26,8 +26,8 @@ ExecCommand::ExecCommand( const TQString& executable, const TQStringList& args, const TQString& workingDir, const TQStringList& env, - TQObject* tqparent, const char* name ): - TQObject( tqparent, name ), out( "" ) /* make sure out is not TQString() since that would mean "error" */ + TQObject* parent, const char* name ): + TQObject( parent, name ), out( "" ) /* make sure out is not TQString() since that would mean "error" */ { progressDlg = 0; diff --git a/lib/util/execcommand.h b/lib/util/execcommand.h index 5be67682..ca403cfc 100644 --- a/lib/util/execcommand.h +++ b/lib/util/execcommand.h @@ -49,7 +49,7 @@ class ExecCommand : public TQObject public: ExecCommand( const TQString& executable, const TQStringList& args, const TQString& workingDir = TQString(), - const TQStringList& env = TQStringList(), TQObject* tqparent = 0, const char* name = 0 ); + const TQStringList& env = TQStringList(), TQObject* parent = 0, const char* name = 0 ); ~ExecCommand(); signals: diff --git a/lib/util/kdevjobtimer.cpp b/lib/util/kdevjobtimer.cpp index a4ac7aa2..b0b78250 100644 --- a/lib/util/kdevjobtimer.cpp +++ b/lib/util/kdevjobtimer.cpp @@ -11,8 +11,8 @@ #include "kdevjobtimer.h" -KDevJobTimer::KDevJobTimer( void * payload, TQObject *tqparent, const char *name) - : TQTimer(tqparent, name) +KDevJobTimer::KDevJobTimer( void * payload, TQObject *parent, const char *name) + : TQTimer(parent, name) { m_payload = payload; connect( this, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotTimeout()) ); diff --git a/lib/util/kdevjobtimer.h b/lib/util/kdevjobtimer.h index 5fb9dbba..09c325f3 100644 --- a/lib/util/kdevjobtimer.h +++ b/lib/util/kdevjobtimer.h @@ -25,7 +25,7 @@ signals: void timeout(void*); private: - KDevJobTimer( void * payload, TQObject *tqparent = 0, const char *name = 0); + KDevJobTimer( void * payload, TQObject *parent = 0, const char *name = 0); ~KDevJobTimer(); private slots: diff --git a/lib/util/kdevshellwidget.cpp b/lib/util/kdevshellwidget.cpp index 0ea05299..8d217274 100644 --- a/lib/util/kdevshellwidget.cpp +++ b/lib/util/kdevshellwidget.cpp @@ -20,8 +20,8 @@ #include "kdevshellwidget.h" -KDevShellWidget::KDevShellWidget(TQWidget *tqparent, const char *name) - : TQVBox(tqparent, name), m_doAutoActivate( false ), m_isRunning( false ) +KDevShellWidget::KDevShellWidget(TQWidget *parent, const char *name) + : TQVBox(parent, name), m_doAutoActivate( false ), m_isRunning( false ) { } diff --git a/lib/util/kdevshellwidget.h b/lib/util/kdevshellwidget.h index 62dbf171..81e81eff 100644 --- a/lib/util/kdevshellwidget.h +++ b/lib/util/kdevshellwidget.h @@ -30,7 +30,7 @@ Q_OBJECT TQ_OBJECT public: - KDevShellWidget(TQWidget *tqparent = 0, const char *name = 0); + KDevShellWidget(TQWidget *parent = 0, const char *name = 0); virtual ~KDevShellWidget(); /** diff --git a/lib/util/kscriptactionmanager.cpp b/lib/util/kscriptactionmanager.cpp index 9b764a75..3c906902 100644 --- a/lib/util/kscriptactionmanager.cpp +++ b/lib/util/kscriptactionmanager.cpp @@ -100,7 +100,7 @@ void KScriptAction::activate( ) return; } } - m_interface->run(tqparent(), TQVariant()); + m_interface->run(parent(), TQVariant()); m_timeout->start(60000,FALSE); // after 1 minute unload m_refs++; } @@ -119,7 +119,7 @@ void KScriptAction::scriptFinished() m_refs--; } -KScriptActionManager::KScriptActionManager( TQObject *tqparent, KActionCollection * ac ) : TQObject(tqparent), m_ac(ac) +KScriptActionManager::KScriptActionManager( TQObject *parent, KActionCollection * ac ) : TQObject(parent), m_ac(ac) { m_actions.setAutoDelete(true); } diff --git a/lib/util/kscriptactionmanager.h b/lib/util/kscriptactionmanager.h index 69de43ac..fa2c53ed 100644 --- a/lib/util/kscriptactionmanager.h +++ b/lib/util/kscriptactionmanager.h @@ -99,7 +99,7 @@ public: /** * Create a script manager that is attached to an action collection. */ - KScriptActionManager( TQObject *tqparent, KActionCollection *ac ); + KScriptActionManager( TQObject *parent, KActionCollection *ac ); ~KScriptActionManager(); /** diff --git a/lib/util/urlutil.cpp b/lib/util/urlutil.cpp index d3cbc5e3..a31aa789 100644 --- a/lib/util/urlutil.cpp +++ b/lib/util/urlutil.cpp @@ -82,22 +82,22 @@ TQString URLUtil::getRelativePath(const TQString& basepath, const TQString& dest /////////////////////////////////////////////////////////////////////////////// -TQString URLUtil::relativePath(const KURL & tqparent, const KURL & child, uint slashPolicy) { +TQString URLUtil::relativePath(const KURL & parent, const KURL & child, uint slashPolicy) { bool slashPrefix = slashPolicy & SLASH_PREFIX; bool slashSuffix = slashPolicy & SLASH_SUFFIX; - if (tqparent.equals(child,true)) + if (parent.equals(child,true)) return slashPrefix ? TQString("/") : TQString(""); - if (!tqparent.isParentOf(child)) return TQString(); + if (!parent.isParentOf(child)) return TQString(); int a=slashPrefix ? -1 : 1; int b=slashSuffix ? 1 : -1; - return child.path(b).mid(tqparent.path(a).length()); + return child.path(b).mid(parent.path(a).length()); } /////////////////////////////////////////////////////////////////////////////// -TQString URLUtil::relativePath(const TQString & tqparent, const TQString & child, uint slashPolicy) { - return relativePath(KURL(tqparent), KURL(child), slashPolicy); +TQString URLUtil::relativePath(const TQString & parent, const TQString & child, uint slashPolicy) { + return relativePath(KURL(parent), KURL(child), slashPolicy); } /////////////////////////////////////////////////////////////////////////////// diff --git a/lib/util/urlutil.h b/lib/util/urlutil.h index 39615858..4a063961 100644 --- a/lib/util/urlutil.h +++ b/lib/util/urlutil.h @@ -50,27 +50,27 @@ namespace URLUtil */ TQString directory(const TQString & pathName); /** - * @return The relative path between a tqparent and child URL, or blank if the specified - * child is not a child of tqparent. - * @param tqparent The tqparent URL. + * @return The relative path between a parent and child URL, or blank if the specified + * child is not a child of parent. + * @param parent The parent URL. * @param child The child URL. - * @param slashPolicy If tqparent and child are equal then the function returns "/" if + * @param slashPolicy If parent and child are equal then the function returns "/" if * slashPolicy contains SLASH_PREFIX and otherwise "".\n"/" is appended to a result * if slashPolicy contains SLASH_SUFFIX.\n"/" is prepended to a result if * slashPolicy contains SLASH_PREFIX. */ - TQString relativePath(const KURL & tqparent, const KURL & child, uint slashPolicy = SLASH_PREFIX); + TQString relativePath(const KURL & parent, const KURL & child, uint slashPolicy = SLASH_PREFIX); /** - * @return The relative path between a tqparent and child URL, or blank if the specified - * child is not a child of tqparent. - * @param tqparent The tqparent URL. + * @return The relative path between a parent and child URL, or blank if the specified + * child is not a child of parent. + * @param parent The parent URL. * @param child The child URL. - * @param slashPolicy If tqparent and child are equal then the function returns "/" if + * @param slashPolicy If parent and child are equal then the function returns "/" if * slashPolicy contains SLASH_PREFIX and otherwise "".\n"/" is appended to a result * if slashPolicy contains SLASH_SUFFIX.\n"/" is prepended to a result if * slashPolicy contains SLASH_PREFIX. */ - TQString relativePath(const TQString & tqparent, const TQString & child, uint slashPolicy = SLASH_PREFIX); + TQString relativePath(const TQString & parent, const TQString & child, uint slashPolicy = SLASH_PREFIX); /** * @return The relative path between a base path and destination path or. * @param base The base Path. diff --git a/lib/widgets/fancylistviewitem.h b/lib/widgets/fancylistviewitem.h index e61beed2..ab8b3310 100644 --- a/lib/widgets/fancylistviewitem.h +++ b/lib/widgets/fancylistviewitem.h @@ -124,11 +124,11 @@ class TextPaintItem { class FancyListViewItem : public KListViewItem { public: - FancyListViewItem(TextPaintStyleStore& styles, TQListView *tqparent, const TQString &label1, const TQString &label2="") : KListViewItem(tqparent, label1, label2), m_styles(styles) { + FancyListViewItem(TextPaintStyleStore& styles, TQListView *parent, const TQString &label1, const TQString &label2="") : KListViewItem(parent, label1, label2), m_styles(styles) { init(label1, label2); } - FancyListViewItem(TextPaintStyleStore& styles, TQListViewItem *tqparent, const TQString &label1, const TQString &label2="") : KListViewItem(tqparent, label1, label2), m_styles(styles) { + FancyListViewItem(TextPaintStyleStore& styles, TQListViewItem *parent, const TQString &label1, const TQString &label2="") : KListViewItem(parent, label1, label2), m_styles(styles) { init(label1, label2); } diff --git a/lib/widgets/flagboxes.cpp b/lib/widgets/flagboxes.cpp index a12c5092..0f1f9193 100644 --- a/lib/widgets/flagboxes.cpp +++ b/lib/widgets/flagboxes.cpp @@ -54,14 +54,14 @@ TQString TQRegExp_escape( const TQString& str ) class FlagListToolTip : public TQToolTip { public: - FlagListToolTip(TQWidget *tqparent); + FlagListToolTip(TQWidget *parent); protected: void maybeTip(const TQPoint &p); }; -FlagListToolTip::FlagListToolTip(TQWidget *tqparent) - : TQToolTip(tqparent) +FlagListToolTip::FlagListToolTip(TQWidget *parent) + : TQToolTip(parent) {} @@ -76,22 +76,22 @@ void FlagListToolTip::maybeTip(const TQPoint &pos) } -FlagListItem::FlagListItem(FlagListBox *tqparent, const TQString &flagstr, +FlagListItem::FlagListItem(FlagListBox *parent, const TQString &flagstr, const TQString &description) - : TQCheckListItem(tqparent, flagstr, TQCheckListItem::CheckBox), + : TQCheckListItem(parent, flagstr, TQCheckListItem::CheckBox), flag(flagstr), desc(description) {} -FlagListItem::FlagListItem(FlagListBox *tqparent, const TQString &flagstr, +FlagListItem::FlagListItem(FlagListBox *parent, const TQString &flagstr, const TQString &description, const TQString &offstr) - : TQCheckListItem(tqparent, flagstr, TQCheckListItem::CheckBox), + : TQCheckListItem(parent, flagstr, TQCheckListItem::CheckBox), flag(flagstr), off(offstr), desc(description) {} -FlagListBox::FlagListBox(TQWidget *tqparent, const char *name) - : TQListView(tqparent, name) +FlagListBox::FlagListBox(TQWidget *parent, const char *name) + : TQListView(parent, name) { setResizeMode(LastColumn); header()->hide(); @@ -130,28 +130,28 @@ void FlagListBox::writeFlags(TQStringList *list) } -FlagCheckBox::FlagCheckBox(TQWidget *tqparent, FlagCheckBoxController *controller, +FlagCheckBox::FlagCheckBox(TQWidget *parent, FlagCheckBoxController *controller, const TQString &flagstr, const TQString &description) - : TQCheckBox(description, tqparent), flag(flagstr), includeOff(false), useDef(false), defSet(false) + : TQCheckBox(description, parent), flag(flagstr), includeOff(false), useDef(false), defSet(false) { TQToolTip::add(this, flagstr); controller->addCheckBox(this); } -FlagCheckBox::FlagCheckBox(TQWidget *tqparent, FlagCheckBoxController *controller, +FlagCheckBox::FlagCheckBox(TQWidget *parent, FlagCheckBoxController *controller, const TQString &flagstr, const TQString &description, const TQString &offstr) - : TQCheckBox(description, tqparent), flag(flagstr), off(offstr), includeOff(false), useDef(false), defSet(false) + : TQCheckBox(description, parent), flag(flagstr), off(offstr), includeOff(false), useDef(false), defSet(false) { TQToolTip::add(this, flagstr); controller->addCheckBox(this); } -FlagCheckBox::FlagCheckBox(TQWidget *tqparent, FlagCheckBoxController *controller, +FlagCheckBox::FlagCheckBox(TQWidget *parent, FlagCheckBoxController *controller, const TQString &flagstr, const TQString &description, const TQString &offstr, const TQString &defstr) - : TQCheckBox(description, tqparent), flag(flagstr), off(offstr), def(defstr), includeOff(false), useDef(true), defSet(false) + : TQCheckBox(description, parent), flag(flagstr), off(offstr), def(defstr), includeOff(false), useDef(true), defSet(false) { TQToolTip::add(this, flagstr); controller->addCheckBox(this); @@ -299,10 +299,10 @@ void FlagPathEditController::addPathEdit( FlagPathEdit * item ) plist.append(item); } -FlagPathEdit::FlagPathEdit( TQWidget * tqparent, TQString pathDelimiter, +FlagPathEdit::FlagPathEdit( TQWidget * parent, TQString pathDelimiter, FlagPathEditController * controller, const TQString & flagstr, const TQString & description, KFile::Mode mode ) - : TQWidget(tqparent), delimiter(pathDelimiter), flag(flagstr), m_description(description) + : TQWidget(parent), delimiter(pathDelimiter), flag(flagstr), m_description(description) { TQBoxLayout *topLayout = new TQVBoxLayout(this, 0, 1); topLayout->addWidget(new TQLabel(description, this)); @@ -379,8 +379,8 @@ bool FlagPathEdit::isEmpty( ) return edit->text().isEmpty(); } -FlagRadioButton::FlagRadioButton( TQWidget * tqparent, FlagRadioButtonController * controller, const TQString & flagstr, const TQString & description ) - : TQRadioButton(description, tqparent), flag(flagstr) +FlagRadioButton::FlagRadioButton( TQWidget * parent, FlagRadioButtonController * controller, const TQString & flagstr, const TQString & description ) + : TQRadioButton(description, parent), flag(flagstr) { TQToolTip::add(this, flagstr); controller->addRadioButton(this); @@ -526,9 +526,9 @@ void FlagEditController::addSpinBox(FlagSpinEdit *item) } -FlagListEdit::FlagListEdit( TQWidget * tqparent, TQString listDelimiter, FlagEditController * controller, +FlagListEdit::FlagListEdit( TQWidget * parent, TQString listDelimiter, FlagEditController * controller, const TQString & flagstr, const TQString & description) - : TQWidget(tqparent), delimiter(listDelimiter), flag(flagstr), m_description(description) + : TQWidget(parent), delimiter(listDelimiter), flag(flagstr), m_description(description) { TQBoxLayout *topLayout = new TQVBoxLayout(this, 0, 1); topLayout->addWidget(new TQLabel(description, this)); @@ -601,8 +601,8 @@ TQStringList FlagListEdit::flags( ) return fl; } -FlagSpinEdit::FlagSpinEdit( TQWidget * tqparent, int minVal, int maxVal, int incr, int defaultVal, FlagEditController * controller, const TQString & flagstr, const TQString & description ) - :TQWidget(tqparent), m_defaultVal(defaultVal), flag(flagstr) +FlagSpinEdit::FlagSpinEdit( TQWidget * parent, int minVal, int maxVal, int incr, int defaultVal, FlagEditController * controller, const TQString & flagstr, const TQString & description ) + :TQWidget(parent), m_defaultVal(defaultVal), flag(flagstr) { TQBoxLayout *topLayout = new TQVBoxLayout(this, 0, 1); topLayout->addWidget(new TQLabel(description, this)); diff --git a/lib/widgets/flagboxes.h b/lib/widgets/flagboxes.h index a2193277..ba04fd10 100644 --- a/lib/widgets/flagboxes.h +++ b/lib/widgets/flagboxes.h @@ -49,9 +49,9 @@ class KURLRequester; class FlagListItem : public TQCheckListItem { public: - FlagListItem(FlagListBox *tqparent, const TQString &flagstr, + FlagListItem(FlagListBox *parent, const TQString &flagstr, const TQString &description); - FlagListItem(FlagListBox *tqparent, const TQString &flagstr, + FlagListItem(FlagListBox *parent, const TQString &flagstr, const TQString &description, const TQString &offstr); ~FlagListItem() {} @@ -70,7 +70,7 @@ class FlagListBox : public TQListView Q_OBJECT TQ_OBJECT public: - FlagListBox( TQWidget *tqparent=0, const char *name=0 ); + FlagListBox( TQWidget *parent=0, const char *name=0 ); ~FlagListBox() {} @@ -85,12 +85,12 @@ class FlagCheckBox : public TQCheckBox Q_OBJECT TQ_OBJECT public: - FlagCheckBox(TQWidget *tqparent, FlagCheckBoxController *controller, + FlagCheckBox(TQWidget *parent, FlagCheckBoxController *controller, const TQString &flagstr, const TQString &description); - FlagCheckBox(TQWidget *tqparent, FlagCheckBoxController *controller, + FlagCheckBox(TQWidget *parent, FlagCheckBoxController *controller, const TQString &flagstr, const TQString &description, const TQString &offstr); - FlagCheckBox(TQWidget *tqparent, FlagCheckBoxController *controller, + FlagCheckBox(TQWidget *parent, FlagCheckBoxController *controller, const TQString &flagstr, const TQString &description, const TQString &offstr, const TQString &defstr); ~FlagCheckBox() @@ -112,7 +112,7 @@ class FlagRadioButton : public TQRadioButton Q_OBJECT TQ_OBJECT public: - FlagRadioButton(TQWidget *tqparent, FlagRadioButtonController *controller, + FlagRadioButton(TQWidget *parent, FlagRadioButtonController *controller, const TQString &flagstr, const TQString &description); ~FlagRadioButton() {} @@ -129,7 +129,7 @@ class FlagPathEdit: public TQWidget TQ_OBJECT public: /**If the pathDelimiter is not empty then path edit can contain a list of paths*/ - FlagPathEdit(TQWidget *tqparent, TQString pathDelimiter, FlagPathEditController *controller, + FlagPathEdit(TQWidget *parent, TQString pathDelimiter, FlagPathEditController *controller, const TQString &flagstr, const TQString &description, KFile::Mode mode = KFile::Directory); ~FlagPathEdit() {} @@ -159,7 +159,7 @@ class FlagListEdit: public TQWidget TQ_OBJECT public: /**If the listDelimiter is not empty then list edit can contain a list of entries*/ - FlagListEdit(TQWidget *tqparent, TQString listDelimiter, FlagEditController *controller, + FlagListEdit(TQWidget *parent, TQString listDelimiter, FlagEditController *controller, const TQString &flagstr, const TQString &description); ~FlagListEdit() {} @@ -187,7 +187,7 @@ private: class FlagSpinEdit: public TQWidget { public: - FlagSpinEdit(TQWidget *tqparent, int minVal, int maxVal, int incr, int defaultVal, FlagEditController *controller, + FlagSpinEdit(TQWidget *parent, int minVal, int maxVal, int incr, int defaultVal, FlagEditController *controller, const TQString &flagstr, const TQString &description); ~FlagSpinEdit() {} diff --git a/lib/widgets/kcomboview.cpp b/lib/widgets/kcomboview.cpp index ad4cd188..2576ed0c 100644 --- a/lib/widgets/kcomboview.cpp +++ b/lib/widgets/kcomboview.cpp @@ -25,8 +25,8 @@ #include "kcomboview.h" -KComboView::KComboView( bool rw, int defaultWidth, TQWidget* tqparent, const char* name , CustomCompleter* comp) - :QComboView(rw, tqparent, name), m_comp( comp ), m_defaultWidth(defaultWidth) +KComboView::KComboView( bool rw, int defaultWidth, TQWidget* parent, const char* name , CustomCompleter* comp) + :QComboView(rw, parent, name), m_comp( comp ), m_defaultWidth(defaultWidth) { if (rw) { diff --git a/lib/widgets/kcomboview.h b/lib/widgets/kcomboview.h index e73b73e6..981eaa1a 100644 --- a/lib/widgets/kcomboview.h +++ b/lib/widgets/kcomboview.h @@ -58,7 +58,7 @@ class KComboView: public QComboView TQ_OBJECT public: ///The combo-view takes the ownership of the completer and deletes it on destruction - KComboView( bool rw, int defaultWidth = 100, TQWidget* tqparent=0, const char* name=0, CustomCompleter* completer = new CustomCompleter() ); + KComboView( bool rw, int defaultWidth = 100, TQWidget* parent=0, const char* name=0, CustomCompleter* completer = new CustomCompleter() ); virtual ~KComboView(); virtual void addItem(TQListViewItem *it); diff --git a/lib/widgets/kdevtabwidget.cpp b/lib/widgets/kdevtabwidget.cpp index 4631f16a..a7d12348 100644 --- a/lib/widgets/kdevtabwidget.cpp +++ b/lib/widgets/kdevtabwidget.cpp @@ -18,7 +18,7 @@ #include "kdevtabwidget.h" -KDevTabWidget::KDevTabWidget(TQWidget *tqparent, const char *name) : TQTabWidget(tqparent,name) +KDevTabWidget::KDevTabWidget(TQWidget *parent, const char *name) : TQTabWidget(parent,name) { m_pTabBar = new KTabBar(this, "tabbar"); setTabBar(m_pTabBar); @@ -26,7 +26,7 @@ KDevTabWidget::KDevTabWidget(TQWidget *tqparent, const char *name) : TQTabWidget connect(m_pTabBar, TQT_SIGNAL(closeOthers(TQWidget*)), this, TQT_SIGNAL(closeOthers(TQWidget*))); } -KTabBar::KTabBar(TQWidget *tqparent, const char *name) : TQTabBar(tqparent,name) +KTabBar::KTabBar(TQWidget *parent, const char *name) : TQTabBar(parent,name) { m_pPopupMenu = new TQPopupMenu(this); @@ -55,7 +55,7 @@ void KTabBar::mousePressEvent(TQMouseEvent *e) TQTab *tab = selectTab(e->pos() ); if( tab == 0L ) return; - m_pPage = ((KDevTabWidget*)tqparent())->page(indexOf(tab->identifier() ) ); + m_pPage = ((KDevTabWidget*)parent())->page(indexOf(tab->identifier() ) ); if(m_pPage == 0L) return; m_pPopupMenu->exec(mapToGlobal(e->pos())); diff --git a/lib/widgets/klistviewaction.cpp b/lib/widgets/klistviewaction.cpp index f439de6b..0a219da5 100644 --- a/lib/widgets/klistviewaction.cpp +++ b/lib/widgets/klistviewaction.cpp @@ -38,8 +38,8 @@ KListViewAction::~KListViewAction() } KListViewAction::KListViewAction(KComboView *view, const TQString & text, const KShortcut & cut, - const TQObject * receiver, const char * slot, KActionCollection * tqparent, const char * name ): - KWidgetAction(view, text, cut, receiver, slot, tqparent, name), m_view(view) + const TQObject * receiver, const char * slot, KActionCollection * parent, const char * name ): + KWidgetAction(view, text, cut, receiver, slot, parent, name), m_view(view) { m_view->setDuplicatesEnabled(false); m_view->setInsertionPolicy(KComboView::NoInsertion); @@ -48,8 +48,8 @@ KListViewAction::KListViewAction(KComboView *view, const TQString & text, const } KListViewAction::KListViewAction( KComboView * view, const TQString & text, const KShortcut & cut, - const TQObject * receiver, const char * slot, KActionCollection * tqparent, const char * name, const bool /*dummy*/ ): - KWidgetAction(new ResizableCombo(view), text, cut, receiver, slot, tqparent, name), m_view(view) + const TQObject * receiver, const char * slot, KActionCollection * parent, const char * name, const bool /*dummy*/ ): + KWidgetAction(new ResizableCombo(view), text, cut, receiver, slot, parent, name), m_view(view) { m_view->setDuplicatesEnabled(false); m_view->setInsertionPolicy(KComboView::NoInsertion); diff --git a/lib/widgets/klistviewaction.h b/lib/widgets/klistviewaction.h index 0334ec30..d8f53eb8 100644 --- a/lib/widgets/klistviewaction.h +++ b/lib/widgets/klistviewaction.h @@ -38,8 +38,8 @@ Can be used on toolbars. It appears as @ref ResizableCombo. class KListViewAction: public KWidgetAction { public: - KListViewAction(KComboView *view, const TQString &text, const KShortcut &cut, const TQObject *receiver, const char *slot, KActionCollection *tqparent, const char *name); - KListViewAction(KComboView *view, const TQString &text, const KShortcut &cut, const TQObject *receiver, const char *slot, KActionCollection *tqparent, const char *name, const bool); + KListViewAction(KComboView *view, const TQString &text, const KShortcut &cut, const TQObject *receiver, const char *slot, KActionCollection *parent, const char *name); + KListViewAction(KComboView *view, const TQString &text, const KShortcut &cut, const TQObject *receiver, const char *slot, KActionCollection *parent, const char *name, const bool); ~KListViewAction(); diff --git a/lib/widgets/ksavealldialog.cpp b/lib/widgets/ksavealldialog.cpp index a2c2d87c..0a922b7d 100644 --- a/lib/widgets/ksavealldialog.cpp +++ b/lib/widgets/ksavealldialog.cpp @@ -49,8 +49,8 @@ private: } -KSaveSelectDialog::KSaveSelectDialog( KURL::List const & filelist, KURL::List const & ignorelist, TQWidget * tqparent ) : - KDialogBase( tqparent, "SaveAllDialog", true, i18n("Save Modified Files?"), +KSaveSelectDialog::KSaveSelectDialog( KURL::List const & filelist, KURL::List const & ignorelist, TQWidget * parent ) : + KDialogBase( parent, "SaveAllDialog", true, i18n("Save Modified Files?"), Ok | User1 | Close ) { TQVBox *top = makeVBoxMainWidget(); @@ -140,8 +140,8 @@ KURL::List KSaveSelectDialog::filesNotToSave( ) } -KSaveAllDialog::KSaveAllDialog( const TQStringList& filenames, TQWidget* tqparent ) : - KDialogBase( tqparent, "SaveAllDialog", true, i18n("Save Modified Files?"), +KSaveAllDialog::KSaveAllDialog( const TQStringList& filenames, TQWidget* parent ) : + KDialogBase( parent, "SaveAllDialog", true, i18n("Save Modified Files?"), Ok | User1 | Close ) { m_result = Cancel; diff --git a/lib/widgets/ksavealldialog.h b/lib/widgets/ksavealldialog.h index 091a3ae0..8aee6870 100644 --- a/lib/widgets/ksavealldialog.h +++ b/lib/widgets/ksavealldialog.h @@ -39,7 +39,7 @@ class KSaveSelectDialog : public KDialogBase TQ_OBJECT public: - KSaveSelectDialog( KURL::List const & filelist, KURL::List const & ignorelist, TQWidget * tqparent ); + KSaveSelectDialog( KURL::List const & filelist, KURL::List const & ignorelist, TQWidget * parent ); virtual ~KSaveSelectDialog(); KURL::List filesToSave(); @@ -67,7 +67,7 @@ class KSaveAllDialog : public KDialogBase public: enum SaveAllResult{ SaveAll, Cancel, Revert }; - KSaveAllDialog( const TQStringList& filenames, TQWidget* tqparent ); + KSaveAllDialog( const TQStringList& filenames, TQWidget* parent ); virtual ~KSaveAllDialog(); SaveAllResult result() const { return m_result; } diff --git a/lib/widgets/processwidget.cpp b/lib/widgets/processwidget.cpp index cf13248c..3de31905 100644 --- a/lib/widgets/processwidget.cpp +++ b/lib/widgets/processwidget.cpp @@ -103,8 +103,8 @@ void ProcessListBoxItem::paint(TQPainter *p) } -ProcessWidget::ProcessWidget(TQWidget *tqparent, const char *name) - : KListBox(tqparent, name) +ProcessWidget::ProcessWidget(TQWidget *parent, const char *name) + : KListBox(parent, name) { setFocusPolicy(TQ_NoFocus); diff --git a/lib/widgets/processwidget.h b/lib/widgets/processwidget.h index e4ef0c5d..15ae5b85 100644 --- a/lib/widgets/processwidget.h +++ b/lib/widgets/processwidget.h @@ -61,7 +61,7 @@ class ProcessWidget : public KListBox TQ_OBJECT public: - ProcessWidget(TQWidget *tqparent, const char *name=0); + ProcessWidget(TQWidget *parent, const char *name=0); ~ProcessWidget(); /** diff --git a/lib/widgets/propeditor/childproperty.cpp b/lib/widgets/propeditor/childproperty.cpp index aa1326c9..ac53936a 100644 --- a/lib/widgets/propeditor/childproperty.cpp +++ b/lib/widgets/propeditor/childproperty.cpp @@ -28,16 +28,16 @@ namespace PropertyLib{ -ChildProperty::ChildProperty(MultiProperty *tqparent, int type, ChildPropertyType childType, const TQString &name, +ChildProperty::ChildProperty(MultiProperty *parent, int type, ChildPropertyType childType, const TQString &name, const TQString &description, const TQVariant &value, bool save, bool readOnly) - :Property(type, name, description, value, save, readOnly), m_parent(tqparent), m_childType(childType) + :Property(type, name, description, value, save, readOnly), m_parent(parent), m_childType(childType) { } -ChildProperty::ChildProperty(MultiProperty *tqparent, const TQString & name, ChildPropertyType childType, +ChildProperty::ChildProperty(MultiProperty *parent, const TQString & name, ChildPropertyType childType, const TQMap<TQString, TQVariant> &v_valueList, const TQString &description, const TQVariant &value, bool save, bool readOnly) - :Property(name, v_valueList, description, value, save, readOnly), m_parent(tqparent), m_childType(childType) + :Property(name, v_valueList, description, value, save, readOnly), m_parent(parent), m_childType(childType) { } diff --git a/lib/widgets/propeditor/childproperty.h b/lib/widgets/propeditor/childproperty.h index 0d1655ae..6e247fd3 100644 --- a/lib/widgets/propeditor/childproperty.h +++ b/lib/widgets/propeditor/childproperty.h @@ -29,7 +29,7 @@ class MultiProperty; /** @short Child property -Child property is a detailed property for complex tqparent properties. +Child property is a detailed property for complex parent properties. For example, to edit a property of Point type one can request two child properties for "x" and "y" components of a point. @@ -60,11 +60,11 @@ public: /**Constructs empty property.*/ ChildProperty() {} /**Constructs property.*/ - ChildProperty(MultiProperty *tqparent, int type, ChildPropertyType childType, const TQString &name, + ChildProperty(MultiProperty *parent, int type, ChildPropertyType childType, const TQString &name, const TQString &description, const TQVariant &value = TQVariant(), bool save = true, bool readOnly = false); /**Constructs property with @ref ValueFromList type.*/ - ChildProperty(MultiProperty *tqparent, const TQString &name, ChildPropertyType childType, + ChildProperty(MultiProperty *parent, const TQString &name, ChildPropertyType childType, const TQMap<TQString, TQVariant> &v_valueList, const TQString &description, const TQVariant &value = TQVariant(), bool save = true, bool readOnly = false); diff --git a/lib/widgets/propeditor/multiproperty.h b/lib/widgets/propeditor/multiproperty.h index 2330ffa0..49410a04 100644 --- a/lib/widgets/propeditor/multiproperty.h +++ b/lib/widgets/propeditor/multiproperty.h @@ -43,7 +43,7 @@ with many properties of the same name and type at the same type. MultiProperty is also responsible for storing detailed %property editors (instances of @ref ChildProperty class. It's too much overhead to store child properties -with their tqparent properties. MultiProperty provides a way to store child properties +with their parent properties. MultiProperty provides a way to store child properties only once for all properties with the same name and same type. */ class MultiProperty diff --git a/lib/widgets/propeditor/pcheckbox.cpp b/lib/widgets/propeditor/pcheckbox.cpp index e4a14389..4a12d575 100644 --- a/lib/widgets/propeditor/pcheckbox.cpp +++ b/lib/widgets/propeditor/pcheckbox.cpp @@ -31,8 +31,8 @@ namespace PropertyLib{ -PCheckBox::PCheckBox(MultiProperty *property, TQWidget *tqparent, const char *name) - :PropertyWidget(property, tqparent, name) +PCheckBox::PCheckBox(MultiProperty *property, TQWidget *parent, const char *name) + :PropertyWidget(property, parent, name) { TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0); m_edit = new TQCheckBox(this); diff --git a/lib/widgets/propeditor/pcheckbox.h b/lib/widgets/propeditor/pcheckbox.h index 5e593588..8a7ff781 100644 --- a/lib/widgets/propeditor/pcheckbox.h +++ b/lib/widgets/propeditor/pcheckbox.h @@ -33,7 +33,7 @@ class PCheckBox: public PropertyWidget{ Q_OBJECT TQ_OBJECT public: - PCheckBox(MultiProperty *property, TQWidget *tqparent = 0, const char *name = 0); + PCheckBox(MultiProperty *property, TQWidget *parent = 0, const char *name = 0); /**@return the value currently entered in the editor widget.*/ virtual TQVariant value() const; diff --git a/lib/widgets/propeditor/pcolorbutton.cpp b/lib/widgets/propeditor/pcolorbutton.cpp index aef37f4a..bb927a08 100644 --- a/lib/widgets/propeditor/pcolorbutton.cpp +++ b/lib/widgets/propeditor/pcolorbutton.cpp @@ -33,8 +33,8 @@ namespace PropertyLib { -PColorButton::PColorButton(MultiProperty* property, TQWidget* tqparent, const char* name) - :PropertyWidget(property, tqparent, name) +PColorButton::PColorButton(MultiProperty* property, TQWidget* parent, const char* name) + :PropertyWidget(property, parent, name) { TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0); #ifndef PURE_QT diff --git a/lib/widgets/propeditor/pcolorbutton.h b/lib/widgets/propeditor/pcolorbutton.h index a132f0ce..d7b7494e 100644 --- a/lib/widgets/propeditor/pcolorbutton.h +++ b/lib/widgets/propeditor/pcolorbutton.h @@ -38,7 +38,7 @@ class PColorButton: public PropertyWidget Q_OBJECT TQ_OBJECT public: - PColorButton(MultiProperty *property, TQWidget *tqparent = 0, const char *name = 0); + PColorButton(MultiProperty *property, TQWidget *parent = 0, const char *name = 0); virtual TQVariant value() const; virtual void drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRect& r, const TQVariant& value); diff --git a/lib/widgets/propeditor/pcolorcombo.cpp b/lib/widgets/propeditor/pcolorcombo.cpp index 5fee6b1f..b0c82de3 100644 --- a/lib/widgets/propeditor/pcolorcombo.cpp +++ b/lib/widgets/propeditor/pcolorcombo.cpp @@ -26,8 +26,8 @@ namespace PropertyLib{ -PColorCombo::PColorCombo(MultiProperty *property, TQWidget *tqparent, const char *name) - :PropertyWidget(property, tqparent, name) +PColorCombo::PColorCombo(MultiProperty *property, TQWidget *parent, const char *name) + :PropertyWidget(property, parent, name) { TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0); m_edit = new KColorCombo(this); diff --git a/lib/widgets/propeditor/pcolorcombo.h b/lib/widgets/propeditor/pcolorcombo.h index 88c5b355..3b189cb6 100644 --- a/lib/widgets/propeditor/pcolorcombo.h +++ b/lib/widgets/propeditor/pcolorcombo.h @@ -33,7 +33,7 @@ class PColorCombo: public PropertyWidget{ Q_OBJECT TQ_OBJECT public: - PColorCombo(MultiProperty *property, TQWidget *tqparent = 0, const char *name = 0); + PColorCombo(MultiProperty *property, TQWidget *parent = 0, const char *name = 0); /**@return the value currently entered in the editor widget.*/ virtual TQVariant value() const; diff --git a/lib/widgets/propeditor/pcombobox.cpp b/lib/widgets/propeditor/pcombobox.cpp index 7732866c..fa21678b 100644 --- a/lib/widgets/propeditor/pcombobox.cpp +++ b/lib/widgets/propeditor/pcombobox.cpp @@ -24,14 +24,14 @@ namespace PropertyLib{ -PComboBox::PComboBox(MultiProperty *property, const TQMap<TQString, TQVariant> &list, TQWidget *tqparent, const char *name) - :PropertyWidget(property, tqparent, name), m_valueList(list) +PComboBox::PComboBox(MultiProperty *property, const TQMap<TQString, TQVariant> &list, TQWidget *parent, const char *name) + :PropertyWidget(property, parent, name), m_valueList(list) { init(false); } -PComboBox::PComboBox(MultiProperty *property, const TQMap<TQString, TQVariant> &list, bool rw, TQWidget *tqparent, const char *name) - :PropertyWidget(property, tqparent, name), m_valueList(list) +PComboBox::PComboBox(MultiProperty *property, const TQMap<TQString, TQVariant> &list, bool rw, TQWidget *parent, const char *name) + :PropertyWidget(property, parent, name), m_valueList(list) { init(rw); } diff --git a/lib/widgets/propeditor/pcombobox.h b/lib/widgets/propeditor/pcombobox.h index 4176e2ed..82ccd220 100644 --- a/lib/widgets/propeditor/pcombobox.h +++ b/lib/widgets/propeditor/pcombobox.h @@ -38,9 +38,9 @@ class PComboBox: public PropertyWidget{ TQ_OBJECT public: /**This constructor is used for read-only selection combo. It provides a value from valueList*/ - PComboBox(MultiProperty *property, const TQMap<TQString, TQVariant> &list, TQWidget *tqparent = 0, const char *name = 0); + PComboBox(MultiProperty *property, const TQMap<TQString, TQVariant> &list, TQWidget *parent = 0, const char *name = 0); /**This constructor is used for read-write selection combo. It provides a value from valueList*/ - PComboBox(MultiProperty *property, const TQMap<TQString, TQVariant> &list, bool rw, TQWidget *tqparent = 0, const char *name = 0); + PComboBox(MultiProperty *property, const TQMap<TQString, TQVariant> &list, bool rw, TQWidget *parent = 0, const char *name = 0); /**@return the value currently entered in the editor widget.*/ virtual TQVariant value() const; diff --git a/lib/widgets/propeditor/pcursoredit.cpp b/lib/widgets/propeditor/pcursoredit.cpp index 02a2148c..85aefd5e 100644 --- a/lib/widgets/propeditor/pcursoredit.cpp +++ b/lib/widgets/propeditor/pcursoredit.cpp @@ -24,8 +24,8 @@ namespace PropertyLib{ PCursorEdit::PCursorEdit(MultiProperty* property, const TQMap<TQString, TQVariant> &spValues, - TQWidget* tqparent, const char* name) - :PComboBox(property, spValues, tqparent, name) + TQWidget* parent, const char* name) + :PComboBox(property, spValues, parent, name) { } diff --git a/lib/widgets/propeditor/pcursoredit.h b/lib/widgets/propeditor/pcursoredit.h index 82924fd2..34bede80 100644 --- a/lib/widgets/propeditor/pcursoredit.h +++ b/lib/widgets/propeditor/pcursoredit.h @@ -33,7 +33,7 @@ class PCursorEdit: public PComboBox TQ_OBJECT public: PCursorEdit(MultiProperty* property, const TQMap<TQString, TQVariant> &spValues, - TQWidget* tqparent = 0, const char* name = 0); + TQWidget* parent = 0, const char* name = 0); virtual void drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRect& r, const TQVariant& value); }; diff --git a/lib/widgets/propeditor/pdateedit.cpp b/lib/widgets/propeditor/pdateedit.cpp index 46de4069..64bbde18 100644 --- a/lib/widgets/propeditor/pdateedit.cpp +++ b/lib/widgets/propeditor/pdateedit.cpp @@ -25,8 +25,8 @@ namespace PropertyLib{ -PDateEdit::PDateEdit(MultiProperty* property, TQWidget* tqparent, const char* name) - :PropertyWidget(property, tqparent, name) +PDateEdit::PDateEdit(MultiProperty* property, TQWidget* parent, const char* name) + :PropertyWidget(property, parent, name) { TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0); m_edit = new TQDateEdit(this); diff --git a/lib/widgets/propeditor/pdateedit.h b/lib/widgets/propeditor/pdateedit.h index a21dbc3f..8348a24d 100644 --- a/lib/widgets/propeditor/pdateedit.h +++ b/lib/widgets/propeditor/pdateedit.h @@ -34,7 +34,7 @@ class PDateEdit : public PropertyWidget Q_OBJECT TQ_OBJECT public: - PDateEdit(MultiProperty* property, TQWidget* tqparent=0, const char* name=0); + PDateEdit(MultiProperty* property, TQWidget* parent=0, const char* name=0); virtual TQVariant value() const; virtual void drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRect& r, const TQVariant& value); diff --git a/lib/widgets/propeditor/pdatetimeedit.cpp b/lib/widgets/propeditor/pdatetimeedit.cpp index e7a4b04f..59df2440 100644 --- a/lib/widgets/propeditor/pdatetimeedit.cpp +++ b/lib/widgets/propeditor/pdatetimeedit.cpp @@ -25,7 +25,7 @@ namespace PropertyLib{ -PDateTimeEdit::PDateTimeEdit(MultiProperty* property, TQWidget* tqparent, const char* name): PropertyWidget(property, tqparent, name) +PDateTimeEdit::PDateTimeEdit(MultiProperty* property, TQWidget* parent, const char* name): PropertyWidget(property, parent, name) { TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0); m_edit = new TQDateTimeEdit(this); diff --git a/lib/widgets/propeditor/pdatetimeedit.h b/lib/widgets/propeditor/pdatetimeedit.h index e44c07d6..57130322 100644 --- a/lib/widgets/propeditor/pdatetimeedit.h +++ b/lib/widgets/propeditor/pdatetimeedit.h @@ -34,7 +34,7 @@ class PDateTimeEdit : public PropertyWidget Q_OBJECT TQ_OBJECT public: - PDateTimeEdit(MultiProperty* property, TQWidget* tqparent=0, const char* name=0); + PDateTimeEdit(MultiProperty* property, TQWidget* parent=0, const char* name=0); virtual TQVariant value() const; virtual void drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRect& r, const TQVariant& value); diff --git a/lib/widgets/propeditor/pdoublenuminput.cpp b/lib/widgets/propeditor/pdoublenuminput.cpp index 742180b4..e48475de 100644 --- a/lib/widgets/propeditor/pdoublenuminput.cpp +++ b/lib/widgets/propeditor/pdoublenuminput.cpp @@ -31,8 +31,8 @@ namespace PropertyLib{ -PDoubleNumInput::PDoubleNumInput(MultiProperty *property, TQWidget *tqparent, const char *name) - :PropertyWidget(property, tqparent, name) +PDoubleNumInput::PDoubleNumInput(MultiProperty *property, TQWidget *parent, const char *name) + :PropertyWidget(property, parent, name) { TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0); #ifndef PURE_QT diff --git a/lib/widgets/propeditor/pdoublenuminput.h b/lib/widgets/propeditor/pdoublenuminput.h index a59ae43d..c3ef0d35 100644 --- a/lib/widgets/propeditor/pdoublenuminput.h +++ b/lib/widgets/propeditor/pdoublenuminput.h @@ -38,7 +38,7 @@ class PDoubleNumInput: public PropertyWidget Q_OBJECT TQ_OBJECT public: - PDoubleNumInput(MultiProperty *property, TQWidget *tqparent = 0, const char *name = 0); + PDoubleNumInput(MultiProperty *property, TQWidget *parent = 0, const char *name = 0); /**@return the value currently entered in the editor widget.*/ virtual TQVariant value() const; diff --git a/lib/widgets/propeditor/pdummywidget.cpp b/lib/widgets/propeditor/pdummywidget.cpp index 428953f2..5d1b3278 100644 --- a/lib/widgets/propeditor/pdummywidget.cpp +++ b/lib/widgets/propeditor/pdummywidget.cpp @@ -23,8 +23,8 @@ namespace PropertyLib{ -PDummyWidget::PDummyWidget(MultiProperty *property, TQWidget *tqparent, const char *name) - :PropertyWidget(property, tqparent, name) +PDummyWidget::PDummyWidget(MultiProperty *property, TQWidget *parent, const char *name) + :PropertyWidget(property, parent, name) { } diff --git a/lib/widgets/propeditor/pdummywidget.h b/lib/widgets/propeditor/pdummywidget.h index f58e92b9..55649b45 100644 --- a/lib/widgets/propeditor/pdummywidget.h +++ b/lib/widgets/propeditor/pdummywidget.h @@ -42,7 +42,7 @@ class PDummyWidget: public PropertyWidget Q_OBJECT TQ_OBJECT public: - PDummyWidget(MultiProperty *property, TQWidget *tqparent = 0, const char *name = 0); + PDummyWidget(MultiProperty *property, TQWidget *parent = 0, const char *name = 0); /**@return the value currently entered in the editor widget.*/ virtual TQVariant value() const; diff --git a/lib/widgets/propeditor/pfontbutton.cpp b/lib/widgets/propeditor/pfontbutton.cpp index d2a10217..e54e401f 100644 --- a/lib/widgets/propeditor/pfontbutton.cpp +++ b/lib/widgets/propeditor/pfontbutton.cpp @@ -33,8 +33,8 @@ namespace PropertyLib{ -PFontButton::PFontButton(MultiProperty* property, TQWidget* tqparent, const char* name) - :PropertyWidget(property, tqparent, name) +PFontButton::PFontButton(MultiProperty* property, TQWidget* parent, const char* name) + :PropertyWidget(property, parent, name) { TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0); m_edit = new KFontRequester(this); diff --git a/lib/widgets/propeditor/pfontbutton.h b/lib/widgets/propeditor/pfontbutton.h index d875f307..91c07d81 100644 --- a/lib/widgets/propeditor/pfontbutton.h +++ b/lib/widgets/propeditor/pfontbutton.h @@ -34,7 +34,7 @@ class PFontButton : public PropertyWidget Q_OBJECT TQ_OBJECT public: - PFontButton(MultiProperty* property, TQWidget* tqparent = 0, const char* name = 0); + PFontButton(MultiProperty* property, TQWidget* parent = 0, const char* name = 0); virtual TQVariant value() const; virtual void drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRect& r, const TQVariant& value); diff --git a/lib/widgets/propeditor/pfontcombo.cpp b/lib/widgets/propeditor/pfontcombo.cpp index 240310c7..51b44e8c 100644 --- a/lib/widgets/propeditor/pfontcombo.cpp +++ b/lib/widgets/propeditor/pfontcombo.cpp @@ -33,8 +33,8 @@ namespace PropertyLib{ -PFontCombo::PFontCombo(MultiProperty *property, TQWidget *tqparent, const char *name) - :PropertyWidget(property, tqparent, name) +PFontCombo::PFontCombo(MultiProperty *property, TQWidget *parent, const char *name) + :PropertyWidget(property, parent, name) { TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0); m_edit = new KFontCombo(this); diff --git a/lib/widgets/propeditor/pfontcombo.h b/lib/widgets/propeditor/pfontcombo.h index 63f07f51..ec22f662 100644 --- a/lib/widgets/propeditor/pfontcombo.h +++ b/lib/widgets/propeditor/pfontcombo.h @@ -37,7 +37,7 @@ class PFontCombo: public PropertyWidget{ Q_OBJECT TQ_OBJECT public: - PFontCombo(MultiProperty *property, TQWidget *tqparent = 0, const char *name = 0); + PFontCombo(MultiProperty *property, TQWidget *parent = 0, const char *name = 0); /**@return the value currently entered in the editor widget.*/ virtual TQVariant value() const; diff --git a/lib/widgets/propeditor/plineedit.cpp b/lib/widgets/propeditor/plineedit.cpp index 0d3afa85..2c4fabc9 100644 --- a/lib/widgets/propeditor/plineedit.cpp +++ b/lib/widgets/propeditor/plineedit.cpp @@ -24,8 +24,8 @@ namespace PropertyLib{ -PLineEdit::PLineEdit(MultiProperty *property, TQWidget *tqparent, const char *name) - :PropertyWidget(property, tqparent, name) +PLineEdit::PLineEdit(MultiProperty *property, TQWidget *parent, const char *name) + :PropertyWidget(property, parent, name) { TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0); m_edit = new KLineEdit(this); diff --git a/lib/widgets/propeditor/plineedit.h b/lib/widgets/propeditor/plineedit.h index c4d0c0f1..46ee3963 100644 --- a/lib/widgets/propeditor/plineedit.h +++ b/lib/widgets/propeditor/plineedit.h @@ -33,7 +33,7 @@ class PLineEdit: public PropertyWidget{ Q_OBJECT TQ_OBJECT public: - PLineEdit(MultiProperty *property, TQWidget *tqparent = 0, const char *name = 0); + PLineEdit(MultiProperty *property, TQWidget *parent = 0, const char *name = 0); /**@return the value currently entered in the editor widget.*/ virtual TQVariant value() const; diff --git a/lib/widgets/propeditor/plinestyleedit.cpp b/lib/widgets/propeditor/plinestyleedit.cpp index 13094245..a47dc614 100644 --- a/lib/widgets/propeditor/plinestyleedit.cpp +++ b/lib/widgets/propeditor/plinestyleedit.cpp @@ -127,7 +127,7 @@ namespace PropertyLib { "................................................"}; -PLineStyleEdit::PLineStyleEdit(MultiProperty* property, TQWidget* tqparent, const char* name): PropertyWidget(property, tqparent, name) +PLineStyleEdit::PLineStyleEdit(MultiProperty* property, TQWidget* parent, const char* name): PropertyWidget(property, parent, name) { TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0); m_edit = new TQComboBox(this); diff --git a/lib/widgets/propeditor/plinestyleedit.h b/lib/widgets/propeditor/plinestyleedit.h index 6021cb9c..8d0a5347 100644 --- a/lib/widgets/propeditor/plinestyleedit.h +++ b/lib/widgets/propeditor/plinestyleedit.h @@ -33,7 +33,7 @@ class PLineStyleEdit : public PropertyWidget { Q_OBJECT TQ_OBJECT public: - PLineStyleEdit(MultiProperty* property, TQWidget* tqparent = 0, const char* name = 0); + PLineStyleEdit(MultiProperty* property, TQWidget* parent = 0, const char* name = 0); virtual TQVariant value() const; virtual void drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRect& r, const TQVariant& value); diff --git a/lib/widgets/propeditor/ppixmapedit.cpp b/lib/widgets/propeditor/ppixmapedit.cpp index 0eaec74b..20f943e8 100644 --- a/lib/widgets/propeditor/ppixmapedit.cpp +++ b/lib/widgets/propeditor/ppixmapedit.cpp @@ -41,8 +41,8 @@ namespace PropertyLib{ -PPixmapEdit::PPixmapEdit(MultiProperty* property, TQWidget* tqparent, const char* name) - :PropertyWidget(property, tqparent, name) +PPixmapEdit::PPixmapEdit(MultiProperty* property, TQWidget* parent, const char* name) + :PropertyWidget(property, parent, name) { TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0); m_edit = new TQLabel(this); diff --git a/lib/widgets/propeditor/ppixmapedit.h b/lib/widgets/propeditor/ppixmapedit.h index 09d7ffef..cbffa443 100644 --- a/lib/widgets/propeditor/ppixmapedit.h +++ b/lib/widgets/propeditor/ppixmapedit.h @@ -35,7 +35,7 @@ class PPixmapEdit : public PropertyWidget Q_OBJECT TQ_OBJECT public: - PPixmapEdit(MultiProperty* property, TQWidget* tqparent = 0, const char* name = 0); + PPixmapEdit(MultiProperty* property, TQWidget* parent = 0, const char* name = 0); virtual TQVariant value() const; virtual void drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRect& r, const TQVariant& value); diff --git a/lib/widgets/propeditor/ppointedit.cpp b/lib/widgets/propeditor/ppointedit.cpp index 7f31d92d..4e85d214 100644 --- a/lib/widgets/propeditor/ppointedit.cpp +++ b/lib/widgets/propeditor/ppointedit.cpp @@ -25,7 +25,7 @@ namespace PropertyLib{ -PPointEdit::PPointEdit(MultiProperty* property, TQWidget* tqparent, const char* name): PropertyWidget(property, tqparent, name) +PPointEdit::PPointEdit(MultiProperty* property, TQWidget* parent, const char* name): PropertyWidget(property, parent, name) { TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0); m_edit = new KLineEdit(this); diff --git a/lib/widgets/propeditor/ppointedit.h b/lib/widgets/propeditor/ppointedit.h index e7de9178..3deb3d94 100644 --- a/lib/widgets/propeditor/ppointedit.h +++ b/lib/widgets/propeditor/ppointedit.h @@ -34,7 +34,7 @@ class PPointEdit : public PropertyWidget Q_OBJECT TQ_OBJECT public: - PPointEdit(MultiProperty* property, TQWidget* tqparent=0, const char* name=0); + PPointEdit(MultiProperty* property, TQWidget* parent=0, const char* name=0); virtual TQVariant value() const; virtual void drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRect& r, const TQVariant& value); diff --git a/lib/widgets/propeditor/prectedit.cpp b/lib/widgets/propeditor/prectedit.cpp index 562c013b..d7a5fa01 100644 --- a/lib/widgets/propeditor/prectedit.cpp +++ b/lib/widgets/propeditor/prectedit.cpp @@ -25,7 +25,7 @@ namespace PropertyLib{ -PRectEdit::PRectEdit(MultiProperty* property, TQWidget* tqparent, const char* name): PropertyWidget(property, tqparent, name) +PRectEdit::PRectEdit(MultiProperty* property, TQWidget* parent, const char* name): PropertyWidget(property, parent, name) { TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0); m_edit = new KLineEdit(this); diff --git a/lib/widgets/propeditor/prectedit.h b/lib/widgets/propeditor/prectedit.h index 14381f80..09cf11c7 100644 --- a/lib/widgets/propeditor/prectedit.h +++ b/lib/widgets/propeditor/prectedit.h @@ -34,7 +34,7 @@ class PRectEdit : public PropertyWidget Q_OBJECT TQ_OBJECT public: - PRectEdit(MultiProperty* property, TQWidget* tqparent=0, const char* name=0); + PRectEdit(MultiProperty* property, TQWidget* parent=0, const char* name=0); virtual TQVariant value() const; virtual void drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRect& r, const TQVariant& value); diff --git a/lib/widgets/propeditor/propertyeditor.cpp b/lib/widgets/propeditor/propertyeditor.cpp index c7e5523c..ed7b81f2 100644 --- a/lib/widgets/propeditor/propertyeditor.cpp +++ b/lib/widgets/propeditor/propertyeditor.cpp @@ -42,14 +42,14 @@ namespace PropertyLib{ class PropertyItem: public KListViewItem{ public: - PropertyItem(PropertyEditor *tqparent, MultiProperty *property) - :KListViewItem(tqparent, property->description()), m_editor(tqparent), m_property(property), + PropertyItem(PropertyEditor *parent, MultiProperty *property) + :KListViewItem(parent, property->description()), m_editor(parent), m_property(property), m_changed(false) { } - PropertyItem(PropertyEditor *editor, KListViewItem *tqparent, MultiProperty *property) - :KListViewItem(tqparent, property->description()), m_editor(editor), + PropertyItem(PropertyEditor *editor, KListViewItem *parent, MultiProperty *property) + :KListViewItem(parent, property->description()), m_editor(editor), m_property(property), m_changed(false) { } @@ -120,13 +120,13 @@ private: class PropertyGroupItem: public KListViewItem{ public: - PropertyGroupItem(KListView *tqparent, const TQString &name) - :KListViewItem(tqparent, name) + PropertyGroupItem(KListView *parent, const TQString &name) + :KListViewItem(parent, name) { init(); } - PropertyGroupItem(KListViewItem *tqparent, const TQString &name) - :KListViewItem(tqparent, name) + PropertyGroupItem(KListViewItem *parent, const TQString &name) + :KListViewItem(parent, name) { init(); } @@ -158,14 +158,14 @@ private: class SeparatorItem: public KListViewItem{ public: - SeparatorItem(KListView *tqparent) - :KListViewItem(tqparent) + SeparatorItem(KListView *parent) + :KListViewItem(parent) { setSelectable(false); } }; -PropertyEditor::PropertyEditor(TQWidget *tqparent, const char *name) - :KListView(tqparent, name) +PropertyEditor::PropertyEditor(TQWidget *parent, const char *name) + :KListView(parent, name) { setSorting(-1); @@ -259,9 +259,9 @@ void PropertyEditor::addProperty(const TQString &name) addChildProperties(pitem); } -void PropertyEditor::addChildProperties(PropertyItem *tqparent) +void PropertyEditor::addChildProperties(PropertyItem *parent) { - MultiProperty *prop = tqparent->property(); + MultiProperty *prop = parent->property(); //force machine creation to get detailed properties appended to current multiproperty if ( !m_registeredForType.contains(prop->name()) && (PropertyMachineFactory::getInstance()->hasDetailedEditors(prop->type())) ) @@ -272,11 +272,11 @@ void PropertyEditor::addChildProperties(PropertyItem *tqparent) // qWarning("seeking tqchildren: count: %d", prop->details.count()); - tqparent->setOpen(true); + parent->setOpen(true); for (TQValueList<ChildProperty>::iterator it = prop->details.begin(); it != prop->details.end(); ++it) { // qWarning("found child %s", (*it).name().ascii()); - new PropertyItem(this, tqparent, new MultiProperty(&m_detailedList, &(*it))); + new PropertyItem(this, parent, new MultiProperty(&m_detailedList, &(*it))); } } diff --git a/lib/widgets/propeditor/propertyeditor.h b/lib/widgets/propeditor/propertyeditor.h index ee868a55..2fdbe432 100644 --- a/lib/widgets/propeditor/propertyeditor.h +++ b/lib/widgets/propeditor/propertyeditor.h @@ -60,7 +60,7 @@ class PropertyEditor: public KListView{ TQ_OBJECT public: /**Constructs the property editor.*/ - PropertyEditor(TQWidget *tqparent = 0, const char *name = 0); + PropertyEditor(TQWidget *parent = 0, const char *name = 0); ~PropertyEditor(); /**@return @ref Machine for given property. @@ -103,7 +103,7 @@ protected: void addGroup(const TQString &name); void addProperty(PropertyGroupItem *group, const TQString &name); void addProperty(const TQString &name); - void addChildProperties(PropertyItem *tqparent); + void addChildProperties(PropertyItem *parent); private: PropertyList *m_list; diff --git a/lib/widgets/propeditor/propertymachinefactory.h b/lib/widgets/propeditor/propertymachinefactory.h index 84da3e71..fae5569f 100644 --- a/lib/widgets/propeditor/propertymachinefactory.h +++ b/lib/widgets/propeditor/propertymachinefactory.h @@ -74,7 +74,7 @@ public: void registerEditor(int type, createMachine creator); /**Creates and returns the editor for given property type. - Warning: editor and viewer widgets won't have tqparent widget. %Property editor + Warning: editor and viewer widgets won't have parent widget. %Property editor cares about reparenting and deletion of returned widgets in machines.*/ Machine *machineForProperty(MultiProperty *property); bool hasDetailedEditors(int type); diff --git a/lib/widgets/propeditor/propertywidget.cpp b/lib/widgets/propeditor/propertywidget.cpp index df0df75a..38a99c9c 100644 --- a/lib/widgets/propeditor/propertywidget.cpp +++ b/lib/widgets/propeditor/propertywidget.cpp @@ -23,8 +23,8 @@ namespace PropertyLib{ -PropertyWidget::PropertyWidget(MultiProperty *property, TQWidget *tqparent, const char *name) - :TQWidget(tqparent, name), m_property(property) +PropertyWidget::PropertyWidget(MultiProperty *property, TQWidget *parent, const char *name) + :TQWidget(parent, name), m_property(property) { } diff --git a/lib/widgets/propeditor/propertywidget.h b/lib/widgets/propeditor/propertywidget.h index d5a22777..2105a220 100644 --- a/lib/widgets/propeditor/propertywidget.h +++ b/lib/widgets/propeditor/propertywidget.h @@ -51,7 +51,7 @@ class PropertyWidget: public TQWidget{ TQ_OBJECT public: /**Constructs widget for property with name "propertyName".*/ - PropertyWidget(MultiProperty *property, TQWidget *tqparent = 0, const char *name = 0); + PropertyWidget(MultiProperty *property, TQWidget *parent = 0, const char *name = 0); virtual ~PropertyWidget() {} /**@return the value currently entered in the editor widget.*/ diff --git a/lib/widgets/propeditor/propertywidgetproxy.cpp b/lib/widgets/propeditor/propertywidgetproxy.cpp index 27f2a49c..813708ca 100644 --- a/lib/widgets/propeditor/propertywidgetproxy.cpp +++ b/lib/widgets/propeditor/propertywidgetproxy.cpp @@ -26,8 +26,8 @@ namespace PropertyLib{ -PropertyWidgetProxy::PropertyWidgetProxy(TQWidget *tqparent, const char *name) - :TQWidget(tqparent, name), mp(0), m_propertyType(Property::Invalid), m_editor(0) +PropertyWidgetProxy::PropertyWidgetProxy(TQWidget *parent, const char *name) + :TQWidget(parent, name), mp(0), m_propertyType(Property::Invalid), m_editor(0) { p = new Property(); m_layout = new TQHBoxLayout(this, 0, 0); diff --git a/lib/widgets/propeditor/propertywidgetproxy.h b/lib/widgets/propeditor/propertywidgetproxy.h index 04a2503a..642d7824 100644 --- a/lib/widgets/propeditor/propertywidgetproxy.h +++ b/lib/widgets/propeditor/propertywidgetproxy.h @@ -46,7 +46,7 @@ Q_OBJECT TQ_PROPERTY( int propertyType READ propertyType WRITE setPropertyType DESIGNABLE true ) TQ_PROPERTY( PropertyType propertyType2 READ propertyType2 WRITE setPropertyType2 DESIGNABLE false ) public: - PropertyWidgetProxy(TQWidget *tqparent = 0, const char *name = 0); + PropertyWidgetProxy(TQWidget *parent = 0, const char *name = 0); ~PropertyWidgetProxy(); /**Sets the type of a property editor to appear.*/ diff --git a/lib/widgets/propeditor/psizeedit.cpp b/lib/widgets/propeditor/psizeedit.cpp index 4ce6561c..5558c3f3 100644 --- a/lib/widgets/propeditor/psizeedit.cpp +++ b/lib/widgets/propeditor/psizeedit.cpp @@ -25,8 +25,8 @@ namespace PropertyLib{ -PSizeEdit::PSizeEdit(MultiProperty *property, TQWidget *tqparent, const char *name) - :PropertyWidget(property, tqparent, name) +PSizeEdit::PSizeEdit(MultiProperty *property, TQWidget *parent, const char *name) + :PropertyWidget(property, parent, name) { TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0); m_edit = new KLineEdit(this); diff --git a/lib/widgets/propeditor/psizeedit.h b/lib/widgets/propeditor/psizeedit.h index 5fbd6d6d..43da3c55 100644 --- a/lib/widgets/propeditor/psizeedit.h +++ b/lib/widgets/propeditor/psizeedit.h @@ -36,7 +36,7 @@ class PSizeEdit: public PropertyWidget Q_OBJECT TQ_OBJECT public: - PSizeEdit(MultiProperty *property, TQWidget *tqparent = 0, const char *name = 0); + PSizeEdit(MultiProperty *property, TQWidget *parent = 0, const char *name = 0); virtual TQVariant value() const; virtual void drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRect& r, const TQVariant& value); diff --git a/lib/widgets/propeditor/psizepolicyedit.cpp b/lib/widgets/propeditor/psizepolicyedit.cpp index 9c417005..94847d2a 100644 --- a/lib/widgets/propeditor/psizepolicyedit.cpp +++ b/lib/widgets/propeditor/psizepolicyedit.cpp @@ -26,8 +26,8 @@ namespace PropertyLib{ -PSizePolicyEdit::PSizePolicyEdit(MultiProperty* property, const TQMap<TQString, TQVariant> &spValues, TQWidget* tqparent, const char* name) - :PropertyWidget(property, tqparent, name), m_spValues(spValues) +PSizePolicyEdit::PSizePolicyEdit(MultiProperty* property, const TQMap<TQString, TQVariant> &spValues, TQWidget* parent, const char* name) + :PropertyWidget(property, parent, name), m_spValues(spValues) { TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0); m_edit = new KLineEdit(this); diff --git a/lib/widgets/propeditor/psizepolicyedit.h b/lib/widgets/propeditor/psizepolicyedit.h index 613c65ea..586b4cba 100644 --- a/lib/widgets/propeditor/psizepolicyedit.h +++ b/lib/widgets/propeditor/psizepolicyedit.h @@ -36,7 +36,7 @@ class PSizePolicyEdit : public PropertyWidget Q_OBJECT TQ_OBJECT public: - PSizePolicyEdit(MultiProperty* property, const TQMap<TQString, TQVariant> &spValues, TQWidget* tqparent=0, const char* name=0); + PSizePolicyEdit(MultiProperty* property, const TQMap<TQString, TQVariant> &spValues, TQWidget* parent=0, const char* name=0); virtual TQVariant value() const; virtual void drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRect& r, const TQVariant& value); diff --git a/lib/widgets/propeditor/pspinbox.cpp b/lib/widgets/propeditor/pspinbox.cpp index 48b36324..e9c25325 100644 --- a/lib/widgets/propeditor/pspinbox.cpp +++ b/lib/widgets/propeditor/pspinbox.cpp @@ -26,8 +26,8 @@ namespace PropertyLib{ -PSpinBox::PSpinBox(MultiProperty *property, TQWidget *tqparent, const char *name) - :PropertyWidget(property, tqparent, name) +PSpinBox::PSpinBox(MultiProperty *property, TQWidget *parent, const char *name) + :PropertyWidget(property, parent, name) { TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0); m_edit = new TQSpinBox(INT_MIN, INT_MAX, 1, this); @@ -37,8 +37,8 @@ PSpinBox::PSpinBox(MultiProperty *property, TQWidget *tqparent, const char *name connect(m_edit, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(updateProperty(int))); } -PSpinBox::PSpinBox(MultiProperty *property, int minValue, int maxValue, int step, TQWidget *tqparent, const char *name) - :PropertyWidget(property, tqparent, name) +PSpinBox::PSpinBox(MultiProperty *property, int minValue, int maxValue, int step, TQWidget *parent, const char *name) + :PropertyWidget(property, parent, name) { TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0); m_edit = new TQSpinBox(minValue, maxValue, step, this); diff --git a/lib/widgets/propeditor/pspinbox.h b/lib/widgets/propeditor/pspinbox.h index 28d34ef2..3b6da02a 100644 --- a/lib/widgets/propeditor/pspinbox.h +++ b/lib/widgets/propeditor/pspinbox.h @@ -33,8 +33,8 @@ class PSpinBox: public PropertyWidget{ Q_OBJECT TQ_OBJECT public: - PSpinBox(MultiProperty *property, TQWidget *tqparent = 0, const char *name = 0); - PSpinBox(MultiProperty *property, int minValue, int maxValue, int step = 1, TQWidget *tqparent = 0, const char *name = 0); + PSpinBox(MultiProperty *property, TQWidget *parent = 0, const char *name = 0); + PSpinBox(MultiProperty *property, int minValue, int maxValue, int step = 1, TQWidget *parent = 0, const char *name = 0); /**@return the value currently entered in the editor widget.*/ virtual TQVariant value() const; diff --git a/lib/widgets/propeditor/pstringlistedit.cpp b/lib/widgets/propeditor/pstringlistedit.cpp index e4eeeccf..fda16a8b 100644 --- a/lib/widgets/propeditor/pstringlistedit.cpp +++ b/lib/widgets/propeditor/pstringlistedit.cpp @@ -36,8 +36,8 @@ namespace PropertyLib{ -PStringListEdit::PStringListEdit(MultiProperty *property, TQWidget *tqparent, const char *name) - :PropertyWidget(property, tqparent, name) +PStringListEdit::PStringListEdit(MultiProperty *property, TQWidget *parent, const char *name) + :PropertyWidget(property, parent, name) { l = new TQHBoxLayout(this); diff --git a/lib/widgets/propeditor/pstringlistedit.h b/lib/widgets/propeditor/pstringlistedit.h index 45aa0e4e..7e651e43 100644 --- a/lib/widgets/propeditor/pstringlistedit.h +++ b/lib/widgets/propeditor/pstringlistedit.h @@ -37,7 +37,7 @@ class PStringListEdit: public PropertyWidget Q_OBJECT TQ_OBJECT public: - PStringListEdit(MultiProperty *property, TQWidget *tqparent = 0, const char *name = 0); + PStringListEdit(MultiProperty *property, TQWidget *parent = 0, const char *name = 0); /**@return the value currently entered in the editor widget.*/ virtual TQVariant value() const; diff --git a/lib/widgets/propeditor/psymbolcombo.cpp b/lib/widgets/propeditor/psymbolcombo.cpp index 087f7a8d..7e79945a 100644 --- a/lib/widgets/propeditor/psymbolcombo.cpp +++ b/lib/widgets/propeditor/psymbolcombo.cpp @@ -35,8 +35,8 @@ namespace PropertyLib{ -PSymbolCombo::PSymbolCombo(MultiProperty *property, TQWidget *tqparent, const char *name) - :PropertyWidget(property, tqparent, name) +PSymbolCombo::PSymbolCombo(MultiProperty *property, TQWidget *parent, const char *name) + :PropertyWidget(property, parent, name) { l = new TQHBoxLayout(this); m_edit = new KLineEdit(this); diff --git a/lib/widgets/propeditor/psymbolcombo.h b/lib/widgets/propeditor/psymbolcombo.h index 9c559844..adb88e78 100644 --- a/lib/widgets/propeditor/psymbolcombo.h +++ b/lib/widgets/propeditor/psymbolcombo.h @@ -36,7 +36,7 @@ class PSymbolCombo: public PropertyWidget{ Q_OBJECT TQ_OBJECT public: - PSymbolCombo(MultiProperty *property, TQWidget *tqparent = 0, const char *name = 0); + PSymbolCombo(MultiProperty *property, TQWidget *parent = 0, const char *name = 0); /**@return the value currently entered in the editor widget.*/ virtual TQVariant value() const; diff --git a/lib/widgets/propeditor/purledit.cpp b/lib/widgets/propeditor/purledit.cpp index d27a0552..df8316cd 100644 --- a/lib/widgets/propeditor/purledit.cpp +++ b/lib/widgets/propeditor/purledit.cpp @@ -30,8 +30,8 @@ namespace PropertyLib{ -PUrlEdit::PUrlEdit(Mode mode, MultiProperty* property, TQWidget* tqparent, const char* name) - :PropertyWidget(property, tqparent, name) +PUrlEdit::PUrlEdit(Mode mode, MultiProperty* property, TQWidget* parent, const char* name) + :PropertyWidget(property, parent, name) { TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0); #ifndef PURE_QT diff --git a/lib/widgets/propeditor/purledit.h b/lib/widgets/propeditor/purledit.h index 4aff51b8..396b16ba 100644 --- a/lib/widgets/propeditor/purledit.h +++ b/lib/widgets/propeditor/purledit.h @@ -47,7 +47,7 @@ public: enum Mode {File,Directory}; #endif - PUrlEdit(Mode mode, MultiProperty* property, TQWidget* tqparent=0, const char* name=0); + PUrlEdit(Mode mode, MultiProperty* property, TQWidget* parent=0, const char* name=0); virtual TQVariant value() const; virtual void setValue(const TQVariant& value, bool emitChange); diff --git a/lib/widgets/propeditor/pyesnobutton.cpp b/lib/widgets/propeditor/pyesnobutton.cpp index 9448d672..614b751b 100644 --- a/lib/widgets/propeditor/pyesnobutton.cpp +++ b/lib/widgets/propeditor/pyesnobutton.cpp @@ -31,8 +31,8 @@ namespace PropertyLib{ -PYesNoButton::PYesNoButton(MultiProperty* property, TQWidget* tqparent, const char* name) - :PropertyWidget(property, tqparent, name) +PYesNoButton::PYesNoButton(MultiProperty* property, TQWidget* parent, const char* name) + :PropertyWidget(property, parent, name) { TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0); m_edit = new TQPushButton(this); diff --git a/lib/widgets/propeditor/pyesnobutton.h b/lib/widgets/propeditor/pyesnobutton.h index efe33584..412d167d 100644 --- a/lib/widgets/propeditor/pyesnobutton.h +++ b/lib/widgets/propeditor/pyesnobutton.h @@ -34,7 +34,7 @@ class PYesNoButton : public PropertyWidget Q_OBJECT TQ_OBJECT public: - PYesNoButton(MultiProperty* property, TQWidget* tqparent = 0, const char* name = 0); + PYesNoButton(MultiProperty* property, TQWidget* parent = 0, const char* name = 0); virtual TQVariant value() const; virtual void drawViewer(TQPainter* p, const TQColorGroup& cg, const TQRect& r, const TQVariant& value); diff --git a/lib/widgets/propeditor/qeditlistbox.cpp b/lib/widgets/propeditor/qeditlistbox.cpp index 0c3119da..fda5a006 100644 --- a/lib/widgets/propeditor/qeditlistbox.cpp +++ b/lib/widgets/propeditor/qeditlistbox.cpp @@ -46,24 +46,24 @@ public: int buttons; }; -QEditListBox::QEditListBox(TQWidget *tqparent, const char *name, +QEditListBox::QEditListBox(TQWidget *parent, const char *name, bool checkAtEntering, int buttons ) - :TQGroupBox(tqparent, name ) + :TQGroupBox(parent, name ) { init( checkAtEntering, buttons ); } -QEditListBox::QEditListBox(const TQString& title, TQWidget *tqparent, +QEditListBox::QEditListBox(const TQString& title, TQWidget *parent, const char *name, bool checkAtEntering, int buttons) - :TQGroupBox(title, tqparent, name ) + :TQGroupBox(title, parent, name ) { init( checkAtEntering, buttons ); } QEditListBox::QEditListBox(const TQString& title, const CustomEditor& custom, - TQWidget *tqparent, const char *name, + TQWidget *parent, const char *name, bool checkAtEntering, int buttons) - :TQGroupBox(title, tqparent, name ) + :TQGroupBox(title, parent, name ) { m_lineEdit = custom.lineEdit(); init( checkAtEntering, buttons, custom.representationWidget() ); diff --git a/lib/widgets/propeditor/qeditlistbox.h b/lib/widgets/propeditor/qeditlistbox.h index 78a61bfc..2750623b 100644 --- a/lib/widgets/propeditor/qeditlistbox.h +++ b/lib/widgets/propeditor/qeditlistbox.h @@ -101,7 +101,7 @@ public: * it will be checked if you press the Add-button. It is not * possible to enter items twice into the listbox. */ - QEditListBox(TQWidget *tqparent = 0, const char *name = 0, + QEditListBox(TQWidget *parent = 0, const char *name = 0, bool checkAtEntering=false, int buttons = All ); /** * Create an editable listbox. @@ -109,7 +109,7 @@ public: * The same as the other constructor, additionally it takes * @p title, which will be the title of the frame around the listbox. */ - QEditListBox(const TQString& title, TQWidget *tqparent = 0, + QEditListBox(const TQString& title, TQWidget *parent = 0, const char *name = 0, bool checkAtEntering=false, int buttons = All ); @@ -127,7 +127,7 @@ public: */ QEditListBox( const TQString& title, const CustomEditor &customEditor, - TQWidget *tqparent = 0, const char *name = 0, + TQWidget *parent = 0, const char *name = 0, bool checkAtEntering = false, int buttons = All ); virtual ~QEditListBox(); diff --git a/lib/widgets/propeditor/qfloatinput.cpp b/lib/widgets/propeditor/qfloatinput.cpp index d14ea9c7..1922ea6a 100644 --- a/lib/widgets/propeditor/qfloatinput.cpp +++ b/lib/widgets/propeditor/qfloatinput.cpp @@ -23,10 +23,10 @@ #include <math.h> TQFloatInput::TQFloatInput( int min, int max, float step, int digits, - TQWidget *tqparent, const char *name ) + TQWidget *parent, const char *name ) : TQSpinBox( (int) (min*pow(digits,10)), (int) (max*pow(digits,10)), - (int) (step*pow(digits,10)), tqparent, name ), + (int) (step*pow(digits,10)), parent, name ), m_digits( digits ) { setValue( (int) (min*pow(digits,10)) ); diff --git a/lib/widgets/propeditor/qfloatinput.h b/lib/widgets/propeditor/qfloatinput.h index dececcbf..23fb10d2 100644 --- a/lib/widgets/propeditor/qfloatinput.h +++ b/lib/widgets/propeditor/qfloatinput.h @@ -29,7 +29,7 @@ class TQFloatInput : public TQSpinBox { public: TQFloatInput( int min, int max, float step, int digits, - TQWidget *tqparent, const char *name = 0 ); + TQWidget *parent, const char *name = 0 ); virtual TQString mapValueToText( int value ); diff --git a/lib/widgets/qcomboview.cpp b/lib/widgets/qcomboview.cpp index 793c52d2..68e940ae 100644 --- a/lib/widgets/qcomboview.cpp +++ b/lib/widgets/qcomboview.cpp @@ -133,13 +133,13 @@ static inline bool checkIndex( const char *method, const char * name, The input field can be edited if \a rw is TRUE, otherwise the user may only choose one of the items in the combobox. - The \a tqparent and \a name arguments are passed on to the TQWidget + The \a parent and \a name arguments are passed on to the TQWidget constructor. */ -QComboView::QComboView( bool rw, TQWidget *tqparent, const char *name ) - : TQWidget( tqparent, name, WResizeNoErase ) +QComboView::QComboView( bool rw, TQWidget *parent, const char *name ) + : TQWidget( parent, name, WResizeNoErase ) { d = new QComboViewData( this ); setUpListView(); @@ -1430,7 +1430,7 @@ void QComboView::setLineEdit( TQLineEdit *edit ) d->ed = edit; - if ( TQT_BASE_OBJECT(edit->tqparent()) != TQT_BASE_OBJECT(this) ) { + if ( TQT_BASE_OBJECT(edit->parent()) != TQT_BASE_OBJECT(this) ) { edit->reparent( this, TQPoint(0,0), FALSE ); edit->setFont( font() ); } diff --git a/lib/widgets/qcomboview.h b/lib/widgets/qcomboview.h index 213c278f..4cdf6754 100644 --- a/lib/widgets/qcomboview.h +++ b/lib/widgets/qcomboview.h @@ -58,8 +58,8 @@ class TQ_EXPORT QComboView : public TQWidget TQ_OVERRIDE( bool autoMask DESIGNABLE true SCRIPTABLE true ) public: -// QComboView( TQWidget* tqparent=0, const char* name=0 ); - QComboView( bool rw, TQWidget* tqparent=0, const char* name=0 ); +// QComboView( TQWidget* parent=0, const char* name=0 ); + QComboView( bool rw, TQWidget* parent=0, const char* name=0 ); ~QComboView(); int childCount() const; diff --git a/lib/widgets/resizablecombo.cpp b/lib/widgets/resizablecombo.cpp index eeeba8d0..aba2f658 100644 --- a/lib/widgets/resizablecombo.cpp +++ b/lib/widgets/resizablecombo.cpp @@ -51,8 +51,8 @@ static const char * resize_xpm[] = { " . ", " "}; -ResizableCombo::ResizableCombo(KComboView *view, TQWidget *tqparent, const char *name): - TQWidget(tqparent, name), m_sizer(0), m_combo(view) +ResizableCombo::ResizableCombo(KComboView *view, TQWidget *parent, const char *name): + TQWidget(parent, name), m_sizer(0), m_combo(view) { TQHBoxLayout *l = new TQHBoxLayout(this); view->reparent(this, TQPoint(0,0)); @@ -86,8 +86,8 @@ void MyPushButton::mouseMoveEvent( TQMouseEvent * e ) TQPushButton::mouseMoveEvent(e); } -MyPushButton::MyPushButton( ResizableCombo * tqparent, const char * name ) - :TQPushButton(tqparent, name), m_resizing(false), m_combo(tqparent) +MyPushButton::MyPushButton( ResizableCombo * parent, const char * name ) + :TQPushButton(parent, name), m_resizing(false), m_combo(parent) { setFocusPolicy(TQ_NoFocus); setFlat(true); diff --git a/lib/widgets/resizablecombo.h b/lib/widgets/resizablecombo.h index bafefe33..ecaa2058 100644 --- a/lib/widgets/resizablecombo.h +++ b/lib/widgets/resizablecombo.h @@ -39,7 +39,7 @@ class ResizableCombo: public TQWidget{ Q_OBJECT TQ_OBJECT public: - ResizableCombo(KComboView *view, TQWidget *tqparent = 0, const char *name = 0); + ResizableCombo(KComboView *view, TQWidget *parent = 0, const char *name = 0); private: MyPushButton *m_sizer; @@ -51,7 +51,7 @@ friend class MyPushButton; class MyPushButton: public TQPushButton { public: - MyPushButton(ResizableCombo *tqparent = 0, const char *name = 0 ); + MyPushButton(ResizableCombo *parent = 0, const char *name = 0 ); TQPoint pressedPos() { |