summaryrefslogtreecommitdiff
path: root/include/sax
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2020-05-01 14:52:05 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2020-05-03 09:21:51 +0200
commit47cd34a60ff9048404075823e519f1abdd4b0e9a (patch)
treee9728dd7c686d23f90b4331f105d6f5f8c1176cd /include/sax
parentc79dd92480cbc409a7061da7f3dd3abaaf9a4883 (diff)
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 <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include/sax')
-rw-r--r--include/sax/fastattribs.hxx6
-rw-r--r--include/sax/fastparser.hxx10
-rw-r--r--include/sax/fshelper.hxx2
-rw-r--r--include/sax/tools/converter.hxx4
4 files changed, 10 insertions, 12 deletions
diff --git a/include/sax/fastattribs.hxx b/include/sax/fastattribs.hxx
index 1c89afeb04cb..f937ab1abb4f 100644
--- a/include/sax/fastattribs.hxx
+++ b/include/sax/fastattribs.hxx
@@ -28,9 +28,9 @@
#include <vector>
-namespace com { namespace sun { namespace star { namespace xml { namespace sax { class XFastTokenHandler; } } } } }
-namespace com { namespace sun { namespace star { namespace xml { struct Attribute; } } } }
-namespace com { namespace sun { namespace star { namespace xml { struct FastAttribute; } } } }
+namespace com::sun::star::xml::sax { class XFastTokenHandler; }
+namespace com::sun::star::xml { struct Attribute; }
+namespace com::sun::star::xml { struct FastAttribute; }
namespace sax_fastparser
{
diff --git a/include/sax/fastparser.hxx b/include/sax/fastparser.hxx
index f9776c595831..a7f1e0c015f9 100644
--- a/include/sax/fastparser.hxx
+++ b/include/sax/fastparser.hxx
@@ -28,12 +28,10 @@
#include <sax/fastsaxdllapi.h>
#include <memory>
-namespace com { namespace sun { namespace star { namespace xml { namespace sax {
-
-class XFastDocumentHandler;
-class XFastTokenHandler;
-
-}}}}}
+namespace com::sun::star::xml::sax {
+ class XFastDocumentHandler;
+ class XFastTokenHandler;
+}
namespace sax_fastparser {
diff --git a/include/sax/fshelper.hxx b/include/sax/fshelper.hxx
index 773ce6892e26..7c1f9a2ea1af 100644
--- a/include/sax/fshelper.hxx
+++ b/include/sax/fshelper.hxx
@@ -27,7 +27,7 @@
#include <memory>
#include <utility>
-namespace com { namespace sun { namespace star { namespace io { class XOutputStream; } } } }
+namespace com::sun::star::io { class XOutputStream; }
namespace sax_fastparser { class FastAttributeList; }
constexpr sal_Int32 FSNS(sal_Int32 namespc, sal_Int32 element) { return (namespc << 16) | element; }
diff --git a/include/sax/tools/converter.hxx b/include/sax/tools/converter.hxx
index bb1e66e25ec0..9f7f5b3df50f 100644
--- a/include/sax/tools/converter.hxx
+++ b/include/sax/tools/converter.hxx
@@ -32,7 +32,7 @@
#include <com/sun/star/util/MeasureUnit.hpp>
#include <tools/color.hxx>
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
namespace uno {
class Any;
}
@@ -41,7 +41,7 @@ namespace com { namespace sun { namespace star {
struct DateTime;
struct Duration;
}
-} } }
+}
namespace sax {