rename the following methods:

tqparent parent
tqmask mask


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdevelop@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 11 insertions, 11 deletions

diff --git a/kdevdesigner/uilib/qwidgetfactory.h b/kdevdesigner/uilib/qwidgetfactory.h
index ebdb38c0..c6770341 100644
--- a/kdevdesigner/uilib/qwidgetfactory.h
+++ b/kdevdesigner/uilib/qwidgetfactory.h
@@ -52,12 +52,12 @@ public:
     TQWidgetFactory();
     virtual ~TQWidgetFactory();
 
-    static TQWidget *create( const TQString &uiFile, TQObject *connector = 0, TQWidget *tqparent = 0, const char *name = 0 );
-    static TQWidget *create( TQIODevice *dev, TQObject *connector = 0, TQWidget *tqparent = 0, const char *name = 0 );
+    static TQWidget *create( const TQString &uiFile, TQObject *connector = 0, TQWidget *parent = 0, const char *name = 0 );
+    static TQWidget *create( TQIODevice *dev, TQObject *connector = 0, TQWidget *parent = 0, const char *name = 0 );
     static void addWidgetFactory( TQWidgetFactory *factory );
     static void loadImages( const TQString &dir );
 
-    virtual TQWidget *createWidget( const TQString &className, TQWidget *tqparent, const char *name ) const;
+    virtual TQWidget *createWidget( const TQString &className, TQWidget *parent, const char *name ) const;
     static TQStringList widgets();
     static bool supportsWidget( const TQString &widget );
 
@@ -66,7 +66,7 @@ private:
     void loadImageCollection( const TQDomElement &e );
     void loadConnections( const TQDomElement &e, TQObject *connector );
     void loadTabOrder( const TQDomElement &e );
-    TQWidget *createWidgetInternal( const TQDomElement &e, TQWidget *tqparent, TQLayout* tqlayout, const TQString &classNameArg );
+    TQWidget *createWidgetInternal( const TQDomElement &e, TQWidget *parent, TQLayout* tqlayout, const TQString &classNameArg );
     TQLayout *createLayout( TQWidget *widget, TQLayout*  tqlayout, LayoutType type, bool isTQLayoutWidget = FALSE );
     LayoutType layoutType( TQLayout *l ) const;
     void setProperty( TQObject* widget, const TQString &prop, TQVariant value );
@@ -87,7 +87,7 @@ private:
     void createColumn( const TQDomElement &e, TQWidget *widget );
     void loadItem( const TQDomElement &e, TQPixmap &pix, TQString &txt, bool &hasPixmap );
     void createItem( const TQDomElement &e, TQWidget *widget, TQListViewItem *i = 0 );
-    void loadChildAction( TQObject *tqparent, const TQDomElement &e );
+    void loadChildAction( TQObject *parent, const TQDomElement &e );
     void loadActions( const TQDomElement &e );
     void loadToolBars( const TQDomElement &e );
     void loadMenuBar( const TQDomElement &e );
@@ -110,21 +110,21 @@ private:
     void unpackVariant( const UibStrTable& strings, TQDataStream& in,
 			TQVariant& value );
     void inputSpacer( const UibStrTable& strings, TQDataStream& in,
-		      TQLayout *tqparent );
+		      TQLayout *parent );
     void inputColumnOrRow( const UibStrTable& strings, TQDataStream& in,
-			   TQObject *tqparent, bool isRow );
+			   TQObject *parent, bool isRow );
     void inputItem( const UibStrTable& strings, TQDataStream& in,
-		    TQObject *tqparent, TQListViewItem *parentItem = 0 );
+		    TQObject *parent, TQListViewItem *parentItem = 0 );
     void inputMenuItem( TQObject **objects, const UibStrTable& strings,
 			TQDataStream& in, TQMenuBar *menuBar );
     TQObject *inputObject( TQObject **objects, int& numObjects,
 			  const UibStrTable& strings, TQDataStream& in,
-			  TQWidget *ancestorWidget, TQObject *tqparent,
+			  TQWidget *ancestorWidget, TQObject *parent,
 			  TQCString className = "" );
     TQWidget *createFromUiFile( TQDomDocument doc, TQObject *connector,
-			       TQWidget *tqparent, const char *name );
+			       TQWidget *parent, const char *name );
     TQWidget *createFromUibFile( TQDataStream& in, TQObject *connector,
-				TQWidget *tqparent, const char *name );
+				TQWidget *parent, const char *name );
 
 private:
     struct Image {