From 47cd34a60ff9048404075823e519f1abdd4b0e9a Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Fri, 1 May 2020 14:52:05 +0200 Subject: 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 --- include/dbaccess/IController.hxx | 4 ++-- include/dbaccess/controllerframe.hxx | 4 ++-- include/dbaccess/dataview.hxx | 4 ++-- include/dbaccess/dbaundomanager.hxx | 4 ++-- include/dbaccess/dbsubcomponentcontroller.hxx | 4 ++-- include/dbaccess/genericcontroller.hxx | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) (limited to 'include/dbaccess') diff --git a/include/dbaccess/IController.hxx b/include/dbaccess/IController.hxx index 754667afd4c0..82e8c5603b16 100644 --- a/include/dbaccess/IController.hxx +++ b/include/dbaccess/IController.hxx @@ -26,7 +26,7 @@ #include #include -namespace com { namespace sun { namespace star { +namespace com::sun::star { namespace beans { struct PropertyValue; } @@ -36,7 +36,7 @@ namespace com { namespace sun { namespace star { namespace frame { class XController; } -} } } +} class NotifyEvent; diff --git a/include/dbaccess/controllerframe.hxx b/include/dbaccess/controllerframe.hxx index fd14bb02f92a..97a9c249d43a 100644 --- a/include/dbaccess/controllerframe.hxx +++ b/include/dbaccess/controllerframe.hxx @@ -25,9 +25,9 @@ #include #include -namespace com { namespace sun { namespace star { +namespace com::sun::star { namespace frame { class XFrame; } -} } } +} namespace dbaui { diff --git a/include/dbaccess/dataview.hxx b/include/dbaccess/dataview.hxx index 738ccc352da1..b599b8c513c5 100644 --- a/include/dbaccess/dataview.hxx +++ b/include/dbaccess/dataview.hxx @@ -29,10 +29,10 @@ #include #include -namespace com { namespace sun { namespace star { +namespace com::sun::star { namespace frame { class XFrame; } namespace uno { class XComponentContext; } -} } } +} namespace svt { class AcceleratorExecute; diff --git a/include/dbaccess/dbaundomanager.hxx b/include/dbaccess/dbaundomanager.hxx index b39e36f49783..f6f75c063cc5 100644 --- a/include/dbaccess/dbaundomanager.hxx +++ b/include/dbaccess/dbaundomanager.hxx @@ -30,11 +30,11 @@ #include #include -namespace com { namespace sun { namespace star { +namespace com::sun::star { namespace document { class XUndoAction; } namespace document { class XUndoManagerListener; } namespace uno { class XInterface; } -} } } +} namespace cppu { class OWeakObject; diff --git a/include/dbaccess/dbsubcomponentcontroller.hxx b/include/dbaccess/dbsubcomponentcontroller.hxx index 01da13c9f8ff..a1bc687ce512 100644 --- a/include/dbaccess/dbsubcomponentcontroller.hxx +++ b/include/dbaccess/dbsubcomponentcontroller.hxx @@ -35,7 +35,7 @@ #include #include -namespace com { namespace sun { namespace star { +namespace com::sun::star { namespace beans { class XPropertySet; } namespace beans { struct PropertyValue; } namespace document { class XEmbeddedScripts; } @@ -45,7 +45,7 @@ namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } namespace util { class XModifyListener; } namespace util { class XNumberFormatter; } -} } } +} namespace dbtools { class DatabaseMetaData; diff --git a/include/dbaccess/genericcontroller.hxx b/include/dbaccess/genericcontroller.hxx index 805131548f28..c60cf9feb25c 100644 --- a/include/dbaccess/genericcontroller.hxx +++ b/include/dbaccess/genericcontroller.hxx @@ -62,7 +62,7 @@ #include #include -namespace com { namespace sun { namespace star { +namespace com::sun::star { namespace awt { class XKeyHandler; } namespace awt { class XMouseClickHandler; } namespace awt { class XWindow; } @@ -83,7 +83,7 @@ namespace com { namespace sun { namespace star { namespace ui { class XSidebarProvider; } namespace uno { class XComponentContext; } namespace util { class XURLTransformer; } -} } } +} namespace vcl { class Window; } namespace weld { class Window; } -- cgit