From 6ab87d4daadf6e21d5cd551237e84705477beb14 Mon Sep 17 00:00:00 2001 From: GiWoong Kim Date: Wed, 22 Apr 2015 15:19:53 +0900 Subject: [PATCH] layout: moved layout source code files tizen/src/ui/controllerform.cpp -> tizen/src/ui/layout/controllerform.cpp tizen/src/ui/displaytype.cpp -> tizen/src/ui/layout/displaytype.cpp tizen/src/ui/hardwarekey.cpp -> tizen/src/ui/layout/hardwarekey.cpp tizen/src/ui/hovertype.cpp -> tizen/src/ui/layout/hovertype.cpp tizen/src/ui/layoutform.cpp -> tizen/src/ui/layout/layoutform.cpp tizen/src/ui/mainform.cpp -> tizen/src/ui/layout/mainform.cpp Change-Id: I63e54b437ebde8f433a6f614a8790d4847496668 Signed-off-by: GiWoong Kim --- tizen/src/display/qt5_supplement.cpp | 2 +- tizen/src/display/xmllayoutparser.h | 4 ++-- tizen/src/ui/Makefile.objs | 7 +------ tizen/src/ui/controller/dockingcontroller.h | 2 +- tizen/src/ui/controller/dockingconview.h | 2 +- tizen/src/ui/controller/floatingcontroller.h | 2 +- tizen/src/ui/controller/floatingconview.h | 2 +- tizen/src/ui/controller/generalpurposecon.h | 2 +- tizen/src/ui/controller/hwkeybutton.h | 2 +- tizen/src/ui/input/keyboardshortcut.h | 2 +- tizen/src/ui/layout/Makefile.objs | 6 ++++++ tizen/src/ui/{ => layout}/controllerform.cpp | 0 tizen/src/ui/{ => layout}/controllerform.h | 0 tizen/src/ui/{ => layout}/displaytype.cpp | 0 tizen/src/ui/{ => layout}/displaytype.h | 0 tizen/src/ui/{ => layout}/hardwarekey.cpp | 0 tizen/src/ui/{ => layout}/hardwarekey.h | 0 tizen/src/ui/{ => layout}/hovertype.cpp | 0 tizen/src/ui/{ => layout}/hovertype.h | 0 tizen/src/ui/{ => layout}/layoutform.cpp | 0 tizen/src/ui/{ => layout}/layoutform.h | 0 tizen/src/ui/{ => layout}/mainform.cpp | 0 tizen/src/ui/{ => layout}/mainform.h | 0 tizen/src/ui/mainwindow.cpp | 2 +- tizen/src/ui/skinkeyitem.h | 4 ++-- tizen/src/ui/skinpainter.h | 2 +- tizen/src/ui/skinview.h | 2 +- tizen/src/ui/uiinformation.h | 4 ++-- 28 files changed, 24 insertions(+), 23 deletions(-) create mode 100644 tizen/src/ui/layout/Makefile.objs rename tizen/src/ui/{ => layout}/controllerform.cpp (100%) rename tizen/src/ui/{ => layout}/controllerform.h (100%) rename tizen/src/ui/{ => layout}/displaytype.cpp (100%) rename tizen/src/ui/{ => layout}/displaytype.h (100%) rename tizen/src/ui/{ => layout}/hardwarekey.cpp (100%) rename tizen/src/ui/{ => layout}/hardwarekey.h (100%) rename tizen/src/ui/{ => layout}/hovertype.cpp (100%) rename tizen/src/ui/{ => layout}/hovertype.h (100%) rename tizen/src/ui/{ => layout}/layoutform.cpp (100%) rename tizen/src/ui/{ => layout}/layoutform.h (100%) rename tizen/src/ui/{ => layout}/mainform.cpp (100%) rename tizen/src/ui/{ => layout}/mainform.h (100%) diff --git a/tizen/src/display/qt5_supplement.cpp b/tizen/src/display/qt5_supplement.cpp index 421a1a9..2b41034 100644 --- a/tizen/src/display/qt5_supplement.cpp +++ b/tizen/src/display/qt5_supplement.cpp @@ -32,7 +32,7 @@ #include "qt5_supplement.h" #include "mainwindow.h" -#include "hardwarekey.h" +#include "layout/hardwarekey.h" #include "xmllayoutparser.h" #include "uiutil.h" diff --git a/tizen/src/display/xmllayoutparser.h b/tizen/src/display/xmllayoutparser.h index d3b65c8..3155da9 100644 --- a/tizen/src/display/xmllayoutparser.h +++ b/tizen/src/display/xmllayoutparser.h @@ -33,11 +33,11 @@ #include #include "uiinformation.h" -#include "mainform.h" +#include "layout/mainform.h" #include "menu/menuitem.h" #include "menu/advancedmenuitem.h" #include "menu/scalemenuitem.h" -#include "controllerform.h" +#include "layout/controllerform.h" class XmlLayoutParser { diff --git a/tizen/src/ui/Makefile.objs b/tizen/src/ui/Makefile.objs index d792f54..e4c2e4d 100644 --- a/tizen/src/ui/Makefile.objs +++ b/tizen/src/ui/Makefile.objs @@ -5,18 +5,12 @@ $(obj)/qrc_resource.o: $(obj)/qrc_resource.cpp $(obj)/qrc_resource.cpp: $(TIZEN_UI)/resource/resource.qrc rcc -name resource $< -o $@ -obj-$(CONFIG_QT) += controllerform.o obj-$(CONFIG_QT) += displaybase.o obj-$(CONFIG_QT) += displayglwidget.o moc_displayglwidget.o obj-$(CONFIG_QT) += displayswwidget.o moc_displayswwidget.o -obj-$(CONFIG_QT) += hardwarekey.o obj-$(CONFIG_QT) += mainwindow.o moc_mainwindow.o obj-$(CONFIG_QT) += skinbezelitem.o obj-$(CONFIG_QT) += skinkeyitem.o moc_skinkeyitem.o -obj-$(CONFIG_QT) += displaytype.o -obj-$(CONFIG_QT) += hovertype.o -obj-$(CONFIG_QT) += layoutform.o -obj-$(CONFIG_QT) += mainform.o obj-$(CONFIG_QT) += skinview.o obj-$(CONFIG_QT) += skinpainter.o obj-$(CONFIG_QT) += uiinformation.o @@ -26,6 +20,7 @@ obj-$(CONFIG_QT) += qrc_resource.o obj-$(CONFIG_QT) += controller/ obj-$(CONFIG_QT) += input/ +obj-$(CONFIG_QT) += layout/ obj-$(CONFIG_QT) += menu/ $(obj)/moc_displayglwidget.o: $(obj)/moc_displayglwidget.cpp diff --git a/tizen/src/ui/controller/dockingcontroller.h b/tizen/src/ui/controller/dockingcontroller.h index d183eac..f0c0e04 100644 --- a/tizen/src/ui/controller/dockingcontroller.h +++ b/tizen/src/ui/controller/dockingcontroller.h @@ -32,7 +32,7 @@ #include -#include "controllerform.h" +#include "layout/controllerform.h" #include "dockingconview.h" class MainWindow; diff --git a/tizen/src/ui/controller/dockingconview.h b/tizen/src/ui/controller/dockingconview.h index 9579b46..46c67bf 100644 --- a/tizen/src/ui/controller/dockingconview.h +++ b/tizen/src/ui/controller/dockingconview.h @@ -34,7 +34,7 @@ #include "skinview.h" #include "skinbezelitem.h" -#include "controllerform.h" +#include "layout/controllerform.h" class DockingController; diff --git a/tizen/src/ui/controller/floatingcontroller.h b/tizen/src/ui/controller/floatingcontroller.h index 24aabab..5a778df 100644 --- a/tizen/src/ui/controller/floatingcontroller.h +++ b/tizen/src/ui/controller/floatingcontroller.h @@ -32,7 +32,7 @@ #include -#include "controllerform.h" +#include "layout/controllerform.h" #include "floatingconview.h" class FloatingController : public QDialog diff --git a/tizen/src/ui/controller/floatingconview.h b/tizen/src/ui/controller/floatingconview.h index 164e964..41a753f 100644 --- a/tizen/src/ui/controller/floatingconview.h +++ b/tizen/src/ui/controller/floatingconview.h @@ -34,7 +34,7 @@ #include "skinview.h" #include "skinbezelitem.h" -#include "controllerform.h" +#include "layout/controllerform.h" class FloatingController; diff --git a/tizen/src/ui/controller/generalpurposecon.h b/tizen/src/ui/controller/generalpurposecon.h index 0a72aa9..fff187f 100644 --- a/tizen/src/ui/controller/generalpurposecon.h +++ b/tizen/src/ui/controller/generalpurposecon.h @@ -34,7 +34,7 @@ #include #include -#include "hardwarekey.h" +#include "layout/hardwarekey.h" #define GPC_HEAD_SPACING (14) #define GPC_TAIL_SPACING (3) diff --git a/tizen/src/ui/controller/hwkeybutton.h b/tizen/src/ui/controller/hwkeybutton.h index 5e2d27f..b758c26 100644 --- a/tizen/src/ui/controller/hwkeybutton.h +++ b/tizen/src/ui/controller/hwkeybutton.h @@ -33,7 +33,7 @@ #include #include -#include "hardwarekey.h" +#include "layout/hardwarekey.h" class HWKeyButton : public QPushButton { diff --git a/tizen/src/ui/input/keyboardshortcut.h b/tizen/src/ui/input/keyboardshortcut.h index 353472f..f178d99 100644 --- a/tizen/src/ui/input/keyboardshortcut.h +++ b/tizen/src/ui/input/keyboardshortcut.h @@ -35,7 +35,7 @@ #include #include -#include "hardwarekey.h" +#include "layout/hardwarekey.h" #include "menu/menuitem.h" class MainWindow; diff --git a/tizen/src/ui/layout/Makefile.objs b/tizen/src/ui/layout/Makefile.objs new file mode 100644 index 0000000..b10587a --- /dev/null +++ b/tizen/src/ui/layout/Makefile.objs @@ -0,0 +1,6 @@ +obj-$(CONFIG_QT) += layoutform.o +obj-$(CONFIG_QT) += mainform.o +obj-$(CONFIG_QT) += controllerform.o +obj-$(CONFIG_QT) += displaytype.o +obj-$(CONFIG_QT) += hardwarekey.o +obj-$(CONFIG_QT) += hovertype.o \ No newline at end of file diff --git a/tizen/src/ui/controllerform.cpp b/tizen/src/ui/layout/controllerform.cpp similarity index 100% rename from tizen/src/ui/controllerform.cpp rename to tizen/src/ui/layout/controllerform.cpp diff --git a/tizen/src/ui/controllerform.h b/tizen/src/ui/layout/controllerform.h similarity index 100% rename from tizen/src/ui/controllerform.h rename to tizen/src/ui/layout/controllerform.h diff --git a/tizen/src/ui/displaytype.cpp b/tizen/src/ui/layout/displaytype.cpp similarity index 100% rename from tizen/src/ui/displaytype.cpp rename to tizen/src/ui/layout/displaytype.cpp diff --git a/tizen/src/ui/displaytype.h b/tizen/src/ui/layout/displaytype.h similarity index 100% rename from tizen/src/ui/displaytype.h rename to tizen/src/ui/layout/displaytype.h diff --git a/tizen/src/ui/hardwarekey.cpp b/tizen/src/ui/layout/hardwarekey.cpp similarity index 100% rename from tizen/src/ui/hardwarekey.cpp rename to tizen/src/ui/layout/hardwarekey.cpp diff --git a/tizen/src/ui/hardwarekey.h b/tizen/src/ui/layout/hardwarekey.h similarity index 100% rename from tizen/src/ui/hardwarekey.h rename to tizen/src/ui/layout/hardwarekey.h diff --git a/tizen/src/ui/hovertype.cpp b/tizen/src/ui/layout/hovertype.cpp similarity index 100% rename from tizen/src/ui/hovertype.cpp rename to tizen/src/ui/layout/hovertype.cpp diff --git a/tizen/src/ui/hovertype.h b/tizen/src/ui/layout/hovertype.h similarity index 100% rename from tizen/src/ui/hovertype.h rename to tizen/src/ui/layout/hovertype.h diff --git a/tizen/src/ui/layoutform.cpp b/tizen/src/ui/layout/layoutform.cpp similarity index 100% rename from tizen/src/ui/layoutform.cpp rename to tizen/src/ui/layout/layoutform.cpp diff --git a/tizen/src/ui/layoutform.h b/tizen/src/ui/layout/layoutform.h similarity index 100% rename from tizen/src/ui/layoutform.h rename to tizen/src/ui/layout/layoutform.h diff --git a/tizen/src/ui/mainform.cpp b/tizen/src/ui/layout/mainform.cpp similarity index 100% rename from tizen/src/ui/mainform.cpp rename to tizen/src/ui/layout/mainform.cpp diff --git a/tizen/src/ui/mainform.h b/tizen/src/ui/layout/mainform.h similarity index 100% rename from tizen/src/ui/mainform.h rename to tizen/src/ui/layout/mainform.h diff --git a/tizen/src/ui/mainwindow.cpp b/tizen/src/ui/mainwindow.cpp index 997d7e1..c7d55fa 100644 --- a/tizen/src/ui/mainwindow.cpp +++ b/tizen/src/ui/mainwindow.cpp @@ -31,7 +31,7 @@ */ #include "mainwindow.h" -#include "mainform.h" +#include "layout/mainform.h" #include "displayglwidget.h" #include "displayswwidget.h" diff --git a/tizen/src/ui/skinkeyitem.h b/tizen/src/ui/skinkeyitem.h index 8f63440..5dad7f7 100644 --- a/tizen/src/ui/skinkeyitem.h +++ b/tizen/src/ui/skinkeyitem.h @@ -35,8 +35,8 @@ #include #include "skinbezelitem.h" -#include "hardwarekey.h" -#include "hovertype.h" +#include "layout/hardwarekey.h" +#include "layout/hovertype.h" extern "C" { #include "skin/maruskin_operation.h" diff --git a/tizen/src/ui/skinpainter.h b/tizen/src/ui/skinpainter.h index 9db0ff6..bfd8771 100644 --- a/tizen/src/ui/skinpainter.h +++ b/tizen/src/ui/skinpainter.h @@ -32,7 +32,7 @@ #include -#include "displaytype.h" +#include "layout/displaytype.h" class SkinPainter { diff --git a/tizen/src/ui/skinview.h b/tizen/src/ui/skinview.h index 33663e2..bec3a68 100644 --- a/tizen/src/ui/skinview.h +++ b/tizen/src/ui/skinview.h @@ -32,7 +32,7 @@ #include -#include "mainform.h" +#include "layout/mainform.h" #include "input/keyboardhelper.h" class MainWindow; diff --git a/tizen/src/ui/uiinformation.h b/tizen/src/ui/uiinformation.h index a5c415f..1e8c02d 100644 --- a/tizen/src/ui/uiinformation.h +++ b/tizen/src/ui/uiinformation.h @@ -32,9 +32,9 @@ #include -#include "mainform.h" +#include "layout/mainform.h" #include "uistate.h" -#include "controllerform.h" +#include "layout/controllerform.h" #include "menu/menuitem.h" class UIInformation -- 2.7.4