DSWaylandTizenInputDeviceManager: Imply macros for Pimpl object

Change-Id: Icb3e2d03183b0471d2049e1b3ba53f69ce7619eb

diff --git a/src/DSWaylandServer/DSWaylandTizenInputDevice.cpp b/src/DSWaylandServer/DSWaylandTizenInputDevice.cpp
index 90c8e0f..ea7a47e 100644 (file)
--- a/src/DSWaylandServer/DSWaylandTizenInputDevice.cpp
+++ b/src/DSWaylandServer/DSWaylandTizenInputDevice.cpp
@@ -4,7 +4,8 @@
 namespace display_server
 {
 DSWaylandTizenInputDevicePrivate::DSWaylandTizenInputDevicePrivate(DSWaylandTizenInputDevice *p_ptr)
-       : DSObjectPrivate(p_ptr)
+       : DSObjectPrivate(p_ptr),
+         __p_ptr(p_ptr)
 {
 }
 DSWaylandTizenInputDevicePrivate::~DSWaylandTizenInputDevicePrivate()
@@ -21,7 +22,7 @@ void DSWaylandTizenInputDevicePrivate::tizen_input_device_release(Resource *reso
 
 
 DSWaylandTizenInputDevice::DSWaylandTizenInputDevice()
-       : DSObject(std::make_unique<DSWaylandTizenInputDevicePrivate>(this))
+       : DS_INIT_PRIVATE_PTR(DSWaylandTizenInputDevice)
 {
 }
 

diff --git a/src/DSWaylandServer/DSWaylandTizenInputDevice.h b/src/DSWaylandServer/DSWaylandTizenInputDevice.h
index 2f0060d..e26b3d7 100644 (file)
--- a/src/DSWaylandServer/DSWaylandTizenInputDevice.h
+++ b/src/DSWaylandServer/DSWaylandTizenInputDevice.h
@@ -2,6 +2,7 @@
 #define _DS_WAYLAND_TIZEN_INPUT_DEVICE_H_
 
 #include <DSObject.h>
+#include <DSCore.h>
 
 namespace display_server
 {
@@ -10,20 +11,13 @@ class DSWaylandTizenInputDevicePrivate;
 
 class DSWaylandTizenInputDevice : public DSObject
 {
+DS_PIMPL_USE_PRIVATE(DSWaylandTizenInputDevice);
 public:
        DSWaylandTizenInputDevice();
        virtual ~DSWaylandTizenInputDevice();
 
 private:
-       inline DSWaylandTizenInputDevicePrivate *__d_func()
-       {
-               return reinterpret_cast<DSWaylandTizenInputDevicePrivate *>(_d_ptr.get());
-       }
-       inline const DSWaylandTizenInputDevicePrivate *__d_func() const
-       {
-               return reinterpret_cast<DSWaylandTizenInputDevicePrivate *>(_d_ptr.get());
-       }
-       friend class DSWaylandTizenInputDevicePrivate;
+
 };
 
 }

diff --git a/src/DSWaylandServer/DSWaylandTizenInputDeviceManager.cpp b/src/DSWaylandServer/DSWaylandTizenInputDeviceManager.cpp
index ec41cc6..e8feaf2 100644 (file)
--- a/src/DSWaylandServer/DSWaylandTizenInputDeviceManager.cpp
+++ b/src/DSWaylandServer/DSWaylandTizenInputDeviceManager.cpp
@@ -6,7 +6,8 @@ namespace display_server
 {
 
 DSWaylandTizenInputDeviceManagerPrivate::DSWaylandTizenInputDeviceManagerPrivate(DSWaylandTizenInputDeviceManager *p_ptr)
-       : DSObjectPrivate(p_ptr)
+       : DSObjectPrivate(p_ptr),
+         __p_ptr(p_ptr)
 {
 }
 
@@ -58,7 +59,7 @@ void DSWaylandTizenInputDeviceManagerPrivate::tizen_input_device_manager_generat
 
 
 DSWaylandTizenInputDeviceManager::DSWaylandTizenInputDeviceManager()
-       : DSObject(std::make_unique<DSWaylandTizenInputDeviceManagerPrivate>(this))
+       : DS_INIT_PRIVATE_PTR(DSWaylandTizenInputDeviceManager)
 {
 }
 

diff --git a/src/DSWaylandServer/DSWaylandTizenInputDeviceManager.h b/src/DSWaylandServer/DSWaylandTizenInputDeviceManager.h
index 36ce7e5..7d7738b 100644 (file)
--- a/src/DSWaylandServer/DSWaylandTizenInputDeviceManager.h
+++ b/src/DSWaylandServer/DSWaylandTizenInputDeviceManager.h
@@ -2,6 +2,7 @@
 #define _DS_WAYLAND_TIZEN_INPUT_DEVICE_MANAGER_H_
 
 #include <DSObject.h>
+#include <DSCore.h>
 
 namespace display_server
 {
@@ -10,20 +11,13 @@ class DSWaylandTizenInputDeviceManagerPrivate;
 
 class DSWaylandTizenInputDeviceManager : public DSObject
 {
+DS_PIMPL_USE_PRIVATE(DSWaylandTizenInputDeviceManager);
 public:
        DSWaylandTizenInputDeviceManager();
        virtual ~DSWaylandTizenInputDeviceManager();
 
 private:
-       inline DSWaylandTizenInputDeviceManagerPrivate *__d_func()
-       {
-               return reinterpret_cast<DSWaylandTizenInputDeviceManagerPrivate *>(_d_ptr.get());
-       }
-       inline const DSWaylandTizenInputDeviceManagerPrivate *__d_func() const
-       {
-               return reinterpret_cast<DSWaylandTizenInputDeviceManagerPrivate *>(_d_ptr.get());
-       }
-       friend class DSWaylandTizenInputDeviceManagerPrivate;
+
 };
 
 }

diff --git a/src/DSWaylandServer/DSWaylandTizenInputDeviceManagerPrivate.h b/src/DSWaylandServer/DSWaylandTizenInputDeviceManagerPrivate.h
index a3cb000..98eebd3 100644 (file)
--- a/src/DSWaylandServer/DSWaylandTizenInputDeviceManagerPrivate.h
+++ b/src/DSWaylandServer/DSWaylandTizenInputDeviceManagerPrivate.h
@@ -9,6 +9,7 @@ namespace display_server
 
 class DSWaylandTizenInputDeviceManagerPrivate : public DSObjectPrivate, public DSWaylandServer::tizen_input_device_manager
 {
+DS_PIMPL_USE_PUBLIC(DSWaylandTizenInputDeviceManager);
 public:
        DSWaylandTizenInputDeviceManagerPrivate() = delete;
        DSWaylandTizenInputDeviceManagerPrivate(DSWaylandTizenInputDeviceManager *p_ptr);

diff --git a/src/DSWaylandServer/DSWaylandTizenInputDevicePrivate.h b/src/DSWaylandServer/DSWaylandTizenInputDevicePrivate.h
index eb1efd2..73b2c2f 100644 (file)
--- a/src/DSWaylandServer/DSWaylandTizenInputDevicePrivate.h
+++ b/src/DSWaylandServer/DSWaylandTizenInputDevicePrivate.h
@@ -9,6 +9,7 @@ namespace display_server
 
 class DSWaylandTizenInputDevicePrivate : public DSObjectPrivate, public DSWaylandServer::tizen_input_device
 {
+DS_PIMPL_USE_PUBLIC(DSWaylandTizenInputDevice);
 public:
        DSWaylandTizenInputDevicePrivate() = delete;
        DSWaylandTizenInputDevicePrivate(DSWaylandTizenInputDevice *p_ptr);