No need for a C API here

Change-Id: Ie453a7c97a762932884c5c41b13607a170368107

6 files changed, 14 insertions, 22 deletions

diff --git a/registry/inc/registry.h b/registry/inc/regapi.hxx
index 8af32faa94ec..c84dab43fa61 100644
--- a/registry/inc/registry.h
+++ b/registry/inc/regapi.hxx
@@ -17,18 +17,14 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_REGISTRY_INC_REGISTRY_H
-#define INCLUDED_REGISTRY_INC_REGISTRY_H
+#ifndef INCLUDED_REGISTRY_INC_REGAPI_HXX
+#define INCLUDED_REGISTRY_INC_REGAPI_HXX
 
 #include <stddef.h>
 #include <rtl/ustring.h>
 #include <registry/regtype.h>
 #include <registry/regdllapi.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif  /* __cplusplus */
-
 /** This function creates the specified key.
 
     If the key already exists in the registry, the function opens the key only.
@@ -295,7 +291,7 @@ REG_DLLPUBLIC RegError REGISTRY_CALLTYPE reg_freeValueList(RegValueType valueTyp
  */
 REG_DLLPUBLIC RegError REGISTRY_CALLTYPE reg_getResolvedKeyName(RegKeyHandle hKey,
                                                     rtl_uString* keyName,
-                                                   sal_Bool firstLinkOnly,
+                                                   bool firstLinkOnly,
                                                       rtl_uString** pResolvedName);
 
 /** This function loads registry information from a file and save it under the
@@ -350,8 +346,8 @@ REG_DLLPUBLIC RegError REGISTRY_CALLTYPE reg_saveKey(RegKeyHandle hKey,
 REG_DLLPUBLIC RegError REGISTRY_CALLTYPE reg_mergeKey(RegKeyHandle hKey,
                                            rtl_uString* keyName,
                                            rtl_uString* regFileName,
-                                           sal_Bool bWarnings,
-                                           sal_Bool bReport);
+                                           bool bWarnings,
+                                           bool bReport);
 
 
 /** This function creates a new registry with the specified name and creates a root key.
@@ -388,7 +384,7 @@ REG_DLLPUBLIC RegError REGISTRY_CALLTYPE reg_getName(RegHandle hRegistry, rtl_uS
     @param  hReg identifies a currently open registry.
     @return TRUE if accessmode is read only else FALSE.
 */
-REG_DLLPUBLIC sal_Bool REGISTRY_CALLTYPE reg_isReadOnly(RegHandle hReg);
+REG_DLLPUBLIC bool REGISTRY_CALLTYPE reg_isReadOnly(RegHandle hReg);
 
 
 /** This function opens a registry with the specified name.
@@ -431,10 +427,6 @@ REG_DLLPUBLIC RegError REGISTRY_CALLTYPE reg_destroyRegistry(RegHandle hRegistry
 */
 REG_DLLPUBLIC RegError REGISTRY_CALLTYPE reg_dumpRegistry(RegKeyHandle hKey);
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/registry/source/keyimpl.hxx b/registry/source/keyimpl.hxx
index 148aded6f488..e7cb81071ccc 100644
--- a/registry/source/keyimpl.hxx
+++ b/registry/source/keyimpl.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_REGISTRY_SOURCE_KEYIMPL_HXX
 #define INCLUDED_REGISTRY_SOURCE_KEYIMPL_HXX
 
-#include <registry.h>
+#include <regapi.hxx>
 #include "regimpl.hxx"
 #include <rtl/ustring.hxx>
 
diff --git a/registry/source/regimpl.hxx b/registry/source/regimpl.hxx
index e1cf2832238b..70d4a78cad74 100644
--- a/registry/source/regimpl.hxx
+++ b/registry/source/regimpl.hxx
@@ -23,7 +23,7 @@
 #include <set>
 #include <unordered_map>
 
-#include <registry.h>
+#include <regapi.hxx>
 #include <rtl/ustring.hxx>
 #include <osl/mutex.hxx>
 #include <store/store.hxx>
diff --git a/registry/source/registry.cxx b/registry/source/registry.cxx
index bc73fcb63d10..0b2ec2a0696c 100644
--- a/registry/source/registry.cxx
+++ b/registry/source/registry.cxx
@@ -18,7 +18,7 @@
  */
 
 
-#include <registry.h>
+#include <regapi.hxx>
 #include <registry/registry.hxx>
 
 #include <osl/process.h>
@@ -485,8 +485,8 @@ RegError REGISTRY_CALLTYPE reg_saveKey(RegKeyHandle hKey,
 RegError REGISTRY_CALLTYPE reg_mergeKey(RegKeyHandle hKey,
                                         rtl_uString* keyName,
                                         rtl_uString* regFileName,
-                                        sal_Bool bWarnings,
-                                        sal_Bool bReport)
+                                        bool bWarnings,
+                                        bool bReport)
 {
     ORegKey *pKey;
 
@@ -541,7 +541,7 @@ RegError REGISTRY_CALLTYPE reg_getName(RegHandle hRegistry, rtl_uString** pName)
 
 //  reg_isReadOnly
 
-sal_Bool REGISTRY_CALLTYPE reg_isReadOnly(RegHandle hRegistry)
+bool REGISTRY_CALLTYPE reg_isReadOnly(RegHandle hRegistry)
 {
     return isReadOnly(hRegistry);
 }
diff --git a/registry/source/regkey.cxx b/registry/source/regkey.cxx
index 04751101bf80..ed624dbc8848 100644
--- a/registry/source/regkey.cxx
+++ b/registry/source/regkey.cxx
@@ -907,7 +907,7 @@ RegError REGISTRY_CALLTYPE reg_freeValueList(RegValueType valueType,
 
 RegError REGISTRY_CALLTYPE reg_getResolvedKeyName(RegKeyHandle hKey,
                                                     rtl_uString* keyName,
-                                                    sal_Bool firstLinkOnly,
+                                                    bool firstLinkOnly,
                                                       rtl_uString** pResolvedName)
 {
     if (!hKey)
diff --git a/registry/tools/regview.cxx b/registry/tools/regview.cxx
index 3682d9054012..5b2ae7d355b6 100644
--- a/registry/tools/regview.cxx
+++ b/registry/tools/regview.cxx
@@ -18,7 +18,7 @@
  */
 
 
-#include "registry.h"
+#include "regapi.hxx"
 #include "fileurl.hxx"
 
 #include "rtl/ustring.hxx"