vbahelper/source/msforms/service.hxx | 2
vcl/inc/configsettings.hxx | 2
vcl/inc/factory.hxx | 4 -
vcl/inc/graphic/UnoGraphicDescriptor.hxx | 2
vcl/inc/implimagetree.hxx | 4 -
vcl/inc/unx/gtk/gtkdata.hxx | 2
vcl/inc/unx/salinst.h | 4 -
vcl/inc/window.h | 60 +++++++++++-----------
vcl/source/filter/jpeg/jpeg.h | 4 -
vcl/unx/gtk3/a11y/atkwrapper.hxx | 4 -
writerfilter/source/dmapper/ConversionHelper.hxx | 5 +
writerfilter/source/dmapper/DomainMapper.hxx | 4 -
writerfilter/source/dmapper/DomainMapper_Impl.hxx | 4 -
writerfilter/source/dmapper/GraphicImport.hxx | 4 -
writerfilter/source/dmapper/OLEHandler.hxx | 4 -
writerfilter/source/dmapper/PropertyMap.hxx | 4 -
writerfilter/source/dmapper/SettingsTable.hxx | 8 +-
writerfilter/source/dmapper/StyleSheetTable.hxx | 4 -
writerfilter/source/dmapper/TDefTableHandler.hxx | 4 -
19 files changed, 64 insertions(+), 65 deletions(-)
New commits:
commit 8fcd2db54af770d04be5c70b726cd14aff288683
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Sun May 3 13:24:33 2020 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Sun May 10 20:48:36 2020 +0200
use compact namespace syntax
mostly done using
git grep -wl namespace
| xargs -P 8 perl -i -pe
's/namespace\s*([\w:]+)\s*\{\s*namespace\s*/namespace \1::/g'
Change-Id: Ic53dbaf443cf81fb8940155f2582a7128d829e6d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93406
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/vbahelper/source/msforms/service.hxx
b/vbahelper/source/msforms/service.hxx
index 94c69b6ac8db..a94d54e3c411 100644
--- a/vbahelper/source/msforms/service.hxx
+++ b/vbahelper/source/msforms/service.hxx
@@ -12,7 +12,7 @@
#include <sal/config.h>
-namespace comphelper { namespace service_decl { class ServiceDecl; } }
+namespace comphelper::service_decl { class ServiceDecl; }
namespace controlprovider {
extern comphelper::service_decl::ServiceDecl const serviceDecl;
diff --git a/vcl/inc/configsettings.hxx b/vcl/inc/configsettings.hxx
index 967387499b9d..ea6cf65740e7 100644
--- a/vcl/inc/configsettings.hxx
+++ b/vcl/inc/configsettings.hxx
@@ -25,7 +25,7 @@
#include <unordered_map>
-namespace com { namespace sun { namespace star { namespace uno { template
<typename > class Sequence; } } } }
+namespace com::sun::star::uno { template <typename > class Sequence; }
namespace vcl
{
diff --git a/vcl/inc/factory.hxx b/vcl/inc/factory.hxx
index 7ddc0c5c2730..54a382aa494c 100644
--- a/vcl/inc/factory.hxx
+++ b/vcl/inc/factory.hxx
@@ -26,13 +26,13 @@
#include <com/sun/star/uno/Sequence.hxx>
#include <rtl/ustring.hxx>
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
namespace lang {
class XMultiServiceFactory;
class XSingleServiceFactory;
}
namespace uno { class XInterface; }
-} } }
+}
css::uno::Sequence<OUString> vcl_session_getSupportedServiceNames();
diff --git a/vcl/inc/graphic/UnoGraphicDescriptor.hxx
b/vcl/inc/graphic/UnoGraphicDescriptor.hxx
index 4186cfc43c4b..ad46952ce925 100644
--- a/vcl/inc/graphic/UnoGraphicDescriptor.hxx
+++ b/vcl/inc/graphic/UnoGraphicDescriptor.hxx
@@ -54,7 +54,7 @@
#define MIMETYPE_VCLGRAPHIC "image/x-vclgraphic"
namespace comphelper { class PropertySetInfo; }
-namespace com { namespace sun { namespace star { namespace io { class
XInputStream; } } } }
+namespace com::sun::star::io { class XInputStream; }
class Graphic;
diff --git a/vcl/inc/implimagetree.hxx b/vcl/inc/implimagetree.hxx
index f5ae99ba7d11..3656b66de70f 100644
--- a/vcl/inc/implimagetree.hxx
+++ b/vcl/inc/implimagetree.hxx
@@ -33,9 +33,9 @@
#include <i18nlangtag/languagetag.hxx>
#include <vcl/ImageTree.hxx>
-namespace com { namespace sun { namespace star { namespace container {
+namespace com::sun::star::container {
class XNameAccess;
-}}}}
+}
struct ImageRequestParameters
{
diff --git a/vcl/inc/unx/gtk/gtkdata.hxx b/vcl/inc/unx/gtk/gtkdata.hxx
index 6c5dd46fc0b6..2f88ffe8b309 100644
--- a/vcl/inc/unx/gtk/gtkdata.hxx
+++ b/vcl/inc/unx/gtk/gtkdata.hxx
@@ -35,7 +35,7 @@
#include <vector>
-namespace com { namespace sun { namespace star { namespace accessibility {
class XAccessibleEventListener; } } } }
+namespace com::sun::star::accessibility { class XAccessibleEventListener; }
class GtkSalDisplay;
class DocumentFocusListener;
diff --git a/vcl/inc/unx/salinst.h b/vcl/inc/unx/salinst.h
index 05b9f45f72e8..89c9a8ae0731 100644
--- a/vcl/inc/unx/salinst.h
+++ b/vcl/inc/unx/salinst.h
@@ -26,9 +26,9 @@
#include <X11/X.h>
-namespace com { namespace sun { namespace star { namespace datatransfer {
+namespace com::sun::star::datatransfer {
namespace clipboard { class XClipboard; }
-} } } }
+}
class SalXLib;
class X11SalGraphics;
diff --git a/vcl/inc/window.h b/vcl/inc/window.h
index f4f4d6b29eb4..02a55afa198a 100644
--- a/vcl/inc/window.h
+++ b/vcl/inc/window.h
@@ -54,36 +54,38 @@ enum class GetFocusFlags;
enum class ParentClipMode;
enum class SalEvent;
-namespace com { namespace sun { namespace star {
-
-namespace accessibility {
- class XAccessible;
- class XAccessibleContext;
- class XAccessibleEditableText;
-}
-
-namespace rendering {
- class XCanvas;
-}
-
-namespace awt {
- class XWindowPeer;
- class XWindow;
-}
-namespace uno {
- class Any;
- class XInterface;
+namespace com::sun::star {
+
+ namespace accessibility {
+ class XAccessible;
+ class XAccessibleContext;
+ class XAccessibleEditableText;
+ }
+
+ namespace rendering {
+ class XCanvas;
+ }
+
+ namespace awt {
+ class XWindowPeer;
+ class XWindow;
+ }
+ namespace uno {
+ class Any;
+ class XInterface;
+ }
+ namespace datatransfer {
+ namespace clipboard {
+ class XClipboard;
+ }
+ namespace dnd {
+ class XDropTargetListener;
+ class XDragGestureRecognizer;
+ class XDragSource;
+ class XDropTarget;
+ }
+ }
}
-namespace datatransfer { namespace clipboard {
- class XClipboard;
-}
-
-namespace dnd {
- class XDropTargetListener;
- class XDragGestureRecognizer;
- class XDragSource;
- class XDropTarget;
-}}}}}
VCL_DLLPUBLIC Size bestmaxFrameSizeForScreenSize(const Size &rScreenSize);
diff --git a/vcl/source/filter/jpeg/jpeg.h b/vcl/source/filter/jpeg/jpeg.h
index e09755ab7a13..2f951e065934 100644
--- a/vcl/source/filter/jpeg/jpeg.h
+++ b/vcl/source/filter/jpeg/jpeg.h
@@ -28,9 +28,9 @@
#include <jpeglib.h>
-namespace com { namespace sun { namespace star { namespace task {
+namespace com::sun::star::task {
class XStatusIndicator;
-} } } }
+}
class JPEGReader;
class JPEGWriter;
class Size;
diff --git a/vcl/unx/gtk3/a11y/atkwrapper.hxx b/vcl/unx/gtk3/a11y/atkwrapper.hxx
index 97ea5997ad4a..d9c651a2eae8 100644
--- a/vcl/unx/gtk3/a11y/atkwrapper.hxx
+++ b/vcl/unx/gtk3/a11y/atkwrapper.hxx
@@ -27,7 +27,7 @@
extern "C" {
-namespace com { namespace sun { namespace star { namespace accessibility {
+namespace com::sun::star::accessibility {
class XAccessibleAction;
class XAccessibleComponent;
class XAccessibleEditableText;
@@ -40,7 +40,7 @@ namespace com { namespace sun { namespace star { namespace
accessibility {
class XAccessibleTextMarkup;
class XAccessibleTextAttributes;
class XAccessibleValue;
-} } } }
+}
struct AtkObjectWrapper
{
diff --git a/writerfilter/source/dmapper/ConversionHelper.hxx
b/writerfilter/source/dmapper/ConversionHelper.hxx
index 387c5d7786a8..707ac7424bb4 100644
--- a/writerfilter/source/dmapper/ConversionHelper.hxx
+++ b/writerfilter/source/dmapper/ConversionHelper.hxx
@@ -25,13 +25,14 @@
#include <com/sun/star/table/BorderLine2.hpp>
#include <com/sun/star/text/RubyAdjust.hpp>
-namespace com{ namespace sun{ namespace star{
+namespace com::sun::star{
namespace lang{
struct Locale;
}
namespace table{
struct BorderLine2;
-}}}}
+ }
+}
namespace writerfilter {
namespace dmapper{
diff --git a/writerfilter/source/dmapper/DomainMapper.hxx
b/writerfilter/source/dmapper/DomainMapper.hxx
index dfabf1e0aab2..31e5fa705838 100644
--- a/writerfilter/source/dmapper/DomainMapper.hxx
+++ b/writerfilter/source/dmapper/DomainMapper.hxx
@@ -29,7 +29,7 @@
#include <vector>
#include <memory>
-namespace com{ namespace sun {namespace star{
+namespace com::sun::star{
namespace beans{
struct PropertyValue;
}
@@ -45,7 +45,7 @@ namespace com{ namespace sun {namespace star{
namespace text{
class XTextRange;
}
-}}}
+}
namespace utl
{
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.hxx
b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
index 334af118500c..889dff41c855 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.hxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
@@ -47,7 +47,7 @@
#include "FormControlHelper.hxx"
#include <map>
-namespace com{ namespace sun{ namespace star{
+namespace com::sun::star{
namespace awt{
struct Size;
}
@@ -61,7 +61,7 @@ namespace com{ namespace sun{ namespace star{
class XFormField;
}
namespace beans{ class XPropertySet;}
-}}}
+}
namespace writerfilter {
namespace dmapper {
diff --git a/writerfilter/source/dmapper/GraphicImport.hxx
b/writerfilter/source/dmapper/GraphicImport.hxx
index 60cd279c5b88..a2495849bcb7 100644
--- a/writerfilter/source/dmapper/GraphicImport.hxx
+++ b/writerfilter/source/dmapper/GraphicImport.hxx
@@ -27,7 +27,7 @@
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/graphic/XGraphic.hpp>
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
namespace uno
{
class XComponentContext;
@@ -48,7 +48,7 @@ namespace com { namespace sun { namespace star {
{
struct PropertyValue;
}
-}}}
+}
namespace writerfilter
{
diff --git a/writerfilter/source/dmapper/OLEHandler.hxx
b/writerfilter/source/dmapper/OLEHandler.hxx
index 131326fe2a61..e173ab40b444 100644
--- a/writerfilter/source/dmapper/OLEHandler.hxx
+++ b/writerfilter/source/dmapper/OLEHandler.hxx
@@ -24,7 +24,7 @@
#include <com/sun/star/drawing/XShape.hpp>
#include <com/sun/star/text/WrapTextMode.hpp>
-namespace com{ namespace sun{ namespace star{
+namespace com::sun::star{
namespace graphic{
class XGraphic;
}
@@ -38,7 +38,7 @@ namespace com{ namespace sun{ namespace star{
namespace uno {
class XComponentContext;
}
-}}}
+}
namespace writerfilter {
namespace dmapper
{
diff --git a/writerfilter/source/dmapper/PropertyMap.hxx
b/writerfilter/source/dmapper/PropertyMap.hxx
index f3b7f828b5d1..d1a6ea0afdd4 100644
--- a/writerfilter/source/dmapper/PropertyMap.hxx
+++ b/writerfilter/source/dmapper/PropertyMap.hxx
@@ -34,7 +34,7 @@
#include <map>
#include <vector>
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
namespace beans {
struct PropertyValue;
}
@@ -53,7 +53,7 @@ namespace com { namespace sun { namespace star {
struct BorderLine2;
struct ShadowFormat;
}
-}}}
+}
namespace writerfilter {
namespace dmapper {
diff --git a/writerfilter/source/dmapper/SettingsTable.hxx
b/writerfilter/source/dmapper/SettingsTable.hxx
index e058420c27db..888fe4ad342e 100644
--- a/writerfilter/source/dmapper/SettingsTable.hxx
+++ b/writerfilter/source/dmapper/SettingsTable.hxx
@@ -24,12 +24,10 @@
#include <com/sun/star/text/XTextDocument.hpp>
#include <memory>
-namespace com{ namespace sun{ namespace star{
-namespace lang{
-class XMultiServiceFactory;
-struct Locale;
+namespace com::sun::star::lang {
+ class XMultiServiceFactory;
+ struct Locale;
}
-}}}
namespace writerfilter {
namespace dmapper
diff --git a/writerfilter/source/dmapper/StyleSheetTable.hxx
b/writerfilter/source/dmapper/StyleSheetTable.hxx
index a2062303f7d7..9381b90eac52 100644
--- a/writerfilter/source/dmapper/StyleSheetTable.hxx
+++ b/writerfilter/source/dmapper/StyleSheetTable.hxx
@@ -28,9 +28,7 @@
#include "FontTable.hxx"
#include "LoggedResources.hxx"
-namespace com{ namespace sun { namespace star { namespace text{
- class XTextDocument;
-}}}}
+namespace com::sun::star::text { class XTextDocument; }
namespace writerfilter {
diff --git a/writerfilter/source/dmapper/TDefTableHandler.hxx
b/writerfilter/source/dmapper/TDefTableHandler.hxx
index 08a8e06353f7..c7e74263f717 100644
--- a/writerfilter/source/dmapper/TDefTableHandler.hxx
+++ b/writerfilter/source/dmapper/TDefTableHandler.hxx
@@ -21,14 +21,14 @@
#include "LoggedResources.hxx"
#include <vector>
-namespace com{ namespace sun{ namespace star{
+namespace com::sun::star{
namespace table {
struct BorderLine2;
}
namespace beans {
struct PropertyValue;
}
-}}}
+}
namespace writerfilter {
namespace dmapper
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
