DSWindow: remove setWindowShell and getWindowShell methods.

bool setWindowShell(DSWindowShell *winShell);
DSWindowShell *getWindowShell(void);

Change-Id: I64870d9f324619357e2c668d8442ab199b6527b7

diff --git a/src/DSWindow/DSWindow.cpp b/src/DSWindow/DSWindow.cpp
index 6267a96..d9e0599 100644 (file)
--- a/src/DSWindow/DSWindow.cpp
+++ b/src/DSWindow/DSWindow.cpp
@@ -43,7 +43,6 @@ DSWindowPrivate::DSWindowPrivate(DSWindow *p_ptr)
          __created(false),
          __hasFocus(false),
          __waylandSurface(nullptr),
-         __winShell(nullptr),
          __acceptsFocus(true),
          __allowUserGeometry(false),
          __title(""),
@@ -161,23 +160,6 @@ bool DSWindowPrivate::isCreated()
        return __created;
 }
 
-bool DSWindowPrivate::setWindowShell(DSWindowShell *winShell)
-{
-       if (__winShell)
-       {
-               DSLOG_ERR("DSWindow", "Already exist DSWindowShell...");
-               return false;
-       }
-
-       __winShell = winShell;
-       return true;
-}
-
-DSWindowShell *DSWindowPrivate::getWindowShell(void)
-{
-       return __winShell;
-}
-
 bool DSWindowPrivate::setVkbdFloating(bool set)
 {
        __vkbd_floating = set;
@@ -450,19 +432,6 @@ DSWaylandSurface *DSWindow::surface()
        return priv->__waylandSurface.get();
 }
 
-
-bool DSWindow::setWindowShell(DSWindowShell *winShell)
-{
-       DS_GET_PRIV(DSWindow);
-       return priv->setWindowShell(winShell);
-}
-
-DSWindowShell *DSWindow::getWindowShell(void)
-{
-       DS_GET_PRIV(DSWindow);
-       return priv->getWindowShell();
-}
-
 void DSWindow::registerCallbackSizeChanged(DSObject *slot, std::function<void(std::shared_ptr<stSize>)> func)
 {
        __sizeChangedSignal.connect(slot, func);

diff --git a/src/DSWindow/DSWindow.h b/src/DSWindow/DSWindow.h
index 2a70cd0..fc4d810 100644 (file)
--- a/src/DSWindow/DSWindow.h
+++ b/src/DSWindow/DSWindow.h
@@ -90,9 +90,6 @@ public:
 
        DSWaylandSurface *surface();
 
-       bool setWindowShell(DSWindowShell *winShell);
-       DSWindowShell *getWindowShell(void);
-
        void registerCallbackSizeChanged(DSObject *slot, std::function<void(std::shared_ptr<stSize>)> func);
        void registerCallbackBufferChanged(DSObject *slot, std::function<void(std::shared_ptr<IDSBuffer>)> func);
        void registerCallbackWindowRaiseToTop(DSObject *slot, std::function<void(void *)> func);

diff --git a/src/DSWindow/DSWindowPrivate.h b/src/DSWindow/DSWindowPrivate.h
index a6a8200..3e87830 100644 (file)
--- a/src/DSWindow/DSWindowPrivate.h
+++ b/src/DSWindow/DSWindowPrivate.h
@@ -70,9 +70,6 @@ public:
        bool setFocus(void);
        bool isCreated();
 
-       bool setWindowShell(DSWindowShell *winShell);
-       DSWindowShell *getWindowShell(void);
-
        bool setVkbdFloating(bool set);
        bool getVkbdFloating();
 
@@ -89,7 +86,6 @@ private:
        bool __created;
        bool __hasFocus;
        std::shared_ptr<DSWaylandSurface> __waylandSurface;
-       DSWindowShell *__winShell;
        bool __acceptsFocus;
        bool __allowUserGeometry;
        std::string __title;

diff --git a/src/DSZone/DSZone.cpp b/src/DSZone/DSZone.cpp
index 58ce34c..2493f8c 100644 (file)
--- a/src/DSZone/DSZone.cpp
+++ b/src/DSZone/DSZone.cpp
@@ -161,9 +161,6 @@ void DSZone::__onSurfaceCreated(std::shared_ptr<DSWaylandSurface> waylandSurface
 
        // create DSWindowShell
        std::shared_ptr<DSWindowShell> shell = __createWindowShell(window);
-
-       // set DSWindowShell to DSWindow
-       window->setWindowShell(shell.get());
 }
 
 void DSZone::__onSurfaceDestroy(std::shared_ptr<DSWaylandSurface> waylandSurface)

diff --git a/tests/DSWindow-test.cpp b/tests/DSWindow-test.cpp
index 88f8b48..1ac52c9 100644 (file)
--- a/tests/DSWindow-test.cpp
+++ b/tests/DSWindow-test.cpp
@@ -119,12 +119,6 @@ TEST_F(DSWindowTest, WindowShellTest)
 
        auto winShell = std::make_shared<DSWindowShell>(win.get());
        EXPECT_TRUE(winShell != nullptr);
-
-       EXPECT_TRUE(win->setWindowShell(winShell.get()) == true);
-
-       DSWindowShell *getWinShell = nullptr;
-       getWinShell = win->getWindowShell();
-       EXPECT_TRUE(winShell.get() == getWinShell);
 }
 
 TEST_F(DSWindowTest, TitleTest)