C++ API - rename objectbox-cpp.h to objectbox.hpp

Ivan Dlugos · Ivan Dlugos · commit d7f3a259243b · 2020-10-29T08:42:43.000+01:00
diff --git a/internal/generator/c/templates/binding-hpp.go b/internal/generator/c/templates/binding-hpp.go
@@ -33,8 +33,8 @@ var CppBindingTemplateHeader = template.Must(template.New("binding-hpp").Funcs(f
 #include <cstdint>
 
 #include "flatbuffers/flatbuffers.h"
-#include "objectbox-cpp.h"
 #include "objectbox.h"
+#include "objectbox.hpp"
 {{range $entity := .Model.EntitiesWithMeta}}
 {{$entity.Meta.PreDeclareCppRelTargets -}}
 {{with $entity.Meta.CppNamespaceStart}}
diff --git a/test/build/c-compiler.go b/test/build/c-compiler.go
@@ -35,7 +35,7 @@ func CanCompileObjectBoxCCpp(t *testing.T, repoRoot string, cpp, required bool)
 
 	// check objectbox lib
 	if cpp {
-		err = cmake.LibraryExists("objectbox", []string{"objectbox-cpp.h"}, includeDirs, libDirs)
+		err = cmake.LibraryExists("objectbox", []string{"objectbox.hpp"}, includeDirs, libDirs)
 	} else {
 		err = cmake.LibraryExists("objectbox", []string{"objectbox.h"}, includeDirs, libDirs)
 	}
diff --git a/test/comparison/c-helper.go b/test/comparison/c-helper.go
@@ -100,7 +100,7 @@ func (h cTestHelper) build(t *testing.T, conf testSpec, dir string, expectedErro
 	{ // write main.c/cpp to the conf dir - a simple one, just include all sources
 		var mainSrc = ""
 		if cmak.IsCpp {
-			mainSrc = mainSrc + "#include \"objectbox-cpp.h\"\n"
+			mainSrc = mainSrc + "#include \"objectbox.hpp\"\n"
 		} else {
 			mainSrc = mainSrc + "#include \"objectbox.h\"\n"
 		}
diff --git a/test/comparison/testdata/fbs/typeful/cpp/schema.obx.hpp.expected b/test/comparison/testdata/fbs/typeful/cpp/schema.obx.hpp.expected
@@ -6,8 +6,8 @@
 #include <cstdint>
 
 #include "flatbuffers/flatbuffers.h"
-#include "objectbox-cpp.h"
 #include "objectbox.h"
+#include "objectbox.hpp"
 
 namespace ns { struct AnnotatedEntity; }
 
diff --git a/test/integration/property-clear/cpp/step-1.cpp b/test/integration/property-clear/cpp/step-1.cpp
@@ -1,7 +1,7 @@
 #define CATCH_CONFIG_MAIN
 
 #include "catch2/catch.hpp"
-#include "objectbox-cpp.h"
+#include "objectbox.hpp"
 #include "schema.obx.hpp"
 #include "shared/store-init.h"
 using namespace obx;
diff --git a/test/integration/property-clear/cpp/step-2.cpp b/test/integration/property-clear/cpp/step-2.cpp
@@ -1,7 +1,7 @@
 #define CATCH_CONFIG_MAIN
 
 #include "catch2/catch.hpp"
-#include "objectbox-cpp.h"
+#include "objectbox.hpp"
 #include "schema.obx.hpp"
 #include "shared/store-init.h"
 using namespace obx;
diff --git a/test/integration/renames/cpp/step-1.cpp b/test/integration/renames/cpp/step-1.cpp
@@ -1,7 +1,7 @@
 #define CATCH_CONFIG_MAIN
 
 #include "catch2/catch.hpp"
-#include "objectbox-cpp.h"
+#include "objectbox.hpp"
 #include "schema.obx.hpp"
 #include "shared/store-init.h"
 using namespace obx;
diff --git a/test/integration/renames/cpp/step-2.cpp b/test/integration/renames/cpp/step-2.cpp
@@ -1,7 +1,7 @@
 #define CATCH_CONFIG_MAIN
 
 #include "catch2/catch.hpp"
-#include "objectbox-cpp.h"
+#include "objectbox.hpp"
 #include "schema.obx.hpp"
 #include "shared/store-init.h"
 using namespace obx;
diff --git a/test/integration/sync/cpp/main.cpp b/test/integration/sync/cpp/main.cpp
@@ -1,7 +1,7 @@
 #define CATCH_CONFIG_MAIN
 
 #include "catch2/catch.hpp"
-#include "objectbox-cpp.h"
+#include "objectbox.hpp"
 #include "objectbox-model.h"
 #include "synced.obx.hpp"
 #include "shared/store-init.h"
diff --git a/test/integration/typeful/cpp/main.cpp b/test/integration/typeful/cpp/main.cpp
@@ -2,7 +2,7 @@
 
 #include "annotated.obx.hpp"
 #include "catch2/catch.hpp"
-#include "objectbox-cpp.h"
+#include "objectbox.hpp"
 #include "objectbox-model.h"
 #include "schema.obx.hpp"
 #include "shared/store-init.h"

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ func CanCompileObjectBoxCCpp(t *testing.T, repoRoot string, cpp, required bool)`
`35`	`35`
`36`	`36`	`// check objectbox lib`
`37`	`37`	`if cpp {`
`38`		`- err = cmake.LibraryExists("objectbox", []string{"objectbox-cpp.h"}, includeDirs, libDirs)`
	`38`	`+ err = cmake.LibraryExists("objectbox", []string{"objectbox.hpp"}, includeDirs, libDirs)`
`39`	`39`	`} else {`
`40`	`40`	`err = cmake.LibraryExists("objectbox", []string{"objectbox.h"}, includeDirs, libDirs)`
`41`	`41`	`}`
Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ func (h cTestHelper) build(t *testing.T, conf testSpec, dir string, expectedErro`
`100`	`100`	`{ // write main.c/cpp to the conf dir - a simple one, just include all sources`
`101`	`101`	`var mainSrc = ""`
`102`	`102`	`if cmak.IsCpp {`
`103`		`- mainSrc = mainSrc + "#include \"objectbox-cpp.h\"\n"`
	`103`	`+ mainSrc = mainSrc + "#include \"objectbox.hpp\"\n"`
`104`	`104`	`} else {`
`105`	`105`	`mainSrc = mainSrc + "#include \"objectbox.h\"\n"`
`106`	`106`	`}`