[Xfce4-commits] <xfce4-mm:master> Removed extra File, Resource, Misc, Utf8 namespaces.

[Jens Luedicke]

Updating branch refs/heads/master
         to 8347cdbe6dca8aceb3185678acfc3bde01c5a176 (commit)
       from 47fd6a57e5c494b1e5cc446647d342dd5efe60b4 (commit)

commit 8347cdbe6dca8aceb3185678acfc3bde01c5a176
Author: Jens Luedicke <perldude at xfce.org>
Date:   Sun Jan 16 23:31:48 2011 +0100

    Removed extra File, Resource, Misc, Utf8 namespaces.

 libxfce4util-mm/file-utils.cpp  |    2 --
 libxfce4util-mm/file-utils.h    |    2 --
 libxfce4util-mm/misc-utils.cpp  |    2 --
 libxfce4util-mm/misc-utils.h    |    2 --
 libxfce4util-mm/rc.cpp          |    2 +-
 libxfce4util-mm/rc.h            |    2 +-
 libxfce4util-mm/resource-enum.h |    2 --
 libxfce4util-mm/resource.cpp    |    2 --
 libxfce4util-mm/resource.h      |    2 --
 libxfce4util-mm/utf8-utils.cpp  |    2 --
 libxfce4util-mm/utf8-utils.h    |    2 --
 11 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/libxfce4util-mm/file-utils.cpp b/libxfce4util-mm/file-utils.cpp
index 2efb1d5..c51b8c4 100644
--- a/libxfce4util-mm/file-utils.cpp
+++ b/libxfce4util-mm/file-utils.cpp
@@ -33,7 +33,6 @@
 
 namespace Xfce4 {
 namespace Util {
-namespace File {
 
 bool mkdirhier(const Glib::ustring &whole_path,
                gulong mode,
@@ -48,4 +47,3 @@ bool mkdirhier(const Glib::ustring &whole_path,
 
 }
 }
-}
diff --git a/libxfce4util-mm/file-utils.h b/libxfce4util-mm/file-utils.h
index e9959a7..5c6752a 100644
--- a/libxfce4util-mm/file-utils.h
+++ b/libxfce4util-mm/file-utils.h
@@ -31,7 +31,6 @@
 
 namespace Xfce4 {
 namespace Util {
-namespace File {
 
 bool mkdirhier(const Glib::ustring &whole_path,
                gulong mode,
@@ -39,6 +38,5 @@ bool mkdirhier(const Glib::ustring &whole_path,
 
 }
 }
-}
 
 #endif /* _XFCE_FILE_UTILS_H_ */
diff --git a/libxfce4util-mm/misc-utils.cpp b/libxfce4util-mm/misc-utils.cpp
index 8a4b447..9d2b82f 100644
--- a/libxfce4util-mm/misc-utils.cpp
+++ b/libxfce4util-mm/misc-utils.cpp
@@ -33,7 +33,6 @@
 
 namespace Xfce4 {
 namespace Util {
-namespace Misc {
 
 const Glib::ustring get_homedir()
 {
@@ -105,4 +104,3 @@ Glib::ustring expand_variables(const Glib::ustring &command,
 
 }
 }
-}
diff --git a/libxfce4util-mm/misc-utils.h b/libxfce4util-mm/misc-utils.h
index e88d70d..4afd2a2 100644
--- a/libxfce4util-mm/misc-utils.h
+++ b/libxfce4util-mm/misc-utils.h
@@ -31,7 +31,6 @@
 
 namespace Xfce4 {
 namespace Util {
-namespace Misc {
 
 const Glib::ustring get_homedir();
 const Glib::ustring get_userdir();
@@ -53,7 +52,6 @@ Glib::ustring expand_variables(const Glib::ustring &command,
 
 }
 }
-}
 
 #endif /* _XFCE_MISC_UTILS_H_ */
 
diff --git a/libxfce4util-mm/rc.cpp b/libxfce4util-mm/rc.cpp
index f00b05c..290eec8 100644
--- a/libxfce4util-mm/rc.cpp
+++ b/libxfce4util-mm/rc.cpp
@@ -46,7 +46,7 @@ Rc::Rc(const Glib::ustring &filename,
 	d->rc = xfce_rc_simple_open(filename.c_str(), static_cast<gboolean>(readonly));
 }
 
-Rc::Rc(Resource::ResourceType type,
+Rc::Rc(ResourceType type,
        const Glib::ustring &resource,
        bool readonly)
 : d(new RcPrivate)
diff --git a/libxfce4util-mm/rc.h b/libxfce4util-mm/rc.h
index d55c1c5..5f0cd3f 100644
--- a/libxfce4util-mm/rc.h
+++ b/libxfce4util-mm/rc.h
@@ -41,7 +41,7 @@ public:
 	Rc(const Glib::ustring &filename,
 	   bool readonly);
 
-	Rc(Resource::ResourceType type,
+	Rc(ResourceType type,
 	   const Glib::ustring &resource,
 	   bool readonly);
 
diff --git a/libxfce4util-mm/resource-enum.h b/libxfce4util-mm/resource-enum.h
index eecfaca..da85bae 100644
--- a/libxfce4util-mm/resource-enum.h
+++ b/libxfce4util-mm/resource-enum.h
@@ -28,7 +28,6 @@
 
 namespace Xfce4 {
 namespace Util {
-namespace Resource {
 
 enum ResourceType {
   RESOURCE_DATA   = 0,
@@ -40,6 +39,5 @@ enum ResourceType {
 
 }
 }
-}
 
 #endif /* _XFCE_RESOURCE_ENUM_H_ */
diff --git a/libxfce4util-mm/resource.cpp b/libxfce4util-mm/resource.cpp
index 8a52970..fc42404 100644
--- a/libxfce4util-mm/resource.cpp
+++ b/libxfce4util-mm/resource.cpp
@@ -33,7 +33,6 @@
 
 namespace Xfce4 {
 namespace Util {
-namespace Resource {
 
 Glib::StringArrayHandle dirs(ResourceType type)
 {
@@ -126,4 +125,3 @@ Glib::ustring save_location(ResourceType type,
 
 }
 }
-}
diff --git a/libxfce4util-mm/resource.h b/libxfce4util-mm/resource.h
index 735dd4e..092a1f2 100644
--- a/libxfce4util-mm/resource.h
+++ b/libxfce4util-mm/resource.h
@@ -33,7 +33,6 @@
 
 namespace Xfce4 {
 namespace Util {
-namespace Resource {
 
 typedef gboolean (*MatchFunc)(const gchar*, const gchar*, gpointer);
 
@@ -72,6 +71,5 @@ Glib::ustring save_location(ResourceType type,
 
 }
 }
-}
 
 #endif /* _XFCE_RESOURCE_H_ */
diff --git a/libxfce4util-mm/utf8-utils.cpp b/libxfce4util-mm/utf8-utils.cpp
index c9b2cc4..c12451e 100644
--- a/libxfce4util-mm/utf8-utils.cpp
+++ b/libxfce4util-mm/utf8-utils.cpp
@@ -33,7 +33,6 @@
 
 namespace Xfce4 {
 namespace Util {
-namespace Utf8 {
 
 Glib::ustring remove_controls(Glib::ustring &str, gssize max_len, const Glib::ustring &end)
 {	
@@ -61,4 +60,3 @@ Glib::ustring strndup(const Glib::ustring &src, gssize max_len)
 
 }
 }
-}
diff --git a/libxfce4util-mm/utf8-utils.h b/libxfce4util-mm/utf8-utils.h
index 4034a5e..65e42e1 100644
--- a/libxfce4util-mm/utf8-utils.h
+++ b/libxfce4util-mm/utf8-utils.h
@@ -30,13 +30,11 @@
 
 namespace Xfce4 {
 namespace Util {
-namespace Utf8 {
 
 Glib::ustring remove_controls(Glib::ustring &str, gssize max_len, const Glib::ustring &end);
 Glib::ustring strndup(const Glib::ustring &src, gssize max_len);
 
 }
 }
-}
 
 #endif /* _XFCE_UTF8_UTILS_H_ */