rename the following methods:

tqparent parent
tqmask mask


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

1 files changed, 4 insertions, 4 deletions

diff --git a/kformula/kformula_doc.h b/kformula/kformula_doc.h
index 81ba62a7..d01ce2a3 100644
--- a/kformula/kformula_doc.h
+++ b/kformula/kformula_doc.h
@@ -55,7 +55,7 @@ public:
 
     KFormulaDoc(TQWidget *parentWidget = 0,
                 const char *widgetName = 0,
-                TQObject* tqparent = 0,
+                TQObject* parent = 0,
                 const char* name = 0,
                 bool singleViewMode = false);
     ~KFormulaDoc();
@@ -63,8 +63,8 @@ public:
     virtual void paintContent( TQPainter &painter, const TQRect &rect, bool transparent = false, double zoomX = 1.0, double zoomY = 1.0 );
 
     virtual bool initDoc(InitDocFlags flags, TQWidget* parentWidget=0);
-    virtual void showStartUpWidget(KoMainWindow* tqparent, bool alwaysShow = false);
-    virtual bool showEmbedInitDialog(TQWidget* tqparent);
+    virtual void showStartUpWidget(KoMainWindow* parent, bool alwaysShow = false);
+    virtual bool showEmbedInitDialog(TQWidget* parent);
     virtual bool loadOasis( const TQDomDocument& doc, KoOasisStyles& oasisStyles, const TQDomDocument& settings, KoStore* );
     virtual bool loadXML(TQIODevice *, const TQDomDocument& doc);
     virtual TQDomDocument saveXML();
@@ -88,7 +88,7 @@ protected slots:
 protected:
 
     virtual TQString configFile() const;
-    virtual KoView* createViewInstance(TQWidget* tqparent, const char* name);
+    virtual KoView* createViewInstance(TQWidget* parent, const char* name);
 
 private: