diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-05-09 20:08:33 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-05-10 07:53:55 +0200 |
commit | e44ca108d47d9eec9e109a325dd9352b94e913b0 (patch) | |
tree | 7bebb8904d4d5fdcc3f7c1d83fc06e2ce3a8d5c1 /svtools | |
parent | 244e1823c41221d53b0dc7b6d9595514930f8cca (diff) |
compact namespace in svtools
Change-Id: I281e162e4aafaf27fa4956b33a45883de163cca9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93876
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'svtools')
-rw-r--r-- | svtools/inc/table/defaultinputhandler.hxx | 4 | ||||
-rw-r--r-- | svtools/inc/table/gridtablerenderer.hxx | 4 | ||||
-rw-r--r-- | svtools/inc/table/tablecontrol.hxx | 4 | ||||
-rw-r--r-- | svtools/inc/table/tablecontrolinterface.hxx | 4 | ||||
-rw-r--r-- | svtools/inc/table/tableinputhandler.hxx | 4 | ||||
-rw-r--r-- | svtools/inc/table/tablemodel.hxx | 6 | ||||
-rw-r--r-- | svtools/inc/table/tablerenderer.hxx | 4 | ||||
-rw-r--r-- | svtools/inc/table/tablesort.hxx | 4 | ||||
-rw-r--r-- | svtools/inc/table/tabletypes.hxx | 4 | ||||
-rw-r--r-- | svtools/source/inc/unoiface.hxx | 4 | ||||
-rw-r--r-- | svtools/source/table/mousefunction.hxx | 4 | ||||
-rw-r--r-- | svtools/source/table/tablecontrol_impl.hxx | 4 | ||||
-rw-r--r-- | svtools/source/table/tabledatawindow.hxx | 4 | ||||
-rw-r--r-- | svtools/source/table/tablegeometry.hxx | 4 | ||||
-rw-r--r-- | svtools/source/uno/fpicker.hxx | 4 | ||||
-rw-r--r-- | svtools/source/uno/svtxgridcontrol.hxx | 4 | ||||
-rw-r--r-- | svtools/source/uno/unocontroltablemodel.hxx | 4 | ||||
-rw-r--r-- | svtools/source/uno/unogridcolumnfacade.hxx | 4 | ||||
-rw-r--r-- | svtools/source/uno/wizard/wizardpagecontroller.hxx | 4 | ||||
-rw-r--r-- | svtools/source/uno/wizard/wizardshell.hxx | 4 |
20 files changed, 41 insertions, 41 deletions
diff --git a/svtools/inc/table/defaultinputhandler.hxx b/svtools/inc/table/defaultinputhandler.hxx index 6bcf4ecd731f..c09328c50e66 100644 --- a/svtools/inc/table/defaultinputhandler.hxx +++ b/svtools/inc/table/defaultinputhandler.hxx @@ -24,7 +24,7 @@ #include <memory> -namespace svt { namespace table +namespace svt::table { @@ -51,7 +51,7 @@ namespace svt { namespace table }; -} } // namespace svt::table +} // namespace svt::table diff --git a/svtools/inc/table/gridtablerenderer.hxx b/svtools/inc/table/gridtablerenderer.hxx index 21e354e767ab..e372de3241e5 100644 --- a/svtools/inc/table/gridtablerenderer.hxx +++ b/svtools/inc/table/gridtablerenderer.hxx @@ -25,7 +25,7 @@ #include <memory> -namespace svt { namespace table +namespace svt::table { @@ -109,7 +109,7 @@ namespace svt { namespace table ); }; -} } // namespace svt::table +} // namespace svt::table diff --git a/svtools/inc/table/tablecontrol.hxx b/svtools/inc/table/tablecontrol.hxx index 62f1261069b3..fb6868f3d5b0 100644 --- a/svtools/inc/table/tablecontrol.hxx +++ b/svtools/inc/table/tablecontrol.hxx @@ -28,7 +28,7 @@ #include <memory> -namespace svt { namespace table +namespace svt::table { class TableControl_Impl; @@ -167,7 +167,7 @@ namespace svt { namespace table }; -} } // namespace svt::table +} // namespace svt::table diff --git a/svtools/inc/table/tablecontrolinterface.hxx b/svtools/inc/table/tablecontrolinterface.hxx index 214b1610db93..69670d2bdaa6 100644 --- a/svtools/inc/table/tablecontrolinterface.hxx +++ b/svtools/inc/table/tablecontrolinterface.hxx @@ -26,7 +26,7 @@ #include <table/tablemodel.hxx> -namespace svt { namespace table +namespace svt::table { @@ -236,7 +236,7 @@ namespace svt { namespace table }; -} } // namespace svt::table +} // namespace svt::table diff --git a/svtools/inc/table/tableinputhandler.hxx b/svtools/inc/table/tableinputhandler.hxx index fec472eeb2a5..9d11df38db3d 100644 --- a/svtools/inc/table/tableinputhandler.hxx +++ b/svtools/inc/table/tableinputhandler.hxx @@ -25,7 +25,7 @@ class MouseEvent; class KeyEvent; -namespace svt { namespace table +namespace svt::table { @@ -57,7 +57,7 @@ namespace svt { namespace table typedef std::shared_ptr< ITableInputHandler > PTableInputHandler; -} } // namespace svt::table +} // namespace svt::table /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/inc/table/tablemodel.hxx b/svtools/inc/table/tablemodel.hxx index b2913615b201..b3bcc36e9f8c 100644 --- a/svtools/inc/table/tablemodel.hxx +++ b/svtools/inc/table/tablemodel.hxx @@ -34,7 +34,7 @@ #include <vector> #include <o3tl/typed_flags_set.hxx> -namespace svt { namespace table { class ITableDataSort; } } +namespace svt::table { class ITableDataSort; } class Color; @@ -54,7 +54,7 @@ namespace o3tl } -namespace svt { namespace table +namespace svt::table { //= ScrollbarVisibility enum ScrollbarVisibility @@ -448,7 +448,7 @@ namespace svt { namespace table typedef std::shared_ptr< ITableModel > PTableModel; -} } // namespace svt::table +} // namespace svt::table /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/inc/table/tablerenderer.hxx b/svtools/inc/table/tablerenderer.hxx index 564250155621..c43bac81875d 100644 --- a/svtools/inc/table/tablerenderer.hxx +++ b/svtools/inc/table/tablerenderer.hxx @@ -36,7 +36,7 @@ namespace vcl { }; -namespace svt { namespace table +namespace svt::table { @@ -243,7 +243,7 @@ namespace svt { namespace table typedef std::shared_ptr< ITableRenderer > PTableRenderer; -} } // namespace svt::table +} // namespace svt::table /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/inc/table/tablesort.hxx b/svtools/inc/table/tablesort.hxx index c92011cb0d5f..699086352c9c 100644 --- a/svtools/inc/table/tablesort.hxx +++ b/svtools/inc/table/tablesort.hxx @@ -22,7 +22,7 @@ #include <table/tabletypes.hxx> -namespace svt { namespace table +namespace svt::table { @@ -74,7 +74,7 @@ namespace svt { namespace table }; -} } // namespace svt::table +} // namespace svt::table /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/inc/table/tabletypes.hxx b/svtools/inc/table/tabletypes.hxx index 1e18786f7ff0..8fdb18a830d8 100644 --- a/svtools/inc/table/tabletypes.hxx +++ b/svtools/inc/table/tabletypes.hxx @@ -22,7 +22,7 @@ #include <sal/types.h> -namespace svt { namespace table +namespace svt::table { /// a value denoting the size of a table @@ -46,7 +46,7 @@ namespace svt { namespace table #define ROW_INVALID (::svt::table::RowPos(-2)) -} } // namespace svt::table +} // namespace svt::table /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/source/inc/unoiface.hxx b/svtools/source/inc/unoiface.hxx index 069e62d0ccd8..7813b9ffe59c 100644 --- a/svtools/source/inc/unoiface.hxx +++ b/svtools/source/inc/unoiface.hxx @@ -28,9 +28,9 @@ #include <com/sun/star/awt/XTextLayoutConstrains.hpp> #include <tools/lineend.hxx> -namespace com { namespace sun { namespace star { namespace util { +namespace com::sun::star::util { class XNumberFormatsSupplier; -} } } } +} class SvNumberFormatsSupplierObj; diff --git a/svtools/source/table/mousefunction.hxx b/svtools/source/table/mousefunction.hxx index 933c1f4b3277..beadbcf59206 100644 --- a/svtools/source/table/mousefunction.hxx +++ b/svtools/source/table/mousefunction.hxx @@ -26,7 +26,7 @@ class MouseEvent; -namespace svt { namespace table +namespace svt::table { @@ -125,7 +125,7 @@ namespace svt { namespace table }; -} } // namespace svt::table +} // namespace svt::table diff --git a/svtools/source/table/tablecontrol_impl.hxx b/svtools/source/table/tablecontrol_impl.hxx index 7b756e1ed59e..9e512e99a1e7 100644 --- a/svtools/source/table/tablecontrol_impl.hxx +++ b/svtools/source/table/tablecontrol_impl.hxx @@ -32,7 +32,7 @@ class ScrollBar; class ScrollBarBox; -namespace svt { namespace table +namespace svt::table { struct MutableColumnMetrics : public ColumnMetrics { @@ -472,7 +472,7 @@ namespace svt { namespace table }; -} } // namespace svt::table +} // namespace svt::table diff --git a/svtools/source/table/tabledatawindow.hxx b/svtools/source/table/tabledatawindow.hxx index 8a584dc6e8db..e42a054939db 100644 --- a/svtools/source/table/tabledatawindow.hxx +++ b/svtools/source/table/tabledatawindow.hxx @@ -22,7 +22,7 @@ #include <vcl/window.hxx> -namespace svt { namespace table +namespace svt::table { class TableControl_Impl; class TableFunctionSet; @@ -59,7 +59,7 @@ namespace svt { namespace table static void impl_hideTipWindow(); }; -} } // namespace svt::table +} // namespace svt::table diff --git a/svtools/source/table/tablegeometry.hxx b/svtools/source/table/tablegeometry.hxx index 09374d8b112d..9fb6d03f0d68 100644 --- a/svtools/source/table/tablegeometry.hxx +++ b/svtools/source/table/tablegeometry.hxx @@ -24,7 +24,7 @@ #include <tools/gen.hxx> -namespace svt { namespace table +namespace svt::table { @@ -151,7 +151,7 @@ namespace svt { namespace table }; -} } // namespace svt::table +} // namespace svt::table diff --git a/svtools/source/uno/fpicker.hxx b/svtools/source/uno/fpicker.hxx index 76a7d078fa61..9fcbacd548a7 100644 --- a/svtools/source/uno/fpicker.hxx +++ b/svtools/source/uno/fpicker.hxx @@ -26,10 +26,10 @@ #include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/uno/XComponentContext.hpp> -namespace com { namespace sun { namespace star { +namespace com::sun::star { namespace lang { class XMultiServiceFactory; } namespace uno { class XInterface; } -} } } +} css::uno::Reference<css::uno::XInterface> FilePicker_CreateInstance( css::uno::Reference< css::uno::XComponentContext > const & context); diff --git a/svtools/source/uno/svtxgridcontrol.hxx b/svtools/source/uno/svtxgridcontrol.hxx index a89c31113cb4..9e4fd85fee89 100644 --- a/svtools/source/uno/svtxgridcontrol.hxx +++ b/svtools/source/uno/svtxgridcontrol.hxx @@ -32,9 +32,9 @@ #include <toolkit/helper/listenermultiplexer.hxx> -namespace svt { namespace table { +namespace svt::table { class TableControl; -} } +} typedef ::cppu::ImplInheritanceHelper < VCLXWindow , css::awt::grid::XGridControl diff --git a/svtools/source/uno/unocontroltablemodel.hxx b/svtools/source/uno/unocontroltablemodel.hxx index cbaae6b151bb..53aa832657a8 100644 --- a/svtools/source/uno/unocontroltablemodel.hxx +++ b/svtools/source/uno/unocontroltablemodel.hxx @@ -31,7 +31,7 @@ #include <memory> -namespace svt { namespace table +namespace svt::table { @@ -148,7 +148,7 @@ namespace svt { namespace table }; -} } // svt::table +} // svt::table diff --git a/svtools/source/uno/unogridcolumnfacade.hxx b/svtools/source/uno/unogridcolumnfacade.hxx index 0651a44ee24a..672397276b90 100644 --- a/svtools/source/uno/unogridcolumnfacade.hxx +++ b/svtools/source/uno/unogridcolumnfacade.hxx @@ -27,7 +27,7 @@ #include <rtl/ref.hxx> -namespace svt { namespace table +namespace svt::table { @@ -82,7 +82,7 @@ namespace svt { namespace table }; -} } // svt::table +} // svt::table diff --git a/svtools/source/uno/wizard/wizardpagecontroller.hxx b/svtools/source/uno/wizard/wizardpagecontroller.hxx index 12cd900b49e2..68d724591fe0 100644 --- a/svtools/source/uno/wizard/wizardpagecontroller.hxx +++ b/svtools/source/uno/wizard/wizardpagecontroller.hxx @@ -22,7 +22,7 @@ #include <vcl/wizardmachine.hxx> #include <com/sun/star/ui/dialogs/XWizardController.hpp> -namespace svt { namespace uno +namespace svt::uno { @@ -55,7 +55,7 @@ namespace svt { namespace uno }; -} } // namespace svt::uno +} // namespace svt::uno diff --git a/svtools/source/uno/wizard/wizardshell.hxx b/svtools/source/uno/wizard/wizardshell.hxx index 29a7e9b3853b..21e3130e477b 100644 --- a/svtools/source/uno/wizard/wizardshell.hxx +++ b/svtools/source/uno/wizard/wizardshell.hxx @@ -28,7 +28,7 @@ using vcl::WizardTypes::WizardState; using vcl::WizardTypes::CommitPageReason; -namespace svt { namespace uno +namespace svt::uno { @@ -123,7 +123,7 @@ namespace svt { namespace uno }; -} } // namespace svt::uno +} // namespace svt::uno |