Merge branch 'dev'

Homegear · Nov 23, 2016 · 61b60a0 · 61b60a0
2 parents 5dd1118 + b4ade62
commit 61b60a0
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 7 deletions.
diff --git a/getVersion.sh b/getVersion.sh
@@ -5,7 +5,7 @@ cat > "$dir/libhomegear-base-version.cpp" <<-'EOF'
 
 int main(int argc, char** argv)
 {
-	std::cout << BaseLib::Obj::version() << std::endl;
+	std::cout << BaseLib::SharedObjects::version() << std::endl;
 	return 0;
 }
 EOF

diff --git a/src/Factory.cpp b/src/Factory.cpp
@@ -31,7 +31,7 @@
 #include "../config.h"
 #include "GD.h"
 
-BaseLib::Systems::DeviceFamily* MyFactory::createDeviceFamily(BaseLib::Obj* bl, BaseLib::Systems::DeviceFamily::IFamilyEventSink* eventHandler)
+BaseLib::Systems::DeviceFamily* MyFactory::createDeviceFamily(BaseLib::SharedObjects* bl, BaseLib::Systems::DeviceFamily::IFamilyEventSink* eventHandler)
 {
 	return new MyFamily::MyFamily(bl, eventHandler);
 }

diff --git a/src/Factory.h b/src/Factory.h
@@ -36,7 +36,7 @@
 class MyFactory : BaseLib::Systems::SystemFactory
 {
 public:
-	virtual BaseLib::Systems::DeviceFamily* createDeviceFamily(BaseLib::Obj* bl, BaseLib::Systems::DeviceFamily::IFamilyEventSink* eventHandler);
+	virtual BaseLib::Systems::DeviceFamily* createDeviceFamily(BaseLib::SharedObjects* bl, BaseLib::Systems::DeviceFamily::IFamilyEventSink* eventHandler);
 };
 
 extern "C" std::string getVersion();

diff --git a/src/GD.cpp b/src/GD.cpp
@@ -31,7 +31,7 @@
 
 namespace MyFamily
 {
-	BaseLib::Obj* GD::bl = nullptr;
+	BaseLib::SharedObjects* GD::bl = nullptr;
 	MyFamily* GD::family = nullptr;
 	BaseLib::Output GD::out;
 }
diff --git a/src/GD.h b/src/GD.h
@@ -44,7 +44,7 @@ class GD
 public:
 	virtual ~GD();
 
-	static BaseLib::Obj* bl;
+	static BaseLib::SharedObjects* bl;
 	static MyFamily* family;
 	static BaseLib::Output out;
 private:

diff --git a/src/MyFamily.cpp b/src/MyFamily.cpp
@@ -34,7 +34,7 @@
 namespace MyFamily
 {
 
-MyFamily::MyFamily(BaseLib::Obj* bl, BaseLib::Systems::DeviceFamily::IFamilyEventSink* eventHandler) : BaseLib::Systems::DeviceFamily(bl, eventHandler, MY_FAMILY_ID, MY_FAMILY_NAME)
+MyFamily::MyFamily(BaseLib::SharedObjects* bl, BaseLib::Systems::DeviceFamily::IFamilyEventSink* eventHandler) : BaseLib::Systems::DeviceFamily(bl, eventHandler, MY_FAMILY_ID, MY_FAMILY_NAME)
 {
 	GD::bl = bl;
 	GD::family = this;

diff --git a/src/MyFamily.h b/src/MyFamily.h
@@ -41,7 +41,7 @@ class MyCentral;
 class MyFamily : public BaseLib::Systems::DeviceFamily
 {
 public:
-	MyFamily(BaseLib::Obj* bl, BaseLib::Systems::DeviceFamily::IFamilyEventSink* eventHandler);
+	MyFamily(BaseLib::SharedObjects* bl, BaseLib::Systems::DeviceFamily::IFamilyEventSink* eventHandler);
 	virtual ~MyFamily();
 	virtual void dispose();