Kaydet (Commit) 2921d677 authored tarafından Stephan Bergmann's avatar Stephan Bergmann

Rename stuff, in preparation of dconf::writeModifications

Change-Id: Icd472e91b222907e2cdcbdba1b78b33c44eff566
üst 12f92e6d
......@@ -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) \
))
......
......@@ -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
......
......@@ -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: */
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment