summaryrefslogtreecommitdiff
path: root/include/toolkit
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2020-05-01 14:52:05 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2020-05-03 09:21:51 +0200
commit47cd34a60ff9048404075823e519f1abdd4b0e9a (patch)
treee9728dd7c686d23f90b4331f105d6f5f8c1176cd /include/toolkit
parentc79dd92480cbc409a7061da7f3dd3abaaf9a4883 (diff)
use more compact namespace syntax in /include
excluding the UDK headers of course Change-Id: Iac7ab83d60265f7d362c860776f1de9d5e444ec0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93268 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include/toolkit')
-rw-r--r--include/toolkit/awt/vclxaccessiblecomponent.hxx2
-rw-r--r--include/toolkit/awt/vclxfont.hxx2
-rw-r--r--include/toolkit/awt/vclxtopwindow.hxx2
-rw-r--r--include/toolkit/awt/vclxwindow.hxx2
-rw-r--r--include/toolkit/controls/unocontrolmodel.hxx2
-rw-r--r--include/toolkit/controls/unocontrols.hxx4
-rw-r--r--include/toolkit/helper/accessiblefactory.hxx4
-rw-r--r--include/toolkit/helper/formpdfexport.hxx4
-rw-r--r--include/toolkit/helper/vclunohelper.hxx10
9 files changed, 16 insertions, 16 deletions
diff --git a/include/toolkit/awt/vclxaccessiblecomponent.hxx b/include/toolkit/awt/vclxaccessiblecomponent.hxx
index db5a15c9be21..b9cf5ec6bacc 100644
--- a/include/toolkit/awt/vclxaccessiblecomponent.hxx
+++ b/include/toolkit/awt/vclxaccessiblecomponent.hxx
@@ -30,7 +30,7 @@
#include <tools/link.hxx>
#include <vcl/vclptr.hxx>
-namespace com { namespace sun { namespace star { namespace accessibility { class XAccessible; } } } }
+namespace com::sun::star::accessibility { class XAccessible; }
namespace vcl { class Window; }
class VCLXWindow;
diff --git a/include/toolkit/awt/vclxfont.hxx b/include/toolkit/awt/vclxfont.hxx
index 92ea58480de4..a0f609a9e8b7 100644
--- a/include/toolkit/awt/vclxfont.hxx
+++ b/include/toolkit/awt/vclxfont.hxx
@@ -30,7 +30,7 @@
#include <osl/mutex.hxx>
#include <vcl/font.hxx>
-namespace com { namespace sun { namespace star { namespace awt { class XDevice; } } } }
+namespace com::sun::star::awt { class XDevice; }
class FontMetric;
diff --git a/include/toolkit/awt/vclxtopwindow.hxx b/include/toolkit/awt/vclxtopwindow.hxx
index 3f64d104bbac..ffa56b0f842d 100644
--- a/include/toolkit/awt/vclxtopwindow.hxx
+++ b/include/toolkit/awt/vclxtopwindow.hxx
@@ -28,7 +28,7 @@
#include <toolkit/awt/vclxcontainer.hxx>
-namespace com { namespace sun { namespace star { namespace awt { class XMenuBar; } } } }
+namespace com::sun::star::awt { class XMenuBar; }
typedef ::cppu::ImplHelper2 < css::awt::XTopWindow2, css::awt::XSystemDependentWindowPeer
> VCLXTopWindow_XBase;
diff --git a/include/toolkit/awt/vclxwindow.hxx b/include/toolkit/awt/vclxwindow.hxx
index 2b6095b7c14e..bc93f391f8ce 100644
--- a/include/toolkit/awt/vclxwindow.hxx
+++ b/include/toolkit/awt/vclxwindow.hxx
@@ -44,7 +44,7 @@
#include <functional>
namespace comphelper { class OInterfaceContainerHelper2; }
-namespace com { namespace sun { namespace star { namespace accessibility { class XAccessibleContext; } } } }
+namespace com::sun::star::accessibility { class XAccessibleContext; }
class VclWindowEvent;
diff --git a/include/toolkit/controls/unocontrolmodel.hxx b/include/toolkit/controls/unocontrolmodel.hxx
index 69b5f121a0f6..9f82bb9e4a79 100644
--- a/include/toolkit/controls/unocontrolmodel.hxx
+++ b/include/toolkit/controls/unocontrolmodel.hxx
@@ -40,7 +40,7 @@
#include <vector>
#include <map>
-namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }
+namespace com::sun::star::uno { class XComponentContext; }
typedef std::map<sal_uInt16, css::uno::Any> ImplPropertyTable;
diff --git a/include/toolkit/controls/unocontrols.hxx b/include/toolkit/controls/unocontrols.hxx
index 6f92de103529..eb75d36b6e97 100644
--- a/include/toolkit/controls/unocontrols.hxx
+++ b/include/toolkit/controls/unocontrols.hxx
@@ -57,8 +57,8 @@
#include <optional>
-namespace com { namespace sun { namespace star { namespace graphic { class XGraphic; } } } }
-namespace com { namespace sun { namespace star { namespace graphic { class XGraphicObject; } } } }
+namespace com::sun::star::graphic { class XGraphic; }
+namespace com::sun::star::graphic { class XGraphicObject; }
class ImageHelper
{
diff --git a/include/toolkit/helper/accessiblefactory.hxx b/include/toolkit/helper/accessiblefactory.hxx
index 0dad596cb8a7..109e1cbea038 100644
--- a/include/toolkit/helper/accessiblefactory.hxx
+++ b/include/toolkit/helper/accessiblefactory.hxx
@@ -23,10 +23,10 @@
#include <com/sun/star/uno/Reference.hxx>
#include <salhelper/simplereferenceobject.hxx>
-namespace com { namespace sun { namespace star { namespace accessibility {
+namespace com::sun::star::accessibility {
class XAccessible;
class XAccessibleContext;
-} } } }
+}
class VCLXButton;
class VCLXCheckBox;
class VCLXRadioButton;
diff --git a/include/toolkit/helper/formpdfexport.hxx b/include/toolkit/helper/formpdfexport.hxx
index a60604d9801b..d1aa35ebfefe 100644
--- a/include/toolkit/helper/formpdfexport.hxx
+++ b/include/toolkit/helper/formpdfexport.hxx
@@ -26,8 +26,8 @@
#include <memory>
-namespace com { namespace sun { namespace star { namespace awt { class XControl; } } } }
-namespace com { namespace sun { namespace star { namespace uno { template <class interface_type> class Reference; } } } }
+namespace com::sun::star::awt { class XControl; }
+namespace com::sun::star::uno { template <class interface_type> class Reference; }
namespace vcl
{
diff --git a/include/toolkit/helper/vclunohelper.hxx b/include/toolkit/helper/vclunohelper.hxx
index b0804b3d4657..6bdffe9f1fec 100644
--- a/include/toolkit/helper/vclunohelper.hxx
+++ b/include/toolkit/helper/vclunohelper.hxx
@@ -34,13 +34,13 @@
#include <tools/poly.hxx>
-namespace com { namespace sun { namespace star { namespace uno { template <typename > class Sequence; } } } }
+namespace com::sun::star::uno { template <typename > class Sequence; }
-namespace com { namespace sun { namespace star { namespace uno {
+namespace com::sun::star::uno {
class XInterface;
-}}}}
+}
-namespace com { namespace sun { namespace star { namespace awt {
+namespace com::sun::star::awt {
class XBitmap;
class XWindow;
class XWindow2;
@@ -57,7 +57,7 @@ namespace com { namespace sun { namespace star { namespace awt {
struct FontDescriptor;
struct Rectangle;
struct KeyEvent;
-}}}}
+}
class FontMetric;