diff options
| author | Tor Lillqvist <tml@collabora.com> | 2015-07-27 12:59:03 +0300 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2015-07-28 07:27:10 +0000 |
| commit | c1780b4c9217b3b5374907b7e537f481ed2c680e (patch) | |
| tree | 7cae90d8bd8d7e9e27a4a64d46e4981a464eef8e | |
| parent | 506be190a9c0aa682c8c3a681a567966353afca8 (diff) | |
Avoid uncommon C++ style of forward declaration combined with its use
Change-Id: I870821ec64653391caf516cbd3aa890637d7dd24
Reviewed-on: https://gerrit.libreoffice.org/17367
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
| -rw-r--r-- | vcl/inc/generic/glyphcache.hxx | 3 | ||||
| -rw-r--r-- | vcl/inc/quartz/salgdi.h | 3 | ||||
| -rw-r--r-- | vcl/unx/generic/dtrans/X11_selection.hxx | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/vcl/inc/generic/glyphcache.hxx b/vcl/inc/generic/glyphcache.hxx index 0a352a16adfa..98baaaaba546 100644 --- a/vcl/inc/generic/glyphcache.hxx +++ b/vcl/inc/generic/glyphcache.hxx @@ -37,6 +37,7 @@ #include <unordered_map> +class FreetypeManager; class FtFontInfo; class GlyphCachePeer; class GlyphData; @@ -99,7 +100,7 @@ private: mutable int mnGlyphCount; ServerFont* mpCurrentGCFont; - class FreetypeManager* mpFtManager; + FreetypeManager* mpFtManager; }; class GlyphMetric diff --git a/vcl/inc/quartz/salgdi.h b/vcl/inc/quartz/salgdi.h index c378f202509e..557d1496499b 100644 --- a/vcl/inc/quartz/salgdi.h +++ b/vcl/inc/quartz/salgdi.h @@ -48,6 +48,7 @@ class AquaSalFrame; class ImplDevFontAttributes; class CoreTextStyle; +class XorEmulation; typedef sal_uInt32 sal_GlyphId; typedef std::vector<unsigned char> ByteVector; @@ -146,7 +147,7 @@ protected: CGLayerRef mxLayer; // Quartz graphics layer CGContextRef mrContext; // Quartz drawing context int mnContextStackDepth; - class XorEmulation* mpXorEmulation; + XorEmulation* mpXorEmulation; int mnXorMode; // 0: off 1: on 2: invert only int mnWidth; int mnHeight; diff --git a/vcl/unx/generic/dtrans/X11_selection.hxx b/vcl/unx/generic/dtrans/X11_selection.hxx index 616b17fd05e0..f91d0fd14794 100644 --- a/vcl/unx/generic/dtrans/X11_selection.hxx +++ b/vcl/unx/generic/dtrans/X11_selection.hxx @@ -47,6 +47,7 @@ namespace x11 { class PixmapHolder; // in bmp.hxx + class SelectionManager; rtl_TextEncoding getTextPlainEncoding( const OUString& rMimeType ); @@ -76,7 +77,7 @@ namespace x11 { bool m_bActive; sal_Int8 m_nDefaultActions; ::Window m_aTargetWindow; - class SelectionManager* m_pSelectionManager; + SelectionManager* m_pSelectionManager; css::uno::Reference< css::datatransfer::dnd::XDragSource > m_xSelectionManager; ::std::list< css::uno::Reference< css::datatransfer::dnd::XDropTargetListener > > |