From 2921d6773698cc588f808172b37fb28d80b28a9c Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Fri, 28 Aug 2015 14:41:40 +0200
Subject: [PATCH] Rename stuff, in preparation of dconf::writeModifications

Change-Id: Icd472e91b222907e2cdcbdba1b78b33c44eff566
---
 configmgr/Library_configmgr.mk                     |  2 +-
 configmgr/source/components.cxx                    |  4 ++--
 configmgr/source/{readdconflayer.cxx => dconf.cxx} |  8 ++++----
 configmgr/source/{readdconflayer.hxx => dconf.hxx} | 10 +++++-----
 4 files changed, 12 insertions(+), 12 deletions(-)
 rename configmgr/source/{readdconflayer.cxx => dconf.cxx} (99%)
 rename configmgr/source/{readdconflayer.hxx => dconf.hxx} (72%)

diff --git a/configmgr/Library_configmgr.mk b/configmgr/Library_configmgr.mk
index 36c316a6b28e..81367ca9e21d 100644
--- a/configmgr/Library_configmgr.mk
+++ b/configmgr/Library_configmgr.mk
@@ -43,7 +43,7 @@ $(eval $(call gb_Library_add_exception_objects,configmgr, \
     configmgr/source/xcsparser \
     configmgr/source/xcuparser \
     configmgr/source/xmldata \
-    $(if $(ENABLE_DCONF),configmgr/source/readdconflayer) \
+    $(if $(ENABLE_DCONF),configmgr/source/dconf) \
     $(if $(filter $(OS),WNT),configmgr/source/winreg) \
 ))
 
diff --git a/configmgr/source/components.cxx b/configmgr/source/components.cxx
index d6f7144f58df..1b9066a45ee3 100644
--- a/configmgr/source/components.cxx
+++ b/configmgr/source/components.cxx
@@ -66,7 +66,7 @@
 #include "xcsparser.hxx"
 
 #if ENABLE_DCONF
-#include <readdconflayer.hxx>
+#include <dconf.hxx>
 #endif
 
 #if defined WNT
@@ -536,7 +536,7 @@ Components::Components(
             if (url == "!") {
                 modificationTarget_ = ModificationTarget::Dconf;
             } else if (url == "*") {
-                readDconfLayer(data_, layer);
+                dconf::readLayer(data_, layer);
             } else {
                 throw css::uno::RuntimeException(
                     "CONFIGURATION_LAYERS: unknown \"dconf\" kind \"" + url
diff --git a/configmgr/source/readdconflayer.cxx b/configmgr/source/dconf.cxx
similarity index 99%
rename from configmgr/source/readdconflayer.cxx
rename to configmgr/source/dconf.cxx
index 035f554dea9e..7d1bc793850b 100644
--- a/configmgr/source/readdconflayer.cxx
+++ b/configmgr/source/dconf.cxx
@@ -20,12 +20,12 @@
 #include <com/sun/star/uno/Sequence.hxx>
 
 #include <data.hxx>
+#include <dconf.hxx>
 #include <groupnode.hxx>
 #include <localizedpropertynode.hxx>
 #include <localizedvaluenode.hxx>
 #include <nodemap.hxx>
 #include <propertynode.hxx>
-#include <readdconflayer.hxx>
 #include <setnode.hxx>
 
 // component-data is encoded in dconf as follows:
@@ -95,7 +95,7 @@
 //
 // TODO: support "mandatory" and "external"?
 
-namespace configmgr {
+namespace configmgr { namespace dconf {
 
 namespace {
 
@@ -941,13 +941,13 @@ void readDir(
 
 }
 
-void readDconfLayer(Data & data, int layer) {
+void readLayer(Data & data, int layer) {
     GObjectHolder<DConfClient> client(dconf_client_new());
     readDir(
         data, layer, rtl::Reference<Node>(), data.getComponents(), client,
         "/org/libreoffice/registry/");
 }
 
-}
+} }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/configmgr/source/readdconflayer.hxx b/configmgr/source/dconf.hxx
similarity index 72%
rename from configmgr/source/readdconflayer.hxx
rename to configmgr/source/dconf.hxx
index 63a4698fbce4..0f63e04b3db0 100644
--- a/configmgr/source/readdconflayer.hxx
+++ b/configmgr/source/dconf.hxx
@@ -7,18 +7,18 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef INCLUDED_CONFIGMGR_SOURCE_READDCONFLAYER_HXX
-#define INCLUDED_CONFIGMGR_SOURCE_READDCONFLAYER_HXX
+#ifndef INCLUDED_CONFIGMGR_SOURCE_DCONF_HXX
+#define INCLUDED_CONFIGMGR_SOURCE_DCONF_HXX
 
 #include <sal/config.h>
 
 namespace configmgr { struct Data; }
 
-namespace configmgr {
+namespace configmgr { namespace dconf {
 
-void readDconfLayer(Data & data, int layer);
+void readLayer(Data & data, int layer);
 
-}
+} }
 
 #endif