compact namespace in testtools..toolkit

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

9 files changed, 19 insertions, 23 deletions

diff --git a/toolkit/inc/controls/accessiblecontrolcontext.hxx b/toolkit/inc/controls/accessiblecontrolcontext.hxx
index 32a23c23c841..e12a77c5ab3d 100644
--- a/toolkit/inc/controls/accessiblecontrolcontext.hxx
+++ b/toolkit/inc/controls/accessiblecontrolcontext.hxx
@@ -26,9 +26,9 @@
 #include <vcl/vclptr.hxx>
 
 namespace vcl { class Window; }
-namespace com { namespace sun { namespace star { namespace awt { class XWindow; } } } }
-namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; } } } }
-namespace com { namespace sun { namespace star { namespace beans { class XPropertySetInfo; } } } }
+namespace com::sun::star::awt { class XWindow; }
+namespace com::sun::star::beans { class XPropertySet; }
+namespace com::sun::star::beans { class XPropertySetInfo; }
 
 namespace toolkit
 {
diff --git a/toolkit/inc/controls/animatedimages.hxx b/toolkit/inc/controls/animatedimages.hxx
index 8953456f9066..c1847b35f7b6 100644
--- a/toolkit/inc/controls/animatedimages.hxx
+++ b/toolkit/inc/controls/animatedimages.hxx
@@ -24,8 +24,8 @@
 #include <cppuhelper/implbase1.hxx>
 #include <memory>
 
-namespace com { namespace sun { namespace star { namespace container { class XContainerListener; } } } }
-namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }
+namespace com::sun::star::container { class XContainerListener; }
+namespace com::sun::star::uno { class XComponentContext; }
 
 namespace toolkit
 {
diff --git a/toolkit/inc/controls/controlmodelcontainerbase.hxx b/toolkit/inc/controls/controlmodelcontainerbase.hxx
index 747795bd488d..3c5c3993ccc1 100644
--- a/toolkit/inc/controls/controlmodelcontainerbase.hxx
+++ b/toolkit/inc/controls/controlmodelcontainerbase.hxx
@@ -39,8 +39,8 @@
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <vector>
 
-namespace com { namespace sun { namespace star { namespace resource { class XStringResourceResolver; } } } }
-namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }
+namespace com::sun::star::resource { class XStringResourceResolver; }
+namespace com::sun::star::uno { class XComponentContext; }
 
 
 typedef UnoControlModel     ControlModel_Base;
diff --git a/toolkit/inc/controls/dialogcontrol.hxx b/toolkit/inc/controls/dialogcontrol.hxx
index 197ee360f036..0bda793c5a02 100644
--- a/toolkit/inc/controls/dialogcontrol.hxx
+++ b/toolkit/inc/controls/dialogcontrol.hxx
@@ -25,7 +25,7 @@
 #include <toolkit/helper/macros.hxx>
 #include <cppuhelper/implbase2.hxx>
 
-namespace com { namespace sun { namespace star { namespace awt { class XTopWindowListener; } } } }
+namespace com::sun::star::awt { class XTopWindowListener; }
 
 typedef ::cppu::AggImplInheritanceHelper2   <   ControlContainerBase
                                             ,   css::awt::XUnoControlDialog
diff --git a/toolkit/inc/controls/formattedcontrol.hxx b/toolkit/inc/controls/formattedcontrol.hxx
index b15836d6904f..234d34224cfd 100644
--- a/toolkit/inc/controls/formattedcontrol.hxx
+++ b/toolkit/inc/controls/formattedcontrol.hxx
@@ -22,7 +22,7 @@
 #include <toolkit/controls/unocontrols.hxx>
 #include <toolkit/controls/unocontrolmodel.hxx>
 
-namespace com { namespace sun { namespace star { namespace util { class XNumberFormatter; } } } }
+namespace com::sun::star::util { class XNumberFormatter; }
 
 
 namespace toolkit
diff --git a/toolkit/inc/controls/geometrycontrolmodel.hxx b/toolkit/inc/controls/geometrycontrolmodel.hxx
index 5fabc57ba434..8c1109c30396 100644
--- a/toolkit/inc/controls/geometrycontrolmodel.hxx
+++ b/toolkit/inc/controls/geometrycontrolmodel.hxx
@@ -28,13 +28,13 @@
 #include <com/sun/star/script/XScriptEventsSupplier.hpp>
 #include <comphelper/IdPropArrayHelper.hxx>
 
-namespace com { namespace sun { namespace star { namespace resource { class XStringResourceResolver; } } } }
+namespace com::sun::star::resource { class XStringResourceResolver; }
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace uno {
         class XComponentContext;
     }
-}}}
+}
 
 
 // namespace toolkit
diff --git a/toolkit/inc/controls/stdtabcontroller.hxx b/toolkit/inc/controls/stdtabcontroller.hxx
index 27f332e53330..e995a143b8cf 100644
--- a/toolkit/inc/controls/stdtabcontroller.hxx
+++ b/toolkit/inc/controls/stdtabcontroller.hxx
@@ -27,9 +27,9 @@
 #include <osl/mutex.hxx>
 
 
-namespace com { namespace sun { namespace star { namespace awt { class XWindow; } } } }
-namespace com { namespace sun { namespace star { namespace awt { class XControl; } } } }
-namespace com { namespace sun { namespace star { namespace awt { class XControlContainer; } } } }
+namespace com::sun::star::awt { class XWindow; }
+namespace com::sun::star::awt { class XControl; }
+namespace com::sun::star::awt { class XControlContainer; }
 
 class StdTabController final : public css::awt::XTabController,
                             public css::lang::XServiceInfo,
diff --git a/toolkit/inc/controls/tabpagecontainer.hxx b/toolkit/inc/controls/tabpagecontainer.hxx
index b24d5cba5d72..9873ad3272b1 100644
--- a/toolkit/inc/controls/tabpagecontainer.hxx
+++ b/toolkit/inc/controls/tabpagecontainer.hxx
@@ -28,9 +28,9 @@
 #include <toolkit/helper/listenermultiplexer.hxx>
 
 
-namespace com { namespace sun { namespace star { namespace awt { namespace tab { class XTabPage; } } } } }
-namespace com { namespace sun { namespace star { namespace awt { namespace tab { class XTabPageContainerListener; } } } } }
-namespace com { namespace sun { namespace star { namespace awt { namespace tab { class XTabPageModel; } } } } }
+namespace com::sun::star::awt::tab { class XTabPage; }
+namespace com::sun::star::awt::tab { class XTabPageContainerListener; }
+namespace com::sun::star::awt::tab { class XTabPageModel; }
 
 
 typedef ::cppu::AggImplInheritanceHelper1   <   UnoControlModel
diff --git a/toolkit/inc/controls/treecontrolpeer.hxx b/toolkit/inc/controls/treecontrolpeer.hxx
index fb547973283d..0bfb7c643238 100644
--- a/toolkit/inc/controls/treecontrolpeer.hxx
+++ b/toolkit/inc/controls/treecontrolpeer.hxx
@@ -32,11 +32,7 @@
 
 #include <map>
 
-namespace com { namespace sun { namespace star { namespace awt { namespace tree {
-
-class XTreeNode;
-
-}}}}}
+namespace com::sun::star::awt::tree { class XTreeNode; }
 
 class UnoTreeListEntry;
 class TreeControlPeer;