ui: move some controller files

tizen/src/ui/ -> tizen/src/ui/controller/

Change-Id: I3496f9dcd48e7fbe167aa8ca7e9068c1672a11be
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>

diff --git a/tizen/src/display/qt5_supplement.cpp b/tizen/src/display/qt5_supplement.cpp
index 2a3489e..7a4368e 100644 (file)
--- a/tizen/src/display/qt5_supplement.cpp
+++ b/tizen/src/display/qt5_supplement.cpp
@@ -32,9 +32,7 @@
 
 #include "qt5_supplement.h"
 #include "mainwindow.h"
-#include "uiinformation.h"
 #include "hardwarekey.h"
-#include "floatingcontroller.h"
 #include "xmllayoutparser.h"
 #include "uiutil.h"
 

diff --git a/tizen/src/ui/Makefile.objs b/tizen/src/ui/Makefile.objs
index 518a914..499efb6 100644 (file)
--- a/tizen/src/ui/Makefile.objs
+++ b/tizen/src/ui/Makefile.objs
@@ -6,10 +6,6 @@ $(obj)/qrc_resource.cpp: $(TIZEN_UI)/resource/resource.qrc
        rcc -name resource $< -o $@
 
 obj-$(CONFIG_QT) += controllerform.o
-obj-$(CONFIG_QT) += dockingcontroller.o moc_dockingcontroller.o
-obj-$(CONFIG_QT) += dockingconview.o
-obj-$(CONFIG_QT) += floatingcontroller.o moc_floatingcontroller.o
-obj-$(CONFIG_QT) += floatingconview.o
 obj-$(CONFIG_QT) += displaybase.o
 obj-$(CONFIG_QT) += displayglwidget.o moc_displayglwidget.o
 obj-$(CONFIG_QT) += displayswwidget.o moc_displayswwidget.o
@@ -33,12 +29,6 @@ obj-$(CONFIG_QT) += qrc_resource.o
 obj-$(CONFIG_QT) += controller/
 obj-$(CONFIG_QT) += menu/
 
-$(obj)/moc_dockingcontroller.o: $(obj)/moc_dockingcontroller.cpp
-$(obj)/moc_dockingcontroller.cpp: $(obj)/dockingcontroller.h
-       moc $< -o $@
-$(obj)/moc_floatingcontroller.o: $(obj)/moc_floatingcontroller.cpp
-$(obj)/moc_floatingcontroller.cpp: $(obj)/floatingcontroller.h
-       moc $< -o $@
 $(obj)/moc_displayglwidget.o: $(obj)/moc_displayglwidget.cpp
 $(obj)/moc_displayglwidget.cpp: $(obj)/displayglwidget.h
        moc $< -o $@

diff --git a/tizen/src/ui/controller/Makefile.objs b/tizen/src/ui/controller/Makefile.objs
index 8149614..2dd3fbb 100644 (file)
--- a/tizen/src/ui/controller/Makefile.objs
+++ b/tizen/src/ui/controller/Makefile.objs
@@ -1 +1,12 @@
-obj-$(CONFIG_QT) += generalpurposecon.o
\ No newline at end of file
+obj-$(CONFIG_QT) += dockingcontroller.o moc_dockingcontroller.o
+obj-$(CONFIG_QT) += dockingconview.o
+obj-$(CONFIG_QT) += floatingcontroller.o moc_floatingcontroller.o
+obj-$(CONFIG_QT) += floatingconview.o
+obj-$(CONFIG_QT) += generalpurposecon.o
+
+$(obj)/moc_dockingcontroller.o: $(obj)/moc_dockingcontroller.cpp
+$(obj)/moc_dockingcontroller.cpp: $(obj)/dockingcontroller.h
+       moc $< -o $@
+$(obj)/moc_floatingcontroller.o: $(obj)/moc_floatingcontroller.cpp
+$(obj)/moc_floatingcontroller.cpp: $(obj)/floatingcontroller.h
+       moc $< -o $@
\ No newline at end of file

diff --git a/tizen/src/ui/dockingcontroller.cpp b/tizen/src/ui/controller/dockingcontroller.cpp
similarity index 100%
rename from tizen/src/ui/dockingcontroller.cpp
rename to tizen/src/ui/controller/dockingcontroller.cpp

diff --git a/tizen/src/ui/dockingcontroller.h b/tizen/src/ui/controller/dockingcontroller.h
similarity index 100%
rename from tizen/src/ui/dockingcontroller.h
rename to tizen/src/ui/controller/dockingcontroller.h

diff --git a/tizen/src/ui/dockingconview.cpp b/tizen/src/ui/controller/dockingconview.cpp
similarity index 100%
rename from tizen/src/ui/dockingconview.cpp
rename to tizen/src/ui/controller/dockingconview.cpp

diff --git a/tizen/src/ui/dockingconview.h b/tizen/src/ui/controller/dockingconview.h
similarity index 100%
rename from tizen/src/ui/dockingconview.h
rename to tizen/src/ui/controller/dockingconview.h

diff --git a/tizen/src/ui/floatingcontroller.cpp b/tizen/src/ui/controller/floatingcontroller.cpp
similarity index 100%
rename from tizen/src/ui/floatingcontroller.cpp
rename to tizen/src/ui/controller/floatingcontroller.cpp

diff --git a/tizen/src/ui/floatingcontroller.h b/tizen/src/ui/controller/floatingcontroller.h
similarity index 100%
rename from tizen/src/ui/floatingcontroller.h
rename to tizen/src/ui/controller/floatingcontroller.h

diff --git a/tizen/src/ui/floatingconview.cpp b/tizen/src/ui/controller/floatingconview.cpp
similarity index 100%
rename from tizen/src/ui/floatingconview.cpp
rename to tizen/src/ui/controller/floatingconview.cpp

diff --git a/tizen/src/ui/floatingconview.h b/tizen/src/ui/controller/floatingconview.h
similarity index 100%
rename from tizen/src/ui/floatingconview.h
rename to tizen/src/ui/controller/floatingconview.h

diff --git a/tizen/src/ui/mainwindow.h b/tizen/src/ui/mainwindow.h
index cd31462..93fdc31 100644 (file)
--- a/tizen/src/ui/mainwindow.h
+++ b/tizen/src/ui/mainwindow.h
@@ -41,8 +41,8 @@
 #include "displaybase.h"
 #include "skinbezelitem.h"
 #include "uiinformation.h"
-#include "dockingcontroller.h"
-#include "floatingcontroller.h"
+#include "controller/dockingcontroller.h"
+#include "controller/floatingcontroller.h"
 #include "keyboardshortcut.h"
 
 extern "C" {

diff --git a/tizen/src/ui/uistate.h b/tizen/src/ui/uistate.h
index a77e9c5..9d0bf0d 100644 (file)
--- a/tizen/src/ui/uistate.h
+++ b/tizen/src/ui/uistate.h
@@ -30,8 +30,8 @@
 #ifndef UISTATE_H
 #define UISTATE_H
 
-#include "dockingcontroller.h"
-#include "floatingcontroller.h"
+#include "controller/dockingcontroller.h"
+#include "controller/floatingcontroller.h"
 
 class ControllerState
 {