diff options
author | Tor Lillqvist <tml@collabora.com> | 2015-04-28 23:09:13 +0300 |
---|---|---|
committer | Tor Lillqvist <tml@collabora.com> | 2015-04-30 07:27:52 +0300 |
commit | d883c12556a71c5d3719454b1f95809a505f0ace (patch) | |
tree | 6f0c1cc518a3727db95b72d609ec9db793041b20 /include | |
parent | d1ca0f4ed0e30394ce6759a20d4896651dd43051 (diff) |
Get rid of the initial :: for the vcl namespace
We used it all over the place without leading :: already anyway, even
in many files in include. So let's be consistent. In the majority of
cases, prefer the easier-on-the-eyes choice, not the "safe" one.
In those files in include where *all* existing uses of ::vcl:: indeed
used the :: prefix, there let's keep it for consistency.
Change-Id: If99cb41d3bf290d38c601d91125c3c8d935e61d0
Diffstat (limited to 'include')
-rw-r--r-- | include/svtools/acceleratorexecute.hxx | 2 | ||||
-rw-r--r-- | include/svtools/treelistbox.hxx | 10 | ||||
-rw-r--r-- | include/svx/svdhdl.hxx | 5 | ||||
-rw-r--r-- | include/toolkit/helper/formpdfexport.hxx | 2 | ||||
-rw-r--r-- | include/vcl/ctrl.hxx | 4 | ||||
-rw-r--r-- | include/vcl/font.hxx | 4 | ||||
-rw-r--r-- | include/vcl/lazydelete.hxx | 2 | ||||
-rw-r--r-- | include/vcl/outdev.hxx | 10 | ||||
-rw-r--r-- | include/vcl/quickselectionengine.hxx | 2 |
9 files changed, 18 insertions, 23 deletions
diff --git a/include/svtools/acceleratorexecute.hxx b/include/svtools/acceleratorexecute.hxx index cb47ade1e7ec..f42bc2afd339 100644 --- a/include/svtools/acceleratorexecute.hxx +++ b/include/svtools/acceleratorexecute.hxx @@ -106,7 +106,7 @@ class SVT_DLLPUBLIC AcceleratorExecute : private TMutexInit /** @deprecated replaced by internal class AsyncAccelExec ... remove this resource here if we go forwards to next major */ - ::vcl::EventPoster m_aAsyncCallback; + vcl::EventPoster m_aAsyncCallback; // interface diff --git a/include/svtools/treelistbox.hxx b/include/svtools/treelistbox.hxx index 4fbda0bb18b3..63318874f88c 100644 --- a/include/svtools/treelistbox.hxx +++ b/include/svtools/treelistbox.hxx @@ -238,8 +238,8 @@ class SVT_DLLPUBLIC SvTreeListBox ,public SvListView ,public DropTargetHelper ,public DragSourceHelper - ,public ::vcl::IMnemonicEntryList - ,public ::vcl::ISearchableStringList + ,public vcl::IMnemonicEntryList + ,public vcl::ISearchableStringList { friend class SvImpLBox; friend class TreeControlPeer; @@ -364,9 +364,9 @@ protected: virtual void ExecuteSearchEntry( const void* _pEntry ) const SAL_OVERRIDE; // ISearchableStringList - virtual ::vcl::StringEntryIdentifier CurrentEntry( OUString& _out_entryText ) const SAL_OVERRIDE; - virtual ::vcl::StringEntryIdentifier NextEntry( ::vcl::StringEntryIdentifier _currentEntry, OUString& _out_entryText ) const SAL_OVERRIDE; - virtual void SelectEntry( ::vcl::StringEntryIdentifier _entry ) SAL_OVERRIDE; + virtual vcl::StringEntryIdentifier CurrentEntry( OUString& _out_entryText ) const SAL_OVERRIDE; + virtual vcl::StringEntryIdentifier NextEntry( vcl::StringEntryIdentifier _currentEntry, OUString& _out_entryText ) const SAL_OVERRIDE; + virtual void SelectEntry( vcl::StringEntryIdentifier _entry ) SAL_OVERRIDE; public: diff --git a/include/svx/svdhdl.hxx b/include/svx/svdhdl.hxx index e945f0b2bf26..6310077ac3fc 100644 --- a/include/svx/svdhdl.hxx +++ b/include/svx/svdhdl.hxx @@ -34,18 +34,13 @@ #include <svx/svxdllapi.h> #include <deque> -class VirtualDevice; class OutputDevice; -namespace vcl { class Region; } -namespace vcl { class Window; } class SdrHdlList; class SdrMarkView; class SdrObject; class SdrPageView; class MouseEvent; - - // Every object must be able to create its handles. They will be fetched on // selection, registered at the View and made visible. // Wird ein Handle von der Maus beruehrt (IsHit()), so wird von der View der diff --git a/include/toolkit/helper/formpdfexport.hxx b/include/toolkit/helper/formpdfexport.hxx index 10300d87940e..569372f9e3d7 100644 --- a/include/toolkit/helper/formpdfexport.hxx +++ b/include/toolkit/helper/formpdfexport.hxx @@ -42,7 +42,7 @@ namespace toolkitform */ std::unique_ptr<vcl::PDFWriter::AnyWidget> TOOLKIT_DLLPUBLIC describePDFControl( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >& _rxControl, - ::vcl::PDFExtOutDevData& i_pdfExportData + vcl::PDFExtOutDevData& i_pdfExportData ); diff --git a/include/vcl/ctrl.hxx b/include/vcl/ctrl.hxx index 4d1f9030a074..f3fd7026472b 100644 --- a/include/vcl/ctrl.hxx +++ b/include/vcl/ctrl.hxx @@ -37,7 +37,7 @@ class StyleSettings; class VCL_DLLPUBLIC Control : public vcl::Window { protected: - ::vcl::ImplControlData* mpControlData; + vcl::ImplControlData* mpControlData; private: bool mbHasControlFocus; @@ -61,7 +61,7 @@ protected: /// determines whether we currently have layout data bool HasLayoutData() const; /// returns the current layout data - ::vcl::ControlLayoutData* + vcl::ControlLayoutData* GetLayoutData() const; /** this calls both our event listeners, and a specified handler diff --git a/include/vcl/font.hxx b/include/vcl/font.hxx index da9ae54480ea..9c91995b4f5c 100644 --- a/include/vcl/font.hxx +++ b/include/vcl/font.hxx @@ -133,8 +133,8 @@ public: { return !(Font::operator==( rFont )); } bool IsSameInstance( const Font& ) const; - friend VCL_DLLPUBLIC SvStream& ::ReadFont( SvStream& rIStm, ::vcl::Font& ); - friend VCL_DLLPUBLIC SvStream& ::WriteFont( SvStream& rOStm, const ::vcl::Font& ); + friend VCL_DLLPUBLIC SvStream& ::ReadFont( SvStream& rIStm, vcl::Font& ); + friend VCL_DLLPUBLIC SvStream& ::WriteFont( SvStream& rOStm, const vcl::Font& ); static Font identifyFont( const void* pBuffer, sal_uInt32 nLen ); }; diff --git a/include/vcl/lazydelete.hxx b/include/vcl/lazydelete.hxx index 08da855ac360..ccefc6285b56 100644 --- a/include/vcl/lazydelete.hxx +++ b/include/vcl/lazydelete.hxx @@ -269,7 +269,7 @@ namespace vcl \<do something with xFactory> */ template <typename I> - class DeleteUnoReferenceOnDeinit : public ::vcl::DeleteOnDeinitBase + class DeleteUnoReferenceOnDeinit : public vcl::DeleteOnDeinitBase { ::com::sun::star::uno::Reference<I> m_xI; virtual void doCleanup() SAL_OVERRIDE { set(NULL); } diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx index 16f44b8085f5..4259258ad133 100644 --- a/include/vcl/outdev.hxx +++ b/include/vcl/outdev.hxx @@ -940,11 +940,11 @@ public: void DrawText( const Rectangle& rRect, const OUString& rStr, sal_uInt16 nStyle = 0, MetricVector* pVector = NULL, OUString* pDisplayText = NULL, - ::vcl::ITextLayout* _pTextLayout = NULL ); + vcl::ITextLayout* _pTextLayout = NULL ); static void ImplDrawText( OutputDevice& rTargetDevice, const Rectangle& rRect, const OUString& rOrigStr, sal_uInt16 nStyle, - MetricVector* pVector, OUString* pDisplayText, ::vcl::ITextLayout& _rLayout ); + MetricVector* pVector, OUString* pDisplayText, vcl::ITextLayout& _rLayout ); void ImplDrawText( SalLayout& ); @@ -974,7 +974,7 @@ public: Rectangle GetTextRect( const Rectangle& rRect, const OUString& rStr, sal_uInt16 nStyle = TEXT_DRAW_WORDBREAK, TextRectInfo* pInfo = NULL, - const ::vcl::ITextLayout* _pTextLayout = NULL ) const; + const vcl::ITextLayout* _pTextLayout = NULL ) const; /** Return the exact bounding rectangle of rStr. @@ -1157,7 +1157,7 @@ private: SAL_DLLPRIVATE static bool ImplIsUnderlineAbove( const vcl::Font& ); static - SAL_DLLPRIVATE long ImplGetTextLines( ImplMultiTextLineInfo& rLineInfo, long nWidth, const OUString& rStr, sal_uInt16 nStyle, const ::vcl::ITextLayout& _rLayout ); + SAL_DLLPRIVATE long ImplGetTextLines( ImplMultiTextLineInfo& rLineInfo, long nWidth, const OUString& rStr, sal_uInt16 nStyle, const vcl::ITextLayout& _rLayout ); ///@} @@ -1258,7 +1258,7 @@ private: static SAL_DLLPRIVATE OUString ImplGetEllipsisString( const OutputDevice& rTargetDevice, const OUString& rStr, - long nMaxWidth, sal_uInt16 nStyle, const ::vcl::ITextLayout& _rLayout ); + long nMaxWidth, sal_uInt16 nStyle, const vcl::ITextLayout& _rLayout ); SAL_DLLPRIVATE void ImplDrawEmphasisMark( long nBaseX, long nX, long nY, const tools::PolyPolygon& rPolyPoly, bool bPolyLine, const Rectangle& rRect1, const Rectangle& rRect2 ); SAL_DLLPRIVATE void ImplDrawEmphasisMarks( SalLayout& ); diff --git a/include/vcl/quickselectionengine.hxx b/include/vcl/quickselectionengine.hxx index 3c33172a1667..d68b4fa8bbe4 100644 --- a/include/vcl/quickselectionengine.hxx +++ b/include/vcl/quickselectionengine.hxx @@ -36,7 +36,7 @@ namespace vcl //= ISearchableStringList - // TODO: consolidate this with ::vcl::IMnemonicEntryList + // TODO: consolidate this with vcl::IMnemonicEntryList class SAL_NO_VTABLE VCL_DLLPUBLIC ISearchableStringList { public: |