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

4 files changed, 12 insertions, 12 deletions

diff --git a/filters/karbon/xfig/xfigimport.cc b/filters/karbon/xfig/xfigimport.cc
index 2932e05c..015c4006 100644
--- a/filters/karbon/xfig/xfigimport.cc
+++ b/filters/karbon/xfig/xfigimport.cc
@@ -134,7 +134,7 @@ int hexstrToInt (const char *str) {
    return value;
 }
 
-XFIGImport::XFIGImport( KoFilter *tqparent, const char *name ) : KoFilter(tqparent, name)
+XFIGImport::XFIGImport( KoFilter *parent, const char *name ) : KoFilter(parent, name)
 {
   fig_resolution = 1200.0 / 72.0;
   coordinate_system = 2;
@@ -473,7 +473,7 @@ void XFIGImport::parsePolyline (istream& fin, GDocument* doc) {
   int arrow_type, arrow_style;
   float arrow_thickness, arrow_width, arrow_height;
   GObject::OutlineInfo oinfo;
-  oinfo.tqmask = GObject::OutlineInfo::Custom;
+  oinfo.mask = GObject::OutlineInfo::Custom;
   oinfo.startArrowId = oinfo.endArrowId = 0;
 
   if (forward_arrow > 0) {
@@ -537,7 +537,7 @@ void XFIGImport::parseSpline (istream& fin, GDocument* doc)
   int arrow_type, arrow_style;
   float arrow_thickness, arrow_width, arrow_height;
   GObject::OutlineInfo oinfo;
-  oinfo.tqmask = GObject::OutlineInfo::Custom;
+  oinfo.mask = GObject::OutlineInfo::Custom;
   oinfo.startArrowId = oinfo.endArrowId = 0;
 
   if (forward_arrow > 0) {
diff --git a/filters/karbon/xfig/xfigimport.h b/filters/karbon/xfig/xfigimport.h
index 5cf9dddf..c084cc8d 100644
--- a/filters/karbon/xfig/xfigimport.h
+++ b/filters/karbon/xfig/xfigimport.h
@@ -43,7 +43,7 @@ class XFIGImport : public KoFilter
   TQ_OBJECT
 
 public:
-    XFIGImport( KoFilter *tqparent, const char *name );
+    XFIGImport( KoFilter *parent, const char *name );
     virtual ~XFIGImport();
 
     virtual bool filterImport( const TQString &file, KoDocument *,
diff --git a/filters/karbon/xfig/xfigimport_factory.cc b/filters/karbon/xfig/xfigimport_factory.cc
index 79fb695c..d734b176 100644
--- a/filters/karbon/xfig/xfigimport_factory.cc
+++ b/filters/karbon/xfig/xfigimport_factory.cc
@@ -33,9 +33,9 @@ K_EXPORT_COMPONENT_FACTORY( libxfigimport, XFIGImportFactory )
 KInstance *XFIGImportFactory::s_global = 0;
 
 XFIGImportFactory::XFIGImportFactory(
-    TQObject *tqparent,
+    TQObject *parent,
     const char *name) :
-        KLibFactory(tqparent, name)
+        KLibFactory(parent, name)
 {
     s_global = new KInstance("xfigimport");
 }
@@ -47,17 +47,17 @@ XFIGImportFactory::~XFIGImportFactory()
 }
 
 TQObject *XFIGImportFactory::createObject(
-    TQObject *tqparent,
+    TQObject *parent,
     const char *name,
     const char*,
     const TQStringList &)
 {
-    if (tqparent && !tqparent->inherits("KoFilter"))
+    if (parent && !parent->inherits("KoFilter"))
     {
-	    kdDebug(30502) << "XFIGImportFactory: tqparent does not inherit KoFilter" << endl;
+	    kdDebug(30502) << "XFIGImportFactory: parent does not inherit KoFilter" << endl;
 	    return 0L;
     }
-    XFIGImport *f = new XFIGImport((KoFilter*)tqparent, name);
+    XFIGImport *f = new XFIGImport((KoFilter*)parent, name);
     return f;
 }
 
diff --git a/filters/karbon/xfig/xfigimport_factory.h b/filters/karbon/xfig/xfigimport_factory.h
index b4fe1bac..10af74a0 100644
--- a/filters/karbon/xfig/xfigimport_factory.h
+++ b/filters/karbon/xfig/xfigimport_factory.h
@@ -34,10 +34,10 @@ class XFIGImportFactory :
     Q_OBJECT
   TQ_OBJECT
 public:
-    XFIGImportFactory(TQObject* tqparent = 0, const char* name = 0);
+    XFIGImportFactory(TQObject* parent = 0, const char* name = 0);
     virtual ~XFIGImportFactory();
 
-    virtual TQObject* createObject(TQObject* tqparent = 0, const char* name = 0, const char* classname = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList());
+    virtual TQObject* createObject(TQObject* parent = 0, const char* name = 0, const char* classname = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList());
 
     static KInstance* global();