compact namespace: vcl

Change-Id: Ic861003f522e76431fffaadc408d0a153b12d0e2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99003
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

28 files changed, 56 insertions, 192 deletions

diff --git a/include/vcl/GraphicLoader.hxx b/include/vcl/GraphicLoader.hxx
index 5cca83a99d94..d99c54731354 100644
--- a/include/vcl/GraphicLoader.hxx
+++ b/include/vcl/GraphicLoader.hxx
@@ -17,12 +17,9 @@ namespace weld
 class Window;
 }
 
-namespace vcl
-{
-namespace graphic
+namespace vcl::graphic
 {
 Graphic VCL_DLLPUBLIC loadFromURL(OUString const& rURL, weld::Window* pParentWin = nullptr);
-}
 } // end vcl::graphic
 
 #endif // INCLUDED_VCL_GRAPHIC_TOOLS_HXX
diff --git a/include/vcl/GraphicObject.hxx b/include/vcl/GraphicObject.hxx
index 16735aac4b1f..7997fabcec67 100644
--- a/include/vcl/GraphicObject.hxx
+++ b/include/vcl/GraphicObject.hxx
@@ -285,9 +285,7 @@ public:
         double fBottomCrop) const;
 };
 
-namespace vcl
-{
-namespace graphic
+namespace vcl::graphic
 {
 
 // Will search an object ( e.g. a control ) for any 'ImageURL' or 'Graphic'
@@ -300,7 +298,7 @@ namespace graphic
 VCL_DLLPUBLIC void SearchForGraphics(css::uno::Reference<css::uno::XInterface> const & rxInterface,
                                      std::vector<css::uno::Reference<css::graphic::XGraphic>> & raGraphicList);
 
-}
+
 } // end namespace vcl::graphic
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/vcl/canvastools.hxx b/include/vcl/canvastools.hxx
index 80a15cffdede..5a46886e59b4 100644
--- a/include/vcl/canvastools.hxx
+++ b/include/vcl/canvastools.hxx
@@ -58,10 +58,8 @@ namespace com::sun::star::rendering
 
 namespace com::sun::star::rendering { class XColorSpace; }
 
-namespace vcl
+namespace vcl::unotools
 {
-    namespace unotools
-    {
         // Bitmap conversions
 
 
@@ -161,7 +159,7 @@ namespace vcl
         tools::Rectangle                   VCL_DLLPUBLIC rectangleFromB2IRectangle( const basegfx::B2IRange& );
         basegfx::B2IPoint           VCL_DLLPUBLIC b2IPointFromPoint(const Point&);
         basegfx::B2IRectangle       VCL_DLLPUBLIC b2IRectangleFromRectangle(const tools::Rectangle&);
-    }
+
 }
 
 #endif // INCLUDED_VCL_CANVASTOOLS_HXX
diff --git a/include/vcl/dndhelp.hxx b/include/vcl/dndhelp.hxx
index b5a1d98c7491..902f67cf1036 100644
--- a/include/vcl/dndhelp.hxx
+++ b/include/vcl/dndhelp.hxx
@@ -26,12 +26,7 @@
 #include <com/sun/star/datatransfer/dnd/XDragSourceListener.hpp>
 #include <com/sun/star/datatransfer/dnd/XDropTargetListener.hpp>
 
-namespace com {
-namespace sun {
-namespace star {
-
-namespace datatransfer {
-namespace dnd {
+namespace com::sun::star::datatransfer::dnd {
     struct DragGestureEvent;
     struct DragSourceDragEvent;
     struct DragSourceDropEvent;
@@ -40,14 +35,9 @@ namespace dnd {
     struct DropTargetDragEnterEvent;
     struct DropTargetDropEvent;
     struct DropTargetEvent;
-}}
-
-}}}
-
-namespace vcl
-{
+}
 
-namespace unohelper
+namespace vcl::unohelper
 {
 
 class VCL_DLLPUBLIC DragAndDropClient
@@ -113,7 +103,7 @@ public:
     void SAL_CALL dropActionChanged( const css::datatransfer::dnd::DropTargetDragEvent& dtde ) override;
 };
 
-}}  // namespace vcl::unohelper
+}  // namespace vcl::unohelper
 
 #endif // INCLUDED_VCL_DNDHELP_HXX
 
diff --git a/include/vcl/edit.hxx b/include/vcl/edit.hxx
index 84e10a8fd963..fe1e12826ee4 100644
--- a/include/vcl/edit.hxx
+++ b/include/vcl/edit.hxx
@@ -34,13 +34,10 @@
 #include <vcl/vclptr.hxx>
 #include <com/sun/star/uno/Reference.h>
 
-namespace com {
-namespace sun {
-namespace star {
-namespace i18n {
+namespace com::sun::star::i18n {
     class XBreakIterator;
     class XExtendedInputSequenceChecker;
-}}}}
+}
 namespace weld {
     class Widget;
 }
diff --git a/include/vcl/font/Feature.hxx b/include/vcl/font/Feature.hxx
index 0b9124f6f728..13c798fbcf32 100644
--- a/include/vcl/font/Feature.hxx
+++ b/include/vcl/font/Feature.hxx
@@ -14,9 +14,7 @@
 #include <rtl/ustring.hxx>
 #include <vector>
 
-namespace vcl
-{
-namespace font
+namespace vcl::font
 {
 constexpr uint32_t featureCode(const char sFeature[4])
 {
@@ -115,9 +113,7 @@ struct FeatureSetting
     unsigned int m_nEnd;
 };
 
-} // end font namespace
-
-} // end vcl namespace
+} // namespace vcl::font
 
 #endif // INCLUDED_VCL_FONT_FEATURE_HXX
 
diff --git a/include/vcl/font/FeatureParser.hxx b/include/vcl/font/FeatureParser.hxx
index 5674e2d3116c..3662c6a20baf 100644
--- a/include/vcl/font/FeatureParser.hxx
+++ b/include/vcl/font/FeatureParser.hxx
@@ -17,9 +17,7 @@
 
 #include <vcl/font/Feature.hxx>
 
-namespace vcl
-{
-namespace font
+namespace vcl::font
 {
 // These must not conflict with font name lists which use ; and ,
 constexpr const char FeaturePrefix = ':';
@@ -43,8 +41,7 @@ public:
     std::unordered_map<uint32_t, uint32_t> getFeaturesMap() const;
 };
 
-} // end font namespace
-} // end vcl namespace
+} // namespace vcl::font
 
 #endif // INCLUDED_VCL_FONT_FEATUREPASER_HXX
 
diff --git a/include/vcl/i18nhelp.hxx b/include/vcl/i18nhelp.hxx
index 38d0232b20b4..306440f61439 100644
--- a/include/vcl/i18nhelp.hxx
+++ b/include/vcl/i18nhelp.hxx
@@ -27,18 +27,12 @@
 #include <vcl/dllapi.h>
 #include <memory>
 
-namespace com {
-namespace sun {
-namespace star {
-namespace uno {
+namespace com::sun::star::uno {
     class XComponentContext;
 }
-}}}
-
 namespace utl {
     class TransliterationWrapper;
 }
-
 class LocaleDataWrapper;
 
 namespace vcl
diff --git a/include/vcl/lok.hxx b/include/vcl/lok.hxx
index 7fc5479a25cd..9f3f30ab7977 100644
--- a/include/vcl/lok.hxx
+++ b/include/vcl/lok.hxx
@@ -14,16 +14,13 @@
 #include <vcl/dllapi.h>
 #include <LibreOfficeKit/LibreOfficeKitTypes.h>
 
-namespace vcl
-{
-namespace lok
+namespace vcl::lok
 {
 bool VCL_DLLPUBLIC isUnipoll();
 void VCL_DLLPUBLIC registerPollCallbacks(LibreOfficeKitPollCallback pPollCallback,
                                          LibreOfficeKitWakeCallback pWakeCallback, void* pData);
 void VCL_DLLPUBLIC unregisterPollCallbacks();
 }
-}
 
 #endif // INCLUDE_VCL_LOK_HXX
 
diff --git a/include/vcl/svapp.hxx b/include/vcl/svapp.hxx
index 2532504b8c16..48177cf90535 100644
--- a/include/vcl/svapp.hxx
+++ b/include/vcl/svapp.hxx
@@ -66,24 +66,18 @@ class GestureEvent;
 struct ImplSVEvent;
 struct ConvertData;
 
-namespace com {
-namespace sun {
-namespace star {
-namespace uno {
+namespace com::sun::star::uno {
     class XComponentContext;
 }
-namespace ui {
-    namespace dialogs {
-        class XFilePicker2;
-        class XFolderPicker2;
-    }
+namespace com::sun::star::ui::dialogs {
+    class XFilePicker2;
+    class XFolderPicker2;
 }
-namespace awt {
+namespace com::sun::star::awt {
     class XToolkit;
     class XDisplayConnection;
     class XWindow;
 }
-} } }
 
 // helper needed by SalLayout implementations as well as svx/source/dialog/svxbmpnumbalueset.cxx
 VCL_DLLPUBLIC sal_UCS4 GetMirroredChar( sal_UCS4 );
diff --git a/include/vcl/texteng.hxx b/include/vcl/texteng.hxx
index 251325d195a0..a7042407dcbf 100644
--- a/include/vcl/texteng.hxx
+++ b/include/vcl/texteng.hxx
@@ -57,13 +57,10 @@ class SfxUndoManager;
 class TextLine;
 struct TEIMEInfos;
 
-namespace com {
-namespace sun {
-namespace star {
-namespace i18n {
+namespace com::sun::star::i18n {
     class XBreakIterator;
     class XExtendedInputSequenceChecker;
-}}}}
+}
 
 class LocaleDataWrapper;
 
diff --git a/include/vcl/toolkit/unowrap.hxx b/include/vcl/toolkit/unowrap.hxx
index fe8a60b19950..ad528af0e0b3 100644
--- a/include/vcl/toolkit/unowrap.hxx
+++ b/include/vcl/toolkit/unowrap.hxx
@@ -32,24 +32,15 @@
 namespace vcl { class Window; }
 class OutputDevice;
 class Menu;
-
-namespace com {
-namespace sun {
-namespace star {
-namespace awt {
+namespace com::sun::star::awt {
     class XGraphics;
     class XToolkit;
     class XWindow;
     class XWindowPeer;
 }
-} } }
-
-namespace com {
-namespace sun {
-namespace star {
-namespace accessibility {
+namespace com::sun::star::accessibility {
     class XAccessible;
-}}}}
+}
 
 class UNLESS_MERGELIBS(VCL_DLLPUBLIC) UnoWrapperBase
 {
diff --git a/include/vcl/uitest/logger.hxx b/include/vcl/uitest/logger.hxx
index 8bda3548875d..a2339b8b8e39 100644
--- a/include/vcl/uitest/logger.hxx
+++ b/include/vcl/uitest/logger.hxx
@@ -15,33 +15,14 @@
 #include <tools/stream.hxx>
 #include <vcl/vclevent.hxx>
 
-namespace com
-{
-namespace sun
-{
-namespace star
-{
-namespace beans
+namespace com::sun::star::beans
 {
 struct PropertyValue;
 }
-}
-}
-}
-namespace com
-{
-namespace sun
-{
-namespace star
-{
-namespace uno
+namespace com::sun::star::uno
 {
 template <class E> class Sequence;
 }
-}
-}
-}
-
 struct EventDescription;
 class Control;
 class KeyEvent;
diff --git a/include/vcl/unohelp.hxx b/include/vcl/unohelp.hxx
index ab00fff5d553..995c59dfc1aa 100644
--- a/include/vcl/unohelp.hxx
+++ b/include/vcl/unohelp.hxx
@@ -25,25 +25,15 @@
 #include <tools/fontenum.hxx>
 #include <vcl/dllapi.h>
 
-namespace com {
-namespace sun {
-namespace star {
-namespace i18n {
+namespace com::sun::star::i18n {
     class XBreakIterator;
     class XCharacterClassification;
-}}}}
-
-namespace com {
-namespace sun {
-namespace star {
-namespace accessibility {
+}
+namespace com::sun::star::accessibility {
     struct AccessibleEventObject;
 }
-}}}
 
-namespace vcl
-{
-namespace unohelper
+namespace vcl::unohelper
 {
 VCL_DLLPUBLIC css::uno::Reference < css::i18n::XBreakIterator > CreateBreakIterator();
 VCL_DLLPUBLIC css::uno::Reference < css::i18n::XCharacterClassification> CreateCharacterClassification();
@@ -54,7 +44,7 @@ VCL_DLLPUBLIC float               ConvertFontWeight( FontWeight eWeight );
 VCL_DLLPUBLIC FontWeight          ConvertFontWeight( float f );
 VCL_DLLPUBLIC css::awt::FontSlant ConvertFontSlant( FontItalic eWeight );
 VCL_DLLPUBLIC FontItalic          ConvertFontSlant( css::awt::FontSlant );
-}}  // namespace vcl::unohelper
+}  // namespace vcl::unohelper
 
 #endif // INCLUDED_VCL_UNOHELP_HXX
 
diff --git a/include/vcl/weld.hxx b/include/vcl/weld.hxx
index 7d29e1c7f605..10bbacfa8f91 100644
--- a/include/vcl/weld.hxx
+++ b/include/vcl/weld.hxx
@@ -31,34 +31,20 @@
 #include <memory>
 #include <vector>
 
-namespace com
-{
-namespace sun
-{
-namespace star
-{
-namespace awt
+namespace com::sun::star::awt
 {
 class XWindow;
 }
-namespace datatransfer
-{
-namespace dnd
+namespace com::sun::star::datatransfer::dnd
 {
 class XDropTarget;
 }
-}
-namespace graphic
+namespace com::sun::star::graphic
 {
 class XGraphic;
 }
-}
-}
-}
-
 typedef css::uno::Reference<css::accessibility::XAccessible> a11yref;
 typedef css::uno::Reference<css::accessibility::XAccessibleRelationSet> a11yrelationset;
-
 enum class PointerStyle;
 class CommandEvent;
 class KeyEvent;
diff --git a/vcl/inc/canvasbitmap.hxx b/vcl/inc/canvasbitmap.hxx
index e49f3f43ab41..96281b7741d2 100644
--- a/vcl/inc/canvasbitmap.hxx
+++ b/vcl/inc/canvasbitmap.hxx
@@ -27,9 +27,7 @@
 
 #include <vcl/bitmapex.hxx>
 
-namespace vcl
-{
-namespace unotools
+namespace vcl::unotools
 {
     class VCL_DLLPUBLIC VclCanvasBitmap final :
         public cppu::WeakImplHelper< css::rendering::XIntegerReadOnlyBitmap,
@@ -113,7 +111,7 @@ namespace unotools
         /// Retrieve contained bitmap. Call me with locked Solar mutex!
         const BitmapEx& getBitmapEx() const { return m_aBmpEx; }
    };
-}
+
 }
 
 #endif
diff --git a/vcl/inc/font/FeatureCollector.hxx b/vcl/inc/font/FeatureCollector.hxx
index bae9e3c56b0c..9148048f1601 100644
--- a/vcl/inc/font/FeatureCollector.hxx
+++ b/vcl/inc/font/FeatureCollector.hxx
@@ -15,9 +15,7 @@
 #include <hb.h>
 #include <i18nlangtag/lang.h>
 
-namespace vcl
-{
-namespace font
+namespace vcl::font
 {
 class FeatureCollector
 {
@@ -47,8 +45,7 @@ public:
     bool collect();
 };
 
-} // end namespace font
-} // end namespace vcl
+} // namespace vcl::font
 
 #endif // INCLUDED_VCL_INC_FONT_FEATURECOLLECTOR_HXX
 
diff --git a/vcl/inc/font/OpenTypeFeatureDefinitionList.hxx b/vcl/inc/font/OpenTypeFeatureDefinitionList.hxx
index 3a01d91359ca..bf4e51c75c39 100644
--- a/vcl/inc/font/OpenTypeFeatureDefinitionList.hxx
+++ b/vcl/inc/font/OpenTypeFeatureDefinitionList.hxx
@@ -15,9 +15,7 @@
 #include <vector>
 #include <unordered_map>
 
-namespace vcl
-{
-namespace font
+namespace vcl::font
 {
 class OpenTypeFeatureDefinitionListPrivate
 {
@@ -42,7 +40,6 @@ class VCL_DLLPUBLIC OpenTypeFeatureDefinitionList
 {
 };
 
-} // end font namespace
-} // end vcl namespace
+} // namespace vcl::font
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/graphic/Manager.hxx b/vcl/inc/graphic/Manager.hxx
index bb52a0cfcf8f..8b21f1c46105 100644
--- a/vcl/inc/graphic/Manager.hxx
+++ b/vcl/inc/graphic/Manager.hxx
@@ -25,9 +25,7 @@
 
 class ImpGraphic;
 
-namespace vcl
-{
-namespace graphic
+namespace vcl::graphic
 {
 class Manager final
 {
@@ -68,7 +66,7 @@ public:
     std::shared_ptr<ImpGraphic> newInstance(const GDIMetaFile& rMtf);
     std::shared_ptr<ImpGraphic> newInstance(const GraphicExternalLink& rGraphicLink);
 };
-}
+
 } // end namespace vcl::graphic
 
 #endif // INCLUDED_VCL_INC_GRAPHIC_MANAGER_HXX
diff --git a/vcl/inc/opengl/VertexUtils.hxx b/vcl/inc/opengl/VertexUtils.hxx
index 910b8725a1e9..9589d0e85775 100644
--- a/vcl/inc/opengl/VertexUtils.hxx
+++ b/vcl/inc/opengl/VertexUtils.hxx
@@ -17,9 +17,7 @@
 #include <tools/color.hxx>
 #include <vector>
 
-namespace vcl
-{
-namespace vertex
+namespace vcl::vertex
 {
 
 template<GLenum TYPE>
@@ -113,7 +111,7 @@ inline float lineVectorAngle(const glm::vec2& previous, const glm::vec2& next)
     return F_PI - std::fabs(angle);
 }
 
-}} // end vcl::vertex
+} // end vcl::vertex
 
 #endif // INCLUDED_VCL_INC_OPENGL_VERTEXUTILS_H
 
diff --git a/vcl/inc/salinst.hxx b/vcl/inc/salinst.hxx
index e82f5b55a393..b8f8d5bd90a8 100644
--- a/vcl/inc/salinst.hxx
+++ b/vcl/inc/salinst.hxx
@@ -35,13 +35,9 @@
 #include <com/sun/star/ui/dialogs/XFolderPicker2.hpp>
 #include <memory>
 
-namespace com {
-namespace sun {
-namespace star {
-namespace awt {
+namespace com::sun::star::awt {
     class XWindow;
 }
-} } }
 namespace comphelper { class SolarMutex; }
 namespace vcl { class Window; }
 namespace weld {
diff --git a/vcl/inc/svimpbox.hxx b/vcl/inc/svimpbox.hxx
index c5a51143f141..fb88701de835 100644
--- a/vcl/inc/svimpbox.hxx
+++ b/vcl/inc/svimpbox.hxx
@@ -36,13 +36,7 @@ class SvLBoxButton;
 class SvTreeList;
 class SvImpLBox;
 class SvTreeListEntry;
-namespace comphelper
-{
-    namespace string
-    {
-        class NaturalStringSorter;
-    }
-}
+namespace comphelper::string { class NaturalStringSorter; }
 
 class ImpLBSelEng final : public FunctionSet
 {
diff --git a/vcl/inc/test/outputdevice.hxx b/vcl/inc/test/outputdevice.hxx
index b8ad0b67fc6b..f45185682814 100644
--- a/vcl/inc/test/outputdevice.hxx
+++ b/vcl/inc/test/outputdevice.hxx
@@ -13,8 +13,7 @@
 
 #include <vcl/virdev.hxx>
 
-namespace vcl {
-namespace test {
+namespace vcl::test {
 
 /** Rendering test result.
  *
@@ -216,7 +215,7 @@ public:
 };
 
 
-}} // end namespace vcl::test
+} // end namespace vcl::test
 
 #endif
 
diff --git a/vcl/inc/unx/gtk/gtkinst.hxx b/vcl/inc/unx/gtk/gtkinst.hxx
index 2e582356dc67..ec1f7d068dc4 100644
--- a/vcl/inc/unx/gtk/gtkinst.hxx
+++ b/vcl/inc/unx/gtk/gtkinst.hxx
@@ -38,13 +38,7 @@
 #include <vcl/weldutils.hxx>
 #include <gtk/gtk.h>
 
-namespace vcl
-{
-namespace unx
-{
-class GtkPrintWrapper;
-}
-}
+namespace vcl::unx { class GtkPrintWrapper; }
 
 vcl::Font pango_to_vcl(const PangoFontDescription* font, const css::lang::Locale& rLocale);
 
diff --git a/vcl/inc/unx/gtk/gtkprintwrapper.hxx b/vcl/inc/unx/gtk/gtkprintwrapper.hxx
index 589c800d77d1..8b09c95281bd 100644
--- a/vcl/inc/unx/gtk/gtkprintwrapper.hxx
+++ b/vcl/inc/unx/gtk/gtkprintwrapper.hxx
@@ -17,9 +17,7 @@
 #include <osl/module.hxx>
 #include <sal/types.h>
 
-namespace vcl
-{
-namespace unx
+namespace vcl::unx
 {
 
 class GtkPrintWrapper
@@ -62,7 +60,6 @@ public:
 };
 
 }
-}
 
 #endif // INCLUDED_VCL_UNX_GTK_INC_GTKPRINTWRAPPER_HXX
 
diff --git a/vcl/inc/unx/salinst.h b/vcl/inc/unx/salinst.h
index 89c9a8ae0731..933de199654d 100644
--- a/vcl/inc/unx/salinst.h
+++ b/vcl/inc/unx/salinst.h
@@ -26,10 +26,7 @@
 
 #include <X11/X.h>
 
-namespace com::sun::star::datatransfer {
-    namespace clipboard { class XClipboard; }
-}
-
+namespace com::sun::star::datatransfer::clipboard { class XClipboard; }
 class SalXLib;
 class X11SalGraphics;
 class SalX11Display;
diff --git a/vcl/inc/window.h b/vcl/inc/window.h
index 8533f8bea80d..81d93375d2e7 100644
--- a/vcl/inc/window.h
+++ b/vcl/inc/window.h
@@ -55,7 +55,6 @@ enum class ParentClipMode;
 enum class SalEvent;
 
 namespace com::sun::star {
-
     namespace accessibility {
         class XAccessible;
         class XAccessibleContext;
diff --git a/vcl/source/gdi/pdfbuildin_fonts.hxx b/vcl/source/gdi/pdfbuildin_fonts.hxx
index 69bdee5dcb9c..8e91cbcb95b4 100644
--- a/vcl/source/gdi/pdfbuildin_fonts.hxx
+++ b/vcl/source/gdi/pdfbuildin_fonts.hxx
@@ -22,9 +22,7 @@
 #include <PhysicalFontFace.hxx>
 #include <fontinstance.hxx>
 
-namespace vcl
-{
-namespace pdf
+namespace vcl::pdf
 {
 struct BuildinFont
 {
@@ -73,8 +71,7 @@ public:
     static const BuildinFont& Get(int nId) { return m_aBuildinFonts[nId]; }
 };
 
-} // namespace pdf
-} // namespace vcl
+} // namespace vcl::pdf
 
 #endif // INCLUDED_VCL_SOURCE_PDF_BUILDIN_FONTS_HXX