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 /svtools | |
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 'svtools')
-rw-r--r-- | svtools/source/contnr/imivctl.hxx | 2 | ||||
-rw-r--r-- | svtools/source/contnr/imivctl1.cxx | 2 | ||||
-rw-r--r-- | svtools/source/contnr/treelistbox.cxx | 6 | ||||
-rw-r--r-- | svtools/source/graphic/provider.cxx | 2 | ||||
-rw-r--r-- | svtools/source/misc/acceleratorexecute.cxx | 2 | ||||
-rw-r--r-- | svtools/source/misc/transfer.cxx | 4 |
6 files changed, 9 insertions, 9 deletions
diff --git a/svtools/source/contnr/imivctl.hxx b/svtools/source/contnr/imivctl.hxx index 0e0006e2316e..c5d3b4b2db53 100644 --- a/svtools/source/contnr/imivctl.hxx +++ b/svtools/source/contnr/imivctl.hxx @@ -452,7 +452,7 @@ public: sal_uInt16 nPaintFlags, OutputDevice* pOut, const OUString* pStr = 0, - ::vcl::ControlLayoutData* _pLayoutData = NULL + vcl::ControlLayoutData* _pLayoutData = NULL ); // recalculates all BoundingRects if bMustRecalcBoundingRects == true diff --git a/svtools/source/contnr/imivctl1.cxx b/svtools/source/contnr/imivctl1.cxx index 078ebc92e67e..a93aa7c39caa 100644 --- a/svtools/source/contnr/imivctl1.cxx +++ b/svtools/source/contnr/imivctl1.cxx @@ -1626,7 +1626,7 @@ void SvxIconChoiceCtrl_Impl::PaintEmphasis( void SvxIconChoiceCtrl_Impl::PaintItem( const Rectangle& rRect, IcnViewFieldType eItem, SvxIconChoiceCtrlEntry* pEntry, sal_uInt16 nPaintFlags, - OutputDevice* pOut, const OUString* pStr, ::vcl::ControlLayoutData* _pLayoutData ) + OutputDevice* pOut, const OUString* pStr, vcl::ControlLayoutData* _pLayoutData ) { if( eItem == IcnViewFieldTypeText ) { diff --git a/svtools/source/contnr/treelistbox.cxx b/svtools/source/contnr/treelistbox.cxx index 87f721483a4d..c4839b32437d 100644 --- a/svtools/source/contnr/treelistbox.cxx +++ b/svtools/source/contnr/treelistbox.cxx @@ -1134,7 +1134,7 @@ void SvTreeListBox::ExecuteSearchEntry( const void* /*_pEntry*/ ) const // nothing to do here, we have no "execution" } -::vcl::StringEntryIdentifier SvTreeListBox::CurrentEntry( OUString& _out_entryText ) const +vcl::StringEntryIdentifier SvTreeListBox::CurrentEntry( OUString& _out_entryText ) const { // always accept the current entry if there is one SvTreeListEntry* pCurrentEntry( GetCurEntry() ); @@ -1146,12 +1146,12 @@ void SvTreeListBox::ExecuteSearchEntry( const void* /*_pEntry*/ ) const return FirstSearchEntry( _out_entryText ); } -::vcl::StringEntryIdentifier SvTreeListBox::NextEntry( ::vcl::StringEntryIdentifier _currentEntry, OUString& _out_entryText ) const +vcl::StringEntryIdentifier SvTreeListBox::NextEntry( vcl::StringEntryIdentifier _currentEntry, OUString& _out_entryText ) const { return NextSearchEntry( _currentEntry, _out_entryText ); } -void SvTreeListBox::SelectEntry( ::vcl::StringEntryIdentifier _entry ) +void SvTreeListBox::SelectEntry( vcl::StringEntryIdentifier _entry ) { SelectSearchEntry( _entry ); } diff --git a/svtools/source/graphic/provider.cxx b/svtools/source/graphic/provider.cxx index 9e7283ca42b4..9bfe0588770b 100644 --- a/svtools/source/graphic/provider.cxx +++ b/svtools/source/graphic/provider.cxx @@ -153,7 +153,7 @@ uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadRepositoryImage( { OUString sPathName( rResourceURL.copy( nIndex ) ); BitmapEx aBitmap; - if ( ::vcl::ImageRepository::loadImage( sPathName, aBitmap, false ) ) + if ( vcl::ImageRepository::loadImage( sPathName, aBitmap, false ) ) { Image aImage( aBitmap ); xRet = aImage.GetXGraphic(); diff --git a/svtools/source/misc/acceleratorexecute.cxx b/svtools/source/misc/acceleratorexecute.cxx index 4cfbfb7b524a..9a5807fc2e10 100644 --- a/svtools/source/misc/acceleratorexecute.cxx +++ b/svtools/source/misc/acceleratorexecute.cxx @@ -70,7 +70,7 @@ class SVT_DLLPRIVATE AsyncAccelExec DECL_DLLPRIVATE_LINK(impl_ts_asyncCallback, void*); private: - ::vcl::EventPoster m_aAsyncCallback; + vcl::EventPoster m_aAsyncCallback; css::uno::Reference< css::frame::XDispatch > m_xDispatch; css::util::URL m_aURL; }; diff --git a/svtools/source/misc/transfer.cxx b/svtools/source/misc/transfer.cxx index 70ec0f63f94e..78f034698063 100644 --- a/svtools/source/misc/transfer.cxx +++ b/svtools/source/misc/transfer.cxx @@ -746,7 +746,7 @@ bool TransferableHelper::SetBitmapEx( const BitmapEx& rBitmapEx, const DataFlavo if(rFlavor.MimeType.equalsIgnoreAsciiCase("image/png")) { // write a PNG - ::vcl::PNGWriter aPNGWriter(rBitmapEx); + vcl::PNGWriter aPNGWriter(rBitmapEx); aPNGWriter.Write(aMemStm); } @@ -1686,7 +1686,7 @@ bool TransferableDataHelper::GetBitmapEx( const DataFlavor& rFlavor, BitmapEx& r if(!bSuppressPNG && rFlavor.MimeType.equalsIgnoreAsciiCase("image/png")) { // it's a PNG, import to BitmapEx - ::vcl::PNGReader aPNGReader(*xStm); + vcl::PNGReader aPNGReader(*xStm); rBmpEx = aPNGReader.Read(); } |