summaryrefslogtreecommitdiff
path: root/include/vcl
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-01-14 13:52:54 +0200
committerMichael Stahl <mstahl@redhat.com>2014-01-16 16:08:34 +0100
commitc648d0872058941ed18499a8bf1993037d9b5532 (patch)
tree47121b3eff267e34480335130106ca1c33be6fd9 /include/vcl
parent70f360f34a9f6605864644feee3c9b9b6ffb79a1 (diff)
convert SvStream::operator<< overloads to more explicit methods
This is in preparation for more conversion of SvStream::operator<< calls to use more explicit method names. This converts the subclasses that have their own convenience overloads of operator<< to use normal methods. Change-Id: I5efd5d9a24c264cb86d2471303dd5849bf91ba80
Diffstat (limited to 'include/vcl')
-rw-r--r--include/vcl/animate.hxx2
-rw-r--r--include/vcl/font.hxx2
-rw-r--r--include/vcl/gdimtf.hxx2
-rw-r--r--include/vcl/gfxlink.hxx2
-rw-r--r--include/vcl/gradient.hxx4
-rw-r--r--include/vcl/graph.hxx2
-rw-r--r--include/vcl/graphictools.hxx4
-rw-r--r--include/vcl/hatch.hxx4
-rw-r--r--include/vcl/jobset.hxx2
-rw-r--r--include/vcl/lineinfo.hxx4
-rw-r--r--include/vcl/mapmod.hxx4
-rw-r--r--include/vcl/print.hxx2
-rw-r--r--include/vcl/region.hxx2
-rw-r--r--include/vcl/wall.hxx2
14 files changed, 19 insertions, 19 deletions
diff --git a/include/vcl/animate.hxx b/include/vcl/animate.hxx
index 3bf7ae094017..966703832b1f 100644
--- a/include/vcl/animate.hxx
+++ b/include/vcl/animate.hxx
@@ -230,7 +230,7 @@ public:
);
friend VCL_DLLPUBLIC SvStream& operator>>( SvStream& rIStream, Animation& rAnimation );
- friend VCL_DLLPUBLIC SvStream& operator<<( SvStream& rOStream, const Animation& rAnimation );
+ friend VCL_DLLPUBLIC SvStream& WriteAnimation( SvStream& rOStream, const Animation& rAnimation );
};
#endif // INCLUDED_VCL_ANIMATE_HXX
diff --git a/include/vcl/font.hxx b/include/vcl/font.hxx
index 9da08b12b149..1aa1cd113971 100644
--- a/include/vcl/font.hxx
+++ b/include/vcl/font.hxx
@@ -132,7 +132,7 @@ public:
sal_Bool IsSameInstance( const Font& ) const;
friend VCL_DLLPUBLIC SvStream& operator>>( SvStream& rIStm, Font& );
- friend VCL_DLLPUBLIC SvStream& operator<<( SvStream& rOStm, const Font& );
+ friend VCL_DLLPUBLIC SvStream& WriteFont( SvStream& rOStm, const Font& );
static Font identifyFont( const void* pBuffer, sal_uInt32 nLen );
};
diff --git a/include/vcl/gdimtf.hxx b/include/vcl/gdimtf.hxx
index 8afdc1478211..d14d6a2a50bf 100644
--- a/include/vcl/gdimtf.hxx
+++ b/include/vcl/gdimtf.hxx
@@ -211,7 +211,7 @@ public:
// Stream-operators write (still) the old format
// and read both the old and the new format
friend VCL_DLLPUBLIC SvStream& operator>>( SvStream& rIStm, GDIMetaFile& rGDIMetaFile );
- friend VCL_DLLPUBLIC SvStream& operator<<( SvStream& rOStm, const GDIMetaFile& rGDIMetaFile );
+ friend VCL_DLLPUBLIC SvStream& WriteGDIMetaFile( SvStream& rOStm, const GDIMetaFile& rGDIMetaFile );
sal_Bool CreateThumbnail( sal_uInt32 nMaximumExtent, BitmapEx& rBmpEx, const BitmapEx* pOverlay = NULL, const Rectangle* pOverlayRect = NULL ) const;
diff --git a/include/vcl/gfxlink.hxx b/include/vcl/gfxlink.hxx
index 80187b1b5c75..15c91705b2e9 100644
--- a/include/vcl/gfxlink.hxx
+++ b/include/vcl/gfxlink.hxx
@@ -173,7 +173,7 @@ public:
public:
- friend VCL_DLLPUBLIC SvStream& operator<<( SvStream& rOStream, const GfxLink& rGfxLink );
+ friend VCL_DLLPUBLIC SvStream& WriteGfxLink( SvStream& rOStream, const GfxLink& rGfxLink );
friend VCL_DLLPUBLIC SvStream& operator>>( SvStream& rIStream, GfxLink& rGfxLink );
};
diff --git a/include/vcl/gradient.hxx b/include/vcl/gradient.hxx
index 3e2cb74e98f7..e0cb0f4fdce0 100644
--- a/include/vcl/gradient.hxx
+++ b/include/vcl/gradient.hxx
@@ -50,7 +50,7 @@ public:
sal_uInt16 mnStepCount;
friend SvStream& operator>>( SvStream& rIStm, Impl_Gradient& rImplGradient );
- friend SvStream& operator<<( SvStream& rOStm, const Impl_Gradient& rImplGradient );
+ friend SvStream& WriteImpl_Gradient( SvStream& rOStm, const Impl_Gradient& rImplGradient );
Impl_Gradient();
Impl_Gradient( const Impl_Gradient& rImplGradient );
@@ -110,7 +110,7 @@ public:
{ return (mpImplGradient == rGradient.mpImplGradient); }
friend VCL_DLLPUBLIC SvStream& operator>>( SvStream& rIStm, Gradient& rGradient );
- friend VCL_DLLPUBLIC SvStream& operator<<( SvStream& rOStm, const Gradient& rGradient );
+ friend VCL_DLLPUBLIC SvStream& WriteGradient( SvStream& rOStm, const Gradient& rGradient );
};
#endif // INCLUDED_VCL_GRADIENT_HXX
diff --git a/include/vcl/graph.hxx b/include/vcl/graph.hxx
index 4217f6437047..12221ece82d6 100644
--- a/include/vcl/graph.hxx
+++ b/include/vcl/graph.hxx
@@ -188,7 +188,7 @@ public:
sal_Bool ExportNative( SvStream& rOStream ) const;
- friend VCL_DLLPUBLIC SvStream& operator<<( SvStream& rOStream, const Graphic& rGraphic );
+ friend VCL_DLLPUBLIC SvStream& WriteGraphic( SvStream& rOStream, const Graphic& rGraphic );
friend VCL_DLLPUBLIC SvStream& operator>>( SvStream& rIStream, Graphic& rGraphic );
public:
diff --git a/include/vcl/graphictools.hxx b/include/vcl/graphictools.hxx
index ee24b128ff9e..ff170f56a255 100644
--- a/include/vcl/graphictools.hxx
+++ b/include/vcl/graphictools.hxx
@@ -175,7 +175,7 @@ public:
private:
// friends
- VCL_DLLPUBLIC friend SvStream& operator<<( SvStream& rOStm, const SvtGraphicStroke& rClass );
+ VCL_DLLPUBLIC friend SvStream& WriteSvtGraphicStroke( SvStream& rOStm, const SvtGraphicStroke& rClass );
VCL_DLLPUBLIC friend SvStream& operator>>( SvStream& rIStm, SvtGraphicStroke& rClass );
Polygon maPath;
@@ -352,7 +352,7 @@ public:
private:
// friends
- VCL_DLLPUBLIC friend SvStream& operator<<( SvStream& rOStm, const SvtGraphicFill& rClass );
+ VCL_DLLPUBLIC friend SvStream& WriteSvtGraphicFill( SvStream& rOStm, const SvtGraphicFill& rClass );
VCL_DLLPUBLIC friend SvStream& operator>>( SvStream& rIStm, SvtGraphicFill& rClass );
PolyPolygon maPath;
diff --git a/include/vcl/hatch.hxx b/include/vcl/hatch.hxx
index 08dab0b08083..da669b3ad1e6 100644
--- a/include/vcl/hatch.hxx
+++ b/include/vcl/hatch.hxx
@@ -43,7 +43,7 @@ struct ImplHatch
ImplHatch( const ImplHatch& rImplHatch );
friend SvStream& operator>>( SvStream& rIStm, ImplHatch& rImplHatch );
- friend SvStream& operator<<( SvStream& rOStm, const ImplHatch& rImplHatch );
+ friend SvStream& WriteImplHatch( SvStream& rOStm, const ImplHatch& rImplHatch );
};
// ---------
@@ -81,7 +81,7 @@ public:
sal_uInt16 GetAngle() const { return mpImplHatch->mnAngle; }
friend VCL_DLLPUBLIC SvStream& operator>>( SvStream& rIStm, Hatch& rHatch );
- friend VCL_DLLPUBLIC SvStream& operator<<( SvStream& rOStm, const Hatch& rHatch );
+ friend VCL_DLLPUBLIC SvStream& WriteHatch( SvStream& rOStm, const Hatch& rHatch );
};
#endif // INCLUDED_VCL_HATCH_HXX
diff --git a/include/vcl/jobset.hxx b/include/vcl/jobset.hxx
index a5caf7b3ef1d..1732ae920b25 100644
--- a/include/vcl/jobset.hxx
+++ b/include/vcl/jobset.hxx
@@ -66,7 +66,7 @@ public:
{ return !(JobSetup::operator==( rJobSetup )); }
friend VCL_DLLPUBLIC SvStream& operator>>( SvStream& rIStream, JobSetup& rJobSetup );
- friend VCL_DLLPUBLIC SvStream& operator<<( SvStream& rOStream, const JobSetup& rJobSetup );
+ friend VCL_DLLPUBLIC SvStream& WriteJobSetup( SvStream& rOStream, const JobSetup& rJobSetup );
};
#endif // INCLUDED_VCL_JOBSET_HXX
diff --git a/include/vcl/lineinfo.hxx b/include/vcl/lineinfo.hxx
index b1ce3bd39811..e1989704c336 100644
--- a/include/vcl/lineinfo.hxx
+++ b/include/vcl/lineinfo.hxx
@@ -53,7 +53,7 @@ struct ImplLineInfo
bool operator==( const ImplLineInfo& ) const;
friend SvStream& operator>>( SvStream& rIStm, ImplLineInfo& rImplLineInfo );
- friend SvStream& operator<<( SvStream& rOStm, const ImplLineInfo& rImplLineInfo );
+ friend SvStream& WriteImplLineInfo( SvStream& rOStm, const ImplLineInfo& rImplLineInfo );
};
// ------------
@@ -109,7 +109,7 @@ public:
sal_Bool IsDefault() const;
friend VCL_DLLPUBLIC SvStream& operator>>( SvStream& rIStm, LineInfo& rLineInfo );
- friend VCL_DLLPUBLIC SvStream& operator<<( SvStream& rOStm, const LineInfo& rLineInfo );
+ friend VCL_DLLPUBLIC SvStream& WriteLineInfo( SvStream& rOStm, const LineInfo& rLineInfo );
// helper to get decomposed polygon data with the LineInfo applied. The source
// hairline polygon is given in io_rLinePolyPolygon. Both given polygons may
diff --git a/include/vcl/mapmod.hxx b/include/vcl/mapmod.hxx
index d2b2cd232771..17beccf14123 100644
--- a/include/vcl/mapmod.hxx
+++ b/include/vcl/mapmod.hxx
@@ -49,7 +49,7 @@ private:
sal_Bool mbSimple;
friend SvStream& operator>>( SvStream& rIStm, ImplMapMode& rMapMode );
- friend SvStream& operator<<( SvStream& rOStm, const ImplMapMode& rMapMode );
+ friend SvStream& WriteImplMapMode( SvStream& rOStm, const ImplMapMode& rMapMode );
static ImplMapMode* ImplGetStaticMapMode( MapUnit eUnit );
public:
@@ -102,7 +102,7 @@ public:
{ return (mpImplMapMode == rMapMode.mpImplMapMode); }
friend VCL_DLLPUBLIC SvStream& operator>>( SvStream& rIStm, MapMode& rMapMode );
- friend VCL_DLLPUBLIC SvStream& operator<<( SvStream& rOStm, const MapMode& rMapMode );
+ friend VCL_DLLPUBLIC SvStream& WriteMapMode( SvStream& rOStm, const MapMode& rMapMode );
};
#endif // INCLUDED_VCL_MAPMOD_HXX
diff --git a/include/vcl/print.hxx b/include/vcl/print.hxx
index f4537fec77e8..44ffa713527a 100644
--- a/include/vcl/print.hxx
+++ b/include/vcl/print.hxx
@@ -115,7 +115,7 @@ public:
bool operator==( const QueueInfo& rInfo ) const;
friend VCL_DLLPUBLIC SvStream& operator>>( SvStream& rIStream, QueueInfo& rInfo );
- friend VCL_DLLPUBLIC SvStream& operator<<( SvStream& rOStream, const QueueInfo& rInfo );
+ friend VCL_DLLPUBLIC SvStream& WriteQueueInfo( SvStream& rOStream, const QueueInfo& rInfo );
};
// ------------------
diff --git a/include/vcl/region.hxx b/include/vcl/region.hxx
index c9ab0c78afc3..7daa349d79d9 100644
--- a/include/vcl/region.hxx
+++ b/include/vcl/region.hxx
@@ -117,7 +117,7 @@ public:
bool operator!=( const Region& rRegion ) const { return !(Region::operator==( rRegion )); }
friend VCL_DLLPUBLIC SvStream& operator>>( SvStream& rIStm, Region& rRegion );
- friend VCL_DLLPUBLIC SvStream& operator<<( SvStream& rOStm, const Region& rRegion );
+ friend VCL_DLLPUBLIC SvStream& WriteRegion( SvStream& rOStm, const Region& rRegion );
/* workaround: faster conversion for PolyPolygons
* if half of the Polygons contained in rPolyPoly are actually
diff --git a/include/vcl/wall.hxx b/include/vcl/wall.hxx
index cf230c528d21..46cfbb7c6d77 100644
--- a/include/vcl/wall.hxx
+++ b/include/vcl/wall.hxx
@@ -125,7 +125,7 @@ public:
{ return (mpImplWallpaper == rWallpaper.mpImplWallpaper); }
friend VCL_DLLPUBLIC SvStream& operator>>( SvStream& rIStm, Wallpaper& rWallpaper );
- friend VCL_DLLPUBLIC SvStream& operator<<( SvStream& rOStm, const Wallpaper& rWallpaper );
+ friend VCL_DLLPUBLIC SvStream& WriteWallpaper( SvStream& rOStm, const Wallpaper& rWallpaper );
};
#endif // INCLUDED_VCL_WALL_HXX