diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-10 22:19:39 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-10 22:19:39 +0000 |
commit | 04766b207afba7961d4d802313e426f5a2fbef63 (patch) | |
tree | c888ea1027c793e2d0386a7e5a1a0cd077b03cb3 /filters/karbon | |
parent | b6edfe41c9395f2e20784cbf0e630af6426950a3 (diff) | |
download | koffice-04766b207afba7961d4d802313e426f5a2fbef63.tar.gz koffice-04766b207afba7961d4d802313e426f5a2fbef63.zip |
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
Diffstat (limited to 'filters/karbon')
25 files changed, 53 insertions, 53 deletions
diff --git a/filters/karbon/ai/aiimport.h b/filters/karbon/ai/aiimport.h index 901eba6d..c305b536 100644 --- a/filters/karbon/ai/aiimport.h +++ b/filters/karbon/ai/aiimport.h @@ -33,7 +33,7 @@ class AiImport : public KoFilter TQ_OBJECT public: - AiImport( KoFilter* tqparent, const char* name, const TQStringList& ); + AiImport( KoFilter* parent, const char* name, const TQStringList& ); virtual ~AiImport(); virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); diff --git a/filters/karbon/applixgraphics/applixgraphicimport.h b/filters/karbon/applixgraphics/applixgraphicimport.h index 4b25471d..3e42256e 100644 --- a/filters/karbon/applixgraphics/applixgraphicimport.h +++ b/filters/karbon/applixgraphics/applixgraphicimport.h @@ -29,7 +29,7 @@ class APPLIXGRAPHICImport : public KoFilter { TQ_OBJECT public: - APPLIXGRAPHICImport (KoFilter *tqparent, const char *name, const TQStringList&); + APPLIXGRAPHICImport (KoFilter *parent, const char *name, const TQStringList&); virtual ~APPLIXGRAPHICImport() {} virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); diff --git a/filters/karbon/eps/epsexport.h b/filters/karbon/eps/epsexport.h index 939887c9..1313294e 100644 --- a/filters/karbon/eps/epsexport.h +++ b/filters/karbon/eps/epsexport.h @@ -43,7 +43,7 @@ class EpsExport : public KoFilter, private VVisitor TQ_OBJECT public: - EpsExport( KoFilter* tqparent, const char* name, const TQStringList& ); + EpsExport( KoFilter* parent, const char* name, const TQStringList& ); virtual ~EpsExport() {} virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); diff --git a/filters/karbon/eps/epsexportdlg.cc b/filters/karbon/eps/epsexportdlg.cc index df51b95b..220dbeba 100644 --- a/filters/karbon/eps/epsexportdlg.cc +++ b/filters/karbon/eps/epsexportdlg.cc @@ -29,8 +29,8 @@ #include "epsexportdlg.h" -EpsExportDlg::EpsExportDlg( TQWidget* tqparent, const char* name ) - : KDialogBase( tqparent, name, true, i18n( "EPS Export" ), Ok | Cancel ) +EpsExportDlg::EpsExportDlg( TQWidget* parent, const char* name ) + : KDialogBase( parent, name, true, i18n( "EPS Export" ), Ok | Cancel ) { TQVBox* page = makeVBoxMainWidget(); diff --git a/filters/karbon/eps/epsexportdlg.h b/filters/karbon/eps/epsexportdlg.h index 6850fc97..ac27c536 100644 --- a/filters/karbon/eps/epsexportdlg.h +++ b/filters/karbon/eps/epsexportdlg.h @@ -32,7 +32,7 @@ class EpsExportDlg : public KDialogBase TQ_OBJECT public: - EpsExportDlg( TQWidget* tqparent = 0L, const char* name = 0L ); + EpsExportDlg( TQWidget* parent = 0L, const char* name = 0L ); uint psLevel() const; bool exportHidden() const; diff --git a/filters/karbon/eps/epsimport.h b/filters/karbon/eps/epsimport.h index f5e17dfb..873dc169 100644 --- a/filters/karbon/eps/epsimport.h +++ b/filters/karbon/eps/epsimport.h @@ -33,7 +33,7 @@ class EpsImport : public KoFilter TQ_OBJECT public: - EpsImport( KoFilter* tqparent, const char* name, const TQStringList& ); + EpsImport( KoFilter* parent, const char* name, const TQStringList& ); virtual ~EpsImport(); virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); diff --git a/filters/karbon/kontour/kontourimport.h b/filters/karbon/kontour/kontourimport.h index 9e9bc85a..e140f088 100644 --- a/filters/karbon/kontour/kontourimport.h +++ b/filters/karbon/kontour/kontourimport.h @@ -30,7 +30,7 @@ class KontourImport : public KoFilter TQ_OBJECT public: - KontourImport(KoFilter *tqparent, const char *name, const TQStringList&); + KontourImport(KoFilter *parent, const char *name, const TQStringList&); virtual ~KontourImport(); virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to); diff --git a/filters/karbon/msod/msod.cc b/filters/karbon/msod/msod.cc index ab48642d..88e4f10b 100644 --- a/filters/karbon/msod/msod.cc +++ b/filters/karbon/msod/msod.cc @@ -1061,8 +1061,8 @@ void Msod::walk(TQ_UINT32 bytes, TQDataStream &operands) } Msod::Options::Options( - Msod &tqparent) : - m_parent(tqparent) + Msod &parent) : + m_parent(parent) { m_pVertices = 0L; initialise(); diff --git a/filters/karbon/msod/msod.h b/filters/karbon/msod/msod.h index a1243aaa..f53146bf 100644 --- a/filters/karbon/msod/msod.h +++ b/filters/karbon/msod/msod.h @@ -221,7 +221,7 @@ private: class Options { public: - Options(Msod &tqparent); + Options(Msod &parent); ~Options(); void walk( TQ_UINT32 bytes, diff --git a/filters/karbon/msod/msodimport.h b/filters/karbon/msod/msodimport.h index ec036bdf..162176de 100644 --- a/filters/karbon/msod/msodimport.h +++ b/filters/karbon/msod/msodimport.h @@ -34,7 +34,7 @@ class MSODImport : public: MSODImport( - KoFilter *tqparent, + KoFilter *parent, const char *name, const TQStringList&); virtual ~MSODImport(); @@ -66,7 +66,7 @@ protected: const TQPointArray &points); signals: - // Communication signals to the tqparent filters + // Communication signals to the parent filters void commSignalDelayStream( const char* delay ); void commSignalShapeID( unsigned int& tqshapeID ); diff --git a/filters/karbon/oodraw/oodrawimport.cc b/filters/karbon/oodraw/oodrawimport.cc index ef90c93d..90320d7e 100644 --- a/filters/karbon/oodraw/oodrawimport.cc +++ b/filters/karbon/oodraw/oodrawimport.cc @@ -229,7 +229,7 @@ KoFilter::ConversiontqStatus OoDrawImport::loadAndParse(const TQString& filename } void -OoDrawImport::parseGroup( VGroup *tqparent, const TQDomElement& parentobject ) +OoDrawImport::parseGroup( VGroup *parent, const TQDomElement& parentobject ) { // parse all objects for( TQDomNode object = parentobject.firstChild(); !object.isNull(); object = object.nextSibling() ) @@ -243,7 +243,7 @@ OoDrawImport::parseGroup( VGroup *tqparent, const TQDomElement& parentobject ) if( name == "g" ) // polyline { storeObjectStyles( o ); - VGroup *group = new VGroup( tqparent ); + VGroup *group = new VGroup( parent ); appendPen( *group ); appendBrush( *group ); obj = group; @@ -257,7 +257,7 @@ OoDrawImport::parseGroup( VGroup *tqparent, const TQDomElement& parentobject ) double w = KoUnit::parseValue( o.attributeNS( ooNS::svg, "width", TQString() ) ); double h = KoUnit::parseValue( o.attributeNS( ooNS::svg, "height", TQString() ) ); int corner = static_cast<int>( KoUnit::parseValue( o.attributeNS( ooNS::draw, "corner-radius", TQString() ) ) ); - VRectangle *rect = new VRectangle( tqparent, KoPoint( x, y ), w, h, corner ); + VRectangle *rect = new VRectangle( parent, KoPoint( x, y ), w, h, corner ); appendPen( *rect ); appendBrush( *rect ); obj = rect; @@ -282,7 +282,7 @@ OoDrawImport::parseGroup( VGroup *tqparent, const TQDomElement& parentobject ) else if( kind == "arc" ) type = VEllipse::arc; } - VEllipse *ellipse = new VEllipse( tqparent, KoPoint( x, y ), w, h, type, start, end ); + VEllipse *ellipse = new VEllipse( parent, KoPoint( x, y ), w, h, type, start, end ); appendPen( *ellipse ); // arc has no brush if( kind != "arc" ) @@ -292,7 +292,7 @@ OoDrawImport::parseGroup( VGroup *tqparent, const TQDomElement& parentobject ) else if( name == "line" ) // line { storeObjectStyles( o ); - VPath *line = new VPath( tqparent ); + VPath *line = new VPath( parent ); double x1 = KoUnit::parseValue( o.attributeNS( ooNS::svg, "x1", TQString() ) ); double y1 = ymirror( KoUnit::parseValue( o.attributeNS( ooNS::svg, "y1", TQString() ) ) ); double x2 = KoUnit::parseValue( o.attributeNS( ooNS::svg, "x2", TQString() ) ); @@ -306,7 +306,7 @@ OoDrawImport::parseGroup( VGroup *tqparent, const TQDomElement& parentobject ) else if( name == "polyline" ) // polyline { storeObjectStyles( o ); - VPath *polyline = new VPath( tqparent ); + VPath *polyline = new VPath( parent ); appendPoints( *polyline, o); appendPen( *polyline ); appendBrush( *polyline ); @@ -315,9 +315,9 @@ OoDrawImport::parseGroup( VGroup *tqparent, const TQDomElement& parentobject ) else if( name == "polygon" ) // polygon { storeObjectStyles( o ); - //VPolygon *polygon = new VPolygon( tqparent ); + //VPolygon *polygon = new VPolygon( parent ); //polygon->load( o ); - VPath *polygon = new VPath( tqparent ); + VPath *polygon = new VPath( parent ); appendPoints( *polygon, o ); appendPen( *polygon ); appendBrush( *polygon ); @@ -326,7 +326,7 @@ OoDrawImport::parseGroup( VGroup *tqparent, const TQDomElement& parentobject ) else if( name == "path" ) // path { storeObjectStyles( o ); - VPath *path = new VPath( tqparent ); + VPath *path = new VPath( parent ); path->loadSvgPath( o.attributeNS( ooNS::svg, "d", TQString() ) ); KoRect rect = parseViewBox( o ); double x = KoUnit::parseValue( o.attributeNS( ooNS::svg, "x", TQString() ) ); @@ -353,8 +353,8 @@ appendImage( doc, e, pictureElement, o ); kdDebug() << "Unsupported object '" << name << "'" << endl; continue; } - if( tqparent && obj ) - tqparent->append( obj ); + if( parent && obj ) + parent->append( obj ); else if( obj ) m_document.append( obj ); } @@ -636,9 +636,9 @@ OoDrawImport::fillStyleStack( const TQDomElement& object ) void OoDrawImport::addStyles( const TQDomElement* style ) { - // this function is necessary as tqparent styles can have parents themself - if( style->hasAttributeNS( ooNS::style, "tqparent-style-name" ) ) - addStyles( m_styles[style->attributeNS( ooNS::style, "tqparent-style-name", TQString() )] ); + // this function is necessary as parent styles can have parents themself + if( style->hasAttributeNS( ooNS::style, "parent-style-name" ) ) + addStyles( m_styles[style->attributeNS( ooNS::style, "parent-style-name", TQString() )] ); m_styleStack.push( *style ); } diff --git a/filters/karbon/oodraw/oodrawimport.h b/filters/karbon/oodraw/oodrawimport.h index ea29b276..2b395f48 100644 --- a/filters/karbon/oodraw/oodrawimport.h +++ b/filters/karbon/oodraw/oodrawimport.h @@ -40,7 +40,7 @@ class OoDrawImport : public KoFilter Q_OBJECT TQ_OBJECT public: - OoDrawImport( KoFilter *tqparent, const char *name, const TQStringList & ); + OoDrawImport( KoFilter *parent, const char *name, const TQStringList & ); virtual ~OoDrawImport(); virtual KoFilter::ConversiontqStatus convert( TQCString const & from, TQCString const & to ); @@ -58,7 +58,7 @@ private: void appendBrush( VObject &obj ); void appendPoints(VPath &path, const TQDomElement& object); void convert(); - void parseGroup( VGroup *tqparent, const TQDomElement& object ); + void parseGroup( VGroup *parent, const TQDomElement& object ); void parseColor( VColor &color, const TQString &s ); double ymirror( double y ); KoRect parseViewBox( const TQDomElement& object ); diff --git a/filters/karbon/png/pngexport.h b/filters/karbon/png/pngexport.h index 9fe9f7eb..3758daa3 100644 --- a/filters/karbon/png/pngexport.h +++ b/filters/karbon/png/pngexport.h @@ -30,7 +30,7 @@ class PngExport : public KoFilter, private VVisitor TQ_OBJECT public: - PngExport( KoFilter* tqparent, const char* name, const TQStringList& ); + PngExport( KoFilter* parent, const char* name, const TQStringList& ); virtual ~PngExport() {} virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); diff --git a/filters/karbon/svg/svgexport.h b/filters/karbon/svg/svgexport.h index 6a79fb07..6bfe5d98 100644 --- a/filters/karbon/svg/svgexport.h +++ b/filters/karbon/svg/svgexport.h @@ -49,7 +49,7 @@ class SvgExport : public KoFilter, private VVisitor TQ_OBJECT public: - SvgExport( KoFilter* tqparent, const char* name, const TQStringList& ); + SvgExport( KoFilter* parent, const char* name, const TQStringList& ); virtual ~SvgExport() {} virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); diff --git a/filters/karbon/svg/svgimport.h b/filters/karbon/svg/svgimport.h index 24857b65..e4e3f56a 100644 --- a/filters/karbon/svg/svgimport.h +++ b/filters/karbon/svg/svgimport.h @@ -42,7 +42,7 @@ class SvgImport : public KoFilter TQ_OBJECT public: - SvgImport(KoFilter *tqparent, const char *name, const TQStringList&); + SvgImport(KoFilter *parent, const char *name, const TQStringList&); virtual ~SvgImport(); virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to); diff --git a/filters/karbon/wmf/wmfexport.h b/filters/karbon/wmf/wmfexport.h index 9d7bf9cb..e0c9be57 100644 --- a/filters/karbon/wmf/wmfexport.h +++ b/filters/karbon/wmf/wmfexport.h @@ -38,7 +38,7 @@ class WmfExport : public KoFilter, private VVisitor TQ_OBJECT public: - WmfExport( KoFilter *tqparent, const char *name, const TQStringList&); + WmfExport( KoFilter *parent, const char *name, const TQStringList&); virtual ~WmfExport(); virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); diff --git a/filters/karbon/wmf/wmfimport.h b/filters/karbon/wmf/wmfimport.h index 45ddefec..21bcee74 100644 --- a/filters/karbon/wmf/wmfimport.h +++ b/filters/karbon/wmf/wmfimport.h @@ -33,7 +33,7 @@ class WMFImport : public KoFilter TQ_OBJECT public: - WMFImport( KoFilter *tqparent, const char *name, const TQStringList&); + WMFImport( KoFilter *parent, const char *name, const TQStringList&); virtual ~WMFImport(); virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); diff --git a/filters/karbon/xaml/xamlexport.h b/filters/karbon/xaml/xamlexport.h index cb762a8d..b1a0f4fd 100644 --- a/filters/karbon/xaml/xamlexport.h +++ b/filters/karbon/xaml/xamlexport.h @@ -47,7 +47,7 @@ class XAMLExport : public KoFilter, private VVisitor TQ_OBJECT public: - XAMLExport( KoFilter* tqparent, const char* name, const TQStringList& ); + XAMLExport( KoFilter* parent, const char* name, const TQStringList& ); virtual ~XAMLExport() {} virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); diff --git a/filters/karbon/xaml/xamlimport.h b/filters/karbon/xaml/xamlimport.h index 83f11fc8..b61313b9 100644 --- a/filters/karbon/xaml/xamlimport.h +++ b/filters/karbon/xaml/xamlimport.h @@ -40,7 +40,7 @@ class XAMLImport : public KoFilter TQ_OBJECT public: - XAMLImport(KoFilter *tqparent, const char *name, const TQStringList&); + XAMLImport(KoFilter *parent, const char *name, const TQStringList&); virtual ~XAMLImport(); virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to); diff --git a/filters/karbon/xcf/xcfexport.cc b/filters/karbon/xcf/xcfexport.cc index d5a0c71b..3e9237fb 100644 --- a/filters/karbon/xcf/xcfexport.cc +++ b/filters/karbon/xcf/xcfexport.cc @@ -223,21 +223,21 @@ XcfExport::visitVLayer( VLayer& layer ) // False. *m_stream << static_cast<TQ_UINT32>( 0 ); - // Apply tqmask? + // Apply mask? *m_stream << static_cast<TQ_UINT32>( 11 ); // Property size in bytes. *m_stream << static_cast<TQ_UINT32>( 4 ); // False. *m_stream << static_cast<TQ_UINT32>( 0 ); - // Edit tqmask? + // Edit mask? *m_stream << static_cast<TQ_UINT32>( 12 ); // Property size in bytes. *m_stream << static_cast<TQ_UINT32>( 4 ); // False. *m_stream << static_cast<TQ_UINT32>( 0 ); - // Show tqmask? + // Show mask? *m_stream << static_cast<TQ_UINT32>( 13 ); // Property size in bytes. *m_stream << static_cast<TQ_UINT32>( 4 ); @@ -302,7 +302,7 @@ XcfExport::visitVLayer( VLayer& layer ) *m_stream << start; - // Append a zero offset to indicate end of layer tqmask offsets. + // Append a zero offset to indicate end of layer mask offsets. *m_stream << static_cast<TQ_UINT32>( 0 ); } diff --git a/filters/karbon/xcf/xcfexport.h b/filters/karbon/xcf/xcfexport.h index 0c60dd4e..82d86883 100644 --- a/filters/karbon/xcf/xcfexport.h +++ b/filters/karbon/xcf/xcfexport.h @@ -37,7 +37,7 @@ class XcfExport : public KoFilter, private VVisitor TQ_OBJECT public: - XcfExport( KoFilter* tqparent, const char* name, const TQStringList& ); + XcfExport( KoFilter* parent, const char* name, const TQStringList& ); virtual ~XcfExport() {} virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to ); 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(); |