[Libreoffice-commits] core.git: include/svx

[Tomaž Vajngerl (via logerrit)]

 include/svx/svdograf.hxx |   13 ++-----------
 include/svx/svdpage.hxx  |    2 +-
 include/svx/svdpagv.hxx  |   16 +++++-----------
 3 files changed, 8 insertions(+), 23 deletions(-)

New commits:
commit ea269c0a04ede8206ba15fd77d26bbd99ec44c75
Author:     Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
AuthorDate: Tue Jul 20 21:39:02 2021 +0900
Commit:     Tomaž Vajngerl <quikee at gmail.com>
CommitDate: Sat Jul 31 04:10:49 2021 +0200

    svx: cleanup some forward decls, unneeded pragma once, whitespace
    
    Change-Id: I26cd723e0ffe907a7aa8cb4f73ba6bfbd6db5fbc
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119719
    Tested-by: Jenkins
    Reviewed-by: Tomaž Vajngerl <quikee at gmail.com>

diff --git a/include/svx/svdograf.hxx b/include/svx/svdograf.hxx
index bf7e329d5442..69ce11533caa 100644
--- a/include/svx/svdograf.hxx
+++ b/include/svx/svdograf.hxx
@@ -29,17 +29,8 @@
 #include <o3tl/typed_flags_set.hxx>
 #include <memory>
 
-namespace sdr
-{
-    namespace properties
-    {
-        class GraphicProperties;
-    } // end of namespace properties
-    namespace contact
-    {
-        class ViewObjectContactOfGraphic;
-    } // end of namespace contact
-} // end of namespace sdr
+namespace sdr::properties { class GraphicProperties; }
+namespace sdr::contact { class ViewObjectContactOfGraphic; }
 
 /**
  * Options for GetTransformedGraphic()
diff --git a/include/svx/svdpage.hxx b/include/svx/svdpage.hxx
index d5552a7c72a4..fc6936a95282 100644
--- a/include/svx/svdpage.hxx
+++ b/include/svx/svdpage.hxx
@@ -64,7 +64,7 @@ private:
     SdrObjList(const SdrObjList& rSrcList) = delete;
     SdrObjList &operator=(const SdrObjList& rSrcList) = delete;
 
-    ::std::vector<SdrObject*>   maList;
+    std::vector<SdrObject*> maList;
 
     tools::Rectangle    maSdrObjListOutRect;
     tools::Rectangle    maSdrObjListSnapRect;
diff --git a/include/svx/svdpagv.hxx b/include/svx/svdpagv.hxx
index ab9bfa5625ae..3aceb48d1d4b 100644
--- a/include/svx/svdpagv.hxx
+++ b/include/svx/svdpagv.hxx
@@ -42,20 +42,16 @@ class SdrView;
 class SdrPageObj;
 class SdrPageView;
 
-namespace sdr
+namespace sdr::contact
 {
-    namespace contact
-    {
-        class ViewObjectContactRedirector;
-        class DisplayInfo;
-        class ViewObjectContactRedirector;
-    } // end of namespace contact
-} // end of namespace sdr
+    class ViewObjectContactRedirector;
+    class DisplayInfo;
+    class ViewObjectContactRedirector;
+}
 
 // typedefs for a list of SdrPageWindow
 class SdrPageWindow;
 
-
 class SVXCORE_DLLPUBLIC SdrPageView
 {
 private:
@@ -255,6 +251,4 @@ public:
     const Color& GetApplicationDocumentColor() const { return maDocumentColor;}
 };
 
-#pragma once
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */