diff --git a/benchmarks/common_top.pri b/benchmarks/common_top.pri index 339402fc4..765d1847d 100644 --- a/benchmarks/common_top.pri +++ b/benchmarks/common_top.pri @@ -1,6 +1,16 @@ DUISRCDIR = ../../src/ STUBSDIR = ../stubs -INCLUDEPATH += . $$DUISRCDIR $$STUBSDIR $$DUISRCDIR/include $$DUISRCDIR/core $$DUISRCDIR/widgets $$DUISRCDIR/workspace $$DUISRCDIR/style ../memorybenchmark/ +INCLUDEPATH += \ + . \ + $$STUBSDIR \ + $$DUISRCDIR/include \ + $$DUISRCDIR/corelib/core \ + $$DUISRCDIR/corelib/widgets \ + $$DUISRCDIR/corelib/workspace \ + $$DUISRCDIR/corelib/style \ + $$DUISRCDIR/views \ + $$DUISRCDIR/views/style \ + ../memorybenchmark/ DEPENDPATH = $$INCLUDEPATH QMAKE_LIBDIR += ../../lib @@ -17,9 +27,9 @@ win32|macx { QMAKE_LFLAGS += -F../../lib LIBS += -framework dui } - win32:LIBS += -L../../lib -ldui0 + win32:LIBS += -lduicore0 } else { - LIBS += ../../lib/libdui.so + LIBS += -lduicore } QMAKE_CXXFLAGS += -Werror diff --git a/benchmarks/mt_duilabel/mt_duilabel.pro b/benchmarks/mt_duilabel/mt_duilabel.pro index f41d12670..4a719d0d9 100644 --- a/benchmarks/mt_duilabel/mt_duilabel.pro +++ b/benchmarks/mt_duilabel/mt_duilabel.pro @@ -6,3 +6,5 @@ TARGET = mt_duilabel SOURCES += mt_duilabel.cpp HEADERS += mt_duilabel.h CONFIG += release + +LIBS += -lduiviews diff --git a/benchmarks/pt_duibutton/pt_duibutton.pro b/benchmarks/pt_duibutton/pt_duibutton.pro index 1e929c64f..fe21894b3 100644 --- a/benchmarks/pt_duibutton/pt_duibutton.pro +++ b/benchmarks/pt_duibutton/pt_duibutton.pro @@ -1,5 +1,5 @@ include(../common_top.pri) -INCLUDEPATH += ../../src/include ../../src/theme +INCLUDEPATH += ../../src/include ../../src/corelib/theme DEPENDPATH += $$INCLUDEPATH TARGET = pt_duibutton diff --git a/benchmarks/pt_duiimagewidget/pt_duiimagewidget.pro b/benchmarks/pt_duiimagewidget/pt_duiimagewidget.pro index 08d62511c..82602c54c 100644 --- a/benchmarks/pt_duiimagewidget/pt_duiimagewidget.pro +++ b/benchmarks/pt_duiimagewidget/pt_duiimagewidget.pro @@ -1,5 +1,5 @@ include(../common_top.pri) -INCLUDEPATH += ../../src/include ../../src/theme +INCLUDEPATH += ../../src/include DEPENDPATH += $$INCLUDEPATH TARGET = pt_duiimagewidget diff --git a/benchmarks/pt_duiprogressindicator/pt_duiprogressindicator.pro b/benchmarks/pt_duiprogressindicator/pt_duiprogressindicator.pro index b37b4089a..3d54a4c88 100644 --- a/benchmarks/pt_duiprogressindicator/pt_duiprogressindicator.pro +++ b/benchmarks/pt_duiprogressindicator/pt_duiprogressindicator.pro @@ -5,3 +5,5 @@ TARGET = pt_duiprogressindicator SOURCES += pt_duiprogressindicator.cpp HEADERS += pt_duiprogressindicator.h + +LIBS += -lduiviews diff --git a/benchmarks/pt_duislider/pt_duislider.pro b/benchmarks/pt_duislider/pt_duislider.pro index 702da7718..c0bab20f2 100644 --- a/benchmarks/pt_duislider/pt_duislider.pro +++ b/benchmarks/pt_duislider/pt_duislider.pro @@ -5,3 +5,5 @@ TARGET = pt_duislider SOURCES += pt_duislider.cpp HEADERS += pt_duislider.h + +LIBS += -lduiviews diff --git a/configure b/configure index 3b448b14f..33e51019a 100755 --- a/configure +++ b/configure @@ -533,6 +533,7 @@ DUI_QMAKE_CACHE="$outpath/.qmake.cache" cat >>"$DUI_QMAKE_CACHE.tmp" < -#include "../../src/core/duiexport.h" +#include "../../src/corelib/core/duiexport.h" #include #include #include diff --git a/demos/animatedlayout/animatedlayout.pro b/demos/animatedlayout/animatedlayout.pro index ce95e1083..1192727d0 100644 --- a/demos/animatedlayout/animatedlayout.pro +++ b/demos/animatedlayout/animatedlayout.pro @@ -18,9 +18,9 @@ win32|macx { QMAKE_LFLAGS += -F../../lib LIBS += -framework dui } - win32:LIBS += -L../../lib -ldui0 + win32:LIBS += -ldui0 } else { - LIBS += ../../lib/libdui.so + LIBS += -lduicore } TEMPLATE = app diff --git a/demos/appletinstallationsource/appletinstallationsource.pro b/demos/appletinstallationsource/appletinstallationsource.pro index db9dcb515..807cf0abb 100644 --- a/demos/appletinstallationsource/appletinstallationsource.pro +++ b/demos/appletinstallationsource/appletinstallationsource.pro @@ -25,10 +25,9 @@ win32|macx { LIBS += -framework \ dui } - win32:LIBS += -L../../lib \ - -ldui0 + win32:LIBS += -lduicore0 } -else:LIBS += ../../lib/libdui.so +else:LIBS += -lduicore TARGET = $$qtLibraryTarget(appletinventory-fakeinstallationsource) DESTDIR = ../../lib diff --git a/demos/applicationextension/applicationextension.pro b/demos/applicationextension/applicationextension.pro index 2b911af68..8e52da293 100644 --- a/demos/applicationextension/applicationextension.pro +++ b/demos/applicationextension/applicationextension.pro @@ -15,10 +15,14 @@ win32|macx { LIBS += -framework \ dui } - win32:LIBS += -L../../lib \ - -ldui0 + win32:LIBS += -lduicore0 } -else:LIBS += ../../lib/libdui.so +else:LIBS += \ + -lduicore \ + -lduiviews \ + -lduisettings \ + -lduiextensions \ + TEMPLATE = app TARGET = applicationextensiondemo target.path = $$DUI_INSTALL_BIN diff --git a/demos/applicationextension/demoextension/demoextension.pro b/demos/applicationextension/demoextension/demoextension.pro index 6d43cd9b7..3201c05f8 100644 --- a/demos/applicationextension/demoextension/demoextension.pro +++ b/demos/applicationextension/demoextension/demoextension.pro @@ -24,10 +24,9 @@ win32|macx { LIBS += -framework \ dui } - win32:LIBS += -L../../../lib \ - -ldui0 + win32:LIBS += -lduicore0 } -else:LIBS += ../../../lib/libdui.so +else:LIBS += -lduicore TARGET = $$qtLibraryTarget(demoextension) DESTDIR = ../../../lib diff --git a/demos/applicationextension/demoextension2/demoextension2.pro b/demos/applicationextension/demoextension2/demoextension2.pro index 5aafdc31f..f1579d462 100644 --- a/demos/applicationextension/demoextension2/demoextension2.pro +++ b/demos/applicationextension/demoextension2/demoextension2.pro @@ -24,10 +24,9 @@ win32|macx { LIBS += -framework \ dui } - win32:LIBS += -L../../../lib \ - -ldui0 + win32:LIBS += -lduicore0 } -else:LIBS += ../../../lib/libdui.so +else:LIBS += -lduicore TARGET = $$qtLibraryTarget(demoextension2) DESTDIR = ../../../lib diff --git a/demos/widgetsgallery/applets/galleryapplet/galleryapplet.pro b/demos/widgetsgallery/applets/galleryapplet/galleryapplet.pro index 506967da9..0bee9ce9e 100644 --- a/demos/widgetsgallery/applets/galleryapplet/galleryapplet.pro +++ b/demos/widgetsgallery/applets/galleryapplet/galleryapplet.pro @@ -20,10 +20,9 @@ win32|macx { QMAKE_LFLAGS += -F$$DUILIB LIBS += -framework dui } - win32:LIBS += -L$$DUILIB -ldui0 + win32:LIBS += -lduicore0 } else { - LIBS += $$DUILIB/libdui.so - + LIBS += -lduicore } diff --git a/demos/widgetsgallery/theme/base/style/widgetsgallery.css b/demos/widgetsgallery/theme/base/style/widgetsgallery.css index 9c0fc6665..04ab67ff9 100644 --- a/demos/widgetsgallery/theme/base/style/widgetsgallery.css +++ b/demos/widgetsgallery/theme/base/style/widgetsgallery.css @@ -1,5 +1,5 @@ -@import "../../libdui/style/fonts.css"; -@import "../../libdui/style/colors.css"; +@import "../../libduicore/style/fonts.css"; +@import "../../libduicore/style/colors.css"; DuiButtonStyle#theme-selection-button { minimum-size: 10mm 10mm; diff --git a/demos/widgetsgallery/widgetsgallery.pro b/demos/widgetsgallery/widgetsgallery.pro index feb03f9cd..5b197b90b 100644 --- a/demos/widgetsgallery/widgetsgallery.pro +++ b/demos/widgetsgallery/widgetsgallery.pro @@ -6,7 +6,8 @@ DUISRCINCLUDE = $$DUISRC/include DUISFWINCLUDE = $$DUIROOT/servicefw/include INCLUDEPATH += . \ $$DUISRCINCLUDE \ - $$DUISRC + $$DUISRC/corelib + QMAKE_LIBDIR += $$DUILIB win32|macx { macx { @@ -14,10 +15,13 @@ win32|macx { LIBS += -framework \ dui } - win32:LIBS += -L../../lib \ - -ldui0 + win32:LIBS += -lduicore0 } -else:LIBS += ../../lib/libdui.so +else:LIBS += \ + -lduicore \ + -lduiviews \ + -lduisettings \ + -lduiextensions \ TEMPLATE = app TARGET = widgetsgallery diff --git a/doc/src/news.dox b/doc/src/news.dox index 0ec08ede3..406d9de44 100644 --- a/doc/src/news.dox +++ b/doc/src/news.dox @@ -134,6 +134,18 @@ - pannedRange() was renamed to range() - pannedPos() was renamed to position() - updateSizePosData() was split into three new methods: setPosition(), setViewportSize() and setRange(). +- Libdui modularization: + - moved src/applicationextension and src/mashup into new library libduiextensions. + - moved src/settingslanguage into new library libduisettings. + - moved part of the views in src/widgets/views to new library libduiviews. + - moved the rest of src/ to new library libduicore. + - You possibly have to update your include pathes. + - You possibly have to update your linking statement in the .pro + file. Before: -ldui, now: -lduicore -lduiviews -lduisettings -lduiextensions. + Or a subset of these four libs. + - Also make sure that you update duitheme in sync with this update, as + it requires some changes in duitheme. + \section v0190 diff --git a/duiappletrunner/duiappletrunner.pro b/duiappletrunner/duiappletrunner.pro index d72f71620..a860a5e72 100644 --- a/duiappletrunner/duiappletrunner.pro +++ b/duiappletrunner/duiappletrunner.pro @@ -1,17 +1,23 @@ include(../mkspecs/common.pri) INCLUDEPATH += . \ - ../src/mashup/mashup \ + ../src/extensions/mashup/mashup \ ../src/include \ - ../src/mashup/appletcommunication \ - ../src/mashup/appletinterface \ - ../src/applicationextension + ../src/extensions/mashup/appletcommunication \ + ../src/extensions/mashup/appletinterface \ + ../src/extensions/applicationextension DEPENDPATH += $$INCLUDEPATH QMAKE_LIBDIR += ../lib TEMPLATE = app TARGET = DEPENDPATH += . -QMAKE_LFLAGS += ../lib/libdui.so + +LIBS += \ + -lduicore \ + -lduiviews \ + -lduisettings \ + -lduiextensions \ + QT += core \ network \ gui \ diff --git a/duiapplicationextensionrunner/duiapplicationextensionrunner.pro b/duiapplicationextensionrunner/duiapplicationextensionrunner.pro index b139286f8..672982ea7 100644 --- a/duiapplicationextensionrunner/duiapplicationextensionrunner.pro +++ b/duiapplicationextensionrunner/duiapplicationextensionrunner.pro @@ -1,17 +1,24 @@ include(../mkspecs/common.pri) INCLUDEPATH += . \ - ../src/mashup/mashup \ ../src/include \ - ../src/mashup/appletcommunication \ - ../src/mashup/appletinterface \ - ../src/applicationextension + ../src/extensions/mashup/mashup \ + ../src/extensions/mashup/appletcommunication \ + ../src/extensions/mashup/appletinterface \ + ../src/extensions/applicationextension + DEPENDPATH += $$INCLUDEPATH QMAKE_LIBDIR += ../lib TEMPLATE = app TARGET = DEPENDPATH += . -QMAKE_LFLAGS += ../lib/libdui.so + +LIBS += \ + -lduicore \ + -lduiviews \ + -lduisettings \ + -lduiextensions \ + QT += core \ network \ gui \ @@ -22,7 +29,7 @@ QT += core \ # Input SOURCES += main.cpp \ duiapplicationextensionrunner.cpp \ - ../src/applicationextension/duiapplicationextensionloader.cpp + ../src/extensions/applicationextension/duiapplicationextensionloader.cpp HEADERS += duiapplicationextensionrunner.h \ duiapplicationextensionloader.h diff --git a/duithemedaemon/duithemedaemon.pro b/duithemedaemon/duithemedaemon.pro index 672448662..8457833fc 100644 --- a/duithemedaemon/duithemedaemon.pro +++ b/duithemedaemon/duithemedaemon.pro @@ -1,6 +1,11 @@ include(../mkspecs/common.pri) -INCLUDEPATH += . ../src/include ../src ../src/core +INCLUDEPATH += \ + . \ + ../src/include \ + ../src/corelib \ + ../src/corelib/core \ + DEPENDPATH += $$INCLUDEPATH QMAKE_LIBDIR += ../lib TEMPLATE = app @@ -24,25 +29,25 @@ PKGCONFIG += gconf-2.0 # Input SOURCES += main.cpp \ duithemedaemonserver.cpp \ - ../src/theme/duithemedaemon.cpp \ - ../src/theme/duicommonpixmaps.cpp \ - ../src/theme/duiimagedirectory.cpp \ - ../src/theme/duithemedaemonclient.cpp \ - ../src/theme/duithemedaemonprotocol.cpp \ - ../src/theme/duithemeresourcemanager.cpp \ - ../src/core/duigconfitem.cpp \ - ../src/core/duicpumonitor.cpp \ + ../src/corelib/theme/duithemedaemon.cpp \ + ../src/corelib/theme/duicommonpixmaps.cpp \ + ../src/corelib/theme/duiimagedirectory.cpp \ + ../src/corelib/theme/duithemedaemonclient.cpp \ + ../src/corelib/theme/duithemedaemonprotocol.cpp \ + ../src/corelib/theme/duithemeresourcemanager.cpp \ + ../src/corelib/core/duigconfitem.cpp \ + ../src/corelib/core/duicpumonitor.cpp \ HEADERS += \ duithemedaemonserver.h \ - ../src/theme/duithemedaemon.h \ - ../src/theme/duicommonpixmaps.h \ - ../src/theme/duiimagedirectory.h \ - ../src/theme/duithemedaemonclient.h \ - ../src/theme/duithemedaemonprotocol.h \ - ../src/theme/duithemeresourcemanager.h \ - ../src/core/duigconfitem.h \ - ../src/core/duicpumonitor.h \ + ../src/corelib/theme/duithemedaemon.h \ + ../src/corelib/theme/duicommonpixmaps.h \ + ../src/corelib/theme/duiimagedirectory.h \ + ../src/corelib/theme/duithemedaemonclient.h \ + ../src/corelib/theme/duithemedaemonprotocol.h \ + ../src/corelib/theme/duithemeresourcemanager.h \ + ../src/corelib/core/duigconfitem.h \ + ../src/corelib/core/duicpumonitor.h \ keypresswaiter.h \ QMAKE_EXTRA_TARGETS += check diff --git a/examples/lifecycle/lifecycle.pro b/examples/lifecycle/lifecycle.pro index c9c782876..d867f5ae1 100644 --- a/examples/lifecycle/lifecycle.pro +++ b/examples/lifecycle/lifecycle.pro @@ -15,10 +15,10 @@ win32|macx { LIBS += -framework \ dui } - win32:LIBS += -L../../lib \ - -ldui0 + win32:LIBS += -lduicore0 } -else:LIBS += ../../lib/libdui.so +else:LIBS += -lduicore + TEMPLATE = app TARGET = lifecycle target.path = /usr/bin diff --git a/examples/servicefw/user/user.pro b/examples/servicefw/user/user.pro index 3067e6e49..77956fee1 100644 --- a/examples/servicefw/user/user.pro +++ b/examples/servicefw/user/user.pro @@ -30,8 +30,7 @@ SOURCES = \ echowindow.cpp \ main.cpp \ -LIBS += \ - ../../../lib/libdui.so \ +LIBS += -lduicore QT += dbus LIBS += \ diff --git a/mkspecs/common.pri b/mkspecs/common.pri index c6d95a512..939006b83 100644 --- a/mkspecs/common.pri +++ b/mkspecs/common.pri @@ -86,4 +86,6 @@ contains(USE_CCACHE, "true") { QMAKE_CXX = ccache g++ } +QMAKE_LIBDIR += $${DUI_BUILD_TREE}/lib + include(shared.pri) diff --git a/mkspecs/features/dui.prf b/mkspecs/features/dui.prf index be855bfa9..2779998e6 100644 --- a/mkspecs/features/dui.prf +++ b/mkspecs/features/dui.prf @@ -28,7 +28,7 @@ macx { DEPENDPATH += $${DUI_INC_DIR} unix: QMAKE_LFLAGS += $${QMAKE_RPATH}$${DUI_LIB_DIR} - LIBS += -L$${DUI_LIB_DIR} -ldui + LIBS += -L$${DUI_LIB_DIR} -lduicore -lduiviews -lduisettings -lduiextensions QMAKE_MOC = duimoc isEmpty(DUIGEN_OUTDIR) { diff --git a/plainqt/style/style.pri b/plainqt/style/style.pri index bbe1fe039..7057c32d1 100644 --- a/plainqt/style/style.pri +++ b/plainqt/style/style.pri @@ -1,5 +1,4 @@ -INCLUDEPATH+=../../src/style -#../../src/widgets +INCLUDEPATH+=../../src/views/style PUBLIC_HEADERS += \ qtmaemo6style.h diff --git a/plainqt/style/style.pro b/plainqt/style/style.pro index d6a1302dd..19b8ea552 100644 --- a/plainqt/style/style.pro +++ b/plainqt/style/style.pro @@ -13,19 +13,16 @@ DUISFWINCLUDE = $$DUIROOT/servicefw/include INCLUDEPATH += . \ $$DUISRCINCLUDE \ - $$DUISRC \ - -QMAKE_LIBDIR += \ - $$DUILIB \ + $$DUIROOT/src/corelib/style \ win32|macx { macx { QMAKE_LFLAGS += -F../../lib LIBS += -framework dui } - win32:LIBS += -L../../lib -ldui0 + win32:LIBS += -lduicore0 } else { - LIBS += ../../lib/libdui.so + LIBS += -lduicore } TEMPLATE = lib diff --git a/src/Dui.pc b/src/Dui.pc index 3f07d81a0..89673485f 100644 --- a/src/Dui.pc +++ b/src/Dui.pc @@ -8,4 +8,4 @@ Description: DirectUI Framework Version: 0.18.0 Requires: QtGui Cflags: -I${includedir} -Libs: -L${libdir} -ldui +Libs: -L${libdir} -lduicore -lduiviews -lduisettings -lduiextensions diff --git a/src/common_bot.pri b/src/common_bot.pri new file mode 100644 index 000000000..fa72180ff --- /dev/null +++ b/src/common_bot.pri @@ -0,0 +1,17 @@ +## Files and paths + +HEADERS += $$PUBLIC_HEADERS $$PRIVATE_HEADERS + +macx { + FRAMEWORK_HEADERS.version = Versions + FRAMEWORK_HEADERS.files = $$system(find include/Dui*) $$HEADERS + FRAMEWORK_HEADERS.path = Headers + QMAKE_BUNDLE_DATA += FRAMEWORK_HEADERS +} + +install_headers.path = $$DUI_INSTALL_HEADERS +install_headers.files = $$PUBLIC_HEADERS + +INSTALLS += \ + target \ + install_headers \ diff --git a/src/common_top.pri b/src/common_top.pri new file mode 100644 index 000000000..20932d4a9 --- /dev/null +++ b/src/common_top.pri @@ -0,0 +1,147 @@ +# this file contains the parts that are common to all libs + +MOC_DIR = .moc +GEN_DIR = .gen +OBJECTS_DIR = .obj +DESTDIR = $$DUI_BUILD_TREE/lib +TEMPLATE = lib + +include(../mkspecs/common.pri) +include(predeps.pri) +include(duigen.pri) + +VERSION = $${DUI_VERSION} +DEFINES += DUI_VERSION=\\\"$${DUI_VERSION}\\\" + +INCLUDEPATH += $${DUI_SOURCE_TREE}/src/include +INCLUDEPATH += $${OUT_PWD}/.moc +INCLUDEPATH += $${OUT_PWD}/.gen + +QMAKE_STRIP = echo + +PRE_TARGETDEPS += $$DUIGEN_EXECUTABLE + +CONFIG += qt warn_on depend_includepath qmake_cache target_qt dll create_prl +!win32:CONFIG += link_pkgconfig +macx:CONFIG += lib_bundle + +win32 { + QMAKE_MOC = perl $${IN_PWD}\..\duimoc\duimoc + INCLUDEPATH += . +} else { + QMAKE_MOC = $${DUI_SOURCE_TREE}/duimoc/duimoc +} + +QMAKE_CFLAGS += -Werror + +QMAKE_CXXFLAGS += -DDUI_EXPORTS +!win32-msvc*:QMAKE_CXXFLAGS += -Wno-long-long -pedantic +!win32:QMAKE_CXXFLAGS += -Werror -Wno-variadic-macros -fvisibility=hidden + +!win32-msvc*:LIBS += -lm -lX11 +macx:LIBS -= -lX11 +win32:LIBS -= -lX11 + +# enable QString optimizations +DEFINES += QT_USE_FAST_CONCATENATION QT_USE_FAST_OPERATOR_PLUS + +# Check for mixing of const and non-const iterators, +# which can cause problems when built with some compilers: +DEFINES += QT_STRICT_ITERATORS + + +## Build configuration + + + +## Features + +contains(DUI_BUILD_FEATURES, coverage) { + QMAKE_CXXFLAGS += --coverage + QMAKE_LFLAGS += --coverage +} + +contains(DUI_BUILD_FEATURES, timestamps) { + DEFINES += DUI_TIMESTAMP +} + +contains(DUI_BUILD_FEATURES, testable) { + DEFINES += TESTABLE + HEADERS += ../corelib/core/testabilityinterface.h +} + +contains(DUI_BUILD_FEATURES, pch) { + DEFINES += USING_PCH + PRECOMPILED_HEADER = pch/stable_pch.h + HEADERS += pch/stable_pch.h + CONFIG += precompile_header +} + +contains(DUI_PROFILE_PARTS, theme) { + DEFINES += DUI_THEMESYSTEM_PROFILING_SUPPORT +} + + +## Dependencies + +# list pkg-config dependencies here +!macx:PKGCONFIG += xdamage + +contains(DEFINES, HAVE_ICU) { + LIBS += -licui18n -licuuc -licudata +} + +contains(DEFINES, HAVE_CONTEXTSUBSCRIBER) { + PKGCONFIG += contextsubscriber-1.0 +} + +contains(DEFINES, HAVE_CONTENTACTION) { + PKGCONFIG += contentaction-0.1 +} + +contains(DEFINES, HAVE_GSTREAMER) { + PKGCONFIG += gstreamer-0.10 + # TODO: Is this necessary? + LIBS += -lgstbase-0.10 -lgstinterfaces-0.10 -lgstvideo-0.10 + + # On Mac, GStreamer can be also in /opt if installed via macports.org or /usr/local if installed from sources + macx:INCLUDEPATH += /opt/local/include/gstreamer-0.10 +} + +contains(DEFINES, HAVE_GCONF) { + PKGCONFIG += gconf-2.0 + # TODO: Why is this necessary? + # The PKGCONFIG call above usually causes qmake to link to the correct libraries + # automatically, but that does not happen if we remove these explicit mentions. + LIBS += -lgconf-2 +} + +contains(DEFINES, HAVE_DBUS) { + QT += dbus +} + +contains(DEFINES, HAVE_GLIB) { + LIBS += -lglib-2.0 +} + +QT += \ + svg \ + network \ + core \ + gui \ + opengl + +QMAKE_EXTRA_TARGETS += check +check.depends = $$DESTDIR/lib$${TARGET}.so.$$VERSION +check.commands = $$system(true) + +QMAKE_EXTRA_TARGETS += check-xml +check-xml.depends = $$DESTDIR/lib$${TARGET}.so.$$VERSION +check-xml.commands = $$system(true) +QMAKE_CLEAN += \ + *.gcov \ + ./.obj/*.gcno \ + ./.obj/*.gcda \ + +target.path = $$DUI_INSTALL_LIBS + diff --git a/src/animation/animation.pri b/src/corelib/animation/animation.pri similarity index 100% rename from src/animation/animation.pri rename to src/corelib/animation/animation.pri diff --git a/src/animation/core/core.pri b/src/corelib/animation/core/core.pri similarity index 100% rename from src/animation/core/core.pri rename to src/corelib/animation/core/core.pri diff --git a/src/animation/core/duianimation.cpp b/src/corelib/animation/core/duianimation.cpp similarity index 100% rename from src/animation/core/duianimation.cpp rename to src/corelib/animation/core/duianimation.cpp diff --git a/src/animation/core/duianimation.h b/src/corelib/animation/core/duianimation.h similarity index 100% rename from src/animation/core/duianimation.h rename to src/corelib/animation/core/duianimation.h diff --git a/src/animation/core/duianimation_p.h b/src/corelib/animation/core/duianimation_p.h similarity index 100% rename from src/animation/core/duianimation_p.h rename to src/corelib/animation/core/duianimation_p.h diff --git a/src/animation/core/duianimationcreator.cpp b/src/corelib/animation/core/duianimationcreator.cpp similarity index 100% rename from src/animation/core/duianimationcreator.cpp rename to src/corelib/animation/core/duianimationcreator.cpp diff --git a/src/animation/core/duianimationcreator.h b/src/corelib/animation/core/duianimationcreator.h similarity index 100% rename from src/animation/core/duianimationcreator.h rename to src/corelib/animation/core/duianimationcreator.h diff --git a/src/animation/core/duigroupanimation.cpp b/src/corelib/animation/core/duigroupanimation.cpp similarity index 100% rename from src/animation/core/duigroupanimation.cpp rename to src/corelib/animation/core/duigroupanimation.cpp diff --git a/src/animation/core/duigroupanimation.h b/src/corelib/animation/core/duigroupanimation.h similarity index 100% rename from src/animation/core/duigroupanimation.h rename to src/corelib/animation/core/duigroupanimation.h diff --git a/src/animation/core/duigroupanimation_p.h b/src/corelib/animation/core/duigroupanimation_p.h similarity index 100% rename from src/animation/core/duigroupanimation_p.h rename to src/corelib/animation/core/duigroupanimation_p.h diff --git a/src/animation/core/duiparallelanimationgroup.cpp b/src/corelib/animation/core/duiparallelanimationgroup.cpp similarity index 100% rename from src/animation/core/duiparallelanimationgroup.cpp rename to src/corelib/animation/core/duiparallelanimationgroup.cpp diff --git a/src/animation/core/duiparallelanimationgroup.h b/src/corelib/animation/core/duiparallelanimationgroup.h similarity index 100% rename from src/animation/core/duiparallelanimationgroup.h rename to src/corelib/animation/core/duiparallelanimationgroup.h diff --git a/src/animation/core/duiparallelanimationgroup_p.h b/src/corelib/animation/core/duiparallelanimationgroup_p.h similarity index 100% rename from src/animation/core/duiparallelanimationgroup_p.h rename to src/corelib/animation/core/duiparallelanimationgroup_p.h diff --git a/src/animation/duiwidgetanimation.cpp b/src/corelib/animation/duiwidgetanimation.cpp similarity index 100% rename from src/animation/duiwidgetanimation.cpp rename to src/corelib/animation/duiwidgetanimation.cpp diff --git a/src/animation/duiwidgetanimation.h b/src/corelib/animation/duiwidgetanimation.h similarity index 100% rename from src/animation/duiwidgetanimation.h rename to src/corelib/animation/duiwidgetanimation.h diff --git a/src/animation/duiwidgetanimation_p.h b/src/corelib/animation/duiwidgetanimation_p.h similarity index 100% rename from src/animation/duiwidgetanimation_p.h rename to src/corelib/animation/duiwidgetanimation_p.h diff --git a/src/animation/scene/duibasicorientationanimation.cpp b/src/corelib/animation/scene/duibasicorientationanimation.cpp similarity index 100% rename from src/animation/scene/duibasicorientationanimation.cpp rename to src/corelib/animation/scene/duibasicorientationanimation.cpp diff --git a/src/animation/scene/duibasicorientationanimation.h b/src/corelib/animation/scene/duibasicorientationanimation.h similarity index 100% rename from src/animation/scene/duibasicorientationanimation.h rename to src/corelib/animation/scene/duibasicorientationanimation.h diff --git a/src/animation/scene/duibasicorientationanimation_p.h b/src/corelib/animation/scene/duibasicorientationanimation_p.h similarity index 100% rename from src/animation/scene/duibasicorientationanimation_p.h rename to src/corelib/animation/scene/duibasicorientationanimation_p.h diff --git a/src/animation/scene/duifliporientationanimation.cpp b/src/corelib/animation/scene/duifliporientationanimation.cpp similarity index 100% rename from src/animation/scene/duifliporientationanimation.cpp rename to src/corelib/animation/scene/duifliporientationanimation.cpp diff --git a/src/animation/scene/duifliporientationanimation.h b/src/corelib/animation/scene/duifliporientationanimation.h similarity index 100% rename from src/animation/scene/duifliporientationanimation.h rename to src/corelib/animation/scene/duifliporientationanimation.h diff --git a/src/animation/scene/duifliporientationanimation_p.h b/src/corelib/animation/scene/duifliporientationanimation_p.h similarity index 100% rename from src/animation/scene/duifliporientationanimation_p.h rename to src/corelib/animation/scene/duifliporientationanimation_p.h diff --git a/src/animation/scene/duinavigationbaranimation.cpp b/src/corelib/animation/scene/duinavigationbaranimation.cpp similarity index 100% rename from src/animation/scene/duinavigationbaranimation.cpp rename to src/corelib/animation/scene/duinavigationbaranimation.cpp diff --git a/src/animation/scene/duinavigationbaranimation.h b/src/corelib/animation/scene/duinavigationbaranimation.h similarity index 100% rename from src/animation/scene/duinavigationbaranimation.h rename to src/corelib/animation/scene/duinavigationbaranimation.h diff --git a/src/animation/scene/duinavigationbaranimation_p.h b/src/corelib/animation/scene/duinavigationbaranimation_p.h similarity index 100% rename from src/animation/scene/duinavigationbaranimation_p.h rename to src/corelib/animation/scene/duinavigationbaranimation_p.h diff --git a/src/animation/scene/duinotificationanimation.cpp b/src/corelib/animation/scene/duinotificationanimation.cpp similarity index 100% rename from src/animation/scene/duinotificationanimation.cpp rename to src/corelib/animation/scene/duinotificationanimation.cpp diff --git a/src/animation/scene/duinotificationanimation.h b/src/corelib/animation/scene/duinotificationanimation.h similarity index 100% rename from src/animation/scene/duinotificationanimation.h rename to src/corelib/animation/scene/duinotificationanimation.h diff --git a/src/animation/scene/duinotificationanimation_p.h b/src/corelib/animation/scene/duinotificationanimation_p.h similarity index 100% rename from src/animation/scene/duinotificationanimation_p.h rename to src/corelib/animation/scene/duinotificationanimation_p.h diff --git a/src/animation/scene/duiorientationanimation.cpp b/src/corelib/animation/scene/duiorientationanimation.cpp similarity index 100% rename from src/animation/scene/duiorientationanimation.cpp rename to src/corelib/animation/scene/duiorientationanimation.cpp diff --git a/src/animation/scene/duiorientationanimation.h b/src/corelib/animation/scene/duiorientationanimation.h similarity index 100% rename from src/animation/scene/duiorientationanimation.h rename to src/corelib/animation/scene/duiorientationanimation.h diff --git a/src/animation/scene/duiorientationanimation_p.h b/src/corelib/animation/scene/duiorientationanimation_p.h similarity index 100% rename from src/animation/scene/duiorientationanimation_p.h rename to src/corelib/animation/scene/duiorientationanimation_p.h diff --git a/src/animation/scene/duipageswitchanimation.cpp b/src/corelib/animation/scene/duipageswitchanimation.cpp similarity index 100% rename from src/animation/scene/duipageswitchanimation.cpp rename to src/corelib/animation/scene/duipageswitchanimation.cpp diff --git a/src/animation/scene/duipageswitchanimation.h b/src/corelib/animation/scene/duipageswitchanimation.h similarity index 100% rename from src/animation/scene/duipageswitchanimation.h rename to src/corelib/animation/scene/duipageswitchanimation.h diff --git a/src/animation/scene/duipageswitchanimation_p.h b/src/corelib/animation/scene/duipageswitchanimation_p.h similarity index 100% rename from src/animation/scene/duipageswitchanimation_p.h rename to src/corelib/animation/scene/duipageswitchanimation_p.h diff --git a/src/animation/scene/duiscenefadeanimation.cpp b/src/corelib/animation/scene/duiscenefadeanimation.cpp similarity index 100% rename from src/animation/scene/duiscenefadeanimation.cpp rename to src/corelib/animation/scene/duiscenefadeanimation.cpp diff --git a/src/animation/scene/duiscenefadeanimation.h b/src/corelib/animation/scene/duiscenefadeanimation.h similarity index 100% rename from src/animation/scene/duiscenefadeanimation.h rename to src/corelib/animation/scene/duiscenefadeanimation.h diff --git a/src/animation/scene/duiscenefadeanimation_p.h b/src/corelib/animation/scene/duiscenefadeanimation_p.h similarity index 100% rename from src/animation/scene/duiscenefadeanimation_p.h rename to src/corelib/animation/scene/duiscenefadeanimation_p.h diff --git a/src/animation/scene/duiscenewindowanimation.cpp b/src/corelib/animation/scene/duiscenewindowanimation.cpp similarity index 100% rename from src/animation/scene/duiscenewindowanimation.cpp rename to src/corelib/animation/scene/duiscenewindowanimation.cpp diff --git a/src/animation/scene/duiscenewindowanimation.h b/src/corelib/animation/scene/duiscenewindowanimation.h similarity index 100% rename from src/animation/scene/duiscenewindowanimation.h rename to src/corelib/animation/scene/duiscenewindowanimation.h diff --git a/src/animation/scene/duiscenewindowanimation_p.h b/src/corelib/animation/scene/duiscenewindowanimation_p.h similarity index 100% rename from src/animation/scene/duiscenewindowanimation_p.h rename to src/corelib/animation/scene/duiscenewindowanimation_p.h diff --git a/src/animation/scene/scene.pri b/src/corelib/animation/scene/scene.pri similarity index 100% rename from src/animation/scene/scene.pri rename to src/corelib/animation/scene/scene.pri diff --git a/src/animation/widget/core/core.pri b/src/corelib/animation/widget/core/core.pri similarity index 100% rename from src/animation/widget/core/core.pri rename to src/corelib/animation/widget/core/core.pri diff --git a/src/animation/widget/core/duiabstractwidgetanimation.cpp b/src/corelib/animation/widget/core/duiabstractwidgetanimation.cpp similarity index 100% rename from src/animation/widget/core/duiabstractwidgetanimation.cpp rename to src/corelib/animation/widget/core/duiabstractwidgetanimation.cpp diff --git a/src/animation/widget/core/duiabstractwidgetanimation.h b/src/corelib/animation/widget/core/duiabstractwidgetanimation.h similarity index 100% rename from src/animation/widget/core/duiabstractwidgetanimation.h rename to src/corelib/animation/widget/core/duiabstractwidgetanimation.h diff --git a/src/animation/widget/core/duiabstractwidgetanimation_p.h b/src/corelib/animation/widget/core/duiabstractwidgetanimation_p.h similarity index 100% rename from src/animation/widget/core/duiabstractwidgetanimation_p.h rename to src/corelib/animation/widget/core/duiabstractwidgetanimation_p.h diff --git a/src/animation/widget/duiwidgetfadeinanimation.cpp b/src/corelib/animation/widget/duiwidgetfadeinanimation.cpp similarity index 100% rename from src/animation/widget/duiwidgetfadeinanimation.cpp rename to src/corelib/animation/widget/duiwidgetfadeinanimation.cpp diff --git a/src/animation/widget/duiwidgetfadeinanimation.h b/src/corelib/animation/widget/duiwidgetfadeinanimation.h similarity index 100% rename from src/animation/widget/duiwidgetfadeinanimation.h rename to src/corelib/animation/widget/duiwidgetfadeinanimation.h diff --git a/src/animation/widget/duiwidgetfadeinanimation_p.h b/src/corelib/animation/widget/duiwidgetfadeinanimation_p.h similarity index 100% rename from src/animation/widget/duiwidgetfadeinanimation_p.h rename to src/corelib/animation/widget/duiwidgetfadeinanimation_p.h diff --git a/src/animation/widget/duiwidgetfadeoutanimation.cpp b/src/corelib/animation/widget/duiwidgetfadeoutanimation.cpp similarity index 100% rename from src/animation/widget/duiwidgetfadeoutanimation.cpp rename to src/corelib/animation/widget/duiwidgetfadeoutanimation.cpp diff --git a/src/animation/widget/duiwidgetfadeoutanimation.h b/src/corelib/animation/widget/duiwidgetfadeoutanimation.h similarity index 100% rename from src/animation/widget/duiwidgetfadeoutanimation.h rename to src/corelib/animation/widget/duiwidgetfadeoutanimation.h diff --git a/src/animation/widget/duiwidgetfadeoutanimation_p.h b/src/corelib/animation/widget/duiwidgetfadeoutanimation_p.h similarity index 100% rename from src/animation/widget/duiwidgetfadeoutanimation_p.h rename to src/corelib/animation/widget/duiwidgetfadeoutanimation_p.h diff --git a/src/animation/widget/duiwidgetslideinanimation.cpp b/src/corelib/animation/widget/duiwidgetslideinanimation.cpp similarity index 100% rename from src/animation/widget/duiwidgetslideinanimation.cpp rename to src/corelib/animation/widget/duiwidgetslideinanimation.cpp diff --git a/src/animation/widget/duiwidgetslideinanimation.h b/src/corelib/animation/widget/duiwidgetslideinanimation.h similarity index 100% rename from src/animation/widget/duiwidgetslideinanimation.h rename to src/corelib/animation/widget/duiwidgetslideinanimation.h diff --git a/src/animation/widget/duiwidgetslideinanimation_p.h b/src/corelib/animation/widget/duiwidgetslideinanimation_p.h similarity index 100% rename from src/animation/widget/duiwidgetslideinanimation_p.h rename to src/corelib/animation/widget/duiwidgetslideinanimation_p.h diff --git a/src/animation/widget/duiwidgetslideoutanimation.cpp b/src/corelib/animation/widget/duiwidgetslideoutanimation.cpp similarity index 100% rename from src/animation/widget/duiwidgetslideoutanimation.cpp rename to src/corelib/animation/widget/duiwidgetslideoutanimation.cpp diff --git a/src/animation/widget/duiwidgetslideoutanimation.h b/src/corelib/animation/widget/duiwidgetslideoutanimation.h similarity index 100% rename from src/animation/widget/duiwidgetslideoutanimation.h rename to src/corelib/animation/widget/duiwidgetslideoutanimation.h diff --git a/src/animation/widget/duiwidgetslideoutanimation_p.h b/src/corelib/animation/widget/duiwidgetslideoutanimation_p.h similarity index 100% rename from src/animation/widget/duiwidgetslideoutanimation_p.h rename to src/corelib/animation/widget/duiwidgetslideoutanimation_p.h diff --git a/src/animation/widget/duiwidgetzoominanimation.cpp b/src/corelib/animation/widget/duiwidgetzoominanimation.cpp similarity index 100% rename from src/animation/widget/duiwidgetzoominanimation.cpp rename to src/corelib/animation/widget/duiwidgetzoominanimation.cpp diff --git a/src/animation/widget/duiwidgetzoominanimation.h b/src/corelib/animation/widget/duiwidgetzoominanimation.h similarity index 100% rename from src/animation/widget/duiwidgetzoominanimation.h rename to src/corelib/animation/widget/duiwidgetzoominanimation.h diff --git a/src/animation/widget/duiwidgetzoominanimation_p.h b/src/corelib/animation/widget/duiwidgetzoominanimation_p.h similarity index 100% rename from src/animation/widget/duiwidgetzoominanimation_p.h rename to src/corelib/animation/widget/duiwidgetzoominanimation_p.h diff --git a/src/animation/widget/duiwidgetzoomoutanimation.cpp b/src/corelib/animation/widget/duiwidgetzoomoutanimation.cpp similarity index 100% rename from src/animation/widget/duiwidgetzoomoutanimation.cpp rename to src/corelib/animation/widget/duiwidgetzoomoutanimation.cpp diff --git a/src/animation/widget/duiwidgetzoomoutanimation.h b/src/corelib/animation/widget/duiwidgetzoomoutanimation.h similarity index 100% rename from src/animation/widget/duiwidgetzoomoutanimation.h rename to src/corelib/animation/widget/duiwidgetzoomoutanimation.h diff --git a/src/animation/widget/duiwidgetzoomoutanimation_p.h b/src/corelib/animation/widget/duiwidgetzoomoutanimation_p.h similarity index 100% rename from src/animation/widget/duiwidgetzoomoutanimation_p.h rename to src/corelib/animation/widget/duiwidgetzoomoutanimation_p.h diff --git a/src/animation/widget/widget.pri b/src/corelib/animation/widget/widget.pri similarity index 100% rename from src/animation/widget/widget.pri rename to src/corelib/animation/widget/widget.pri diff --git a/src/core/DuiApplicationAdaptor.xml b/src/corelib/core/DuiApplicationAdaptor.xml similarity index 100% rename from src/core/DuiApplicationAdaptor.xml rename to src/corelib/core/DuiApplicationAdaptor.xml diff --git a/src/core/TestabilityInterface b/src/corelib/core/TestabilityInterface similarity index 100% rename from src/core/TestabilityInterface rename to src/corelib/core/TestabilityInterface diff --git a/src/core/core.pri b/src/corelib/core/core.pri similarity index 90% rename from src/core/core.pri rename to src/corelib/core/core.pri index c5f5cf316..77d375f33 100644 --- a/src/core/core.pri +++ b/src/corelib/core/core.pri @@ -25,6 +25,10 @@ HEADERS += \ $$CORE_SRC_DIR/duiinputmethodstate.h \ $$CORE_SRC_DIR/duiinputmethodstate_p.h \ $$CORE_SRC_DIR/duidebug.h \ + $$CORE_SRC_DIR/duidataaccess.h \ + $$CORE_SRC_DIR/duidatastore.h \ + $$CORE_SRC_DIR/duifiledatastore.h \ + $$CORE_SRC_DIR/duifiledatastore_p.h \ contains(DEFINES, HAVE_DBUS) { HEADERS += \ @@ -46,9 +50,10 @@ SOURCES += \ $$CORE_SRC_DIR/duidesktopentry.cpp \ $$CORE_SRC_DIR/duiclassfactory.cpp \ $$CORE_SRC_DIR/duicpumonitor.cpp \ - $$CORE_SRC_DIR/duishareddata.cpp \ + $$CORE_SRC_DIR/duishareddata.cpp \ $$CORE_SRC_DIR/duitimestamp.cpp \ $$CORE_SRC_DIR/duiinputmethodstate.cpp \ + $$CORE_SRC_DIR/duifiledatastore.cpp \ contains(DEFINES, HAVE_DBUS) { SOURCES += \ diff --git a/src/core/duiaction.cpp b/src/corelib/core/duiaction.cpp similarity index 100% rename from src/core/duiaction.cpp rename to src/corelib/core/duiaction.cpp diff --git a/src/core/duiaction.h b/src/corelib/core/duiaction.h similarity index 100% rename from src/core/duiaction.h rename to src/corelib/core/duiaction.h diff --git a/src/core/duiaction_p.h b/src/corelib/core/duiaction_p.h similarity index 100% rename from src/core/duiaction_p.h rename to src/corelib/core/duiaction_p.h diff --git a/src/core/duiapplication.cpp b/src/corelib/core/duiapplication.cpp similarity index 100% rename from src/core/duiapplication.cpp rename to src/corelib/core/duiapplication.cpp diff --git a/src/core/duiapplication.h b/src/corelib/core/duiapplication.h similarity index 100% rename from src/core/duiapplication.h rename to src/corelib/core/duiapplication.h diff --git a/src/core/duiapplication_p.h b/src/corelib/core/duiapplication_p.h similarity index 100% rename from src/core/duiapplication_p.h rename to src/corelib/core/duiapplication_p.h diff --git a/src/core/duiapplicationifadaptor.cpp b/src/corelib/core/duiapplicationifadaptor.cpp similarity index 100% rename from src/core/duiapplicationifadaptor.cpp rename to src/corelib/core/duiapplicationifadaptor.cpp diff --git a/src/core/duiapplicationifadaptor.h b/src/corelib/core/duiapplicationifadaptor.h similarity index 100% rename from src/core/duiapplicationifadaptor.h rename to src/corelib/core/duiapplicationifadaptor.h diff --git a/src/core/duiapplicationifproxy.cpp b/src/corelib/core/duiapplicationifproxy.cpp similarity index 100% rename from src/core/duiapplicationifproxy.cpp rename to src/corelib/core/duiapplicationifproxy.cpp diff --git a/src/core/duiapplicationifproxy.h b/src/corelib/core/duiapplicationifproxy.h similarity index 100% rename from src/core/duiapplicationifproxy.h rename to src/corelib/core/duiapplicationifproxy.h diff --git a/src/core/duiapplicationservice.cpp b/src/corelib/core/duiapplicationservice.cpp similarity index 100% rename from src/core/duiapplicationservice.cpp rename to src/corelib/core/duiapplicationservice.cpp diff --git a/src/core/duiapplicationservice.h b/src/corelib/core/duiapplicationservice.h similarity index 100% rename from src/core/duiapplicationservice.h rename to src/corelib/core/duiapplicationservice.h diff --git a/src/core/duiapplicationservice_p.cpp b/src/corelib/core/duiapplicationservice_p.cpp similarity index 100% rename from src/core/duiapplicationservice_p.cpp rename to src/corelib/core/duiapplicationservice_p.cpp diff --git a/src/core/duiapplicationservice_p.h b/src/corelib/core/duiapplicationservice_p.h similarity index 100% rename from src/core/duiapplicationservice_p.h rename to src/corelib/core/duiapplicationservice_p.h diff --git a/src/core/duiassembly.cpp b/src/corelib/core/duiassembly.cpp similarity index 100% rename from src/core/duiassembly.cpp rename to src/corelib/core/duiassembly.cpp diff --git a/src/core/duiassembly.h b/src/corelib/core/duiassembly.h similarity index 100% rename from src/core/duiassembly.h rename to src/corelib/core/duiassembly.h diff --git a/src/core/duiassembly_p.h b/src/corelib/core/duiassembly_p.h similarity index 100% rename from src/core/duiassembly_p.h rename to src/corelib/core/duiassembly_p.h diff --git a/src/core/duiclassfactory.cpp b/src/corelib/core/duiclassfactory.cpp similarity index 98% rename from src/core/duiclassfactory.cpp rename to src/corelib/core/duiclassfactory.cpp index 5c1695c95..bf7d98381 100644 --- a/src/core/duiclassfactory.cpp +++ b/src/corelib/core/duiclassfactory.cpp @@ -48,8 +48,14 @@ DuiClassFactory::~DuiClassFactory() DuiClassFactory *DuiClassFactory::instance() { - static DuiClassFactory gFactory; - return &gFactory; + static DuiClassFactory *gFactory = 0; + + if ( ! gFactory ) + { + gFactory = new DuiClassFactory(); + } + + return gFactory; } //////////// diff --git a/src/core/duiclassfactory.h b/src/corelib/core/duiclassfactory.h similarity index 100% rename from src/core/duiclassfactory.h rename to src/corelib/core/duiclassfactory.h diff --git a/src/core/duicomponentdata.cpp b/src/corelib/core/duicomponentdata.cpp similarity index 100% rename from src/core/duicomponentdata.cpp rename to src/corelib/core/duicomponentdata.cpp diff --git a/src/core/duicomponentdata.h b/src/corelib/core/duicomponentdata.h similarity index 100% rename from src/core/duicomponentdata.h rename to src/corelib/core/duicomponentdata.h diff --git a/src/core/duicomponentdata_p.h b/src/corelib/core/duicomponentdata_p.h similarity index 100% rename from src/core/duicomponentdata_p.h rename to src/corelib/core/duicomponentdata_p.h diff --git a/src/core/duicpumonitor.cpp b/src/corelib/core/duicpumonitor.cpp similarity index 100% rename from src/core/duicpumonitor.cpp rename to src/corelib/core/duicpumonitor.cpp diff --git a/src/core/duicpumonitor.h b/src/corelib/core/duicpumonitor.h similarity index 100% rename from src/core/duicpumonitor.h rename to src/corelib/core/duicpumonitor.h diff --git a/src/mashup/mashup/duidataaccess.h b/src/corelib/core/duidataaccess.h similarity index 100% rename from src/mashup/mashup/duidataaccess.h rename to src/corelib/core/duidataaccess.h diff --git a/src/mashup/mashup/duidatastore.h b/src/corelib/core/duidatastore.h similarity index 100% rename from src/mashup/mashup/duidatastore.h rename to src/corelib/core/duidatastore.h diff --git a/src/core/duidbusservicewaiter.cpp b/src/corelib/core/duidbusservicewaiter.cpp similarity index 100% rename from src/core/duidbusservicewaiter.cpp rename to src/corelib/core/duidbusservicewaiter.cpp diff --git a/src/core/duidbusservicewaiter_p.h b/src/corelib/core/duidbusservicewaiter_p.h similarity index 100% rename from src/core/duidbusservicewaiter_p.h rename to src/corelib/core/duidbusservicewaiter_p.h diff --git a/src/core/duidebug.h b/src/corelib/core/duidebug.h similarity index 100% rename from src/core/duidebug.h rename to src/corelib/core/duidebug.h diff --git a/src/core/duidesktopentry.cpp b/src/corelib/core/duidesktopentry.cpp similarity index 100% rename from src/core/duidesktopentry.cpp rename to src/corelib/core/duidesktopentry.cpp diff --git a/src/core/duidesktopentry.h b/src/corelib/core/duidesktopentry.h similarity index 100% rename from src/core/duidesktopentry.h rename to src/corelib/core/duidesktopentry.h diff --git a/src/core/duidesktopentry_p.h b/src/corelib/core/duidesktopentry_p.h similarity index 100% rename from src/core/duidesktopentry_p.h rename to src/corelib/core/duidesktopentry_p.h diff --git a/src/core/duiexport.h b/src/corelib/core/duiexport.h similarity index 100% rename from src/core/duiexport.h rename to src/corelib/core/duiexport.h diff --git a/src/mashup/mashup/duifiledatastore.cpp b/src/corelib/core/duifiledatastore.cpp similarity index 100% rename from src/mashup/mashup/duifiledatastore.cpp rename to src/corelib/core/duifiledatastore.cpp diff --git a/src/mashup/mashup/duifiledatastore.h b/src/corelib/core/duifiledatastore.h similarity index 100% rename from src/mashup/mashup/duifiledatastore.h rename to src/corelib/core/duifiledatastore.h diff --git a/src/mashup/mashup/duifiledatastore_p.h b/src/corelib/core/duifiledatastore_p.h similarity index 100% rename from src/mashup/mashup/duifiledatastore_p.h rename to src/corelib/core/duifiledatastore_p.h diff --git a/src/core/duigconfitem.cpp b/src/corelib/core/duigconfitem.cpp similarity index 100% rename from src/core/duigconfitem.cpp rename to src/corelib/core/duigconfitem.cpp diff --git a/src/core/duigconfitem.h b/src/corelib/core/duigconfitem.h similarity index 100% rename from src/core/duigconfitem.h rename to src/corelib/core/duigconfitem.h diff --git a/src/core/duigconfitem_stub.cpp b/src/corelib/core/duigconfitem_stub.cpp similarity index 100% rename from src/core/duigconfitem_stub.cpp rename to src/corelib/core/duigconfitem_stub.cpp diff --git a/src/core/duiinputmethodstate.cpp b/src/corelib/core/duiinputmethodstate.cpp similarity index 100% rename from src/core/duiinputmethodstate.cpp rename to src/corelib/core/duiinputmethodstate.cpp diff --git a/src/core/duiinputmethodstate.h b/src/corelib/core/duiinputmethodstate.h similarity index 100% rename from src/core/duiinputmethodstate.h rename to src/corelib/core/duiinputmethodstate.h diff --git a/src/core/duiinputmethodstate_p.h b/src/corelib/core/duiinputmethodstate_p.h similarity index 100% rename from src/core/duiinputmethodstate_p.h rename to src/corelib/core/duiinputmethodstate_p.h diff --git a/src/core/duilibrary.cpp b/src/corelib/core/duilibrary.cpp similarity index 100% rename from src/core/duilibrary.cpp rename to src/corelib/core/duilibrary.cpp diff --git a/src/core/duilibrary.h b/src/corelib/core/duilibrary.h similarity index 100% rename from src/core/duilibrary.h rename to src/corelib/core/duilibrary.h diff --git a/src/core/duinamespace.h b/src/corelib/core/duinamespace.h similarity index 100% rename from src/core/duinamespace.h rename to src/corelib/core/duinamespace.h diff --git a/src/core/duiremoteaction.cpp b/src/corelib/core/duiremoteaction.cpp similarity index 100% rename from src/core/duiremoteaction.cpp rename to src/corelib/core/duiremoteaction.cpp diff --git a/src/core/duiremoteaction.h b/src/corelib/core/duiremoteaction.h similarity index 100% rename from src/core/duiremoteaction.h rename to src/corelib/core/duiremoteaction.h diff --git a/src/core/duiremoteaction_p.h b/src/corelib/core/duiremoteaction_p.h similarity index 100% rename from src/core/duiremoteaction_p.h rename to src/corelib/core/duiremoteaction_p.h diff --git a/src/core/duishareddata.cpp b/src/corelib/core/duishareddata.cpp similarity index 100% rename from src/core/duishareddata.cpp rename to src/corelib/core/duishareddata.cpp diff --git a/src/core/duishareddata.h b/src/corelib/core/duishareddata.h similarity index 100% rename from src/core/duishareddata.h rename to src/corelib/core/duishareddata.h diff --git a/src/core/duishareddata_p.h b/src/corelib/core/duishareddata_p.h similarity index 100% rename from src/core/duishareddata_p.h rename to src/corelib/core/duishareddata_p.h diff --git a/src/core/duitimestamp.cpp b/src/corelib/core/duitimestamp.cpp similarity index 100% rename from src/core/duitimestamp.cpp rename to src/corelib/core/duitimestamp.cpp diff --git a/src/core/duitimestamp.h b/src/corelib/core/duitimestamp.h similarity index 100% rename from src/core/duitimestamp.h rename to src/corelib/core/duitimestamp.h diff --git a/src/core/duiwidgetaction.cpp b/src/corelib/core/duiwidgetaction.cpp similarity index 100% rename from src/core/duiwidgetaction.cpp rename to src/corelib/core/duiwidgetaction.cpp diff --git a/src/core/duiwidgetaction.h b/src/corelib/core/duiwidgetaction.h similarity index 100% rename from src/core/duiwidgetaction.h rename to src/corelib/core/duiwidgetaction.h diff --git a/src/core/duiwidgetaction_p.h b/src/corelib/core/duiwidgetaction_p.h similarity index 100% rename from src/core/duiwidgetaction_p.h rename to src/corelib/core/duiwidgetaction_p.h diff --git a/src/core/testabilityinterface.h b/src/corelib/core/testabilityinterface.h similarity index 100% rename from src/core/testabilityinterface.h rename to src/corelib/core/testabilityinterface.h diff --git a/src/corelib/corelib.pro b/src/corelib/corelib.pro new file mode 100644 index 000000000..8414a5283 --- /dev/null +++ b/src/corelib/corelib.pro @@ -0,0 +1,62 @@ +include(../common_top.pri) + +TARGET = duicore + +include(animation/animation.pri) +include(core/core.pri) +include(events/events.pri) +include(feedback/feedback.pri) +include(layout/layout.pri) +include(painting/painting.pri) +include(scene/scene.pri) +include(service/service.pri) +include(style/style.pri) +include(theme/theme.pri) +include(i18n/i18n.pri) +include(widgets/widgets.pri) +include(workspace/workspace.pri) +!macx:include(video/video.pri) +contains(DEFINES, HAVE_DBUS) { + include(servicefwif/servicefwif.pri) + include(notification/notification.pri) +} + +contains(DEFINES, HAVE_ICU) { + include(icu-extradata/extradata.pri) + EXTRADATA_SOURCE=icu-extradata/extradata.txt +} + + +# install .prf files +install_prf.path = $$[QT_INSTALL_DATA]/mkspecs/features +install_prf.files = $${DUI_SOURCE_TREE}/mkspecs/features/dui.prf \ + $${DUI_SOURCE_TREE}/mkspecs/features/dui_translations.prf \ + $${DUI_BUILD_TREE}/mkspecs/features/dui_defines.prf + +# causes problems when installing on windows with INSTALL_ROOT +!win32 { + INSTALLS += install_prf +} + + +#install libdui .pc file +install_pkgconfig.path = $$DUI_INSTALL_LIBS/pkgconfig +install_pkgconfig.files = ../Dui.pc +INSTALLS += install_pkgconfig + + +# install forwarding headers +win32 { + # for windows we can live with the broken pattern matching + FORWARDING_HEADERS = include/Dui* +} else { + # match only the camel case forwarding headers here + FORWARDING_HEADERS = $$system( find ../include/Dui* ) +} +forwarding_headers.path = $$DUI_INSTALL_HEADERS +forwarding_headers.files = $$FORWARDING_HEADERS +INSTALLS += forwarding_headers + + + +include(../common_bot.pri) diff --git a/src/events/duicancelevent.cpp b/src/corelib/events/duicancelevent.cpp similarity index 100% rename from src/events/duicancelevent.cpp rename to src/corelib/events/duicancelevent.cpp diff --git a/src/events/duicancelevent.h b/src/corelib/events/duicancelevent.h similarity index 100% rename from src/events/duicancelevent.h rename to src/corelib/events/duicancelevent.h diff --git a/src/events/duidismissevent.cpp b/src/corelib/events/duidismissevent.cpp similarity index 100% rename from src/events/duidismissevent.cpp rename to src/corelib/events/duidismissevent.cpp diff --git a/src/events/duidismissevent.h b/src/corelib/events/duidismissevent.h similarity index 100% rename from src/events/duidismissevent.h rename to src/corelib/events/duidismissevent.h diff --git a/src/events/duikeyboardstatetracker.cpp b/src/corelib/events/duikeyboardstatetracker.cpp similarity index 100% rename from src/events/duikeyboardstatetracker.cpp rename to src/corelib/events/duikeyboardstatetracker.cpp diff --git a/src/events/duikeyboardstatetracker.h b/src/corelib/events/duikeyboardstatetracker.h similarity index 100% rename from src/events/duikeyboardstatetracker.h rename to src/corelib/events/duikeyboardstatetracker.h diff --git a/src/events/duikeyboardstatetracker_p.h b/src/corelib/events/duikeyboardstatetracker_p.h similarity index 100% rename from src/events/duikeyboardstatetracker_p.h rename to src/corelib/events/duikeyboardstatetracker_p.h diff --git a/src/events/duiondisplaychangeevent.cpp b/src/corelib/events/duiondisplaychangeevent.cpp similarity index 100% rename from src/events/duiondisplaychangeevent.cpp rename to src/corelib/events/duiondisplaychangeevent.cpp diff --git a/src/events/duiondisplaychangeevent.h b/src/corelib/events/duiondisplaychangeevent.h similarity index 100% rename from src/events/duiondisplaychangeevent.h rename to src/corelib/events/duiondisplaychangeevent.h diff --git a/src/events/duiondisplaychangeevent_p.h b/src/corelib/events/duiondisplaychangeevent_p.h similarity index 100% rename from src/events/duiondisplaychangeevent_p.h rename to src/corelib/events/duiondisplaychangeevent_p.h diff --git a/src/events/duiorientationchangeevent.cpp b/src/corelib/events/duiorientationchangeevent.cpp similarity index 100% rename from src/events/duiorientationchangeevent.cpp rename to src/corelib/events/duiorientationchangeevent.cpp diff --git a/src/events/duiorientationchangeevent.h b/src/corelib/events/duiorientationchangeevent.h similarity index 100% rename from src/events/duiorientationchangeevent.h rename to src/corelib/events/duiorientationchangeevent.h diff --git a/src/events/duiorientationchangeevent_p.h b/src/corelib/events/duiorientationchangeevent_p.h similarity index 100% rename from src/events/duiorientationchangeevent_p.h rename to src/corelib/events/duiorientationchangeevent_p.h diff --git a/src/events/duiorientationtracker.cpp b/src/corelib/events/duiorientationtracker.cpp similarity index 100% rename from src/events/duiorientationtracker.cpp rename to src/corelib/events/duiorientationtracker.cpp diff --git a/src/events/duiorientationtracker.h b/src/corelib/events/duiorientationtracker.h similarity index 95% rename from src/events/duiorientationtracker.h rename to src/corelib/events/duiorientationtracker.h index 72dd352f0..b24852145 100644 --- a/src/events/duiorientationtracker.h +++ b/src/corelib/events/duiorientationtracker.h @@ -23,6 +23,7 @@ #include #include "duinamespace.h" +#include "duiexport.h" class DuiOrientationTrackerPrivate; @@ -35,7 +36,7 @@ class DuiOrientationTrackerPrivate; * Initially designed as singleton as DuiDeviceProfile might need to access some more information about * the concrete phone position, that is not available from fired events. */ -class DuiOrientationTracker : public QObject +class DUI_EXPORT DuiOrientationTracker: public QObject { Q_OBJECT public: diff --git a/src/events/duiorientationtracker_p.h b/src/corelib/events/duiorientationtracker_p.h similarity index 100% rename from src/events/duiorientationtracker_p.h rename to src/corelib/events/duiorientationtracker_p.h diff --git a/src/events/duipreeditinjectionevent.cpp b/src/corelib/events/duipreeditinjectionevent.cpp similarity index 100% rename from src/events/duipreeditinjectionevent.cpp rename to src/corelib/events/duipreeditinjectionevent.cpp diff --git a/src/events/duipreeditinjectionevent.h b/src/corelib/events/duipreeditinjectionevent.h similarity index 100% rename from src/events/duipreeditinjectionevent.h rename to src/corelib/events/duipreeditinjectionevent.h diff --git a/src/events/duipreeditinjectionevent_p.h b/src/corelib/events/duipreeditinjectionevent_p.h similarity index 100% rename from src/events/duipreeditinjectionevent_p.h rename to src/corelib/events/duipreeditinjectionevent_p.h diff --git a/src/events/duiscenewindowevent_p.cpp b/src/corelib/events/duiscenewindowevent_p.cpp similarity index 100% rename from src/events/duiscenewindowevent_p.cpp rename to src/corelib/events/duiscenewindowevent_p.cpp diff --git a/src/events/duiscenewindowevent_p.h b/src/corelib/events/duiscenewindowevent_p.h similarity index 100% rename from src/events/duiscenewindowevent_p.h rename to src/corelib/events/duiscenewindowevent_p.h diff --git a/src/events/duitapandholdgesture.cpp b/src/corelib/events/duitapandholdgesture.cpp similarity index 100% rename from src/events/duitapandholdgesture.cpp rename to src/corelib/events/duitapandholdgesture.cpp diff --git a/src/events/duitapandholdgesture_p.h b/src/corelib/events/duitapandholdgesture_p.h similarity index 100% rename from src/events/duitapandholdgesture_p.h rename to src/corelib/events/duitapandholdgesture_p.h diff --git a/src/events/duitapandholdrecognizer.cpp b/src/corelib/events/duitapandholdrecognizer.cpp similarity index 100% rename from src/events/duitapandholdrecognizer.cpp rename to src/corelib/events/duitapandholdrecognizer.cpp diff --git a/src/events/duitapandholdrecognizer.h b/src/corelib/events/duitapandholdrecognizer.h similarity index 100% rename from src/events/duitapandholdrecognizer.h rename to src/corelib/events/duitapandholdrecognizer.h diff --git a/src/events/duitapandholdrecognizer_p.h b/src/corelib/events/duitapandholdrecognizer_p.h similarity index 100% rename from src/events/duitapandholdrecognizer_p.h rename to src/corelib/events/duitapandholdrecognizer_p.h diff --git a/src/events/events.pri b/src/corelib/events/events.pri similarity index 100% rename from src/events/events.pri rename to src/corelib/events/events.pri diff --git a/src/feedback/duifeedback.cpp b/src/corelib/feedback/duifeedback.cpp similarity index 100% rename from src/feedback/duifeedback.cpp rename to src/corelib/feedback/duifeedback.cpp diff --git a/src/feedback/duifeedback.h b/src/corelib/feedback/duifeedback.h similarity index 100% rename from src/feedback/duifeedback.h rename to src/corelib/feedback/duifeedback.h diff --git a/src/feedback/duifeedback_p.cpp b/src/corelib/feedback/duifeedback_p.cpp similarity index 100% rename from src/feedback/duifeedback_p.cpp rename to src/corelib/feedback/duifeedback_p.cpp diff --git a/src/feedback/duifeedback_p.h b/src/corelib/feedback/duifeedback_p.h similarity index 100% rename from src/feedback/duifeedback_p.h rename to src/corelib/feedback/duifeedback_p.h diff --git a/src/feedback/duifeedbackplayer.cpp b/src/corelib/feedback/duifeedbackplayer.cpp similarity index 100% rename from src/feedback/duifeedbackplayer.cpp rename to src/corelib/feedback/duifeedbackplayer.cpp diff --git a/src/feedback/duifeedbackplayer.h b/src/corelib/feedback/duifeedbackplayer.h similarity index 100% rename from src/feedback/duifeedbackplayer.h rename to src/corelib/feedback/duifeedbackplayer.h diff --git a/src/feedback/duifeedbackplayer_p.cpp b/src/corelib/feedback/duifeedbackplayer_p.cpp similarity index 100% rename from src/feedback/duifeedbackplayer_p.cpp rename to src/corelib/feedback/duifeedbackplayer_p.cpp diff --git a/src/feedback/duifeedbackplayer_p.h b/src/corelib/feedback/duifeedbackplayer_p.h similarity index 100% rename from src/feedback/duifeedbackplayer_p.h rename to src/corelib/feedback/duifeedbackplayer_p.h diff --git a/src/feedback/feedback.pri b/src/corelib/feedback/feedback.pri similarity index 100% rename from src/feedback/feedback.pri rename to src/corelib/feedback/feedback.pri diff --git a/src/i18n/duibreakiterator.cpp b/src/corelib/i18n/duibreakiterator.cpp similarity index 100% rename from src/i18n/duibreakiterator.cpp rename to src/corelib/i18n/duibreakiterator.cpp diff --git a/src/i18n/duibreakiterator.h b/src/corelib/i18n/duibreakiterator.h similarity index 100% rename from src/i18n/duibreakiterator.h rename to src/corelib/i18n/duibreakiterator.h diff --git a/src/i18n/duibreakiteratorif.h b/src/corelib/i18n/duibreakiteratorif.h similarity index 100% rename from src/i18n/duibreakiteratorif.h rename to src/corelib/i18n/duibreakiteratorif.h diff --git a/src/i18n/duicalendar.cpp b/src/corelib/i18n/duicalendar.cpp similarity index 100% rename from src/i18n/duicalendar.cpp rename to src/corelib/i18n/duicalendar.cpp diff --git a/src/i18n/duicalendar.h b/src/corelib/i18n/duicalendar.h similarity index 100% rename from src/i18n/duicalendar.h rename to src/corelib/i18n/duicalendar.h diff --git a/src/i18n/duicalendar_p.h b/src/corelib/i18n/duicalendar_p.h similarity index 100% rename from src/i18n/duicalendar_p.h rename to src/corelib/i18n/duicalendar_p.h diff --git a/src/i18n/duicollator.cpp b/src/corelib/i18n/duicollator.cpp similarity index 100% rename from src/i18n/duicollator.cpp rename to src/corelib/i18n/duicollator.cpp diff --git a/src/i18n/duicollator.h b/src/corelib/i18n/duicollator.h similarity index 100% rename from src/i18n/duicollator.h rename to src/corelib/i18n/duicollator.h diff --git a/src/i18n/duicollator_p.h b/src/corelib/i18n/duicollator_p.h similarity index 100% rename from src/i18n/duicollator_p.h rename to src/corelib/i18n/duicollator_p.h diff --git a/src/i18n/duiicubreakiterator.cpp b/src/corelib/i18n/duiicubreakiterator.cpp similarity index 100% rename from src/i18n/duiicubreakiterator.cpp rename to src/corelib/i18n/duiicubreakiterator.cpp diff --git a/src/i18n/duiicubreakiterator.h b/src/corelib/i18n/duiicubreakiterator.h similarity index 100% rename from src/i18n/duiicubreakiterator.h rename to src/corelib/i18n/duiicubreakiterator.h diff --git a/src/i18n/duiicuconversions.cpp b/src/corelib/i18n/duiicuconversions.cpp similarity index 100% rename from src/i18n/duiicuconversions.cpp rename to src/corelib/i18n/duiicuconversions.cpp diff --git a/src/i18n/duiicuconversions.h b/src/corelib/i18n/duiicuconversions.h similarity index 100% rename from src/i18n/duiicuconversions.h rename to src/corelib/i18n/duiicuconversions.h diff --git a/src/i18n/duilocale.cpp b/src/corelib/i18n/duilocale.cpp similarity index 100% rename from src/i18n/duilocale.cpp rename to src/corelib/i18n/duilocale.cpp diff --git a/src/i18n/duilocale.h b/src/corelib/i18n/duilocale.h similarity index 100% rename from src/i18n/duilocale.h rename to src/corelib/i18n/duilocale.h diff --git a/src/i18n/duilocale_p.h b/src/corelib/i18n/duilocale_p.h similarity index 100% rename from src/i18n/duilocale_p.h rename to src/corelib/i18n/duilocale_p.h diff --git a/src/i18n/duinullbreakiterator.cpp b/src/corelib/i18n/duinullbreakiterator.cpp similarity index 100% rename from src/i18n/duinullbreakiterator.cpp rename to src/corelib/i18n/duinullbreakiterator.cpp diff --git a/src/i18n/duinullbreakiterator.h b/src/corelib/i18n/duinullbreakiterator.h similarity index 100% rename from src/i18n/duinullbreakiterator.h rename to src/corelib/i18n/duinullbreakiterator.h diff --git a/src/i18n/i18n.pri b/src/corelib/i18n/i18n.pri similarity index 100% rename from src/i18n/i18n.pri rename to src/corelib/i18n/i18n.pri diff --git a/src/icu-extradata/extradata.pri b/src/corelib/icu-extradata/extradata.pri similarity index 100% rename from src/icu-extradata/extradata.pri rename to src/corelib/icu-extradata/extradata.pri diff --git a/src/icu-extradata/extradata.txt b/src/corelib/icu-extradata/extradata.txt similarity index 100% rename from src/icu-extradata/extradata.txt rename to src/corelib/icu-extradata/extradata.txt diff --git a/src/icu-extradata/packagelist.txt b/src/corelib/icu-extradata/packagelist.txt similarity index 100% rename from src/icu-extradata/packagelist.txt rename to src/corelib/icu-extradata/packagelist.txt diff --git a/src/layout/duiabstractlayoutpolicy.cpp b/src/corelib/layout/duiabstractlayoutpolicy.cpp similarity index 100% rename from src/layout/duiabstractlayoutpolicy.cpp rename to src/corelib/layout/duiabstractlayoutpolicy.cpp diff --git a/src/layout/duiabstractlayoutpolicy.h b/src/corelib/layout/duiabstractlayoutpolicy.h similarity index 100% rename from src/layout/duiabstractlayoutpolicy.h rename to src/corelib/layout/duiabstractlayoutpolicy.h diff --git a/src/layout/duiabstractlayoutpolicy_p.cpp b/src/corelib/layout/duiabstractlayoutpolicy_p.cpp similarity index 100% rename from src/layout/duiabstractlayoutpolicy_p.cpp rename to src/corelib/layout/duiabstractlayoutpolicy_p.cpp diff --git a/src/layout/duiabstractlayoutpolicy_p.h b/src/corelib/layout/duiabstractlayoutpolicy_p.h similarity index 100% rename from src/layout/duiabstractlayoutpolicy_p.h rename to src/corelib/layout/duiabstractlayoutpolicy_p.h diff --git a/src/layout/duibasiclayoutanimation.cpp b/src/corelib/layout/duibasiclayoutanimation.cpp similarity index 100% rename from src/layout/duibasiclayoutanimation.cpp rename to src/corelib/layout/duibasiclayoutanimation.cpp diff --git a/src/layout/duibasiclayoutanimation.h b/src/corelib/layout/duibasiclayoutanimation.h similarity index 100% rename from src/layout/duibasiclayoutanimation.h rename to src/corelib/layout/duibasiclayoutanimation.h diff --git a/src/layout/duibasiclayoutanimation_p.cpp b/src/corelib/layout/duibasiclayoutanimation_p.cpp similarity index 100% rename from src/layout/duibasiclayoutanimation_p.cpp rename to src/corelib/layout/duibasiclayoutanimation_p.cpp diff --git a/src/layout/duibasiclayoutanimation_p.h b/src/corelib/layout/duibasiclayoutanimation_p.h similarity index 100% rename from src/layout/duibasiclayoutanimation_p.h rename to src/corelib/layout/duibasiclayoutanimation_p.h diff --git a/src/layout/duiflowlayoutpolicy.cpp b/src/corelib/layout/duiflowlayoutpolicy.cpp similarity index 100% rename from src/layout/duiflowlayoutpolicy.cpp rename to src/corelib/layout/duiflowlayoutpolicy.cpp diff --git a/src/layout/duiflowlayoutpolicy.h b/src/corelib/layout/duiflowlayoutpolicy.h similarity index 100% rename from src/layout/duiflowlayoutpolicy.h rename to src/corelib/layout/duiflowlayoutpolicy.h diff --git a/src/layout/duiflowlayoutpolicy_p.cpp b/src/corelib/layout/duiflowlayoutpolicy_p.cpp similarity index 100% rename from src/layout/duiflowlayoutpolicy_p.cpp rename to src/corelib/layout/duiflowlayoutpolicy_p.cpp diff --git a/src/layout/duiflowlayoutpolicy_p.h b/src/corelib/layout/duiflowlayoutpolicy_p.h similarity index 100% rename from src/layout/duiflowlayoutpolicy_p.h rename to src/corelib/layout/duiflowlayoutpolicy_p.h diff --git a/src/layout/duifreestylelayoutpolicy.cpp b/src/corelib/layout/duifreestylelayoutpolicy.cpp similarity index 100% rename from src/layout/duifreestylelayoutpolicy.cpp rename to src/corelib/layout/duifreestylelayoutpolicy.cpp diff --git a/src/layout/duifreestylelayoutpolicy.h b/src/corelib/layout/duifreestylelayoutpolicy.h similarity index 100% rename from src/layout/duifreestylelayoutpolicy.h rename to src/corelib/layout/duifreestylelayoutpolicy.h diff --git a/src/layout/duifreestylelayoutpolicy_p.cpp b/src/corelib/layout/duifreestylelayoutpolicy_p.cpp similarity index 100% rename from src/layout/duifreestylelayoutpolicy_p.cpp rename to src/corelib/layout/duifreestylelayoutpolicy_p.cpp diff --git a/src/layout/duifreestylelayoutpolicy_p.h b/src/corelib/layout/duifreestylelayoutpolicy_p.h similarity index 100% rename from src/layout/duifreestylelayoutpolicy_p.h rename to src/corelib/layout/duifreestylelayoutpolicy_p.h diff --git a/src/layout/duigridlayoutpolicy.cpp b/src/corelib/layout/duigridlayoutpolicy.cpp similarity index 100% rename from src/layout/duigridlayoutpolicy.cpp rename to src/corelib/layout/duigridlayoutpolicy.cpp diff --git a/src/layout/duigridlayoutpolicy.h b/src/corelib/layout/duigridlayoutpolicy.h similarity index 100% rename from src/layout/duigridlayoutpolicy.h rename to src/corelib/layout/duigridlayoutpolicy.h diff --git a/src/layout/duigridlayoutpolicy_p.cpp b/src/corelib/layout/duigridlayoutpolicy_p.cpp similarity index 100% rename from src/layout/duigridlayoutpolicy_p.cpp rename to src/corelib/layout/duigridlayoutpolicy_p.cpp diff --git a/src/layout/duigridlayoutpolicy_p.h b/src/corelib/layout/duigridlayoutpolicy_p.h similarity index 100% rename from src/layout/duigridlayoutpolicy_p.h rename to src/corelib/layout/duigridlayoutpolicy_p.h diff --git a/src/layout/duiitemstate.cpp b/src/corelib/layout/duiitemstate.cpp similarity index 100% rename from src/layout/duiitemstate.cpp rename to src/corelib/layout/duiitemstate.cpp diff --git a/src/layout/duiitemstate.h b/src/corelib/layout/duiitemstate.h similarity index 100% rename from src/layout/duiitemstate.h rename to src/corelib/layout/duiitemstate.h diff --git a/src/layout/duiitemstate_p.h b/src/corelib/layout/duiitemstate_p.h similarity index 100% rename from src/layout/duiitemstate_p.h rename to src/corelib/layout/duiitemstate_p.h diff --git a/src/layout/duilayout.cpp b/src/corelib/layout/duilayout.cpp similarity index 100% rename from src/layout/duilayout.cpp rename to src/corelib/layout/duilayout.cpp diff --git a/src/layout/duilayout.h b/src/corelib/layout/duilayout.h similarity index 100% rename from src/layout/duilayout.h rename to src/corelib/layout/duilayout.h diff --git a/src/layout/duilayout_p.cpp b/src/corelib/layout/duilayout_p.cpp similarity index 100% rename from src/layout/duilayout_p.cpp rename to src/corelib/layout/duilayout_p.cpp diff --git a/src/layout/duilayout_p.h b/src/corelib/layout/duilayout_p.h similarity index 100% rename from src/layout/duilayout_p.h rename to src/corelib/layout/duilayout_p.h diff --git a/src/layout/duilayoutanimation.cpp b/src/corelib/layout/duilayoutanimation.cpp similarity index 100% rename from src/layout/duilayoutanimation.cpp rename to src/corelib/layout/duilayoutanimation.cpp diff --git a/src/layout/duilayoutanimation.h b/src/corelib/layout/duilayoutanimation.h similarity index 100% rename from src/layout/duilayoutanimation.h rename to src/corelib/layout/duilayoutanimation.h diff --git a/src/layout/duilayoutanimation_p.h b/src/corelib/layout/duilayoutanimation_p.h similarity index 100% rename from src/layout/duilayoutanimation_p.h rename to src/corelib/layout/duilayoutanimation_p.h diff --git a/src/layout/duilayouthelper_p.h b/src/corelib/layout/duilayouthelper_p.h similarity index 100% rename from src/layout/duilayouthelper_p.h rename to src/corelib/layout/duilayouthelper_p.h diff --git a/src/layout/duilinearlayoutpolicy.cpp b/src/corelib/layout/duilinearlayoutpolicy.cpp similarity index 100% rename from src/layout/duilinearlayoutpolicy.cpp rename to src/corelib/layout/duilinearlayoutpolicy.cpp diff --git a/src/layout/duilinearlayoutpolicy.h b/src/corelib/layout/duilinearlayoutpolicy.h similarity index 100% rename from src/layout/duilinearlayoutpolicy.h rename to src/corelib/layout/duilinearlayoutpolicy.h diff --git a/src/layout/duilinearlayoutpolicy_p.cpp b/src/corelib/layout/duilinearlayoutpolicy_p.cpp similarity index 100% rename from src/layout/duilinearlayoutpolicy_p.cpp rename to src/corelib/layout/duilinearlayoutpolicy_p.cpp diff --git a/src/layout/duilinearlayoutpolicy_p.h b/src/corelib/layout/duilinearlayoutpolicy_p.h similarity index 100% rename from src/layout/duilinearlayoutpolicy_p.h rename to src/corelib/layout/duilinearlayoutpolicy_p.h diff --git a/src/layout/layout state machine.txt b/src/corelib/layout/layout state machine.txt similarity index 100% rename from src/layout/layout state machine.txt rename to src/corelib/layout/layout state machine.txt diff --git a/src/layout/layout.pri b/src/corelib/layout/layout.pri similarity index 100% rename from src/layout/layout.pri rename to src/corelib/layout/layout.pri diff --git a/src/notification/duinotification.cpp b/src/corelib/notification/duinotification.cpp similarity index 100% rename from src/notification/duinotification.cpp rename to src/corelib/notification/duinotification.cpp diff --git a/src/notification/duinotification.h b/src/corelib/notification/duinotification.h similarity index 100% rename from src/notification/duinotification.h rename to src/corelib/notification/duinotification.h diff --git a/src/notification/duinotification_p.h b/src/corelib/notification/duinotification_p.h similarity index 100% rename from src/notification/duinotification_p.h rename to src/corelib/notification/duinotification_p.h diff --git a/src/notification/duinotificationgroup.cpp b/src/corelib/notification/duinotificationgroup.cpp similarity index 100% rename from src/notification/duinotificationgroup.cpp rename to src/corelib/notification/duinotificationgroup.cpp diff --git a/src/notification/duinotificationgroup.h b/src/corelib/notification/duinotificationgroup.h similarity index 100% rename from src/notification/duinotificationgroup.h rename to src/corelib/notification/duinotificationgroup.h diff --git a/src/notification/duinotificationgroup_p.h b/src/corelib/notification/duinotificationgroup_p.h similarity index 100% rename from src/notification/duinotificationgroup_p.h rename to src/corelib/notification/duinotificationgroup_p.h diff --git a/src/notification/duinotificationmanager.cpp b/src/corelib/notification/duinotificationmanager.cpp similarity index 100% rename from src/notification/duinotificationmanager.cpp rename to src/corelib/notification/duinotificationmanager.cpp diff --git a/src/notification/duinotificationmanager.h b/src/corelib/notification/duinotificationmanager.h similarity index 100% rename from src/notification/duinotificationmanager.h rename to src/corelib/notification/duinotificationmanager.h diff --git a/src/notification/duinotificationmanagerproxy.cpp b/src/corelib/notification/duinotificationmanagerproxy.cpp similarity index 100% rename from src/notification/duinotificationmanagerproxy.cpp rename to src/corelib/notification/duinotificationmanagerproxy.cpp diff --git a/src/notification/duinotificationmanagerproxy.h b/src/corelib/notification/duinotificationmanagerproxy.h similarity index 100% rename from src/notification/duinotificationmanagerproxy.h rename to src/corelib/notification/duinotificationmanagerproxy.h diff --git a/src/notification/metatypedeclarations.h b/src/corelib/notification/metatypedeclarations.h similarity index 100% rename from src/notification/metatypedeclarations.h rename to src/corelib/notification/metatypedeclarations.h diff --git a/src/notification/notification.pri b/src/corelib/notification/notification.pri similarity index 100% rename from src/notification/notification.pri rename to src/corelib/notification/notification.pri diff --git a/src/notification/notificationmanager.xml b/src/corelib/notification/notificationmanager.xml similarity index 100% rename from src/notification/notificationmanager.xml rename to src/corelib/notification/notificationmanager.xml diff --git a/src/painting/duigles2renderer.cpp b/src/corelib/painting/duigles2renderer.cpp similarity index 100% rename from src/painting/duigles2renderer.cpp rename to src/corelib/painting/duigles2renderer.cpp diff --git a/src/painting/duigles2renderer.h b/src/corelib/painting/duigles2renderer.h similarity index 100% rename from src/painting/duigles2renderer.h rename to src/corelib/painting/duigles2renderer.h diff --git a/src/painting/duiscalableimage.cpp b/src/corelib/painting/duiscalableimage.cpp similarity index 100% rename from src/painting/duiscalableimage.cpp rename to src/corelib/painting/duiscalableimage.cpp diff --git a/src/painting/duiscalableimage.h b/src/corelib/painting/duiscalableimage.h similarity index 100% rename from src/painting/duiscalableimage.h rename to src/corelib/painting/duiscalableimage.h diff --git a/src/painting/duiscalableimage_p.h b/src/corelib/painting/duiscalableimage_p.h similarity index 100% rename from src/painting/duiscalableimage_p.h rename to src/corelib/painting/duiscalableimage_p.h diff --git a/src/painting/painting.pri b/src/corelib/painting/painting.pri similarity index 100% rename from src/painting/painting.pri rename to src/corelib/painting/painting.pri diff --git a/src/painting/shaders/default.frag b/src/corelib/painting/shaders/default.frag similarity index 100% rename from src/painting/shaders/default.frag rename to src/corelib/painting/shaders/default.frag diff --git a/src/painting/shaders/default.vert b/src/corelib/painting/shaders/default.vert similarity index 100% rename from src/painting/shaders/default.vert rename to src/corelib/painting/shaders/default.vert diff --git a/src/painting/shaders/yuv1.frag b/src/corelib/painting/shaders/yuv1.frag similarity index 100% rename from src/painting/shaders/yuv1.frag rename to src/corelib/painting/shaders/yuv1.frag diff --git a/src/painting/shaders/yuv3.frag b/src/corelib/painting/shaders/yuv3.frag similarity index 100% rename from src/painting/shaders/yuv3.frag rename to src/corelib/painting/shaders/yuv3.frag diff --git a/src/scene/duiscene.cpp b/src/corelib/scene/duiscene.cpp similarity index 100% rename from src/scene/duiscene.cpp rename to src/corelib/scene/duiscene.cpp diff --git a/src/scene/duiscene.h b/src/corelib/scene/duiscene.h similarity index 100% rename from src/scene/duiscene.h rename to src/corelib/scene/duiscene.h diff --git a/src/scene/duiscene_p.h b/src/corelib/scene/duiscene_p.h similarity index 100% rename from src/scene/duiscene_p.h rename to src/corelib/scene/duiscene_p.h diff --git a/src/scene/duiscenelayereffect.cpp b/src/corelib/scene/duiscenelayereffect.cpp similarity index 100% rename from src/scene/duiscenelayereffect.cpp rename to src/corelib/scene/duiscenelayereffect.cpp diff --git a/src/scene/duiscenelayereffect.h b/src/corelib/scene/duiscenelayereffect.h similarity index 100% rename from src/scene/duiscenelayereffect.h rename to src/corelib/scene/duiscenelayereffect.h diff --git a/src/scene/duiscenelayereffect_p.h b/src/corelib/scene/duiscenelayereffect_p.h similarity index 100% rename from src/scene/duiscenelayereffect_p.h rename to src/corelib/scene/duiscenelayereffect_p.h diff --git a/src/scene/duiscenemanager.cpp b/src/corelib/scene/duiscenemanager.cpp similarity index 100% rename from src/scene/duiscenemanager.cpp rename to src/corelib/scene/duiscenemanager.cpp diff --git a/src/scene/duiscenemanager.h b/src/corelib/scene/duiscenemanager.h similarity index 100% rename from src/scene/duiscenemanager.h rename to src/corelib/scene/duiscenemanager.h diff --git a/src/scene/duiscenemanager_p.h b/src/corelib/scene/duiscenemanager_p.h similarity index 100% rename from src/scene/duiscenemanager_p.h rename to src/corelib/scene/duiscenemanager_p.h diff --git a/src/scene/duiscenewindowanimator.cpp b/src/corelib/scene/duiscenewindowanimator.cpp similarity index 100% rename from src/scene/duiscenewindowanimator.cpp rename to src/corelib/scene/duiscenewindowanimator.cpp diff --git a/src/scene/duiscenewindowanimator.h b/src/corelib/scene/duiscenewindowanimator.h similarity index 100% rename from src/scene/duiscenewindowanimator.h rename to src/corelib/scene/duiscenewindowanimator.h diff --git a/src/scene/scene.pri b/src/corelib/scene/scene.pri similarity index 83% rename from src/scene/scene.pri rename to src/corelib/scene/scene.pri index e16c672f0..70400d9ac 100644 --- a/src/scene/scene.pri +++ b/src/corelib/scene/scene.pri @@ -10,10 +10,8 @@ HEADERS += $$SCENE_SRC_DIR/duiscene.h \ $$SCENE_SRC_DIR/duiscenemanager.h \ $$SCENE_SRC_DIR/duiscenemanager_p.h \ # $$SCENE_SRC_DIR/duiscenewindowanimator.h \ - $$SCENE_SRC_DIR/scenelayereffectviews/duiscenelayereffectdimview.h SOURCES += $$SCENE_SRC_DIR/duiscene.cpp \ $$SCENE_SRC_DIR/duiscenelayereffect.cpp \ $$SCENE_SRC_DIR/duiscenemanager.cpp \ # $$SCENE_SRC_DIR/duiscenewindowanimator.cpp \ - $$SCENE_SRC_DIR/scenelayereffectviews/duiscenelayereffectdimview.cpp diff --git a/src/service/duiserviceaction.cpp b/src/corelib/service/duiserviceaction.cpp similarity index 100% rename from src/service/duiserviceaction.cpp rename to src/corelib/service/duiserviceaction.cpp diff --git a/src/service/duiserviceaction.h b/src/corelib/service/duiserviceaction.h similarity index 100% rename from src/service/duiserviceaction.h rename to src/corelib/service/duiserviceaction.h diff --git a/src/service/duiserviceaction_p.h b/src/corelib/service/duiserviceaction_p.h similarity index 100% rename from src/service/duiserviceaction_p.h rename to src/corelib/service/duiserviceaction_p.h diff --git a/src/service/duiserviceinvoker.cpp b/src/corelib/service/duiserviceinvoker.cpp similarity index 100% rename from src/service/duiserviceinvoker.cpp rename to src/corelib/service/duiserviceinvoker.cpp diff --git a/src/service/duiserviceinvoker.h b/src/corelib/service/duiserviceinvoker.h similarity index 100% rename from src/service/duiserviceinvoker.h rename to src/corelib/service/duiserviceinvoker.h diff --git a/src/service/service.pri b/src/corelib/service/service.pri similarity index 100% rename from src/service/service.pri rename to src/corelib/service/service.pri diff --git a/src/servicefwif/com.nokia.DuiServiceFwIf.xml b/src/corelib/servicefwif/com.nokia.DuiServiceFwIf.xml similarity index 100% rename from src/servicefwif/com.nokia.DuiServiceFwIf.xml rename to src/corelib/servicefwif/com.nokia.DuiServiceFwIf.xml diff --git a/src/servicefwif/duiservicefwbaseif.cpp b/src/corelib/servicefwif/duiservicefwbaseif.cpp similarity index 100% rename from src/servicefwif/duiservicefwbaseif.cpp rename to src/corelib/servicefwif/duiservicefwbaseif.cpp diff --git a/src/servicefwif/duiservicefwbaseif.h b/src/corelib/servicefwif/duiservicefwbaseif.h similarity index 100% rename from src/servicefwif/duiservicefwbaseif.h rename to src/corelib/servicefwif/duiservicefwbaseif.h diff --git a/src/servicefwif/duiservicefwbaseif_p.h b/src/corelib/servicefwif/duiservicefwbaseif_p.h similarity index 100% rename from src/servicefwif/duiservicefwbaseif_p.h rename to src/corelib/servicefwif/duiservicefwbaseif_p.h diff --git a/src/servicefwif/duiservicefwproxy.cpp b/src/corelib/servicefwif/duiservicefwproxy.cpp similarity index 100% rename from src/servicefwif/duiservicefwproxy.cpp rename to src/corelib/servicefwif/duiservicefwproxy.cpp diff --git a/src/servicefwif/include/duiservicefwproxy.h b/src/corelib/servicefwif/include/duiservicefwproxy.h similarity index 100% rename from src/servicefwif/include/duiservicefwproxy.h rename to src/corelib/servicefwif/include/duiservicefwproxy.h diff --git a/src/servicefwif/servicefwif.pri b/src/corelib/servicefwif/servicefwif.pri similarity index 100% rename from src/servicefwif/servicefwif.pri rename to src/corelib/servicefwif/servicefwif.pri diff --git a/src/style/duiabstractlayoutpolicystyle.h b/src/corelib/style/duiabstractlayoutpolicystyle.h similarity index 100% rename from src/style/duiabstractlayoutpolicystyle.h rename to src/corelib/style/duiabstractlayoutpolicystyle.h diff --git a/src/style/duiabstractwidgetanimationstyle.h b/src/corelib/style/duiabstractwidgetanimationstyle.h similarity index 100% rename from src/style/duiabstractwidgetanimationstyle.h rename to src/corelib/style/duiabstractwidgetanimationstyle.h diff --git a/src/style/duianimationstyle.h b/src/corelib/style/duianimationstyle.h similarity index 100% rename from src/style/duianimationstyle.h rename to src/corelib/style/duianimationstyle.h diff --git a/src/style/duibasiclayoutanimationstyle.h b/src/corelib/style/duibasiclayoutanimationstyle.h similarity index 100% rename from src/style/duibasiclayoutanimationstyle.h rename to src/corelib/style/duibasiclayoutanimationstyle.h diff --git a/src/style/duibasicorientationanimationstyle.h b/src/corelib/style/duibasicorientationanimationstyle.h similarity index 100% rename from src/style/duibasicorientationanimationstyle.h rename to src/corelib/style/duibasicorientationanimationstyle.h diff --git a/src/style/duigroupanimationstyle.h b/src/corelib/style/duigroupanimationstyle.h similarity index 100% rename from src/style/duigroupanimationstyle.h rename to src/corelib/style/duigroupanimationstyle.h diff --git a/src/style/duilayoutanimationstyle.h b/src/corelib/style/duilayoutanimationstyle.h similarity index 100% rename from src/style/duilayoutanimationstyle.h rename to src/corelib/style/duilayoutanimationstyle.h diff --git a/src/style/duipageswitchanimationstyle.h b/src/corelib/style/duipageswitchanimationstyle.h similarity index 100% rename from src/style/duipageswitchanimationstyle.h rename to src/corelib/style/duipageswitchanimationstyle.h diff --git a/src/style/duiscenewindowanimationstyle.h b/src/corelib/style/duiscenewindowanimationstyle.h similarity index 100% rename from src/style/duiscenewindowanimationstyle.h rename to src/corelib/style/duiscenewindowanimationstyle.h diff --git a/src/style/duistyle.cpp b/src/corelib/style/duistyle.cpp similarity index 100% rename from src/style/duistyle.cpp rename to src/corelib/style/duistyle.cpp diff --git a/src/style/duistyle.h b/src/corelib/style/duistyle.h similarity index 100% rename from src/style/duistyle.h rename to src/corelib/style/duistyle.h diff --git a/src/style/duistyle_p.h b/src/corelib/style/duistyle_p.h similarity index 100% rename from src/style/duistyle_p.h rename to src/corelib/style/duistyle_p.h diff --git a/src/style/duistylecreator.cpp b/src/corelib/style/duistylecreator.cpp similarity index 100% rename from src/style/duistylecreator.cpp rename to src/corelib/style/duistylecreator.cpp diff --git a/src/style/duistylecreator.h b/src/corelib/style/duistylecreator.h similarity index 100% rename from src/style/duistylecreator.h rename to src/corelib/style/duistylecreator.h diff --git a/src/style/duistylesheet.cpp b/src/corelib/style/duistylesheet.cpp similarity index 100% rename from src/style/duistylesheet.cpp rename to src/corelib/style/duistylesheet.cpp diff --git a/src/style/duistylesheet.h b/src/corelib/style/duistylesheet.h similarity index 100% rename from src/style/duistylesheet.h rename to src/corelib/style/duistylesheet.h diff --git a/src/style/duistylesheet_p.h b/src/corelib/style/duistylesheet_p.h similarity index 100% rename from src/style/duistylesheet_p.h rename to src/corelib/style/duistylesheet_p.h diff --git a/src/style/duistylesheetattribute.cpp b/src/corelib/style/duistylesheetattribute.cpp similarity index 100% rename from src/style/duistylesheetattribute.cpp rename to src/corelib/style/duistylesheetattribute.cpp diff --git a/src/style/duistylesheetattribute.h b/src/corelib/style/duistylesheetattribute.h similarity index 100% rename from src/style/duistylesheetattribute.h rename to src/corelib/style/duistylesheetattribute.h diff --git a/src/style/duistylesheetparser.cpp b/src/corelib/style/duistylesheetparser.cpp similarity index 100% rename from src/style/duistylesheetparser.cpp rename to src/corelib/style/duistylesheetparser.cpp diff --git a/src/style/duistylesheetparser.h b/src/corelib/style/duistylesheetparser.h similarity index 100% rename from src/style/duistylesheetparser.h rename to src/corelib/style/duistylesheetparser.h diff --git a/src/style/duistylesheetselector.cpp b/src/corelib/style/duistylesheetselector.cpp similarity index 100% rename from src/style/duistylesheetselector.cpp rename to src/corelib/style/duistylesheetselector.cpp diff --git a/src/style/duistylesheetselector.h b/src/corelib/style/duistylesheetselector.h similarity index 100% rename from src/style/duistylesheetselector.h rename to src/corelib/style/duistylesheetselector.h diff --git a/src/style/duistylesheetselector_p.h b/src/corelib/style/duistylesheetselector_p.h similarity index 100% rename from src/style/duistylesheetselector_p.h rename to src/corelib/style/duistylesheetselector_p.h diff --git a/src/style/duiwidgetfadeinanimationstyle.h b/src/corelib/style/duiwidgetfadeinanimationstyle.h similarity index 100% rename from src/style/duiwidgetfadeinanimationstyle.h rename to src/corelib/style/duiwidgetfadeinanimationstyle.h diff --git a/src/style/duiwidgetfadeoutanimationstyle.h b/src/corelib/style/duiwidgetfadeoutanimationstyle.h similarity index 100% rename from src/style/duiwidgetfadeoutanimationstyle.h rename to src/corelib/style/duiwidgetfadeoutanimationstyle.h diff --git a/src/style/duiwidgetslideinanimationstyle.h b/src/corelib/style/duiwidgetslideinanimationstyle.h similarity index 100% rename from src/style/duiwidgetslideinanimationstyle.h rename to src/corelib/style/duiwidgetslideinanimationstyle.h diff --git a/src/style/duiwidgetslideoutanimationstyle.h b/src/corelib/style/duiwidgetslideoutanimationstyle.h similarity index 100% rename from src/style/duiwidgetslideoutanimationstyle.h rename to src/corelib/style/duiwidgetslideoutanimationstyle.h diff --git a/src/style/duiwidgetstyle.h b/src/corelib/style/duiwidgetstyle.h similarity index 100% rename from src/style/duiwidgetstyle.h rename to src/corelib/style/duiwidgetstyle.h diff --git a/src/style/duiwidgetzoominanimationstyle.h b/src/corelib/style/duiwidgetzoominanimationstyle.h similarity index 100% rename from src/style/duiwidgetzoominanimationstyle.h rename to src/corelib/style/duiwidgetzoominanimationstyle.h diff --git a/src/style/duiwidgetzoomoutanimationstyle.h b/src/corelib/style/duiwidgetzoomoutanimationstyle.h similarity index 100% rename from src/style/duiwidgetzoomoutanimationstyle.h rename to src/corelib/style/duiwidgetzoomoutanimationstyle.h diff --git a/src/corelib/style/style.pri b/src/corelib/style/style.pri new file mode 100644 index 000000000..28329b88a --- /dev/null +++ b/src/corelib/style/style.pri @@ -0,0 +1,49 @@ +############################################################################### +# DuiTheme module +# This module contains all classes that handle style and CSS support. +############################################################################### +STYLE_SRC_DIR=./style +INCLUDEPATH+=./style + +PUBLIC_HEADERS += \ + $$STYLE_SRC_DIR/duistylecreator.h \ + $$STYLE_SRC_DIR/duistylesheet.h \ + $$STYLE_SRC_DIR/duistylesheetparser.h \ + $$STYLE_SRC_DIR/duistylesheetselector.h \ + $$STYLE_SRC_DIR/duistylesheetattribute.h + +PRIVATE_HEADERS += \ + $$STYLE_SRC_DIR/duistyle_p.h \ + $$STYLE_SRC_DIR/duistylesheet_p.h \ + $$STYLE_SRC_DIR/duistylesheetselector_p.h + +DUIGEN_STYLE_HEADERS += \ + $$STYLE_SRC_DIR/duistyle.h \ + $$STYLE_SRC_DIR/duiwidgetstyle.h \ + $$STYLE_SRC_DIR/duiabstractlayoutpolicystyle.h \ + $$STYLE_SRC_DIR/duiabstractwidgetanimationstyle.h \ + $$STYLE_SRC_DIR/duianimationstyle.h \ + $$STYLE_SRC_DIR/duiscenewindowanimationstyle.h \ + $$STYLE_SRC_DIR/duibasiclayoutanimationstyle.h \ + $$STYLE_SRC_DIR/duigroupanimationstyle.h \ + $$STYLE_SRC_DIR/duilayoutanimationstyle.h \ + $$STYLE_SRC_DIR/duiwidgetfadeinanimationstyle.h \ + $$STYLE_SRC_DIR/duiwidgetfadeoutanimationstyle.h \ + $$STYLE_SRC_DIR/duiwidgetslideinanimationstyle.h \ + $$STYLE_SRC_DIR/duiwidgetslideoutanimationstyle.h \ + $$STYLE_SRC_DIR/duiwidgetzoominanimationstyle.h \ + $$STYLE_SRC_DIR/duiwidgetzoomoutanimationstyle.h \ + $$STYLE_SRC_DIR/duipageswitchanimationstyle.h \ + $$STYLE_SRC_DIR/duibasicorientationanimationstyle.h \ + + +HEADERS += \ + $$DUIGEN_STYLE_HEADERS \ + +SOURCES += \ + $$STYLE_SRC_DIR/duistyle.cpp \ + $$STYLE_SRC_DIR/duistylecreator.cpp \ + $$STYLE_SRC_DIR/duistylesheet.cpp \ + $$STYLE_SRC_DIR/duistylesheetparser.cpp \ + $$STYLE_SRC_DIR/duistylesheetselector.cpp \ + $$STYLE_SRC_DIR/duistylesheetattribute.cpp diff --git a/src/theme/IDuiThemeDaemon b/src/corelib/theme/IDuiThemeDaemon similarity index 100% rename from src/theme/IDuiThemeDaemon rename to src/corelib/theme/IDuiThemeDaemon diff --git a/src/theme/duicommonpixmaps.cpp b/src/corelib/theme/duicommonpixmaps.cpp similarity index 100% rename from src/theme/duicommonpixmaps.cpp rename to src/corelib/theme/duicommonpixmaps.cpp diff --git a/src/theme/duicommonpixmaps.h b/src/corelib/theme/duicommonpixmaps.h similarity index 100% rename from src/theme/duicommonpixmaps.h rename to src/corelib/theme/duicommonpixmaps.h diff --git a/src/theme/duidefaultfonts.cpp b/src/corelib/theme/duidefaultfonts.cpp similarity index 100% rename from src/theme/duidefaultfonts.cpp rename to src/corelib/theme/duidefaultfonts.cpp diff --git a/src/theme/duidefaultfonts.h b/src/corelib/theme/duidefaultfonts.h similarity index 100% rename from src/theme/duidefaultfonts.h rename to src/corelib/theme/duidefaultfonts.h diff --git a/src/theme/duidefaultfonts_p.h b/src/corelib/theme/duidefaultfonts_p.h similarity index 100% rename from src/theme/duidefaultfonts_p.h rename to src/corelib/theme/duidefaultfonts_p.h diff --git a/src/theme/duiimagedirectory.cpp b/src/corelib/theme/duiimagedirectory.cpp similarity index 100% rename from src/theme/duiimagedirectory.cpp rename to src/corelib/theme/duiimagedirectory.cpp diff --git a/src/theme/duiimagedirectory.h b/src/corelib/theme/duiimagedirectory.h similarity index 100% rename from src/theme/duiimagedirectory.h rename to src/corelib/theme/duiimagedirectory.h diff --git a/src/theme/duilocalthemedaemon.cpp b/src/corelib/theme/duilocalthemedaemon.cpp similarity index 100% rename from src/theme/duilocalthemedaemon.cpp rename to src/corelib/theme/duilocalthemedaemon.cpp diff --git a/src/theme/duilocalthemedaemon.h b/src/corelib/theme/duilocalthemedaemon.h similarity index 100% rename from src/theme/duilocalthemedaemon.h rename to src/corelib/theme/duilocalthemedaemon.h diff --git a/src/theme/duilogicalvalues.cpp b/src/corelib/theme/duilogicalvalues.cpp similarity index 100% rename from src/theme/duilogicalvalues.cpp rename to src/corelib/theme/duilogicalvalues.cpp diff --git a/src/theme/duilogicalvalues.h b/src/corelib/theme/duilogicalvalues.h similarity index 100% rename from src/theme/duilogicalvalues.h rename to src/corelib/theme/duilogicalvalues.h diff --git a/src/theme/duilogicalvalues_p.h b/src/corelib/theme/duilogicalvalues_p.h similarity index 100% rename from src/theme/duilogicalvalues_p.h rename to src/corelib/theme/duilogicalvalues_p.h diff --git a/src/theme/duipalette.cpp b/src/corelib/theme/duipalette.cpp similarity index 100% rename from src/theme/duipalette.cpp rename to src/corelib/theme/duipalette.cpp diff --git a/src/theme/duipalette.h b/src/corelib/theme/duipalette.h similarity index 100% rename from src/theme/duipalette.h rename to src/corelib/theme/duipalette.h diff --git a/src/theme/duipalette_p.h b/src/corelib/theme/duipalette_p.h similarity index 100% rename from src/theme/duipalette_p.h rename to src/corelib/theme/duipalette_p.h diff --git a/src/theme/duiremotethemedaemon.cpp b/src/corelib/theme/duiremotethemedaemon.cpp similarity index 100% rename from src/theme/duiremotethemedaemon.cpp rename to src/corelib/theme/duiremotethemedaemon.cpp diff --git a/src/theme/duiremotethemedaemon.h b/src/corelib/theme/duiremotethemedaemon.h similarity index 100% rename from src/theme/duiremotethemedaemon.h rename to src/corelib/theme/duiremotethemedaemon.h diff --git a/src/theme/duiremotethemedaemon_p.h b/src/corelib/theme/duiremotethemedaemon_p.h similarity index 100% rename from src/theme/duiremotethemedaemon_p.h rename to src/corelib/theme/duiremotethemedaemon_p.h diff --git a/src/theme/duitheme.cpp b/src/corelib/theme/duitheme.cpp similarity index 100% rename from src/theme/duitheme.cpp rename to src/corelib/theme/duitheme.cpp diff --git a/src/theme/duitheme.h b/src/corelib/theme/duitheme.h similarity index 100% rename from src/theme/duitheme.h rename to src/corelib/theme/duitheme.h diff --git a/src/theme/duitheme_p.h b/src/corelib/theme/duitheme_p.h similarity index 100% rename from src/theme/duitheme_p.h rename to src/corelib/theme/duitheme_p.h diff --git a/src/theme/duithemedaemon.cpp b/src/corelib/theme/duithemedaemon.cpp similarity index 99% rename from src/theme/duithemedaemon.cpp rename to src/corelib/theme/duithemedaemon.cpp index 25f9d978b..57af150a1 100644 --- a/src/theme/duithemedaemon.cpp +++ b/src/corelib/theme/duithemedaemon.cpp @@ -42,7 +42,7 @@ DuiThemeDaemon::DuiThemeDaemon() : { // check that the base theme ("fallback") directory exists. QDir baseThemeDir(systemThemeDirectory() + QDir::separator() + "base" + QDir::separator() + - "dui" + QDir::separator() + "libdui" + QDir::separator() + "style"); + "dui" + QDir::separator() + "libduicore" + QDir::separator() + "style"); if (!baseThemeDir.exists()) { // we don't have the base theme ("fallback") directory, so exit! qFatal("DuiThemeDaemon - base theme directory not found: %s. Please (re)install duitheme package.", diff --git a/src/theme/duithemedaemon.h b/src/corelib/theme/duithemedaemon.h similarity index 100% rename from src/theme/duithemedaemon.h rename to src/corelib/theme/duithemedaemon.h diff --git a/src/theme/duithemedaemonclient.cpp b/src/corelib/theme/duithemedaemonclient.cpp similarity index 100% rename from src/theme/duithemedaemonclient.cpp rename to src/corelib/theme/duithemedaemonclient.cpp diff --git a/src/theme/duithemedaemonclient.h b/src/corelib/theme/duithemedaemonclient.h similarity index 100% rename from src/theme/duithemedaemonclient.h rename to src/corelib/theme/duithemedaemonclient.h diff --git a/src/theme/duithemedaemonprotocol.cpp b/src/corelib/theme/duithemedaemonprotocol.cpp similarity index 100% rename from src/theme/duithemedaemonprotocol.cpp rename to src/corelib/theme/duithemedaemonprotocol.cpp diff --git a/src/theme/duithemedaemonprotocol.h b/src/corelib/theme/duithemedaemonprotocol.h similarity index 100% rename from src/theme/duithemedaemonprotocol.h rename to src/corelib/theme/duithemedaemonprotocol.h diff --git a/src/theme/duithemeresourcemanager.cpp b/src/corelib/theme/duithemeresourcemanager.cpp similarity index 100% rename from src/theme/duithemeresourcemanager.cpp rename to src/corelib/theme/duithemeresourcemanager.cpp diff --git a/src/theme/duithemeresourcemanager.h b/src/corelib/theme/duithemeresourcemanager.h similarity index 100% rename from src/theme/duithemeresourcemanager.h rename to src/corelib/theme/duithemeresourcemanager.h diff --git a/src/theme/iduithemedaemon.h b/src/corelib/theme/iduithemedaemon.h similarity index 100% rename from src/theme/iduithemedaemon.h rename to src/corelib/theme/iduithemedaemon.h diff --git a/src/theme/theme.pri b/src/corelib/theme/theme.pri similarity index 100% rename from src/theme/theme.pri rename to src/corelib/theme/theme.pri diff --git a/src/video/duigstvideo.cpp b/src/corelib/video/duigstvideo.cpp similarity index 100% rename from src/video/duigstvideo.cpp rename to src/corelib/video/duigstvideo.cpp diff --git a/src/video/duigstvideo.h b/src/corelib/video/duigstvideo.h similarity index 100% rename from src/video/duigstvideo.h rename to src/corelib/video/duigstvideo.h diff --git a/src/video/duisink.c b/src/corelib/video/duisink.c similarity index 100% rename from src/video/duisink.c rename to src/corelib/video/duisink.c diff --git a/src/video/duisink.h b/src/corelib/video/duisink.h similarity index 100% rename from src/video/duisink.h rename to src/corelib/video/duisink.h diff --git a/src/video/duivideo.h b/src/corelib/video/duivideo.h similarity index 100% rename from src/video/duivideo.h rename to src/corelib/video/duivideo.h diff --git a/src/video/duivideowidget.cpp b/src/corelib/video/duivideowidget.cpp similarity index 100% rename from src/video/duivideowidget.cpp rename to src/corelib/video/duivideowidget.cpp diff --git a/src/video/duivideowidget.h b/src/corelib/video/duivideowidget.h similarity index 100% rename from src/video/duivideowidget.h rename to src/corelib/video/duivideowidget.h diff --git a/src/video/duivideowidgetmodel.h b/src/corelib/video/duivideowidgetmodel.h similarity index 100% rename from src/video/duivideowidgetmodel.h rename to src/corelib/video/duivideowidgetmodel.h diff --git a/src/video/duivideowidgetshaders.h b/src/corelib/video/duivideowidgetshaders.h similarity index 100% rename from src/video/duivideowidgetshaders.h rename to src/corelib/video/duivideowidgetshaders.h diff --git a/src/video/duivideowidgetview.cpp b/src/corelib/video/duivideowidgetview.cpp similarity index 100% rename from src/video/duivideowidgetview.cpp rename to src/corelib/video/duivideowidgetview.cpp diff --git a/src/video/duivideowidgetview.h b/src/corelib/video/duivideowidgetview.h similarity index 100% rename from src/video/duivideowidgetview.h rename to src/corelib/video/duivideowidgetview.h diff --git a/src/video/duivideowidgetview_p.h b/src/corelib/video/duivideowidgetview_p.h similarity index 100% rename from src/video/duivideowidgetview_p.h rename to src/corelib/video/duivideowidgetview_p.h diff --git a/src/video/video.pri b/src/corelib/video/video.pri similarity index 66% rename from src/video/video.pri rename to src/corelib/video/video.pri index 67f48700a..f6f33efd2 100644 --- a/src/video/video.pri +++ b/src/corelib/video/video.pri @@ -6,16 +6,6 @@ VIDEO_SRC_DIR = ./video # REMOVE THIS WHEN ITS AVAILABLE #QT -= opengl -#duigen_model.name = duigenerator model -#duigen_model.input = WIDGET_MODEL_HEADERS -#duigen_model.depends = ../duigen/duigen -#duigen_model.output = $$GEN_DIR/gen_${QMAKE_FILE_BASE}data.cpp -#duigen_model.commands += ../duigen/duigen --model ${QMAKE_FILE_NAME} $$GEN_DIR/ -#duigen_model.clean += $$GEN_DIR/gen_* -#duigen_model.CONFIG = target_predeps no_link -#duigen_model.variable_out = GENERATED_SOURCES -#QMAKE_EXTRA_COMPILERS += duigen_model - contains( DEFINES, HAVE_GSTREAMER) { PUBLIC_HEADERS += \ $$VIDEO_SRC_DIR/duivideowidget.h \ @@ -35,7 +25,7 @@ contains( DEFINES, HAVE_GSTREAMER) { $$VIDEO_SRC_DIR/duigstvideo.cpp \ $$VIDEO_SRC_DIR/duisink.c - WIDGET_MODEL_HEADERS += \ + DUIGEN_MODEL_HEADERS += \ $$VIDEO_SRC_DIR/duivideowidgetmodel.h } diff --git a/src/style/.gitignore b/src/corelib/widgets/.gitignore similarity index 100% rename from src/style/.gitignore rename to src/corelib/widgets/.gitignore diff --git a/src/widgets/core/core.pri b/src/corelib/widgets/core/core.pri similarity index 100% rename from src/widgets/core/core.pri rename to src/corelib/widgets/core/core.pri diff --git a/src/widgets/core/duiwidget.cpp b/src/corelib/widgets/core/duiwidget.cpp similarity index 100% rename from src/widgets/core/duiwidget.cpp rename to src/corelib/widgets/core/duiwidget.cpp diff --git a/src/widgets/core/duiwidget.h b/src/corelib/widgets/core/duiwidget.h similarity index 100% rename from src/widgets/core/duiwidget.h rename to src/corelib/widgets/core/duiwidget.h diff --git a/src/widgets/core/duiwidget_p.h b/src/corelib/widgets/core/duiwidget_p.h similarity index 100% rename from src/widgets/core/duiwidget_p.h rename to src/corelib/widgets/core/duiwidget_p.h diff --git a/src/widgets/core/duiwidgetcontroller.cpp b/src/corelib/widgets/core/duiwidgetcontroller.cpp similarity index 100% rename from src/widgets/core/duiwidgetcontroller.cpp rename to src/corelib/widgets/core/duiwidgetcontroller.cpp diff --git a/src/widgets/core/duiwidgetcontroller.h b/src/corelib/widgets/core/duiwidgetcontroller.h similarity index 100% rename from src/widgets/core/duiwidgetcontroller.h rename to src/corelib/widgets/core/duiwidgetcontroller.h diff --git a/src/widgets/core/duiwidgetcontroller_p.h b/src/corelib/widgets/core/duiwidgetcontroller_p.h similarity index 100% rename from src/widgets/core/duiwidgetcontroller_p.h rename to src/corelib/widgets/core/duiwidgetcontroller_p.h diff --git a/src/widgets/core/duiwidgetcreator.cpp b/src/corelib/widgets/core/duiwidgetcreator.cpp similarity index 100% rename from src/widgets/core/duiwidgetcreator.cpp rename to src/corelib/widgets/core/duiwidgetcreator.cpp diff --git a/src/widgets/core/duiwidgetcreator.h b/src/corelib/widgets/core/duiwidgetcreator.h similarity index 100% rename from src/widgets/core/duiwidgetcreator.h rename to src/corelib/widgets/core/duiwidgetcreator.h diff --git a/src/widgets/core/duiwidgetview.cpp b/src/corelib/widgets/core/duiwidgetview.cpp similarity index 100% rename from src/widgets/core/duiwidgetview.cpp rename to src/corelib/widgets/core/duiwidgetview.cpp diff --git a/src/widgets/core/duiwidgetview.h b/src/corelib/widgets/core/duiwidgetview.h similarity index 100% rename from src/widgets/core/duiwidgetview.h rename to src/corelib/widgets/core/duiwidgetview.h diff --git a/src/widgets/core/duiwidgetview_p.h b/src/corelib/widgets/core/duiwidgetview_p.h similarity index 100% rename from src/widgets/core/duiwidgetview_p.h rename to src/corelib/widgets/core/duiwidgetview_p.h diff --git a/src/widgets/duiabstractcellcreator.cpp b/src/corelib/widgets/duiabstractcellcreator.cpp similarity index 100% rename from src/widgets/duiabstractcellcreator.cpp rename to src/corelib/widgets/duiabstractcellcreator.cpp diff --git a/src/widgets/duiabstractcellcreator.h b/src/corelib/widgets/duiabstractcellcreator.h similarity index 100% rename from src/widgets/duiabstractcellcreator.h rename to src/corelib/widgets/duiabstractcellcreator.h diff --git a/src/widgets/duiapplicationmenu.cpp b/src/corelib/widgets/duiapplicationmenu.cpp similarity index 100% rename from src/widgets/duiapplicationmenu.cpp rename to src/corelib/widgets/duiapplicationmenu.cpp diff --git a/src/widgets/duiapplicationmenu.h b/src/corelib/widgets/duiapplicationmenu.h similarity index 100% rename from src/widgets/duiapplicationmenu.h rename to src/corelib/widgets/duiapplicationmenu.h diff --git a/src/widgets/duiapplicationmenu_p.h b/src/corelib/widgets/duiapplicationmenu_p.h similarity index 100% rename from src/widgets/duiapplicationmenu_p.h rename to src/corelib/widgets/duiapplicationmenu_p.h diff --git a/src/widgets/duiapplicationmenumodel.h b/src/corelib/widgets/duiapplicationmenumodel.h similarity index 100% rename from src/widgets/duiapplicationmenumodel.h rename to src/corelib/widgets/duiapplicationmenumodel.h diff --git a/src/widgets/duiapplicationpage.cpp b/src/corelib/widgets/duiapplicationpage.cpp similarity index 100% rename from src/widgets/duiapplicationpage.cpp rename to src/corelib/widgets/duiapplicationpage.cpp diff --git a/src/widgets/duiapplicationpage.h b/src/corelib/widgets/duiapplicationpage.h similarity index 100% rename from src/widgets/duiapplicationpage.h rename to src/corelib/widgets/duiapplicationpage.h diff --git a/src/widgets/duiapplicationpage_p.h b/src/corelib/widgets/duiapplicationpage_p.h similarity index 100% rename from src/widgets/duiapplicationpage_p.h rename to src/corelib/widgets/duiapplicationpage_p.h diff --git a/src/widgets/duiapplicationpagemodel.h b/src/corelib/widgets/duiapplicationpagemodel.h similarity index 100% rename from src/widgets/duiapplicationpagemodel.h rename to src/corelib/widgets/duiapplicationpagemodel.h diff --git a/src/widgets/duiapplicationwindow.cpp b/src/corelib/widgets/duiapplicationwindow.cpp similarity index 100% rename from src/widgets/duiapplicationwindow.cpp rename to src/corelib/widgets/duiapplicationwindow.cpp diff --git a/src/widgets/duiapplicationwindow.h b/src/corelib/widgets/duiapplicationwindow.h similarity index 100% rename from src/widgets/duiapplicationwindow.h rename to src/corelib/widgets/duiapplicationwindow.h diff --git a/src/widgets/duiapplicationwindow_p.h b/src/corelib/widgets/duiapplicationwindow_p.h similarity index 100% rename from src/widgets/duiapplicationwindow_p.h rename to src/corelib/widgets/duiapplicationwindow_p.h diff --git a/src/widgets/duibutton.cpp b/src/corelib/widgets/duibutton.cpp similarity index 100% rename from src/widgets/duibutton.cpp rename to src/corelib/widgets/duibutton.cpp diff --git a/src/widgets/duibutton.h b/src/corelib/widgets/duibutton.h similarity index 100% rename from src/widgets/duibutton.h rename to src/corelib/widgets/duibutton.h diff --git a/src/widgets/duibutton_p.h b/src/corelib/widgets/duibutton_p.h similarity index 100% rename from src/widgets/duibutton_p.h rename to src/corelib/widgets/duibutton_p.h diff --git a/src/widgets/duibuttongroup.cpp b/src/corelib/widgets/duibuttongroup.cpp similarity index 100% rename from src/widgets/duibuttongroup.cpp rename to src/corelib/widgets/duibuttongroup.cpp diff --git a/src/widgets/duibuttongroup.h b/src/corelib/widgets/duibuttongroup.h similarity index 100% rename from src/widgets/duibuttongroup.h rename to src/corelib/widgets/duibuttongroup.h diff --git a/src/widgets/duibuttongroup_p.h b/src/corelib/widgets/duibuttongroup_p.h similarity index 100% rename from src/widgets/duibuttongroup_p.h rename to src/corelib/widgets/duibuttongroup_p.h diff --git a/src/widgets/duibuttonmodel.h b/src/corelib/widgets/duibuttonmodel.h similarity index 100% rename from src/widgets/duibuttonmodel.h rename to src/corelib/widgets/duibuttonmodel.h diff --git a/src/widgets/duicombobox.cpp b/src/corelib/widgets/duicombobox.cpp similarity index 100% rename from src/widgets/duicombobox.cpp rename to src/corelib/widgets/duicombobox.cpp diff --git a/src/widgets/duicombobox.h b/src/corelib/widgets/duicombobox.h similarity index 100% rename from src/widgets/duicombobox.h rename to src/corelib/widgets/duicombobox.h diff --git a/src/widgets/duicombobox_p.h b/src/corelib/widgets/duicombobox_p.h similarity index 100% rename from src/widgets/duicombobox_p.h rename to src/corelib/widgets/duicombobox_p.h diff --git a/src/widgets/duicomboboxmodel.h b/src/corelib/widgets/duicomboboxmodel.h similarity index 100% rename from src/widgets/duicomboboxmodel.h rename to src/corelib/widgets/duicomboboxmodel.h diff --git a/src/widgets/duicompleter.cpp b/src/corelib/widgets/duicompleter.cpp similarity index 100% rename from src/widgets/duicompleter.cpp rename to src/corelib/widgets/duicompleter.cpp diff --git a/src/widgets/duicompleter.h b/src/corelib/widgets/duicompleter.h similarity index 100% rename from src/widgets/duicompleter.h rename to src/corelib/widgets/duicompleter.h diff --git a/src/widgets/duicompleter_p.h b/src/corelib/widgets/duicompleter_p.h similarity index 100% rename from src/widgets/duicompleter_p.h rename to src/corelib/widgets/duicompleter_p.h diff --git a/src/widgets/duicompletermodel.h b/src/corelib/widgets/duicompletermodel.h similarity index 100% rename from src/widgets/duicompletermodel.h rename to src/corelib/widgets/duicompletermodel.h diff --git a/src/widgets/duicontainer.cpp b/src/corelib/widgets/duicontainer.cpp similarity index 100% rename from src/widgets/duicontainer.cpp rename to src/corelib/widgets/duicontainer.cpp diff --git a/src/widgets/duicontainer.h b/src/corelib/widgets/duicontainer.h similarity index 100% rename from src/widgets/duicontainer.h rename to src/corelib/widgets/duicontainer.h diff --git a/src/widgets/duicontainer_p.h b/src/corelib/widgets/duicontainer_p.h similarity index 100% rename from src/widgets/duicontainer_p.h rename to src/corelib/widgets/duicontainer_p.h diff --git a/src/widgets/duicontainermodel.h b/src/corelib/widgets/duicontainermodel.h similarity index 100% rename from src/widgets/duicontainermodel.h rename to src/corelib/widgets/duicontainermodel.h diff --git a/src/widgets/duicontentitem.cpp b/src/corelib/widgets/duicontentitem.cpp similarity index 100% rename from src/widgets/duicontentitem.cpp rename to src/corelib/widgets/duicontentitem.cpp diff --git a/src/widgets/duicontentitem.h b/src/corelib/widgets/duicontentitem.h similarity index 100% rename from src/widgets/duicontentitem.h rename to src/corelib/widgets/duicontentitem.h diff --git a/src/widgets/duicontentitem_p.h b/src/corelib/widgets/duicontentitem_p.h similarity index 100% rename from src/widgets/duicontentitem_p.h rename to src/corelib/widgets/duicontentitem_p.h diff --git a/src/widgets/duicontentitemmodel.cpp b/src/corelib/widgets/duicontentitemmodel.cpp similarity index 100% rename from src/widgets/duicontentitemmodel.cpp rename to src/corelib/widgets/duicontentitemmodel.cpp diff --git a/src/widgets/duicontentitemmodel.h b/src/corelib/widgets/duicontentitemmodel.h similarity index 97% rename from src/widgets/duicontentitemmodel.h rename to src/corelib/widgets/duicontentitemmodel.h index 3e10d018b..5fc3d03aa 100644 --- a/src/widgets/duicontentitemmodel.h +++ b/src/corelib/widgets/duicontentitemmodel.h @@ -25,7 +25,7 @@ class QPixmap; class QImage; -class DuiContentItemModel : public DuiWidgetModel +class DUI_EXPORT DuiContentItemModel : public DuiWidgetModel { Q_OBJECT DUI_MODEL_INTERNAL(DuiContentItemModel) diff --git a/src/widgets/duidialog.cpp b/src/corelib/widgets/duidialog.cpp similarity index 100% rename from src/widgets/duidialog.cpp rename to src/corelib/widgets/duidialog.cpp diff --git a/src/widgets/duidialog.h b/src/corelib/widgets/duidialog.h similarity index 100% rename from src/widgets/duidialog.h rename to src/corelib/widgets/duidialog.h diff --git a/src/widgets/duidialog_p.h b/src/corelib/widgets/duidialog_p.h similarity index 100% rename from src/widgets/duidialog_p.h rename to src/corelib/widgets/duidialog_p.h diff --git a/src/widgets/duidialogmodel.cpp b/src/corelib/widgets/duidialogmodel.cpp similarity index 100% rename from src/widgets/duidialogmodel.cpp rename to src/corelib/widgets/duidialogmodel.cpp diff --git a/src/widgets/duidialogmodel.h b/src/corelib/widgets/duidialogmodel.h similarity index 100% rename from src/widgets/duidialogmodel.h rename to src/corelib/widgets/duidialogmodel.h diff --git a/src/widgets/duidockwidget.cpp b/src/corelib/widgets/duidockwidget.cpp similarity index 100% rename from src/widgets/duidockwidget.cpp rename to src/corelib/widgets/duidockwidget.cpp diff --git a/src/widgets/duidockwidget.h b/src/corelib/widgets/duidockwidget.h similarity index 100% rename from src/widgets/duidockwidget.h rename to src/corelib/widgets/duidockwidget.h diff --git a/src/widgets/duidockwidget_p.h b/src/corelib/widgets/duidockwidget_p.h similarity index 100% rename from src/widgets/duidockwidget_p.h rename to src/corelib/widgets/duidockwidget_p.h diff --git a/src/widgets/duidockwidgetmodel.h b/src/corelib/widgets/duidockwidgetmodel.h similarity index 100% rename from src/widgets/duidockwidgetmodel.h rename to src/corelib/widgets/duidockwidgetmodel.h diff --git a/src/widgets/duiescapebuttonpanel.cpp b/src/corelib/widgets/duiescapebuttonpanel.cpp similarity index 100% rename from src/widgets/duiescapebuttonpanel.cpp rename to src/corelib/widgets/duiescapebuttonpanel.cpp diff --git a/src/widgets/duiescapebuttonpanel.h b/src/corelib/widgets/duiescapebuttonpanel.h similarity index 100% rename from src/widgets/duiescapebuttonpanel.h rename to src/corelib/widgets/duiescapebuttonpanel.h diff --git a/src/widgets/duiescapebuttonpanelmodel.h b/src/corelib/widgets/duiescapebuttonpanelmodel.h similarity index 100% rename from src/widgets/duiescapebuttonpanelmodel.h rename to src/corelib/widgets/duiescapebuttonpanelmodel.h diff --git a/src/widgets/duigriditem.cpp b/src/corelib/widgets/duigriditem.cpp similarity index 100% rename from src/widgets/duigriditem.cpp rename to src/corelib/widgets/duigriditem.cpp diff --git a/src/widgets/duigriditem.h b/src/corelib/widgets/duigriditem.h similarity index 100% rename from src/widgets/duigriditem.h rename to src/corelib/widgets/duigriditem.h diff --git a/src/widgets/duigriditem_p.h b/src/corelib/widgets/duigriditem_p.h similarity index 100% rename from src/widgets/duigriditem_p.h rename to src/corelib/widgets/duigriditem_p.h diff --git a/src/widgets/duigriditemmodel.h b/src/corelib/widgets/duigriditemmodel.h similarity index 100% rename from src/widgets/duigriditemmodel.h rename to src/corelib/widgets/duigriditemmodel.h diff --git a/src/widgets/duigridmodel.h b/src/corelib/widgets/duigridmodel.h similarity index 100% rename from src/widgets/duigridmodel.h rename to src/corelib/widgets/duigridmodel.h diff --git a/src/widgets/duihomebuttonpanel.cpp b/src/corelib/widgets/duihomebuttonpanel.cpp similarity index 100% rename from src/widgets/duihomebuttonpanel.cpp rename to src/corelib/widgets/duihomebuttonpanel.cpp diff --git a/src/widgets/duihomebuttonpanel.h b/src/corelib/widgets/duihomebuttonpanel.h similarity index 100% rename from src/widgets/duihomebuttonpanel.h rename to src/corelib/widgets/duihomebuttonpanel.h diff --git a/src/widgets/duiimagewidget.cpp b/src/corelib/widgets/duiimagewidget.cpp similarity index 100% rename from src/widgets/duiimagewidget.cpp rename to src/corelib/widgets/duiimagewidget.cpp diff --git a/src/widgets/duiimagewidget.h b/src/corelib/widgets/duiimagewidget.h similarity index 100% rename from src/widgets/duiimagewidget.h rename to src/corelib/widgets/duiimagewidget.h diff --git a/src/widgets/duiimagewidget_p.h b/src/corelib/widgets/duiimagewidget_p.h similarity index 100% rename from src/widgets/duiimagewidget_p.h rename to src/corelib/widgets/duiimagewidget_p.h diff --git a/src/widgets/duiimagewidgetmodel.h b/src/corelib/widgets/duiimagewidgetmodel.h similarity index 100% rename from src/widgets/duiimagewidgetmodel.h rename to src/corelib/widgets/duiimagewidgetmodel.h diff --git a/src/widgets/duiinfobanner.cpp b/src/corelib/widgets/duiinfobanner.cpp similarity index 100% rename from src/widgets/duiinfobanner.cpp rename to src/corelib/widgets/duiinfobanner.cpp diff --git a/src/widgets/duiinfobanner.h b/src/corelib/widgets/duiinfobanner.h similarity index 100% rename from src/widgets/duiinfobanner.h rename to src/corelib/widgets/duiinfobanner.h diff --git a/src/widgets/duiinfobanner_p.h b/src/corelib/widgets/duiinfobanner_p.h similarity index 100% rename from src/widgets/duiinfobanner_p.h rename to src/corelib/widgets/duiinfobanner_p.h diff --git a/src/widgets/duiinfobannermodel.cpp b/src/corelib/widgets/duiinfobannermodel.cpp similarity index 100% rename from src/widgets/duiinfobannermodel.cpp rename to src/corelib/widgets/duiinfobannermodel.cpp diff --git a/src/widgets/duiinfobannermodel.h b/src/corelib/widgets/duiinfobannermodel.h similarity index 100% rename from src/widgets/duiinfobannermodel.h rename to src/corelib/widgets/duiinfobannermodel.h diff --git a/src/widgets/duilabel.cpp b/src/corelib/widgets/duilabel.cpp similarity index 100% rename from src/widgets/duilabel.cpp rename to src/corelib/widgets/duilabel.cpp diff --git a/src/widgets/duilabel.h b/src/corelib/widgets/duilabel.h similarity index 100% rename from src/widgets/duilabel.h rename to src/corelib/widgets/duilabel.h diff --git a/src/widgets/duilabel_p.h b/src/corelib/widgets/duilabel_p.h similarity index 100% rename from src/widgets/duilabel_p.h rename to src/corelib/widgets/duilabel_p.h diff --git a/src/widgets/duilabelhighlighter.cpp b/src/corelib/widgets/duilabelhighlighter.cpp similarity index 100% rename from src/widgets/duilabelhighlighter.cpp rename to src/corelib/widgets/duilabelhighlighter.cpp diff --git a/src/widgets/duilabelhighlighter.h b/src/corelib/widgets/duilabelhighlighter.h similarity index 100% rename from src/widgets/duilabelhighlighter.h rename to src/corelib/widgets/duilabelhighlighter.h diff --git a/src/widgets/duilabelmodel.cpp b/src/corelib/widgets/duilabelmodel.cpp similarity index 100% rename from src/widgets/duilabelmodel.cpp rename to src/corelib/widgets/duilabelmodel.cpp diff --git a/src/widgets/duilabelmodel.h b/src/corelib/widgets/duilabelmodel.h similarity index 100% rename from src/widgets/duilabelmodel.h rename to src/corelib/widgets/duilabelmodel.h diff --git a/src/widgets/duilist.cpp b/src/corelib/widgets/duilist.cpp similarity index 100% rename from src/widgets/duilist.cpp rename to src/corelib/widgets/duilist.cpp diff --git a/src/widgets/duilist.h b/src/corelib/widgets/duilist.h similarity index 100% rename from src/widgets/duilist.h rename to src/corelib/widgets/duilist.h diff --git a/src/widgets/duilist_p.h b/src/corelib/widgets/duilist_p.h similarity index 100% rename from src/widgets/duilist_p.h rename to src/corelib/widgets/duilist_p.h diff --git a/src/widgets/duilistmodel.cpp b/src/corelib/widgets/duilistmodel.cpp similarity index 100% rename from src/widgets/duilistmodel.cpp rename to src/corelib/widgets/duilistmodel.cpp diff --git a/src/widgets/duilistmodel.h b/src/corelib/widgets/duilistmodel.h similarity index 100% rename from src/widgets/duilistmodel.h rename to src/corelib/widgets/duilistmodel.h diff --git a/src/widgets/duimessagebox.cpp b/src/corelib/widgets/duimessagebox.cpp similarity index 100% rename from src/widgets/duimessagebox.cpp rename to src/corelib/widgets/duimessagebox.cpp diff --git a/src/widgets/duimessagebox.h b/src/corelib/widgets/duimessagebox.h similarity index 100% rename from src/widgets/duimessagebox.h rename to src/corelib/widgets/duimessagebox.h diff --git a/src/widgets/duimessagebox_p.h b/src/corelib/widgets/duimessagebox_p.h similarity index 100% rename from src/widgets/duimessagebox_p.h rename to src/corelib/widgets/duimessagebox_p.h diff --git a/src/widgets/duimessageboxmodel.h b/src/corelib/widgets/duimessageboxmodel.h similarity index 100% rename from src/widgets/duimessageboxmodel.h rename to src/corelib/widgets/duimessageboxmodel.h diff --git a/src/widgets/duimodalscenewindow.cpp b/src/corelib/widgets/duimodalscenewindow.cpp similarity index 100% rename from src/widgets/duimodalscenewindow.cpp rename to src/corelib/widgets/duimodalscenewindow.cpp diff --git a/src/widgets/duimodalscenewindow.h b/src/corelib/widgets/duimodalscenewindow.h similarity index 100% rename from src/widgets/duimodalscenewindow.h rename to src/corelib/widgets/duimodalscenewindow.h diff --git a/src/widgets/duimodalscenewindow_p.h b/src/corelib/widgets/duimodalscenewindow_p.h similarity index 100% rename from src/widgets/duimodalscenewindow_p.h rename to src/corelib/widgets/duimodalscenewindow_p.h diff --git a/src/widgets/duimodalscenewindowmodel.h b/src/corelib/widgets/duimodalscenewindowmodel.h similarity index 100% rename from src/widgets/duimodalscenewindowmodel.h rename to src/corelib/widgets/duimodalscenewindowmodel.h diff --git a/src/widgets/duinavigationbar.cpp b/src/corelib/widgets/duinavigationbar.cpp similarity index 100% rename from src/widgets/duinavigationbar.cpp rename to src/corelib/widgets/duinavigationbar.cpp diff --git a/src/widgets/duinavigationbar.h b/src/corelib/widgets/duinavigationbar.h similarity index 100% rename from src/widgets/duinavigationbar.h rename to src/corelib/widgets/duinavigationbar.h diff --git a/src/widgets/duinavigationbar_p.h b/src/corelib/widgets/duinavigationbar_p.h similarity index 100% rename from src/widgets/duinavigationbar_p.h rename to src/corelib/widgets/duinavigationbar_p.h diff --git a/src/widgets/duinavigationbarmodel.h b/src/corelib/widgets/duinavigationbarmodel.h similarity index 100% rename from src/widgets/duinavigationbarmodel.h rename to src/corelib/widgets/duinavigationbarmodel.h diff --git a/src/widgets/duiobjectmenu.cpp b/src/corelib/widgets/duiobjectmenu.cpp similarity index 100% rename from src/widgets/duiobjectmenu.cpp rename to src/corelib/widgets/duiobjectmenu.cpp diff --git a/src/widgets/duiobjectmenu.h b/src/corelib/widgets/duiobjectmenu.h similarity index 99% rename from src/widgets/duiobjectmenu.h rename to src/corelib/widgets/duiobjectmenu.h index 871c524dd..c5da40b64 100644 --- a/src/widgets/duiobjectmenu.h +++ b/src/corelib/widgets/duiobjectmenu.h @@ -114,7 +114,7 @@ class QGraphicsSceneContextMenuEvent; \sa DuiObjectMenuModel DuiObjectMenuStyle */ -class DuiObjectMenu : public DuiSceneWindow +class DUI_EXPORT DuiObjectMenu : public DuiSceneWindow { Q_OBJECT Q_DISABLE_COPY(DuiObjectMenu) diff --git a/src/widgets/duiobjectmenumodel.cpp b/src/corelib/widgets/duiobjectmenumodel.cpp similarity index 100% rename from src/widgets/duiobjectmenumodel.cpp rename to src/corelib/widgets/duiobjectmenumodel.cpp diff --git a/src/widgets/duiobjectmenumodel.h b/src/corelib/widgets/duiobjectmenumodel.h similarity index 100% rename from src/widgets/duiobjectmenumodel.h rename to src/corelib/widgets/duiobjectmenumodel.h diff --git a/src/widgets/duioverlay.cpp b/src/corelib/widgets/duioverlay.cpp similarity index 100% rename from src/widgets/duioverlay.cpp rename to src/corelib/widgets/duioverlay.cpp diff --git a/src/widgets/duioverlay.h b/src/corelib/widgets/duioverlay.h similarity index 100% rename from src/widgets/duioverlay.h rename to src/corelib/widgets/duioverlay.h diff --git a/src/widgets/duioverlay_p.h b/src/corelib/widgets/duioverlay_p.h similarity index 100% rename from src/widgets/duioverlay_p.h rename to src/corelib/widgets/duioverlay_p.h diff --git a/src/widgets/duipannableviewport.cpp b/src/corelib/widgets/duipannableviewport.cpp similarity index 100% rename from src/widgets/duipannableviewport.cpp rename to src/corelib/widgets/duipannableviewport.cpp diff --git a/src/widgets/duipannableviewport.h b/src/corelib/widgets/duipannableviewport.h similarity index 100% rename from src/widgets/duipannableviewport.h rename to src/corelib/widgets/duipannableviewport.h diff --git a/src/widgets/duipannableviewport_p.h b/src/corelib/widgets/duipannableviewport_p.h similarity index 100% rename from src/widgets/duipannableviewport_p.h rename to src/corelib/widgets/duipannableviewport_p.h diff --git a/src/widgets/duipannableviewportlayout.cpp b/src/corelib/widgets/duipannableviewportlayout.cpp similarity index 100% rename from src/widgets/duipannableviewportlayout.cpp rename to src/corelib/widgets/duipannableviewportlayout.cpp diff --git a/src/widgets/duipannableviewportlayout.h b/src/corelib/widgets/duipannableviewportlayout.h similarity index 100% rename from src/widgets/duipannableviewportlayout.h rename to src/corelib/widgets/duipannableviewportlayout.h diff --git a/src/widgets/duipannableviewportmodel.h b/src/corelib/widgets/duipannableviewportmodel.h similarity index 100% rename from src/widgets/duipannableviewportmodel.h rename to src/corelib/widgets/duipannableviewportmodel.h diff --git a/src/widgets/duipannablewidget.cpp b/src/corelib/widgets/duipannablewidget.cpp similarity index 100% rename from src/widgets/duipannablewidget.cpp rename to src/corelib/widgets/duipannablewidget.cpp diff --git a/src/widgets/duipannablewidget.h b/src/corelib/widgets/duipannablewidget.h similarity index 100% rename from src/widgets/duipannablewidget.h rename to src/corelib/widgets/duipannablewidget.h diff --git a/src/widgets/duipannablewidget_p.h b/src/corelib/widgets/duipannablewidget_p.h similarity index 100% rename from src/widgets/duipannablewidget_p.h rename to src/corelib/widgets/duipannablewidget_p.h diff --git a/src/widgets/duipannablewidgetmodel.h b/src/corelib/widgets/duipannablewidgetmodel.h similarity index 100% rename from src/widgets/duipannablewidgetmodel.h rename to src/corelib/widgets/duipannablewidgetmodel.h diff --git a/src/widgets/duiphysics2dpanning.cpp b/src/corelib/widgets/duiphysics2dpanning.cpp similarity index 100% rename from src/widgets/duiphysics2dpanning.cpp rename to src/corelib/widgets/duiphysics2dpanning.cpp diff --git a/src/widgets/duiphysics2dpanning.h b/src/corelib/widgets/duiphysics2dpanning.h similarity index 100% rename from src/widgets/duiphysics2dpanning.h rename to src/corelib/widgets/duiphysics2dpanning.h diff --git a/src/widgets/duiphysics2dpanning_p.h b/src/corelib/widgets/duiphysics2dpanning_p.h similarity index 100% rename from src/widgets/duiphysics2dpanning_p.h rename to src/corelib/widgets/duiphysics2dpanning_p.h diff --git a/src/widgets/duipopuplist.cpp b/src/corelib/widgets/duipopuplist.cpp similarity index 100% rename from src/widgets/duipopuplist.cpp rename to src/corelib/widgets/duipopuplist.cpp diff --git a/src/widgets/duipopuplist.h b/src/corelib/widgets/duipopuplist.h similarity index 100% rename from src/widgets/duipopuplist.h rename to src/corelib/widgets/duipopuplist.h diff --git a/src/widgets/duipopuplist_p.h b/src/corelib/widgets/duipopuplist_p.h similarity index 100% rename from src/widgets/duipopuplist_p.h rename to src/corelib/widgets/duipopuplist_p.h diff --git a/src/widgets/duipopuplistmodel.h b/src/corelib/widgets/duipopuplistmodel.h similarity index 100% rename from src/widgets/duipopuplistmodel.h rename to src/corelib/widgets/duipopuplistmodel.h diff --git a/src/widgets/duipositionindicator.cpp b/src/corelib/widgets/duipositionindicator.cpp similarity index 100% rename from src/widgets/duipositionindicator.cpp rename to src/corelib/widgets/duipositionindicator.cpp diff --git a/src/widgets/duipositionindicator.h b/src/corelib/widgets/duipositionindicator.h similarity index 100% rename from src/widgets/duipositionindicator.h rename to src/corelib/widgets/duipositionindicator.h diff --git a/src/widgets/duipositionindicator_p.h b/src/corelib/widgets/duipositionindicator_p.h similarity index 100% rename from src/widgets/duipositionindicator_p.h rename to src/corelib/widgets/duipositionindicator_p.h diff --git a/src/widgets/duipositionindicatormodel.h b/src/corelib/widgets/duipositionindicatormodel.h similarity index 100% rename from src/widgets/duipositionindicatormodel.h rename to src/corelib/widgets/duipositionindicatormodel.h diff --git a/src/widgets/duiprogressindicator.cpp b/src/corelib/widgets/duiprogressindicator.cpp similarity index 100% rename from src/widgets/duiprogressindicator.cpp rename to src/corelib/widgets/duiprogressindicator.cpp diff --git a/src/widgets/duiprogressindicator.h b/src/corelib/widgets/duiprogressindicator.h similarity index 100% rename from src/widgets/duiprogressindicator.h rename to src/corelib/widgets/duiprogressindicator.h diff --git a/src/widgets/duiprogressindicator_p.h b/src/corelib/widgets/duiprogressindicator_p.h similarity index 100% rename from src/widgets/duiprogressindicator_p.h rename to src/corelib/widgets/duiprogressindicator_p.h diff --git a/src/widgets/duiprogressindicatormodel.h b/src/corelib/widgets/duiprogressindicatormodel.h similarity index 100% rename from src/widgets/duiprogressindicatormodel.h rename to src/corelib/widgets/duiprogressindicatormodel.h diff --git a/src/widgets/duiscenelayereffectmodel.h b/src/corelib/widgets/duiscenelayereffectmodel.h similarity index 100% rename from src/widgets/duiscenelayereffectmodel.h rename to src/corelib/widgets/duiscenelayereffectmodel.h diff --git a/src/widgets/duiscenewindow.cpp b/src/corelib/widgets/duiscenewindow.cpp similarity index 100% rename from src/widgets/duiscenewindow.cpp rename to src/corelib/widgets/duiscenewindow.cpp diff --git a/src/widgets/duiscenewindow.h b/src/corelib/widgets/duiscenewindow.h similarity index 100% rename from src/widgets/duiscenewindow.h rename to src/corelib/widgets/duiscenewindow.h diff --git a/src/widgets/duiscenewindow_p.h b/src/corelib/widgets/duiscenewindow_p.h similarity index 100% rename from src/widgets/duiscenewindow_p.h rename to src/corelib/widgets/duiscenewindow_p.h diff --git a/src/widgets/duiscenewindowmodel.h b/src/corelib/widgets/duiscenewindowmodel.h similarity index 100% rename from src/widgets/duiscenewindowmodel.h rename to src/corelib/widgets/duiscenewindowmodel.h diff --git a/src/widgets/duiseekbar.cpp b/src/corelib/widgets/duiseekbar.cpp similarity index 100% rename from src/widgets/duiseekbar.cpp rename to src/corelib/widgets/duiseekbar.cpp diff --git a/src/widgets/duiseekbar.h b/src/corelib/widgets/duiseekbar.h similarity index 100% rename from src/widgets/duiseekbar.h rename to src/corelib/widgets/duiseekbar.h diff --git a/src/widgets/duiseekbarmodel.h b/src/corelib/widgets/duiseekbarmodel.h similarity index 100% rename from src/widgets/duiseekbarmodel.h rename to src/corelib/widgets/duiseekbarmodel.h diff --git a/src/widgets/duiseparator.cpp b/src/corelib/widgets/duiseparator.cpp similarity index 100% rename from src/widgets/duiseparator.cpp rename to src/corelib/widgets/duiseparator.cpp diff --git a/src/widgets/duiseparator.h b/src/corelib/widgets/duiseparator.h similarity index 100% rename from src/widgets/duiseparator.h rename to src/corelib/widgets/duiseparator.h diff --git a/src/widgets/duiseparator_p.h b/src/corelib/widgets/duiseparator_p.h similarity index 100% rename from src/widgets/duiseparator_p.h rename to src/corelib/widgets/duiseparator_p.h diff --git a/src/widgets/duiseparatormodel.h b/src/corelib/widgets/duiseparatormodel.h similarity index 100% rename from src/widgets/duiseparatormodel.h rename to src/corelib/widgets/duiseparatormodel.h diff --git a/src/widgets/duislider.cpp b/src/corelib/widgets/duislider.cpp similarity index 100% rename from src/widgets/duislider.cpp rename to src/corelib/widgets/duislider.cpp diff --git a/src/widgets/duislider.h b/src/corelib/widgets/duislider.h similarity index 100% rename from src/widgets/duislider.h rename to src/corelib/widgets/duislider.h diff --git a/src/widgets/duislider_p.h b/src/corelib/widgets/duislider_p.h similarity index 100% rename from src/widgets/duislider_p.h rename to src/corelib/widgets/duislider_p.h diff --git a/src/widgets/duislidermodel.cpp b/src/corelib/widgets/duislidermodel.cpp similarity index 100% rename from src/widgets/duislidermodel.cpp rename to src/corelib/widgets/duislidermodel.cpp diff --git a/src/widgets/duislidermodel.h b/src/corelib/widgets/duislidermodel.h similarity index 100% rename from src/widgets/duislidermodel.h rename to src/corelib/widgets/duislidermodel.h diff --git a/src/widgets/duistatusbar.cpp b/src/corelib/widgets/duistatusbar.cpp similarity index 100% rename from src/widgets/duistatusbar.cpp rename to src/corelib/widgets/duistatusbar.cpp diff --git a/src/widgets/duistatusbar.h b/src/corelib/widgets/duistatusbar.h similarity index 100% rename from src/widgets/duistatusbar.h rename to src/corelib/widgets/duistatusbar.h diff --git a/src/widgets/duistylablewidget.cpp b/src/corelib/widgets/duistylablewidget.cpp similarity index 100% rename from src/widgets/duistylablewidget.cpp rename to src/corelib/widgets/duistylablewidget.cpp diff --git a/src/widgets/duistylablewidget.h b/src/corelib/widgets/duistylablewidget.h similarity index 100% rename from src/widgets/duistylablewidget.h rename to src/corelib/widgets/duistylablewidget.h diff --git a/src/widgets/duitextedit.cpp b/src/corelib/widgets/duitextedit.cpp similarity index 100% rename from src/widgets/duitextedit.cpp rename to src/corelib/widgets/duitextedit.cpp diff --git a/src/widgets/duitextedit.h b/src/corelib/widgets/duitextedit.h similarity index 100% rename from src/widgets/duitextedit.h rename to src/corelib/widgets/duitextedit.h diff --git a/src/widgets/duitextedit_p.h b/src/corelib/widgets/duitextedit_p.h similarity index 100% rename from src/widgets/duitextedit_p.h rename to src/corelib/widgets/duitextedit_p.h diff --git a/src/widgets/duitexteditmodel.h b/src/corelib/widgets/duitexteditmodel.h similarity index 100% rename from src/widgets/duitexteditmodel.h rename to src/corelib/widgets/duitexteditmodel.h diff --git a/src/widgets/duitoolbar.cpp b/src/corelib/widgets/duitoolbar.cpp similarity index 100% rename from src/widgets/duitoolbar.cpp rename to src/corelib/widgets/duitoolbar.cpp diff --git a/src/widgets/duitoolbar.h b/src/corelib/widgets/duitoolbar.h similarity index 100% rename from src/widgets/duitoolbar.h rename to src/corelib/widgets/duitoolbar.h diff --git a/src/widgets/duitoolbar_p.h b/src/corelib/widgets/duitoolbar_p.h similarity index 100% rename from src/widgets/duitoolbar_p.h rename to src/corelib/widgets/duitoolbar_p.h diff --git a/src/widgets/duiviewcreator.cpp b/src/corelib/widgets/duiviewcreator.cpp similarity index 100% rename from src/widgets/duiviewcreator.cpp rename to src/corelib/widgets/duiviewcreator.cpp diff --git a/src/widgets/duiviewcreator.h b/src/corelib/widgets/duiviewcreator.h similarity index 100% rename from src/widgets/duiviewcreator.h rename to src/corelib/widgets/duiviewcreator.h diff --git a/src/widgets/duiwidgetlistmodel_p.h b/src/corelib/widgets/duiwidgetlistmodel_p.h similarity index 100% rename from src/widgets/duiwidgetlistmodel_p.h rename to src/corelib/widgets/duiwidgetlistmodel_p.h diff --git a/src/widgets/duiwidgetmodel.cpp b/src/corelib/widgets/duiwidgetmodel.cpp similarity index 100% rename from src/widgets/duiwidgetmodel.cpp rename to src/corelib/widgets/duiwidgetmodel.cpp diff --git a/src/widgets/duiwidgetmodel.h b/src/corelib/widgets/duiwidgetmodel.h similarity index 100% rename from src/widgets/duiwidgetmodel.h rename to src/corelib/widgets/duiwidgetmodel.h diff --git a/src/widgets/duiwidgetmodel_p.h b/src/corelib/widgets/duiwidgetmodel_p.h similarity index 100% rename from src/widgets/duiwidgetmodel_p.h rename to src/corelib/widgets/duiwidgetmodel_p.h diff --git a/src/widgets/duiwidgetrecycler.cpp b/src/corelib/widgets/duiwidgetrecycler.cpp similarity index 100% rename from src/widgets/duiwidgetrecycler.cpp rename to src/corelib/widgets/duiwidgetrecycler.cpp diff --git a/src/widgets/duiwidgetrecycler.h b/src/corelib/widgets/duiwidgetrecycler.h similarity index 100% rename from src/widgets/duiwidgetrecycler.h rename to src/corelib/widgets/duiwidgetrecycler.h diff --git a/src/widgets/duiwidgetrecycler_p.h b/src/corelib/widgets/duiwidgetrecycler_p.h similarity index 100% rename from src/widgets/duiwidgetrecycler_p.h rename to src/corelib/widgets/duiwidgetrecycler_p.h diff --git a/src/widgets/duiwindow.cpp b/src/corelib/widgets/duiwindow.cpp similarity index 100% rename from src/widgets/duiwindow.cpp rename to src/corelib/widgets/duiwindow.cpp diff --git a/src/widgets/duiwindow.h b/src/corelib/widgets/duiwindow.h similarity index 100% rename from src/widgets/duiwindow.h rename to src/corelib/widgets/duiwindow.h diff --git a/src/widgets/duiwindow_p.h b/src/corelib/widgets/duiwindow_p.h similarity index 100% rename from src/widgets/duiwindow_p.h rename to src/corelib/widgets/duiwindow_p.h diff --git a/src/corelib/widgets/views/views.pri b/src/corelib/widgets/views/views.pri new file mode 100644 index 000000000..22bb33ecc --- /dev/null +++ b/src/corelib/widgets/views/views.pri @@ -0,0 +1,42 @@ +############################################################################### +# DuiWidget/Views module +# This module contains all classes implemeting widget views. +############################################################################### + +WIDGETS_VIEWS_SRC_DIR=./widgets/views +INCLUDEPATH+=./widgets/views + +PUBLIC_HEADERS += \ + $$WIDGETS_VIEWS_SRC_DIR/duiscenewindowview.h \ + $$WIDGETS_VIEWS_SRC_DIR/duilabelview.h \ + $$WIDGETS_VIEWS_SRC_DIR/duipositionindicatorview.h \ + $$WIDGETS_VIEWS_SRC_DIR/duiapplicationmenubuttonview.h \ + $$WIDGETS_VIEWS_SRC_DIR/duibuttonview.h \ + $$WIDGETS_VIEWS_SRC_DIR/duiimagewidgetview.h \ + $$WIDGETS_VIEWS_SRC_DIR/duibuttoniconview.h \ + $$WIDGETS_VIEWS_SRC_DIR/duibuttonswitchview.h \ + $$WIDGETS_VIEWS_SRC_DIR/duicheckboxview.h \ + $$WIDGETS_VIEWS_SRC_DIR/duicontainerview.h \ + $$WIDGETS_VIEWS_SRC_DIR/duidockwidgetview.h \ + $$WIDGETS_VIEWS_SRC_DIR/duicontentitemview.h \ + $$WIDGETS_VIEWS_SRC_DIR/duinavigationbarview.h \ + +PRIVATE_HEADERS += \ + +SOURCES += \ + $$WIDGETS_VIEWS_SRC_DIR/duiscenewindowview.cpp \ + $$WIDGETS_VIEWS_SRC_DIR/duilabelview.cpp \ + $$WIDGETS_VIEWS_SRC_DIR/duilabelview_rich.cpp \ + $$WIDGETS_VIEWS_SRC_DIR/duilabelview_simple.cpp \ + $$WIDGETS_VIEWS_SRC_DIR/duipositionindicatorview.cpp \ + $$WIDGETS_VIEWS_SRC_DIR/duiapplicationmenubuttonview.cpp \ + $$WIDGETS_VIEWS_SRC_DIR/duibuttonview.cpp \ + $$WIDGETS_VIEWS_SRC_DIR/duiimagewidgetview.cpp \ + $$WIDGETS_VIEWS_SRC_DIR/duibuttoniconview.cpp \ + $$WIDGETS_VIEWS_SRC_DIR/duibuttonswitchview.cpp \ + $$WIDGETS_VIEWS_SRC_DIR/duicheckboxview.cpp \ + $$WIDGETS_VIEWS_SRC_DIR/duicontainerview.cpp \ + $$WIDGETS_VIEWS_SRC_DIR/duidockwidgetview.cpp \ + $$WIDGETS_VIEWS_SRC_DIR/duicontentitemview.cpp \ + $$WIDGETS_VIEWS_SRC_DIR/duinavigationbarview.cpp \ + diff --git a/src/widgets/widgets.pri b/src/corelib/widgets/widgets.pri similarity index 88% rename from src/widgets/widgets.pri rename to src/corelib/widgets/widgets.pri index 1495c2416..376390cdb 100644 --- a/src/widgets/widgets.pri +++ b/src/corelib/widgets/widgets.pri @@ -6,23 +6,11 @@ WIDGETS_SRC_DIR=./widgets INCLUDEPATH+=./widgets -duigen_model.name = duigenerator model -duigen_model.input = WIDGET_MODEL_HEADERS -duigen_model.depends = $$DUIGEN_EXECUTABLE -duigen_model.output = $$GEN_DIR/gen_${QMAKE_FILE_BASE}data.cpp -duigen_model.commands += $$DUIGEN_EXECUTABLE --model ${QMAKE_FILE_NAME} $$GEN_DIR/ -duigen_model.clean += $$GEN_DIR/gen_* -duigen_model.CONFIG = target_predeps no_link -duigen_model.variable_out = GENERATED_SOURCES -QMAKE_EXTRA_COMPILERS += duigen_model - include(core/core.pri) -include(views/views.pri) PUBLIC_HEADERS += \ $$WIDGETS_SRC_DIR/duiapplicationpage.h \ $$WIDGETS_SRC_DIR/duiapplicationmenu.h \ - $$WIDGETS_SRC_DIR/duiapplicationmenubutton.h \ $$WIDGETS_SRC_DIR/duiapplicationwindow.h \ $$WIDGETS_SRC_DIR/duibutton.h \ $$WIDGETS_SRC_DIR/duibuttongroup.h \ @@ -66,7 +54,7 @@ PUBLIC_HEADERS += \ $$WIDGETS_SRC_DIR/duicontentitem.h \ -WIDGET_MODEL_HEADERS += \ +DUIGEN_MODEL_HEADERS += \ $$WIDGETS_SRC_DIR/duiwidgetmodel.h \ $$WIDGETS_SRC_DIR/duibuttonmodel.h \ $$WIDGETS_SRC_DIR/duicomboboxmodel.h \ @@ -78,7 +66,6 @@ WIDGET_MODEL_HEADERS += \ $$WIDGETS_SRC_DIR/duiimagewidgetmodel.h \ $$WIDGETS_SRC_DIR/duiinfobannermodel.h \ $$WIDGETS_SRC_DIR/duiapplicationmenumodel.h \ - $$WIDGETS_SRC_DIR/duiapplicationmenubuttonmodel.h \ $$WIDGETS_SRC_DIR/duimessageboxmodel.h \ $$WIDGETS_SRC_DIR/duinavigationbarmodel.h \ $$WIDGETS_SRC_DIR/duiobjectmenumodel.h \ @@ -104,12 +91,11 @@ WIDGET_MODEL_HEADERS += \ PRIVATE_HEADERS += \ $$WIDGETS_SRC_DIR/duiobjectmenu.h \ $$WIDGETS_SRC_DIR/duipannableviewportlayout.h \ - $$WIDGETS_SRC_DIR/duicontainerheader_p.h \ $$WIDGETS_SRC_DIR/duicontentitem_p.h \ $$WIDGETS_SRC_DIR/duibuttongroup_p.h \ HEADERS += \ - $$WIDGET_MODEL_HEADERS \ + $$DUIGEN_MODEL_HEADERS \ SOURCES += \ $$WIDGETS_SRC_DIR/duiwidgetmodel.cpp \ @@ -134,7 +120,6 @@ SOURCES += \ $$WIDGETS_SRC_DIR/duigriditem.cpp \ $$WIDGETS_SRC_DIR/duiinfobannermodel.cpp \ $$WIDGETS_SRC_DIR/duiapplicationmenu.cpp \ - $$WIDGETS_SRC_DIR/duiapplicationmenubutton.cpp \ $$WIDGETS_SRC_DIR/duimessagebox.cpp \ $$WIDGETS_SRC_DIR/duinavigationbar.cpp \ $$WIDGETS_SRC_DIR/duiobjectmenu.cpp \ @@ -160,7 +145,6 @@ SOURCES += \ $$WIDGETS_SRC_DIR/duiseparator.cpp \ $$WIDGETS_SRC_DIR/duistylablewidget.cpp \ $$WIDGETS_SRC_DIR/duiwidgetrecycler.cpp \ - $$WIDGETS_SRC_DIR/duicontainerheader.cpp \ $$WIDGETS_SRC_DIR/duiabstractcellcreator.cpp \ $$WIDGETS_SRC_DIR/duicontentitem.cpp \ $$WIDGETS_SRC_DIR/duicontentitemmodel.cpp \ diff --git a/src/workspace/devices.conf b/src/corelib/workspace/devices.conf similarity index 100% rename from src/workspace/devices.conf rename to src/corelib/workspace/devices.conf diff --git a/src/workspace/duideviceprofile.cpp b/src/corelib/workspace/duideviceprofile.cpp similarity index 100% rename from src/workspace/duideviceprofile.cpp rename to src/corelib/workspace/duideviceprofile.cpp diff --git a/src/workspace/duideviceprofile.h b/src/corelib/workspace/duideviceprofile.h similarity index 100% rename from src/workspace/duideviceprofile.h rename to src/corelib/workspace/duideviceprofile.h diff --git a/src/workspace/duideviceprofile_p.h b/src/corelib/workspace/duideviceprofile_p.h similarity index 100% rename from src/workspace/duideviceprofile_p.h rename to src/corelib/workspace/duideviceprofile_p.h diff --git a/src/workspace/workspace.pri b/src/corelib/workspace/workspace.pri similarity index 100% rename from src/workspace/workspace.pri rename to src/corelib/workspace/workspace.pri diff --git a/src/duigen.pri b/src/duigen.pri new file mode 100644 index 000000000..344f39e73 --- /dev/null +++ b/src/duigen.pri @@ -0,0 +1,23 @@ +# definition of the duigen "compiler" + +duigen_model.name = duigenerator model +duigen_model.input = DUIGEN_MODEL_HEADERS +duigen_model.output = $$GEN_DIR/gen_${QMAKE_FILE_BASE}data.cpp +duigen_model.depends = $$DUIGEN_EXECUTABLE +duigen_model.commands += $$DUIGEN_EXECUTABLE --model ${QMAKE_FILE_NAME} $$GEN_DIR +duigen_model.clean += $$GEN_DIR/gen_* +duigen_model.CONFIG = target_predeps no_link +duigen_model.variable_out = GENERATED_SOURCES + +QMAKE_EXTRA_COMPILERS += duigen_model + +duigen_style.name = duigenerator style +duigen_style.input = DUIGEN_STYLE_HEADERS +duigen_style.depends = $$DUIGEN_EXECUTABLE +duigen_style.output = $$GEN_DIR/gen_${QMAKE_FILE_BASE}data.cpp +duigen_style.commands += $$DUIGEN_EXECUTABLE --style ${QMAKE_FILE_NAME} $$GEN_DIR +duigen_style.clean += $$GEN_DIR/gen_* +duigen_style.CONFIG = target_predeps no_link +duigen_style.variable_out = GENERATED_SOURCES + +QMAKE_EXTRA_COMPILERS += duigen_style diff --git a/src/applicationextension/applicationextension.pri b/src/extensions/applicationextension/applicationextension.pri similarity index 94% rename from src/applicationextension/applicationextension.pri rename to src/extensions/applicationextension/applicationextension.pri index 14194e872..7362e2057 100644 --- a/src/applicationextension/applicationextension.pri +++ b/src/extensions/applicationextension/applicationextension.pri @@ -1,6 +1,4 @@ EXTENSION_DIR=./applicationextension -INCLUDEPATH+=./applicationextension \ - $$GEN_DIR HEADERS += \ $$EXTENSION_DIR/duiextensionarea.h \ @@ -39,6 +37,8 @@ SOURCES += $$EXTENSION_DIR/duiextensionarea.cpp \ $$EXTENSION_DIR/duiextensionhandleview.cpp \ $$EXTENSION_DIR/duiapplicationextensionhandleview.cpp -WIDGET_MODEL_HEADERS += $$EXTENSION_DIR/duiextensionareamodel.h \ +DUIGEN_MODEL_HEADERS += $$EXTENSION_DIR/duiextensionareamodel.h \ $$EXTENSION_DIR/duiapplicationextensionareamodel.h \ $$EXTENSION_DIR/duiextensionhandlemodel.h + +HEADERS += $$DUIGEN_MODEL_HEADERS diff --git a/src/applicationextension/duiapplicationextensionarea.cpp b/src/extensions/applicationextension/duiapplicationextensionarea.cpp similarity index 100% rename from src/applicationextension/duiapplicationextensionarea.cpp rename to src/extensions/applicationextension/duiapplicationextensionarea.cpp diff --git a/src/applicationextension/duiapplicationextensionarea.h b/src/extensions/applicationextension/duiapplicationextensionarea.h similarity index 100% rename from src/applicationextension/duiapplicationextensionarea.h rename to src/extensions/applicationextension/duiapplicationextensionarea.h diff --git a/src/applicationextension/duiapplicationextensionarea_p.h b/src/extensions/applicationextension/duiapplicationextensionarea_p.h similarity index 100% rename from src/applicationextension/duiapplicationextensionarea_p.h rename to src/extensions/applicationextension/duiapplicationextensionarea_p.h diff --git a/src/applicationextension/duiapplicationextensionareamodel.h b/src/extensions/applicationextension/duiapplicationextensionareamodel.h similarity index 100% rename from src/applicationextension/duiapplicationextensionareamodel.h rename to src/extensions/applicationextension/duiapplicationextensionareamodel.h diff --git a/src/applicationextension/duiapplicationextensionareaview.cpp b/src/extensions/applicationextension/duiapplicationextensionareaview.cpp similarity index 100% rename from src/applicationextension/duiapplicationextensionareaview.cpp rename to src/extensions/applicationextension/duiapplicationextensionareaview.cpp diff --git a/src/applicationextension/duiapplicationextensionareaview.h b/src/extensions/applicationextension/duiapplicationextensionareaview.h similarity index 100% rename from src/applicationextension/duiapplicationextensionareaview.h rename to src/extensions/applicationextension/duiapplicationextensionareaview.h diff --git a/src/applicationextension/duiapplicationextensionareaview_p.h b/src/extensions/applicationextension/duiapplicationextensionareaview_p.h similarity index 100% rename from src/applicationextension/duiapplicationextensionareaview_p.h rename to src/extensions/applicationextension/duiapplicationextensionareaview_p.h diff --git a/src/applicationextension/duiapplicationextensionhandleview.cpp b/src/extensions/applicationextension/duiapplicationextensionhandleview.cpp similarity index 100% rename from src/applicationextension/duiapplicationextensionhandleview.cpp rename to src/extensions/applicationextension/duiapplicationextensionhandleview.cpp diff --git a/src/applicationextension/duiapplicationextensionhandleview.h b/src/extensions/applicationextension/duiapplicationextensionhandleview.h similarity index 100% rename from src/applicationextension/duiapplicationextensionhandleview.h rename to src/extensions/applicationextension/duiapplicationextensionhandleview.h diff --git a/src/applicationextension/duiapplicationextensionhandleview_p.h b/src/extensions/applicationextension/duiapplicationextensionhandleview_p.h similarity index 100% rename from src/applicationextension/duiapplicationextensionhandleview_p.h rename to src/extensions/applicationextension/duiapplicationextensionhandleview_p.h diff --git a/src/applicationextension/duiapplicationextensioninterface.h b/src/extensions/applicationextension/duiapplicationextensioninterface.h similarity index 100% rename from src/applicationextension/duiapplicationextensioninterface.h rename to src/extensions/applicationextension/duiapplicationextensioninterface.h diff --git a/src/applicationextension/duiapplicationextensionloader.cpp b/src/extensions/applicationextension/duiapplicationextensionloader.cpp similarity index 100% rename from src/applicationextension/duiapplicationextensionloader.cpp rename to src/extensions/applicationextension/duiapplicationextensionloader.cpp diff --git a/src/applicationextension/duiapplicationextensionloader.h b/src/extensions/applicationextension/duiapplicationextensionloader.h similarity index 100% rename from src/applicationextension/duiapplicationextensionloader.h rename to src/extensions/applicationextension/duiapplicationextensionloader.h diff --git a/src/applicationextension/duiapplicationextensionmanager.cpp b/src/extensions/applicationextension/duiapplicationextensionmanager.cpp similarity index 100% rename from src/applicationextension/duiapplicationextensionmanager.cpp rename to src/extensions/applicationextension/duiapplicationextensionmanager.cpp diff --git a/src/applicationextension/duiapplicationextensionmanager.h b/src/extensions/applicationextension/duiapplicationextensionmanager.h similarity index 100% rename from src/applicationextension/duiapplicationextensionmanager.h rename to src/extensions/applicationextension/duiapplicationextensionmanager.h diff --git a/src/applicationextension/duiapplicationextensionmetadata.cpp b/src/extensions/applicationextension/duiapplicationextensionmetadata.cpp similarity index 100% rename from src/applicationextension/duiapplicationextensionmetadata.cpp rename to src/extensions/applicationextension/duiapplicationextensionmetadata.cpp diff --git a/src/applicationextension/duiapplicationextensionmetadata.h b/src/extensions/applicationextension/duiapplicationextensionmetadata.h similarity index 100% rename from src/applicationextension/duiapplicationextensionmetadata.h rename to src/extensions/applicationextension/duiapplicationextensionmetadata.h diff --git a/src/applicationextension/duiextensionarea.cpp b/src/extensions/applicationextension/duiextensionarea.cpp similarity index 74% rename from src/applicationextension/duiextensionarea.cpp rename to src/extensions/applicationextension/duiextensionarea.cpp index 35e5949a1..ee8c43012 100644 --- a/src/applicationextension/duiextensionarea.cpp +++ b/src/extensions/applicationextension/duiextensionarea.cpp @@ -19,11 +19,15 @@ #include "duiextensionarea.h" #include "duiextensionarea_p.h" + +#include + #include "duidatastore.h" #include "duidebug.h" DuiExtensionAreaPrivate::DuiExtensionAreaPrivate() + : q_ptr(NULL) { } @@ -66,16 +70,36 @@ void DuiExtensionAreaPrivate::init() q->model()->setDataStores(&dataStores); } -DuiExtensionArea::DuiExtensionArea(DuiWidgetControllerPrivate *dd, DuiWidgetModel *model, QGraphicsItem *parent) - : DuiWidgetController(dd, model, parent) +void DuiExtensionAreaPrivate::gestureEvent(QGestureEvent *event) +{ + foreach(QGesture* state, event->gestures()) { + if (Qt::TapAndHoldGesture == state->gestureType()) { + QTapAndHoldGesture* tapAndHoldState = static_cast(state); + tapAndHoldGesture(event,tapAndHoldState); + } + } +} + +void DuiExtensionAreaPrivate::tapAndHoldGesture(QGestureEvent *event, QTapAndHoldGesture *state) +{ + Q_UNUSED(event); + Q_UNUSED(state); +} + +DuiExtensionArea::DuiExtensionArea(DuiExtensionAreaPrivate *dd, DuiWidgetModel *model, QGraphicsItem *parent) + : DuiWidgetController(model, parent), + d_ptr(dd) { // Initialize the private implementation Q_D(DuiExtensionArea); + if (d) + d->q_ptr = this; d->init(); } DuiExtensionArea::DuiExtensionArea(QGraphicsItem *parent) : - DuiWidgetController(new DuiExtensionAreaPrivate, new DuiExtensionAreaModel, parent) + DuiWidgetController(new DuiExtensionAreaModel, parent), + d_ptr(new DuiExtensionAreaPrivate()) { // Initialize the private implementation Q_D(DuiExtensionArea); diff --git a/src/applicationextension/duiextensionarea.h b/src/extensions/applicationextension/duiextensionarea.h similarity index 95% rename from src/applicationextension/duiextensionarea.h rename to src/extensions/applicationextension/duiextensionarea.h index b8198a094..862fc6aa3 100644 --- a/src/applicationextension/duiextensionarea.h +++ b/src/extensions/applicationextension/duiextensionarea.h @@ -51,7 +51,8 @@ class DUI_EXPORT DuiExtensionArea : public DuiWidgetController * Protected constructor to be called by derived classes to set up the private implementation * hierarchy. */ - DuiExtensionArea(DuiWidgetControllerPrivate *dd, DuiWidgetModel *model, QGraphicsItem *parent); + DuiExtensionArea(DuiExtensionAreaPrivate *dd, DuiWidgetModel *model, QGraphicsItem *parent); + DuiExtensionAreaPrivate *const d_ptr; protected Q_SLOTS: /*! diff --git a/src/applicationextension/duiextensionarea_p.h b/src/extensions/applicationextension/duiextensionarea_p.h similarity index 87% rename from src/applicationextension/duiextensionarea_p.h rename to src/extensions/applicationextension/duiextensionarea_p.h index efecd311d..a5e53ce5b 100644 --- a/src/applicationextension/duiextensionarea_p.h +++ b/src/extensions/applicationextension/duiextensionarea_p.h @@ -20,15 +20,16 @@ #ifndef DUIEXTENSIONAREA_P_H #define DUIEXTENSIONAREA_P_H -#include "private/duiwidgetcontroller_p.h" #include "duiextensionarea.h" +#include + class DuiDataStore; /*! * Private class for DuiExtensionArea. */ -class DuiExtensionAreaPrivate : public DuiWidgetControllerPrivate +class DuiExtensionAreaPrivate { Q_DECLARE_PUBLIC(DuiExtensionArea) @@ -55,6 +56,9 @@ class DuiExtensionAreaPrivate : public DuiWidgetControllerPrivate */ virtual void removeWidget(DuiWidget *widget); + virtual void gestureEvent(QGestureEvent *event); + virtual void tapAndHoldGesture(QGestureEvent *event, QTapAndHoldGesture *state); + //! Map to maintain DuiDataStore objects of associated widgets in. QMap dataStores; @@ -63,6 +67,9 @@ class DuiExtensionAreaPrivate : public DuiWidgetControllerPrivate * is used for anything else. */ void init(); +protected: + DuiExtensionArea *q_ptr; }; #endif // DUIEXTENSIONAREA_P_H + diff --git a/src/applicationextension/duiextensionareamodel.cpp b/src/extensions/applicationextension/duiextensionareamodel.cpp similarity index 100% rename from src/applicationextension/duiextensionareamodel.cpp rename to src/extensions/applicationextension/duiextensionareamodel.cpp diff --git a/src/applicationextension/duiextensionareamodel.h b/src/extensions/applicationextension/duiextensionareamodel.h similarity index 100% rename from src/applicationextension/duiextensionareamodel.h rename to src/extensions/applicationextension/duiextensionareamodel.h diff --git a/src/applicationextension/duiextensionareaview.cpp b/src/extensions/applicationextension/duiextensionareaview.cpp similarity index 96% rename from src/applicationextension/duiextensionareaview.cpp rename to src/extensions/applicationextension/duiextensionareaview.cpp index 27a9221c3..531282012 100644 --- a/src/applicationextension/duiextensionareaview.cpp +++ b/src/extensions/applicationextension/duiextensionareaview.cpp @@ -25,6 +25,9 @@ #include "duicontainer.h" DuiExtensionAreaViewPrivate::DuiExtensionAreaViewPrivate() + : controller(0), + layout(0), + q_ptr(NULL) { } @@ -155,13 +158,18 @@ void DuiExtensionAreaViewPrivate::connectContainerToWidget(DuiContainer *contain } DuiExtensionAreaView::DuiExtensionAreaView(DuiExtensionArea *controller) : - DuiWidgetView(* new DuiExtensionAreaViewPrivate, controller) + DuiWidgetView(controller), + d_ptr(new DuiExtensionAreaViewPrivate()) { } DuiExtensionAreaView::DuiExtensionAreaView(DuiExtensionAreaViewPrivate &dd, DuiExtensionArea *controller) : - DuiWidgetView(dd, controller) + DuiWidgetView(controller), + d_ptr(& dd) { + Q_D(DuiExtensionAreaView); + if (d) + d->q_ptr = this; } DuiExtensionAreaView::~DuiExtensionAreaView() diff --git a/src/applicationextension/duiextensionareaview.h b/src/extensions/applicationextension/duiextensionareaview.h similarity index 97% rename from src/applicationextension/duiextensionareaview.h rename to src/extensions/applicationextension/duiextensionareaview.h index dca739b33..b084a1c6d 100644 --- a/src/applicationextension/duiextensionareaview.h +++ b/src/extensions/applicationextension/duiextensionareaview.h @@ -63,6 +63,7 @@ class DUI_EXPORT DuiExtensionAreaView : public DuiWidgetView * \param controller the DuiExtensionArea controller for the view. */ DuiExtensionAreaView(DuiExtensionAreaViewPrivate &dd, DuiExtensionArea *controller); + DuiExtensionAreaViewPrivate *const d_ptr; private: Q_DISABLE_COPY(DuiExtensionAreaView) diff --git a/src/applicationextension/duiextensionareaview_p.h b/src/extensions/applicationextension/duiextensionareaview_p.h similarity index 95% rename from src/applicationextension/duiextensionareaview_p.h rename to src/extensions/applicationextension/duiextensionareaview_p.h index eff87bfde..5a6617f75 100644 --- a/src/applicationextension/duiextensionareaview_p.h +++ b/src/extensions/applicationextension/duiextensionareaview_p.h @@ -20,7 +20,6 @@ #ifndef DUIEXTENSIONAREAVIEW_P_H_ #define DUIEXTENSIONAREAVIEW_P_H_ -#include "private/duiwidgetview_p.h" #include "applicationextension/duiextensionareaview.h" class DuiContainer; @@ -28,7 +27,7 @@ class DuiContainer; /*! * DuiExtensionAreaViewPrivate is the private class for DuiExtensionAreaView. */ -class DuiExtensionAreaViewPrivate : public DuiWidgetViewPrivate +class DuiExtensionAreaViewPrivate { Q_DECLARE_PUBLIC(DuiExtensionAreaView) @@ -44,6 +43,11 @@ class DuiExtensionAreaViewPrivate : public DuiWidgetViewPrivate */ virtual ~DuiExtensionAreaViewPrivate(); + /*! + * pointer to controller + */ + DuiWidgetController *controller; + /*! * Updates the geometry of each widget present in the layout into the data * store. @@ -97,6 +101,9 @@ class DuiExtensionAreaViewPrivate : public DuiWidgetViewPrivate //! Layout used to layout the widget instances on this extension area. QGraphicsLayout *layout; + +protected: + DuiExtensionAreaView *q_ptr; }; #endif /* DUIEXTENSIONAREAVIEW_P_H_ */ diff --git a/src/applicationextension/duiextensionhandle.cpp b/src/extensions/applicationextension/duiextensionhandle.cpp similarity index 98% rename from src/applicationextension/duiextensionhandle.cpp rename to src/extensions/applicationextension/duiextensionhandle.cpp index 7553403f6..98b19425f 100644 --- a/src/applicationextension/duiextensionhandle.cpp +++ b/src/extensions/applicationextension/duiextensionhandle.cpp @@ -72,7 +72,8 @@ DuiExtensionHandlePrivate::DuiExtensionHandlePrivate() : runnerConnectionTimeout(20000), applicationVisible(true), widgetVisible(true), - remoteActions() + remoteActions(), + q_ptr(NULL) { communicationTimer.setSingleShot(true); @@ -112,10 +113,14 @@ void DuiExtensionHandlePrivate::operationProgress(const QString &operation, cons } DuiExtensionHandle::DuiExtensionHandle(QGraphicsItem *parent) : - DuiWidgetController(new DuiExtensionHandlePrivate, new DuiExtensionHandleModel, parent) + DuiWidgetController(new DuiExtensionHandleModel, parent), + d_ptr(new DuiExtensionHandlePrivate()) { Q_D(DuiExtensionHandle); + if (d) + d->q_ptr = this; + // TODO: FIXME - this needs to have the scene specified, // temporarily uses currently active DuiWindow's scene. connect(DuiApplication::activeWindow(), @@ -130,9 +135,12 @@ DuiExtensionHandle::DuiExtensionHandle(QGraphicsItem *parent) : } DuiExtensionHandle::DuiExtensionHandle(DuiExtensionHandlePrivate *dd, DuiExtensionHandleModel *model, QGraphicsItem *parent) : - DuiWidgetController(dd, model, parent) + DuiWidgetController(model, parent), + d_ptr(dd) { Q_D(DuiExtensionHandle); + if (d) + d->q_ptr = this; // TODO: FIXME - this needs to have the scene specified, // temporarily uses currently active DuiWindow's scene. diff --git a/src/applicationextension/duiextensionhandle.h b/src/extensions/applicationextension/duiextensionhandle.h similarity index 96% rename from src/applicationextension/duiextensionhandle.h rename to src/extensions/applicationextension/duiextensionhandle.h index f6b776215..612ed05f5 100644 --- a/src/applicationextension/duiextensionhandle.h +++ b/src/extensions/applicationextension/duiextensionhandle.h @@ -158,6 +158,7 @@ class DuiExtensionHandle : public DuiWidgetController * hierarchy. */ DuiExtensionHandle(DuiExtensionHandlePrivate *dd, DuiExtensionHandleModel *model, QGraphicsItem *parent); + DuiExtensionHandlePrivate *const d_ptr; //! \reimp virtual void mousePressEvent(QGraphicsSceneMouseEvent *event); @@ -258,6 +259,11 @@ protected slots: #ifdef UNIT_TEST friend class Ut_DuiExtensionHandle; #endif + + Q_PRIVATE_SLOT(d_func(), void operationComplete( const QString &operation, + const QString &pkg, const QString &error) ) + Q_PRIVATE_SLOT(d_func(), void operationProgress( const QString &operation, + const QString &pkg, int percentage) ) }; //! \internal_end diff --git a/src/applicationextension/duiextensionhandle_p.h b/src/extensions/applicationextension/duiextensionhandle_p.h similarity index 97% rename from src/applicationextension/duiextensionhandle_p.h rename to src/extensions/applicationextension/duiextensionhandle_p.h index 31b30c0df..da09bb417 100644 --- a/src/applicationextension/duiextensionhandle_p.h +++ b/src/extensions/applicationextension/duiextensionhandle_p.h @@ -33,7 +33,7 @@ class DuiAction; /*! * A private data class for DuiExtensionHandle. */ -class DuiExtensionHandlePrivate : public virtual QObject, public DuiWidgetControllerPrivate +class DuiExtensionHandlePrivate : public QObject { Q_DECLARE_PUBLIC(DuiExtensionHandle) Q_OBJECT @@ -127,6 +127,10 @@ public slots: * \param percentage Current progress percentage */ void operationProgress(const QString &operation, const QString &pkg, int percentage); + +protected: + DuiExtensionHandle *q_ptr; + }; #endif diff --git a/src/applicationextension/duiextensionhandlemodel.h b/src/extensions/applicationextension/duiextensionhandlemodel.h similarity index 100% rename from src/applicationextension/duiextensionhandlemodel.h rename to src/extensions/applicationextension/duiextensionhandlemodel.h diff --git a/src/applicationextension/duiextensionhandleview.cpp b/src/extensions/applicationextension/duiextensionhandleview.cpp similarity index 98% rename from src/applicationextension/duiextensionhandleview.cpp rename to src/extensions/applicationextension/duiextensionhandleview.cpp index 05a899ff1..6229e4a73 100644 --- a/src/applicationextension/duiextensionhandleview.cpp +++ b/src/extensions/applicationextension/duiextensionhandleview.cpp @@ -38,11 +38,13 @@ #endif DuiExtensionHandleViewPrivate::DuiExtensionHandleViewPrivate(DuiExtensionHandle *handle) : + controller(handle), handle(handle), pixmapTakenIntoUse(NULL), pixmapToBeTakenIntoUse(NULL), pixmapSizeToBeTakenIntoUse(NULL), - progressIndicator(new DuiProgressIndicator(handle)) + progressIndicator(new DuiProgressIndicator(handle)), + q_ptr(NULL) { // The progress indicator is not visible by default progressIndicator->setVisible(false); @@ -181,9 +183,12 @@ void DuiExtensionHandleViewPrivate::updateLocalPixmap() } DuiExtensionHandleView::DuiExtensionHandleView(DuiExtensionHandleViewPrivate &dd, DuiExtensionHandle *handle) : - DuiWidgetView(dd, handle) + DuiWidgetView(handle), + d_ptr(&dd) { Q_D(DuiExtensionHandleView); + if (d) + d->q_ptr = this; d->connectSignals(); } diff --git a/src/applicationextension/duiextensionhandleview.h b/src/extensions/applicationextension/duiextensionhandleview.h similarity index 98% rename from src/applicationextension/duiextensionhandleview.h rename to src/extensions/applicationextension/duiextensionhandleview.h index 58c6fa304..9186d260f 100644 --- a/src/applicationextension/duiextensionhandleview.h +++ b/src/extensions/applicationextension/duiextensionhandleview.h @@ -64,6 +64,7 @@ class DuiExtensionHandleView : public DuiWidgetView * \param handle the DuiExtensionHandle controller to be used */ DuiExtensionHandleView(DuiExtensionHandleViewPrivate &dd, DuiExtensionHandle *handle); + DuiExtensionHandleViewPrivate *const d_ptr; protected slots: //! \reimp diff --git a/src/applicationextension/duiextensionhandleview_p.h b/src/extensions/applicationextension/duiextensionhandleview_p.h similarity index 95% rename from src/applicationextension/duiextensionhandleview_p.h rename to src/extensions/applicationextension/duiextensionhandleview_p.h index 924b178e4..c4c4ec6e1 100644 --- a/src/applicationextension/duiextensionhandleview_p.h +++ b/src/extensions/applicationextension/duiextensionhandleview_p.h @@ -20,14 +20,12 @@ #ifndef DUIEXTENSIONHANDLEVIEW_P_H_ #define DUIEXTENSIONHANDLEVIEW_P_H_ -#include "private/duiwidgetview_p.h" - class DuiExtensionHandleView; class DuiExtensionHandle; class QPixmap; class DuiProgressIndicator; -class DuiExtensionHandleViewPrivate : public DuiWidgetViewPrivate +class DuiExtensionHandleViewPrivate { Q_DECLARE_PUBLIC(DuiExtensionHandleView) @@ -35,6 +33,11 @@ class DuiExtensionHandleViewPrivate : public DuiWidgetViewPrivate DuiExtensionHandleViewPrivate(DuiExtensionHandle *handle); virtual ~DuiExtensionHandleViewPrivate(); + /*! + * pointer to controller + */ + DuiWidgetController *controller; + //! The controller DuiExtensionHandle *handle; @@ -107,6 +110,9 @@ class DuiExtensionHandleViewPrivate : public DuiWidgetViewPrivate //! Calculates the scale based on the size hints and available size void calculateScale(); + +protected: + DuiExtensionHandleView *q_ptr; }; #endif /* DUIEXTENSIONHANDLEVIEW_P_H_ */ diff --git a/src/applicationextension/duiextensionrunner.cpp b/src/extensions/applicationextension/duiextensionrunner.cpp similarity index 100% rename from src/applicationextension/duiextensionrunner.cpp rename to src/extensions/applicationextension/duiextensionrunner.cpp diff --git a/src/applicationextension/duiextensionrunner.h b/src/extensions/applicationextension/duiextensionrunner.h similarity index 100% rename from src/applicationextension/duiextensionrunner.h rename to src/extensions/applicationextension/duiextensionrunner.h diff --git a/src/extensions/duiextensionslibrary.cpp b/src/extensions/duiextensionslibrary.cpp new file mode 100644 index 000000000..edfb926c5 --- /dev/null +++ b/src/extensions/duiextensionslibrary.cpp @@ -0,0 +1,5 @@ +// initialize the duiextensions library for styles etc. here + +#include "duilibrary.h" + +DUI_LIBRARY diff --git a/src/extensions/extensions.pro b/src/extensions/extensions.pro new file mode 100644 index 000000000..6eb4b8f59 --- /dev/null +++ b/src/extensions/extensions.pro @@ -0,0 +1,26 @@ +include( ../common_top.pri ) + +TARGET = duiextensions + +INCLUDEPATH += \ + ../include \ + ../include/private \ + applicationextension \ + mashup/mashup \ + style \ + ../corelib/.gen \ + +contains(DEFINES, HAVE_DBUS) { + include(applicationextension/applicationextension.pri) + include(mashup/appletcommunication/appletcommunication.pri) + include(mashup/appletinterface/appletinterface.pri) + include(mashup/appletinstallation/appletinstallation.pri) + include(mashup/mashup/mashup.pri) + include(style/style.pri) +} + +LIBS += -lduiviews -lduisettings + +SOURCES += duiextensionslibrary.cpp + +include(../common_bot.pri) diff --git a/src/mashup/appletcommunication/appletcommunication.pri b/src/extensions/mashup/appletcommunication/appletcommunication.pri similarity index 100% rename from src/mashup/appletcommunication/appletcommunication.pri rename to src/extensions/mashup/appletcommunication/appletcommunication.pri diff --git a/src/mashup/appletcommunication/duiappletalivemessagerequest.cpp b/src/extensions/mashup/appletcommunication/duiappletalivemessagerequest.cpp similarity index 100% rename from src/mashup/appletcommunication/duiappletalivemessagerequest.cpp rename to src/extensions/mashup/appletcommunication/duiappletalivemessagerequest.cpp diff --git a/src/mashup/appletcommunication/duiappletalivemessagerequest.h b/src/extensions/mashup/appletcommunication/duiappletalivemessagerequest.h similarity index 100% rename from src/mashup/appletcommunication/duiappletalivemessagerequest.h rename to src/extensions/mashup/appletcommunication/duiappletalivemessagerequest.h diff --git a/src/mashup/appletcommunication/duiappletalivemessageresponse.cpp b/src/extensions/mashup/appletcommunication/duiappletalivemessageresponse.cpp similarity index 100% rename from src/mashup/appletcommunication/duiappletalivemessageresponse.cpp rename to src/extensions/mashup/appletcommunication/duiappletalivemessageresponse.cpp diff --git a/src/mashup/appletcommunication/duiappletalivemessageresponse.h b/src/extensions/mashup/appletcommunication/duiappletalivemessageresponse.h similarity index 100% rename from src/mashup/appletcommunication/duiappletalivemessageresponse.h rename to src/extensions/mashup/appletcommunication/duiappletalivemessageresponse.h diff --git a/src/mashup/appletcommunication/duiappletcancelmessage.cpp b/src/extensions/mashup/appletcommunication/duiappletcancelmessage.cpp similarity index 100% rename from src/mashup/appletcommunication/duiappletcancelmessage.cpp rename to src/extensions/mashup/appletcommunication/duiappletcancelmessage.cpp diff --git a/src/mashup/appletcommunication/duiappletcancelmessage.h b/src/extensions/mashup/appletcommunication/duiappletcancelmessage.h similarity index 100% rename from src/mashup/appletcommunication/duiappletcancelmessage.h rename to src/extensions/mashup/appletcommunication/duiappletcancelmessage.h diff --git a/src/mashup/appletcommunication/duiappletclient.cpp b/src/extensions/mashup/appletcommunication/duiappletclient.cpp similarity index 100% rename from src/mashup/appletcommunication/duiappletclient.cpp rename to src/extensions/mashup/appletcommunication/duiappletclient.cpp diff --git a/src/mashup/appletcommunication/duiappletclient.h b/src/extensions/mashup/appletcommunication/duiappletclient.h similarity index 100% rename from src/mashup/appletcommunication/duiappletclient.h rename to src/extensions/mashup/appletcommunication/duiappletclient.h diff --git a/src/mashup/appletcommunication/duiappletcommunicator.cpp b/src/extensions/mashup/appletcommunication/duiappletcommunicator.cpp similarity index 100% rename from src/mashup/appletcommunication/duiappletcommunicator.cpp rename to src/extensions/mashup/appletcommunication/duiappletcommunicator.cpp diff --git a/src/mashup/appletcommunication/duiappletcommunicator.h b/src/extensions/mashup/appletcommunication/duiappletcommunicator.h similarity index 100% rename from src/mashup/appletcommunication/duiappletcommunicator.h rename to src/extensions/mashup/appletcommunication/duiappletcommunicator.h diff --git a/src/mashup/appletcommunication/duiappleticonchangedmessage.cpp b/src/extensions/mashup/appletcommunication/duiappleticonchangedmessage.cpp similarity index 100% rename from src/mashup/appletcommunication/duiappleticonchangedmessage.cpp rename to src/extensions/mashup/appletcommunication/duiappleticonchangedmessage.cpp diff --git a/src/mashup/appletcommunication/duiappleticonchangedmessage.h b/src/extensions/mashup/appletcommunication/duiappleticonchangedmessage.h similarity index 100% rename from src/mashup/appletcommunication/duiappleticonchangedmessage.h rename to src/extensions/mashup/appletcommunication/duiappleticonchangedmessage.h diff --git a/src/mashup/appletcommunication/duiappletmessage.cpp b/src/extensions/mashup/appletcommunication/duiappletmessage.cpp similarity index 100% rename from src/mashup/appletcommunication/duiappletmessage.cpp rename to src/extensions/mashup/appletcommunication/duiappletmessage.cpp diff --git a/src/mashup/appletcommunication/duiappletmessage.h b/src/extensions/mashup/appletcommunication/duiappletmessage.h similarity index 100% rename from src/mashup/appletcommunication/duiappletmessage.h rename to src/extensions/mashup/appletcommunication/duiappletmessage.h diff --git a/src/mashup/appletcommunication/duiappletmessagefactory.cpp b/src/extensions/mashup/appletcommunication/duiappletmessagefactory.cpp similarity index 100% rename from src/mashup/appletcommunication/duiappletmessagefactory.cpp rename to src/extensions/mashup/appletcommunication/duiappletmessagefactory.cpp diff --git a/src/mashup/appletcommunication/duiappletmessagefactory.h b/src/extensions/mashup/appletcommunication/duiappletmessagefactory.h similarity index 100% rename from src/mashup/appletcommunication/duiappletmessagefactory.h rename to src/extensions/mashup/appletcommunication/duiappletmessagefactory.h diff --git a/src/mashup/appletcommunication/duiappletmousemessage.cpp b/src/extensions/mashup/appletcommunication/duiappletmousemessage.cpp similarity index 100% rename from src/mashup/appletcommunication/duiappletmousemessage.cpp rename to src/extensions/mashup/appletcommunication/duiappletmousemessage.cpp diff --git a/src/mashup/appletcommunication/duiappletmousemessage.h b/src/extensions/mashup/appletcommunication/duiappletmousemessage.h similarity index 100% rename from src/mashup/appletcommunication/duiappletmousemessage.h rename to src/extensions/mashup/appletcommunication/duiappletmousemessage.h diff --git a/src/mashup/appletcommunication/duiappletobjectmenuactionselectedmessage.cpp b/src/extensions/mashup/appletcommunication/duiappletobjectmenuactionselectedmessage.cpp similarity index 100% rename from src/mashup/appletcommunication/duiappletobjectmenuactionselectedmessage.cpp rename to src/extensions/mashup/appletcommunication/duiappletobjectmenuactionselectedmessage.cpp diff --git a/src/mashup/appletcommunication/duiappletobjectmenuactionselectedmessage.h b/src/extensions/mashup/appletcommunication/duiappletobjectmenuactionselectedmessage.h similarity index 100% rename from src/mashup/appletcommunication/duiappletobjectmenuactionselectedmessage.h rename to src/extensions/mashup/appletcommunication/duiappletobjectmenuactionselectedmessage.h diff --git a/src/mashup/appletcommunication/duiappletobjectmenumessage.cpp b/src/extensions/mashup/appletcommunication/duiappletobjectmenumessage.cpp similarity index 100% rename from src/mashup/appletcommunication/duiappletobjectmenumessage.cpp rename to src/extensions/mashup/appletcommunication/duiappletobjectmenumessage.cpp diff --git a/src/mashup/appletcommunication/duiappletobjectmenumessage.h b/src/extensions/mashup/appletcommunication/duiappletobjectmenumessage.h similarity index 100% rename from src/mashup/appletcommunication/duiappletobjectmenumessage.h rename to src/extensions/mashup/appletcommunication/duiappletobjectmenumessage.h diff --git a/src/mashup/appletcommunication/duiappletobjectmenurequestmessage.cpp b/src/extensions/mashup/appletcommunication/duiappletobjectmenurequestmessage.cpp similarity index 100% rename from src/mashup/appletcommunication/duiappletobjectmenurequestmessage.cpp rename to src/extensions/mashup/appletcommunication/duiappletobjectmenurequestmessage.cpp diff --git a/src/mashup/appletcommunication/duiappletobjectmenurequestmessage.h b/src/extensions/mashup/appletcommunication/duiappletobjectmenurequestmessage.h similarity index 100% rename from src/mashup/appletcommunication/duiappletobjectmenurequestmessage.h rename to src/extensions/mashup/appletcommunication/duiappletobjectmenurequestmessage.h diff --git a/src/mashup/appletcommunication/duiappletorientationmessage.cpp b/src/extensions/mashup/appletcommunication/duiappletorientationmessage.cpp similarity index 100% rename from src/mashup/appletcommunication/duiappletorientationmessage.cpp rename to src/extensions/mashup/appletcommunication/duiappletorientationmessage.cpp diff --git a/src/mashup/appletcommunication/duiappletorientationmessage.h b/src/extensions/mashup/appletcommunication/duiappletorientationmessage.h similarity index 100% rename from src/mashup/appletcommunication/duiappletorientationmessage.h rename to src/extensions/mashup/appletcommunication/duiappletorientationmessage.h diff --git a/src/mashup/appletcommunication/duiappletpixmapmodifiedmessage.cpp b/src/extensions/mashup/appletcommunication/duiappletpixmapmodifiedmessage.cpp similarity index 100% rename from src/mashup/appletcommunication/duiappletpixmapmodifiedmessage.cpp rename to src/extensions/mashup/appletcommunication/duiappletpixmapmodifiedmessage.cpp diff --git a/src/mashup/appletcommunication/duiappletpixmapmodifiedmessage.h b/src/extensions/mashup/appletcommunication/duiappletpixmapmodifiedmessage.h similarity index 100% rename from src/mashup/appletcommunication/duiappletpixmapmodifiedmessage.h rename to src/extensions/mashup/appletcommunication/duiappletpixmapmodifiedmessage.h diff --git a/src/mashup/appletcommunication/duiappletpixmaptakenintousemessage.cpp b/src/extensions/mashup/appletcommunication/duiappletpixmaptakenintousemessage.cpp similarity index 100% rename from src/mashup/appletcommunication/duiappletpixmaptakenintousemessage.cpp rename to src/extensions/mashup/appletcommunication/duiappletpixmaptakenintousemessage.cpp diff --git a/src/mashup/appletcommunication/duiappletpixmaptakenintousemessage.h b/src/extensions/mashup/appletcommunication/duiappletpixmaptakenintousemessage.h similarity index 100% rename from src/mashup/appletcommunication/duiappletpixmaptakenintousemessage.h rename to src/extensions/mashup/appletcommunication/duiappletpixmaptakenintousemessage.h diff --git a/src/mashup/appletcommunication/duiappletserver.cpp b/src/extensions/mashup/appletcommunication/duiappletserver.cpp similarity index 100% rename from src/mashup/appletcommunication/duiappletserver.cpp rename to src/extensions/mashup/appletcommunication/duiappletserver.cpp diff --git a/src/mashup/appletcommunication/duiappletserver.h b/src/extensions/mashup/appletcommunication/duiappletserver.h similarity index 100% rename from src/mashup/appletcommunication/duiappletserver.h rename to src/extensions/mashup/appletcommunication/duiappletserver.h diff --git a/src/mashup/appletcommunication/duiappletsetgeometrymessage.cpp b/src/extensions/mashup/appletcommunication/duiappletsetgeometrymessage.cpp similarity index 100% rename from src/mashup/appletcommunication/duiappletsetgeometrymessage.cpp rename to src/extensions/mashup/appletcommunication/duiappletsetgeometrymessage.cpp diff --git a/src/mashup/appletcommunication/duiappletsetgeometrymessage.h b/src/extensions/mashup/appletcommunication/duiappletsetgeometrymessage.h similarity index 100% rename from src/mashup/appletcommunication/duiappletsetgeometrymessage.h rename to src/extensions/mashup/appletcommunication/duiappletsetgeometrymessage.h diff --git a/src/mashup/appletcommunication/duiapplettextchangedmessage.cpp b/src/extensions/mashup/appletcommunication/duiapplettextchangedmessage.cpp similarity index 100% rename from src/mashup/appletcommunication/duiapplettextchangedmessage.cpp rename to src/extensions/mashup/appletcommunication/duiapplettextchangedmessage.cpp diff --git a/src/mashup/appletcommunication/duiapplettextchangedmessage.h b/src/extensions/mashup/appletcommunication/duiapplettextchangedmessage.h similarity index 100% rename from src/mashup/appletcommunication/duiapplettextchangedmessage.h rename to src/extensions/mashup/appletcommunication/duiapplettextchangedmessage.h diff --git a/src/mashup/appletcommunication/duiapplettitlechangedmessage.cpp b/src/extensions/mashup/appletcommunication/duiapplettitlechangedmessage.cpp similarity index 100% rename from src/mashup/appletcommunication/duiapplettitlechangedmessage.cpp rename to src/extensions/mashup/appletcommunication/duiapplettitlechangedmessage.cpp diff --git a/src/mashup/appletcommunication/duiapplettitlechangedmessage.h b/src/extensions/mashup/appletcommunication/duiapplettitlechangedmessage.h similarity index 100% rename from src/mashup/appletcommunication/duiapplettitlechangedmessage.h rename to src/extensions/mashup/appletcommunication/duiapplettitlechangedmessage.h diff --git a/src/mashup/appletcommunication/duiappletupdategeometrymessage.cpp b/src/extensions/mashup/appletcommunication/duiappletupdategeometrymessage.cpp similarity index 100% rename from src/mashup/appletcommunication/duiappletupdategeometrymessage.cpp rename to src/extensions/mashup/appletcommunication/duiappletupdategeometrymessage.cpp diff --git a/src/mashup/appletcommunication/duiappletupdategeometrymessage.h b/src/extensions/mashup/appletcommunication/duiappletupdategeometrymessage.h similarity index 100% rename from src/mashup/appletcommunication/duiappletupdategeometrymessage.h rename to src/extensions/mashup/appletcommunication/duiappletupdategeometrymessage.h diff --git a/src/mashup/appletcommunication/duiappletvisibilitymessage.cpp b/src/extensions/mashup/appletcommunication/duiappletvisibilitymessage.cpp similarity index 100% rename from src/mashup/appletcommunication/duiappletvisibilitymessage.cpp rename to src/extensions/mashup/appletcommunication/duiappletvisibilitymessage.cpp diff --git a/src/mashup/appletcommunication/duiappletvisibilitymessage.h b/src/extensions/mashup/appletcommunication/duiappletvisibilitymessage.h similarity index 100% rename from src/mashup/appletcommunication/duiappletvisibilitymessage.h rename to src/extensions/mashup/appletcommunication/duiappletvisibilitymessage.h diff --git a/src/mashup/appletinstallation/appletinstallation.pri b/src/extensions/mashup/appletinstallation/appletinstallation.pri similarity index 100% rename from src/mashup/appletinstallation/appletinstallation.pri rename to src/extensions/mashup/appletinstallation/appletinstallation.pri diff --git a/src/mashup/appletinstallation/duiappletinstallationsourceinterface.h b/src/extensions/mashup/appletinstallation/duiappletinstallationsourceinterface.h similarity index 100% rename from src/mashup/appletinstallation/duiappletinstallationsourceinterface.h rename to src/extensions/mashup/appletinstallation/duiappletinstallationsourceinterface.h diff --git a/src/mashup/appletinstallation/duiappletinstantiator.cpp b/src/extensions/mashup/appletinstallation/duiappletinstantiator.cpp similarity index 100% rename from src/mashup/appletinstallation/duiappletinstantiator.cpp rename to src/extensions/mashup/appletinstallation/duiappletinstantiator.cpp diff --git a/src/mashup/appletinstallation/duiappletinstantiator.h b/src/extensions/mashup/appletinstallation/duiappletinstantiator.h similarity index 100% rename from src/mashup/appletinstallation/duiappletinstantiator.h rename to src/extensions/mashup/appletinstallation/duiappletinstantiator.h diff --git a/src/mashup/appletinstallation/duiappletinstantiator_p.h b/src/extensions/mashup/appletinstallation/duiappletinstantiator_p.h similarity index 100% rename from src/mashup/appletinstallation/duiappletinstantiator_p.h rename to src/extensions/mashup/appletinstallation/duiappletinstantiator_p.h diff --git a/src/mashup/appletinterface/appletinterface.pri b/src/extensions/mashup/appletinterface/appletinterface.pri similarity index 100% rename from src/mashup/appletinterface/appletinterface.pri rename to src/extensions/mashup/appletinterface/appletinterface.pri diff --git a/src/mashup/appletinterface/duiappletinterface.h b/src/extensions/mashup/appletinterface/duiappletinterface.h similarity index 100% rename from src/mashup/appletinterface/duiappletinterface.h rename to src/extensions/mashup/appletinterface/duiappletinterface.h diff --git a/src/mashup/appletinterface/duiappletmetadata.cpp b/src/extensions/mashup/appletinterface/duiappletmetadata.cpp similarity index 100% rename from src/mashup/appletinterface/duiappletmetadata.cpp rename to src/extensions/mashup/appletinterface/duiappletmetadata.cpp diff --git a/src/mashup/appletinterface/duiappletmetadata.h b/src/extensions/mashup/appletinterface/duiappletmetadata.h similarity index 100% rename from src/mashup/appletinterface/duiappletmetadata.h rename to src/extensions/mashup/appletinterface/duiappletmetadata.h diff --git a/src/mashup/mashup.pri b/src/extensions/mashup/mashup.pri similarity index 100% rename from src/mashup/mashup.pri rename to src/extensions/mashup/mashup.pri diff --git a/src/mashup/mashup/duiaggregatedataaccess.cpp b/src/extensions/mashup/mashup/duiaggregatedataaccess.cpp similarity index 100% rename from src/mashup/mashup/duiaggregatedataaccess.cpp rename to src/extensions/mashup/mashup/duiaggregatedataaccess.cpp diff --git a/src/mashup/mashup/duiaggregatedataaccess.h b/src/extensions/mashup/mashup/duiaggregatedataaccess.h similarity index 100% rename from src/mashup/mashup/duiaggregatedataaccess.h rename to src/extensions/mashup/mashup/duiaggregatedataaccess.h diff --git a/src/mashup/mashup/duiaggregatedataaccess_p.h b/src/extensions/mashup/mashup/duiaggregatedataaccess_p.h similarity index 100% rename from src/mashup/mashup/duiaggregatedataaccess_p.h rename to src/extensions/mashup/mashup/duiaggregatedataaccess_p.h diff --git a/src/mashup/mashup/duiappletbutton.cpp b/src/extensions/mashup/mashup/duiappletbutton.cpp similarity index 100% rename from src/mashup/mashup/duiappletbutton.cpp rename to src/extensions/mashup/mashup/duiappletbutton.cpp diff --git a/src/mashup/mashup/duiappletbutton.h b/src/extensions/mashup/mashup/duiappletbutton.h similarity index 100% rename from src/mashup/mashup/duiappletbutton.h rename to src/extensions/mashup/mashup/duiappletbutton.h diff --git a/src/mashup/mashup/duiapplethandle.cpp b/src/extensions/mashup/mashup/duiapplethandle.cpp similarity index 100% rename from src/mashup/mashup/duiapplethandle.cpp rename to src/extensions/mashup/mashup/duiapplethandle.cpp diff --git a/src/mashup/mashup/duiapplethandle.h b/src/extensions/mashup/mashup/duiapplethandle.h similarity index 100% rename from src/mashup/mashup/duiapplethandle.h rename to src/extensions/mashup/mashup/duiapplethandle.h diff --git a/src/mashup/mashup/duiapplethandle_p.h b/src/extensions/mashup/mashup/duiapplethandle_p.h similarity index 100% rename from src/mashup/mashup/duiapplethandle_p.h rename to src/extensions/mashup/mashup/duiapplethandle_p.h diff --git a/src/mashup/mashup/duiapplethandlemodel.h b/src/extensions/mashup/mashup/duiapplethandlemodel.h similarity index 100% rename from src/mashup/mashup/duiapplethandlemodel.h rename to src/extensions/mashup/mashup/duiapplethandlemodel.h diff --git a/src/mashup/mashup/duiapplethandleview.cpp b/src/extensions/mashup/mashup/duiapplethandleview.cpp similarity index 100% rename from src/mashup/mashup/duiapplethandleview.cpp rename to src/extensions/mashup/mashup/duiapplethandleview.cpp diff --git a/src/mashup/mashup/duiapplethandleview.h b/src/extensions/mashup/mashup/duiapplethandleview.h similarity index 100% rename from src/mashup/mashup/duiapplethandleview.h rename to src/extensions/mashup/mashup/duiapplethandleview.h diff --git a/src/mashup/mashup/duiapplethandleview_p.h b/src/extensions/mashup/mashup/duiapplethandleview_p.h similarity index 100% rename from src/mashup/mashup/duiapplethandleview_p.h rename to src/extensions/mashup/mashup/duiapplethandleview_p.h diff --git a/src/mashup/mashup/duiappletid.cpp b/src/extensions/mashup/mashup/duiappletid.cpp similarity index 100% rename from src/mashup/mashup/duiappletid.cpp rename to src/extensions/mashup/mashup/duiappletid.cpp diff --git a/src/mashup/mashup/duiappletid.h b/src/extensions/mashup/mashup/duiappletid.h similarity index 100% rename from src/mashup/mashup/duiappletid.h rename to src/extensions/mashup/mashup/duiappletid.h diff --git a/src/mashup/mashup/duiappletinstancedata.cpp b/src/extensions/mashup/mashup/duiappletinstancedata.cpp similarity index 100% rename from src/mashup/mashup/duiappletinstancedata.cpp rename to src/extensions/mashup/mashup/duiappletinstancedata.cpp diff --git a/src/mashup/mashup/duiappletinstancedata.h b/src/extensions/mashup/mashup/duiappletinstancedata.h similarity index 100% rename from src/mashup/mashup/duiappletinstancedata.h rename to src/extensions/mashup/mashup/duiappletinstancedata.h diff --git a/src/mashup/mashup/duiappletinstancemanager.cpp b/src/extensions/mashup/mashup/duiappletinstancemanager.cpp similarity index 100% rename from src/mashup/mashup/duiappletinstancemanager.cpp rename to src/extensions/mashup/mashup/duiappletinstancemanager.cpp diff --git a/src/mashup/mashup/duiappletinstancemanager.h b/src/extensions/mashup/mashup/duiappletinstancemanager.h similarity index 100% rename from src/mashup/mashup/duiappletinstancemanager.h rename to src/extensions/mashup/mashup/duiappletinstancemanager.h diff --git a/src/mashup/mashup/duiappletinstancemanagerdbusadaptor.cpp b/src/extensions/mashup/mashup/duiappletinstancemanagerdbusadaptor.cpp similarity index 100% rename from src/mashup/mashup/duiappletinstancemanagerdbusadaptor.cpp rename to src/extensions/mashup/mashup/duiappletinstancemanagerdbusadaptor.cpp diff --git a/src/mashup/mashup/duiappletinstancemanagerdbusadaptor.h b/src/extensions/mashup/mashup/duiappletinstancemanagerdbusadaptor.h similarity index 100% rename from src/mashup/mashup/duiappletinstancemanagerdbusadaptor.h rename to src/extensions/mashup/mashup/duiappletinstancemanagerdbusadaptor.h diff --git a/src/mashup/mashup/duiappletinstancemanagerdbusinterface.xml b/src/extensions/mashup/mashup/duiappletinstancemanagerdbusinterface.xml similarity index 100% rename from src/mashup/mashup/duiappletinstancemanagerdbusinterface.xml rename to src/extensions/mashup/mashup/duiappletinstancemanagerdbusinterface.xml diff --git a/src/mashup/mashup/duiappletinventory.cpp b/src/extensions/mashup/mashup/duiappletinventory.cpp similarity index 98% rename from src/mashup/mashup/duiappletinventory.cpp rename to src/extensions/mashup/mashup/duiappletinventory.cpp index 3b31bfdd2..5e2a525ad 100644 --- a/src/mashup/mashup/duiappletinventory.cpp +++ b/src/extensions/mashup/mashup/duiappletinventory.cpp @@ -35,7 +35,7 @@ DUI_REGISTER_WIDGET_NO_CREATE(DuiAppletInventory) DuiAppletInventory::DuiAppletInventory(QGraphicsItem *parent) : - DuiWidgetController(new DuiWidgetControllerPrivate, new DuiAppletInventoryModel, parent), + DuiWidgetController(new DuiAppletInventoryModel, parent), mashupCanvas(NULL), watcher(new QFileSystemWatcher()), appletPath(APPLET_DATA), diff --git a/src/mashup/mashup/duiappletinventory.h b/src/extensions/mashup/mashup/duiappletinventory.h similarity index 100% rename from src/mashup/mashup/duiappletinventory.h rename to src/extensions/mashup/mashup/duiappletinventory.h diff --git a/src/mashup/mashup/duiappletinventorymodel.h b/src/extensions/mashup/mashup/duiappletinventorymodel.h similarity index 100% rename from src/mashup/mashup/duiappletinventorymodel.h rename to src/extensions/mashup/mashup/duiappletinventorymodel.h diff --git a/src/mashup/mashup/duiappletinventoryview.cpp b/src/extensions/mashup/mashup/duiappletinventoryview.cpp similarity index 97% rename from src/mashup/mashup/duiappletinventoryview.cpp rename to src/extensions/mashup/mashup/duiappletinventoryview.cpp index 888ecc5e6..e92b761c8 100644 --- a/src/mashup/mashup/duiappletinventoryview.cpp +++ b/src/extensions/mashup/mashup/duiappletinventoryview.cpp @@ -40,7 +40,8 @@ DuiAppletInventoryViewPrivate::DuiAppletInventoryViewPrivate() : appletLayoutPolicy(new DuiFlowLayoutPolicy(appletLayout)), appletContainer(NULL), closeButtonOverlay(new DuiOverlay), - closeButton(new DuiButton(closeButtonOverlay)) + closeButton(new DuiButton(closeButtonOverlay)), + q_ptr(NULL) { } @@ -82,7 +83,8 @@ void DuiAppletInventoryViewPrivate::init(DuiAppletInventory *controller) } DuiAppletInventoryView::DuiAppletInventoryView(DuiAppletInventory *container) : - DuiExtendingBackgroundView(* new DuiAppletInventoryViewPrivate, container) + DuiExtendingBackgroundView(container), + d_ptr(new DuiAppletInventoryViewPrivate()) { Q_D(DuiAppletInventoryView); d->init(container); diff --git a/src/mashup/mashup/duiappletinventoryview.h b/src/extensions/mashup/mashup/duiappletinventoryview.h similarity index 97% rename from src/mashup/mashup/duiappletinventoryview.h rename to src/extensions/mashup/mashup/duiappletinventoryview.h index 4f00514d9..e339fe85e 100644 --- a/src/mashup/mashup/duiappletinventoryview.h +++ b/src/extensions/mashup/mashup/duiappletinventoryview.h @@ -70,6 +70,9 @@ private slots: //! List of applet installation source container widgets displayed on the inventory QList installationSourceContainers; + +protected: + DuiAppletInventoryViewPrivate *const d_ptr; }; //! \internal_end diff --git a/src/mashup/mashup/duiappletinventoryview_p.h b/src/extensions/mashup/mashup/duiappletinventoryview_p.h similarity index 94% rename from src/mashup/mashup/duiappletinventoryview_p.h rename to src/extensions/mashup/mashup/duiappletinventoryview_p.h index cb4107bc8..5293496e3 100644 --- a/src/mashup/mashup/duiappletinventoryview_p.h +++ b/src/extensions/mashup/mashup/duiappletinventoryview_p.h @@ -20,8 +20,6 @@ #ifndef DUIAPPLETINVENTORYVIEW_P_H_ #define DUIAPPLETINVENTORYVIEW_P_H_ -#include "private/duiextendingbackgroundview_p.h" - class DuiAppletInventory; class DuiLayout; class DuiFlowLayoutPolicy; @@ -33,7 +31,7 @@ class DuiContainer; /*! * The private class for DuiAppletInventoryView. */ -class DuiAppletInventoryViewPrivate : public DuiExtendingBackgroundViewPrivate +class DuiAppletInventoryViewPrivate { Q_DECLARE_PUBLIC(DuiAppletInventoryView) @@ -78,6 +76,9 @@ class DuiAppletInventoryViewPrivate : public DuiExtendingBackgroundViewPrivate //! A close button DuiButton *closeButton; + +protected: + DuiAppletInventoryView *q_ptr; }; #endif /* DUIAPPLETINVENTORYVIEW_P_H_ */ diff --git a/src/mashup/mashup/duiappletloader.cpp b/src/extensions/mashup/mashup/duiappletloader.cpp similarity index 100% rename from src/mashup/mashup/duiappletloader.cpp rename to src/extensions/mashup/mashup/duiappletloader.cpp diff --git a/src/mashup/mashup/duiappletloader.h b/src/extensions/mashup/mashup/duiappletloader.h similarity index 100% rename from src/mashup/mashup/duiappletloader.h rename to src/extensions/mashup/mashup/duiappletloader.h diff --git a/src/mashup/mashup/duiappletpackagemetadata.h b/src/extensions/mashup/mashup/duiappletpackagemetadata.h similarity index 100% rename from src/mashup/mashup/duiappletpackagemetadata.h rename to src/extensions/mashup/mashup/duiappletpackagemetadata.h diff --git a/src/mashup/mashup/duiappletsettings.cpp b/src/extensions/mashup/mashup/duiappletsettings.cpp similarity index 100% rename from src/mashup/mashup/duiappletsettings.cpp rename to src/extensions/mashup/mashup/duiappletsettings.cpp diff --git a/src/mashup/mashup/duiappletsettings.h b/src/extensions/mashup/mashup/duiappletsettings.h similarity index 100% rename from src/mashup/mashup/duiappletsettings.h rename to src/extensions/mashup/mashup/duiappletsettings.h diff --git a/src/mashup/mashup/duiappletsettings_p.h b/src/extensions/mashup/mashup/duiappletsettings_p.h similarity index 100% rename from src/mashup/mashup/duiappletsettings_p.h rename to src/extensions/mashup/mashup/duiappletsettings_p.h diff --git a/src/mashup/mashup/duiappletsettingsdialog.cpp b/src/extensions/mashup/mashup/duiappletsettingsdialog.cpp similarity index 100% rename from src/mashup/mashup/duiappletsettingsdialog.cpp rename to src/extensions/mashup/mashup/duiappletsettingsdialog.cpp diff --git a/src/mashup/mashup/duiappletsettingsdialog.h b/src/extensions/mashup/mashup/duiappletsettingsdialog.h similarity index 100% rename from src/mashup/mashup/duiappletsettingsdialog.h rename to src/extensions/mashup/mashup/duiappletsettingsdialog.h diff --git a/src/mashup/mashup/duiappletsharedmutex.cpp b/src/extensions/mashup/mashup/duiappletsharedmutex.cpp similarity index 100% rename from src/mashup/mashup/duiappletsharedmutex.cpp rename to src/extensions/mashup/mashup/duiappletsharedmutex.cpp diff --git a/src/mashup/mashup/duiappletsharedmutex.h b/src/extensions/mashup/mashup/duiappletsharedmutex.h similarity index 100% rename from src/mashup/mashup/duiappletsharedmutex.h rename to src/extensions/mashup/mashup/duiappletsharedmutex.h diff --git a/src/mashup/mashup/duiappletsharedmutex_p.h b/src/extensions/mashup/mashup/duiappletsharedmutex_p.h similarity index 100% rename from src/mashup/mashup/duiappletsharedmutex_p.h rename to src/extensions/mashup/mashup/duiappletsharedmutex_p.h diff --git a/src/mashup/mashup/duigconfdatastore.cpp b/src/extensions/mashup/mashup/duigconfdatastore.cpp similarity index 100% rename from src/mashup/mashup/duigconfdatastore.cpp rename to src/extensions/mashup/mashup/duigconfdatastore.cpp diff --git a/src/mashup/mashup/duigconfdatastore.h b/src/extensions/mashup/mashup/duigconfdatastore.h similarity index 100% rename from src/mashup/mashup/duigconfdatastore.h rename to src/extensions/mashup/mashup/duigconfdatastore.h diff --git a/src/mashup/mashup/duigconfdatastore_p.h b/src/extensions/mashup/mashup/duigconfdatastore_p.h similarity index 100% rename from src/mashup/mashup/duigconfdatastore_p.h rename to src/extensions/mashup/mashup/duigconfdatastore_p.h diff --git a/src/mashup/mashup/duimashupcanvas.cpp b/src/extensions/mashup/mashup/duimashupcanvas.cpp similarity index 97% rename from src/mashup/mashup/duimashupcanvas.cpp rename to src/extensions/mashup/mashup/duimashupcanvas.cpp index 6c84b1a19..308d1b4b9 100644 --- a/src/mashup/mashup/duimashupcanvas.cpp +++ b/src/extensions/mashup/mashup/duimashupcanvas.cpp @@ -36,7 +36,8 @@ DUI_REGISTER_WIDGET_NO_CREATE(DuiMashupCanvas) QSet DuiMashupCanvasPrivate::allMashupCanvasIdentifiers; -DuiMashupCanvasPrivate::DuiMashupCanvasPrivate() : instanceManager(NULL) +DuiMashupCanvasPrivate::DuiMashupCanvasPrivate() + : instanceManager(NULL) { } @@ -107,7 +108,6 @@ DuiMashupCanvas::DuiMashupCanvas(const QString &identifier, QGraphicsItem *paren { // Initialize the private implementation Q_D(DuiMashupCanvas); - d->q_ptr = this; d->init(identifier); } @@ -115,7 +115,6 @@ DuiMashupCanvas::DuiMashupCanvas(DuiMashupCanvasPrivate *dd, DuiMashupCanvasMode DuiExtensionArea(dd, model, parent) { Q_D(DuiMashupCanvas); - // Initialize the private implementation d->init(identifier); } diff --git a/src/mashup/mashup/duimashupcanvas.h b/src/extensions/mashup/mashup/duimashupcanvas.h similarity index 100% rename from src/mashup/mashup/duimashupcanvas.h rename to src/extensions/mashup/mashup/duimashupcanvas.h diff --git a/src/mashup/mashup/duimashupcanvas_p.h b/src/extensions/mashup/mashup/duimashupcanvas_p.h similarity index 96% rename from src/mashup/mashup/duimashupcanvas_p.h rename to src/extensions/mashup/mashup/duimashupcanvas_p.h index 5e6d005f8..3aa17b6ef 100644 --- a/src/mashup/mashup/duimashupcanvas_p.h +++ b/src/extensions/mashup/mashup/duimashupcanvas_p.h @@ -20,8 +20,7 @@ #ifndef DUIMASHUPCANVAS_P_H #define DUIMASHUPCANVAS_P_H -#include "private/duiwidgetcontroller_p.h" -#include "applicationextension/duiextensionarea_p.h" +#include "duiextensionarea_p.h" class DuiDataStore; class DuiAppletInstanceManager; diff --git a/src/extensions/mashup/mashup/duimashupcanvasmodel.cpp b/src/extensions/mashup/mashup/duimashupcanvasmodel.cpp new file mode 100644 index 000000000..3e2dc604e --- /dev/null +++ b/src/extensions/mashup/mashup/duimashupcanvasmodel.cpp @@ -0,0 +1,26 @@ +/*************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (directui@nokia.com) +** +** This file is part of libdui. +** +** If you have questions regarding the use of this file, please contact +** Nokia at directui@nokia.com. +** +** This library is free software; you can redistribute it and/or +** modify it under the terms of the GNU Lesser General Public +** License version 2.1 as published by the Free Software Foundation +** and appearing in the file LICENSE.LGPL included in the packaging +** of this file. +** +****************************************************************************/ + +#include "duimashupcanvasmodel.h" +#include "gen_duimashupcanvasmodeldata.h" + +void DuiMashupCanvasModel::dataStoresModified() +{ + memberModified(DataStores); +} diff --git a/src/mashup/mashup/duimashupcanvasmodel.h b/src/extensions/mashup/mashup/duimashupcanvasmodel.h similarity index 100% rename from src/mashup/mashup/duimashupcanvasmodel.h rename to src/extensions/mashup/mashup/duimashupcanvasmodel.h diff --git a/src/mashup/mashup/duimashupcanvasview.cpp b/src/extensions/mashup/mashup/duimashupcanvasview.cpp similarity index 98% rename from src/mashup/mashup/duimashupcanvasview.cpp rename to src/extensions/mashup/mashup/duimashupcanvasview.cpp index 0a1181f5f..282f32901 100644 --- a/src/mashup/mashup/duimashupcanvasview.cpp +++ b/src/extensions/mashup/mashup/duimashupcanvasview.cpp @@ -147,7 +147,7 @@ void DuiMashupCanvasViewPrivate::connectContainerToWidget(DuiContainer *containe DuiMashupCanvasView::DuiMashupCanvasView(DuiMashupCanvas *controller) : - DuiWidgetView(* new DuiMashupCanvasViewPrivate, controller) + DuiExtensionAreaView(* new DuiMashupCanvasViewPrivate, controller) { Q_D(DuiMashupCanvasView); d->q_ptr = this; @@ -157,7 +157,7 @@ DuiMashupCanvasView::DuiMashupCanvasView(DuiMashupCanvas *controller) : } DuiMashupCanvasView::DuiMashupCanvasView(DuiMashupCanvasViewPrivate &dd, DuiMashupCanvas *controller) : - DuiWidgetView(dd, controller) + DuiExtensionAreaView(dd, controller) { init(controller); } diff --git a/src/mashup/mashup/duimashupcanvasview.h b/src/extensions/mashup/mashup/duimashupcanvasview.h similarity index 96% rename from src/mashup/mashup/duimashupcanvasview.h rename to src/extensions/mashup/mashup/duimashupcanvasview.h index 5b5f31c2b..690a96dc3 100644 --- a/src/mashup/mashup/duimashupcanvasview.h +++ b/src/extensions/mashup/mashup/duimashupcanvasview.h @@ -20,7 +20,7 @@ #ifndef DUIMASHUPCANVASVIEW_H_ #define DUIMASHUPCANVASVIEW_H_ -#include +#include "duiextensionareaview.h" #include #include "duimashupcanvasmodel.h" #include "duimashupcanvasstyle.h" @@ -32,7 +32,7 @@ class DuiContainer; /*! * A view class for the DuiMashupCanvas. */ -class DUI_EXPORT DuiMashupCanvasView : public DuiWidgetView +class DUI_EXPORT DuiMashupCanvasView : public DuiExtensionAreaView { Q_OBJECT DUI_VIEW(DuiMashupCanvasModel, DuiMashupCanvasStyle) diff --git a/src/mashup/mashup/duimashupcanvasview_p.h b/src/extensions/mashup/mashup/duimashupcanvasview_p.h similarity index 96% rename from src/mashup/mashup/duimashupcanvasview_p.h rename to src/extensions/mashup/mashup/duimashupcanvasview_p.h index fe2539d32..c373e058f 100644 --- a/src/mashup/mashup/duimashupcanvasview_p.h +++ b/src/extensions/mashup/mashup/duimashupcanvasview_p.h @@ -20,8 +20,8 @@ #ifndef DUIMASHUPCANVASVIEW_P_H_ #define DUIMASHUPCANVASVIEW_P_H_ -#include "private/duiwidgetview_p.h" -#include "applicationextension/duiextensionareaview_p.h" +#include "duiwidgetview_p.h" +#include "duiextensionareaview_p.h" #include "duimashupcanvasview.h" class DuiLayout; diff --git a/src/mashup/mashup/duisubdatastore.cpp b/src/extensions/mashup/mashup/duisubdatastore.cpp similarity index 100% rename from src/mashup/mashup/duisubdatastore.cpp rename to src/extensions/mashup/mashup/duisubdatastore.cpp diff --git a/src/mashup/mashup/duisubdatastore.h b/src/extensions/mashup/mashup/duisubdatastore.h similarity index 100% rename from src/mashup/mashup/duisubdatastore.h rename to src/extensions/mashup/mashup/duisubdatastore.h diff --git a/src/mashup/mashup/mashup.pri b/src/extensions/mashup/mashup/mashup.pri similarity index 75% rename from src/mashup/mashup/mashup.pri rename to src/extensions/mashup/mashup/mashup.pri index 2f81347b0..f22b4ac7a 100644 --- a/src/mashup/mashup/mashup.pri +++ b/src/extensions/mashup/mashup/mashup.pri @@ -1,19 +1,6 @@ include(../mashup.pri) MASHUP_MASHUP_SRC_DIR = $$MASHUP_SRC_DIR/mashup -INCLUDEPATH += $$MASHUP_SRC_DIR/mashup \ - $$GEN_DIR -duigen_model_mashup.name = duigenerator \ - model -duigen_model_mashup.input = MASHUP_WIDGET_MODEL_HEADERS -duigen_model_mashup.output = $$GEN_DIR/gen_${QMAKE_FILE_BASE}data.cpp -duigen_model_mashup.depends = $$DUIGEN_EXECUTABLE -duigen_model_mashup.commands += $$DUIGEN_EXECUTABLE --model ${QMAKE_FILE_NAME} $$GEN_DIR -duigen_model_mashup.clean += $$GEN_DIR/gen_* -duigen_model_mashup.CONFIG = target_predeps no_link -duigen_model_mashup.variable_out = GENERATED_SOURCES - -QMAKE_EXTRA_COMPILERS += duigen_model_mashup HEADERS += $$MASHUP_MASHUP_SRC_DIR/duiappletbutton.h \ $$MASHUP_MASHUP_SRC_DIR/duiappletsharedmutex.h \ $$MASHUP_MASHUP_SRC_DIR/duiappletsharedmutex_p.h \ @@ -27,12 +14,8 @@ HEADERS += $$MASHUP_MASHUP_SRC_DIR/duiappletbutton.h \ $$MASHUP_MASHUP_SRC_DIR/duiappletinventoryview.h \ $$MASHUP_MASHUP_SRC_DIR/duiappletinventoryview_p.h \ $$MASHUP_MASHUP_SRC_DIR/duiappletinventorymodel.h \ - $$MASHUP_MASHUP_SRC_DIR/duidatastore.h \ - $$MASHUP_MASHUP_SRC_DIR/duidataaccess.h \ $$MASHUP_MASHUP_SRC_DIR/duiaggregatedataaccess.h \ $$MASHUP_MASHUP_SRC_DIR/duiaggregatedataaccess_p.h \ - $$MASHUP_MASHUP_SRC_DIR/duifiledatastore.h \ - $$MASHUP_MASHUP_SRC_DIR/duifiledatastore_p.h \ $$MASHUP_MASHUP_SRC_DIR/duimashupcanvas.h \ $$MASHUP_MASHUP_SRC_DIR/duimashupcanvas_p.h \ $$MASHUP_MASHUP_SRC_DIR/duimashupcanvasmodel.h \ @@ -58,7 +41,6 @@ SOURCES += $$MASHUP_MASHUP_SRC_DIR/duiappletbutton.cpp \ $$MASHUP_MASHUP_SRC_DIR/duiappletinventory.cpp \ $$MASHUP_MASHUP_SRC_DIR/duiappletinventoryview.cpp \ $$MASHUP_MASHUP_SRC_DIR/duiaggregatedataaccess.cpp \ - $$MASHUP_MASHUP_SRC_DIR/duifiledatastore.cpp \ $$MASHUP_MASHUP_SRC_DIR/duimashupcanvas.cpp \ $$MASHUP_MASHUP_SRC_DIR/duimashupcanvasview.cpp \ $$MASHUP_MASHUP_SRC_DIR/duisubdatastore.cpp \ @@ -69,6 +51,8 @@ SOURCES += $$MASHUP_MASHUP_SRC_DIR/duiappletbutton.cpp \ $$MASHUP_MASHUP_SRC_DIR/duigconfdatastore.cpp \ $$MASHUP_MASHUP_SRC_DIR/duiappletinstancemanagerdbusadaptor.cpp -MASHUP_WIDGET_MODEL_HEADERS += $$MASHUP_MASHUP_SRC_DIR/duiapplethandlemodel.h \ +DUIGEN_MODEL_HEADERS += $$MASHUP_MASHUP_SRC_DIR/duiapplethandlemodel.h \ $$MASHUP_MASHUP_SRC_DIR/duimashupcanvasmodel.h \ $$MASHUP_MASHUP_SRC_DIR/duiappletinventorymodel.h + +HEADERS += $$DUIGEN_MODEL_HEADERS diff --git a/src/style/duiapplethandlestyle.h b/src/extensions/style/duiapplethandlestyle.h similarity index 100% rename from src/style/duiapplethandlestyle.h rename to src/extensions/style/duiapplethandlestyle.h diff --git a/src/style/duiappletinventorystyle.h b/src/extensions/style/duiappletinventorystyle.h similarity index 91% rename from src/style/duiappletinventorystyle.h rename to src/extensions/style/duiappletinventorystyle.h index e72f975a3..22bd99a81 100644 --- a/src/style/duiappletinventorystyle.h +++ b/src/extensions/style/duiappletinventorystyle.h @@ -27,12 +27,12 @@ class DuiAppletInventoryStyle : public DuiExtendingBackgroundStyle { Q_OBJECT - DUI_STYLE_INTERNAL(DuiAppletInventoryStyle) + DUI_STYLE(DuiAppletInventoryStyle) }; class DuiAppletInventoryStyleContainer : public DuiExtendingBackgroundStyleContainer { - DUI_STYLE_CONTAINER_INTERNAL(DuiAppletInventoryStyle) + DUI_STYLE_CONTAINER(DuiAppletInventoryStyle) }; //! \internal_end diff --git a/src/style/duiapplicationextensionareastyle.h b/src/extensions/style/duiapplicationextensionareastyle.h similarity index 100% rename from src/style/duiapplicationextensionareastyle.h rename to src/extensions/style/duiapplicationextensionareastyle.h diff --git a/src/style/duiextensionareastyle.h b/src/extensions/style/duiextensionareastyle.h similarity index 100% rename from src/style/duiextensionareastyle.h rename to src/extensions/style/duiextensionareastyle.h diff --git a/src/style/duiextensionhandlestyle.h b/src/extensions/style/duiextensionhandlestyle.h similarity index 100% rename from src/style/duiextensionhandlestyle.h rename to src/extensions/style/duiextensionhandlestyle.h diff --git a/src/style/duimashupcanvasstyle.h b/src/extensions/style/duimashupcanvasstyle.h similarity index 100% rename from src/style/duimashupcanvasstyle.h rename to src/extensions/style/duimashupcanvasstyle.h diff --git a/src/extensions/style/style.pri b/src/extensions/style/style.pri new file mode 100644 index 000000000..7a7be33ad --- /dev/null +++ b/src/extensions/style/style.pri @@ -0,0 +1,9 @@ +DUIGEN_STYLE_HEADERS += \ + style/duiapplethandlestyle.h \ + style/duiappletinventorystyle.h \ + style/duiapplicationextensionareastyle.h \ + style/duiextensionareastyle.h \ + style/duiextensionhandlestyle.h \ + style/duimashupcanvasstyle.h \ + +HEADERS += $$DUIGEN_STYLE_HEADERS diff --git a/src/include/DuiFileDataStore b/src/include/DuiFileDataStore new file mode 100644 index 000000000..80cad8613 --- /dev/null +++ b/src/include/DuiFileDataStore @@ -0,0 +1,2 @@ +#include "duifiledatastore.h" + diff --git a/src/include/DuiObjectMenu b/src/include/DuiObjectMenu new file mode 100644 index 000000000..c50b084ea --- /dev/null +++ b/src/include/DuiObjectMenu @@ -0,0 +1 @@ +#include "duiobjectmenu.h" diff --git a/src/include/TestabilityInterface b/src/include/TestabilityInterface index 240a2dd4c..9897fbf2f 100644 --- a/src/include/TestabilityInterface +++ b/src/include/TestabilityInterface @@ -1,2 +1,2 @@ -#include "../core/testabilityinterface.h" +#include "../corelib/core/testabilityinterface.h" diff --git a/src/include/duiabstractcellcreator.h b/src/include/duiabstractcellcreator.h index 63a9e52af..0c17edd8a 100644 --- a/src/include/duiabstractcellcreator.h +++ b/src/include/duiabstractcellcreator.h @@ -17,5 +17,5 @@ ** ****************************************************************************/ -#include "../widgets/duiabstractcellcreator.h" +#include "../corelib/widgets/duiabstractcellcreator.h" diff --git a/src/include/duiabstractlayoutpolicy.h b/src/include/duiabstractlayoutpolicy.h index 6b32437e5..e3d51f911 100644 --- a/src/include/duiabstractlayoutpolicy.h +++ b/src/include/duiabstractlayoutpolicy.h @@ -17,5 +17,5 @@ ** ****************************************************************************/ -#include "../layout/duiabstractlayoutpolicy.h" +#include "../corelib/layout/duiabstractlayoutpolicy.h" diff --git a/src/include/duiabstractlayoutpolicystyle.h b/src/include/duiabstractlayoutpolicystyle.h index 2e343e2bb..b7a66069d 100644 --- a/src/include/duiabstractlayoutpolicystyle.h +++ b/src/include/duiabstractlayoutpolicystyle.h @@ -17,5 +17,5 @@ ** ****************************************************************************/ -#include "../style/duiabstractlayoutpolicystyle.h" +#include "../corelib/style/duiabstractlayoutpolicystyle.h" diff --git a/src/include/duiabstractwidgetanimationstyle.h b/src/include/duiabstractwidgetanimationstyle.h index a2d4e307c..302e645dc 100644 --- a/src/include/duiabstractwidgetanimationstyle.h +++ b/src/include/duiabstractwidgetanimationstyle.h @@ -17,4 +17,4 @@ ** ****************************************************************************/ -#include "../style/duiabstractwidgetanimationstyle.h" +#include "../corelib/style/duiabstractwidgetanimationstyle.h" diff --git a/src/include/duiaction.h b/src/include/duiaction.h index 7b33fb204..f8e30eea8 100644 --- a/src/include/duiaction.h +++ b/src/include/duiaction.h @@ -17,5 +17,5 @@ ** ****************************************************************************/ -#include "../core/duiaction.h" +#include "../corelib/core/duiaction.h" diff --git a/src/include/duianimation.h b/src/include/duianimation.h index e6b8ef2a9..baef95029 100644 --- a/src/include/duianimation.h +++ b/src/include/duianimation.h @@ -17,5 +17,5 @@ ** ****************************************************************************/ -#include "../animation/core/duianimation.h" +#include "../corelib/animation/core/duianimation.h" diff --git a/src/include/duianimationcreator.h b/src/include/duianimationcreator.h index c052b5b6d..f272d8164 100644 --- a/src/include/duianimationcreator.h +++ b/src/include/duianimationcreator.h @@ -17,5 +17,5 @@ ** ****************************************************************************/ -#include "../animation/core/duianimationcreator.h" +#include "../corelib/animation/core/duianimationcreator.h" diff --git a/src/include/duianimationstyle.h b/src/include/duianimationstyle.h index eb789b6ca..0c71db0f5 100644 --- a/src/include/duianimationstyle.h +++ b/src/include/duianimationstyle.h @@ -17,5 +17,5 @@ ** ****************************************************************************/ -#include "../style/duianimationstyle.h" +#include "../corelib/style/duianimationstyle.h" diff --git a/src/include/duiappletinstallationsourceinterface.h b/src/include/duiappletinstallationsourceinterface.h index 50297bad2..19a356e5a 100644 --- a/src/include/duiappletinstallationsourceinterface.h +++ b/src/include/duiappletinstallationsourceinterface.h @@ -17,4 +17,4 @@ ** ****************************************************************************/ -#include "../mashup/appletinstallation/duiappletinstallationsourceinterface.h" +#include "../extensions/mashup/appletinstallation/duiappletinstallationsourceinterface.h" diff --git a/src/include/duiappletinstantiator.h b/src/include/duiappletinstantiator.h index 69c6fdce6..133130d45 100644 --- a/src/include/duiappletinstantiator.h +++ b/src/include/duiappletinstantiator.h @@ -17,4 +17,4 @@ ** ****************************************************************************/ -#include "../mashup/appletinstallation/duiappletinstantiator.h" +#include "../extensions/mashup/appletinstallation/duiappletinstantiator.h" diff --git a/src/include/duiappletinterface.h b/src/include/duiappletinterface.h index f21ef5c28..44b10fbea 100644 --- a/src/include/duiappletinterface.h +++ b/src/include/duiappletinterface.h @@ -17,4 +17,4 @@ ** ****************************************************************************/ -#include "../mashup/appletinterface/duiappletinterface.h" +#include "../extensions/mashup/appletinterface/duiappletinterface.h" diff --git a/src/include/duiappletmetadata.h b/src/include/duiappletmetadata.h index 479de849c..43faaa597 100644 --- a/src/include/duiappletmetadata.h +++ b/src/include/duiappletmetadata.h @@ -17,4 +17,4 @@ ** ****************************************************************************/ -#include "../mashup/appletinterface/duiappletmetadata.h" +#include "../extensions/mashup/appletinterface/duiappletmetadata.h" diff --git a/src/include/duiapplication.h b/src/include/duiapplication.h index 538bca102..1e50cac75 100644 --- a/src/include/duiapplication.h +++ b/src/include/duiapplication.h @@ -17,4 +17,4 @@ ** ****************************************************************************/ -#include "../core/duiapplication.h" +#include "../corelib/core/duiapplication.h" diff --git a/src/include/duiapplicationextensionarea.h b/src/include/duiapplicationextensionarea.h index 06eebabf2..475d9b5d9 100644 --- a/src/include/duiapplicationextensionarea.h +++ b/src/include/duiapplicationextensionarea.h @@ -17,4 +17,4 @@ ** ****************************************************************************/ -#include "../applicationextension/duiapplicationextensionarea.h" +#include "../extensions/applicationextension/duiapplicationextensionarea.h" diff --git a/src/include/duiapplicationextensionareamodel.h b/src/include/duiapplicationextensionareamodel.h index dba47101c..1f4a668df 100644 --- a/src/include/duiapplicationextensionareamodel.h +++ b/src/include/duiapplicationextensionareamodel.h @@ -17,4 +17,4 @@ ** ****************************************************************************/ -#include "../applicationextension/duiapplicationextensionareamodel.h" +#include "../extensions/applicationextension/duiapplicationextensionareamodel.h" diff --git a/src/include/duiapplicationextensionareaview.h b/src/include/duiapplicationextensionareaview.h new file mode 100644 index 000000000..5c1ed1669 --- /dev/null +++ b/src/include/duiapplicationextensionareaview.h @@ -0,0 +1 @@ +#include "../extensions/applicationextension/duiapplicationextensionareaview.h" diff --git a/src/include/duiapplicationextensionhandleview.h b/src/include/duiapplicationextensionhandleview.h new file mode 100644 index 000000000..0b9b3fb66 --- /dev/null +++ b/src/include/duiapplicationextensionhandleview.h @@ -0,0 +1 @@ +#include "../extensions/applicationextension/duiapplicationextensionhandleview.h" diff --git a/src/include/duiapplicationextensioninterface.h b/src/include/duiapplicationextensioninterface.h index c6ac9019a..0757cf9a7 100644 --- a/src/include/duiapplicationextensioninterface.h +++ b/src/include/duiapplicationextensioninterface.h @@ -17,4 +17,4 @@ ** ****************************************************************************/ -#include "../applicationextension/duiapplicationextensioninterface.h" +#include "../extensions/applicationextension/duiapplicationextensioninterface.h" diff --git a/src/include/duiapplicationextensionloader.h b/src/include/duiapplicationextensionloader.h new file mode 100644 index 000000000..049d232f5 --- /dev/null +++ b/src/include/duiapplicationextensionloader.h @@ -0,0 +1 @@ +#include "../extensions/applicationextension/duiapplicationextensionloader.h" diff --git a/src/include/duiapplicationextensionmanager.h b/src/include/duiapplicationextensionmanager.h new file mode 100644 index 000000000..fef946d82 --- /dev/null +++ b/src/include/duiapplicationextensionmanager.h @@ -0,0 +1 @@ +#include "../extensions/applicationextension/duiapplicationextensionmanager.h" diff --git a/src/include/duiapplicationextensionmetadata.h b/src/include/duiapplicationextensionmetadata.h new file mode 100644 index 000000000..841084827 --- /dev/null +++ b/src/include/duiapplicationextensionmetadata.h @@ -0,0 +1 @@ +#include "../extensions/applicationextension/duiapplicationextensionmetadata.h" diff --git a/src/include/duiapplicationifadaptor.h b/src/include/duiapplicationifadaptor.h index 16bb8ac26..f708fc0e5 100644 --- a/src/include/duiapplicationifadaptor.h +++ b/src/include/duiapplicationifadaptor.h @@ -17,4 +17,4 @@ ** ****************************************************************************/ -#include "../core/duiapplicationifadaptor.h" +#include "../corelib/core/duiapplicationifadaptor.h" diff --git a/src/include/duiapplicationifproxy.h b/src/include/duiapplicationifproxy.h index ef1a50e13..f1348d49b 100644 --- a/src/include/duiapplicationifproxy.h +++ b/src/include/duiapplicationifproxy.h @@ -17,4 +17,4 @@ ** ****************************************************************************/ -#include "../core/duiapplicationifproxy.h" +#include "../corelib/core/duiapplicationifproxy.h" diff --git a/src/include/duiapplicationmenu.h b/src/include/duiapplicationmenu.h index e4a7eebd4..128b1a0c8 100644 --- a/src/include/duiapplicationmenu.h +++ b/src/include/duiapplicationmenu.h @@ -17,5 +17,5 @@ ** ****************************************************************************/ -#include "../widgets/duiapplicationmenu.h" +#include "../corelib/widgets/duiapplicationmenu.h" diff --git a/src/include/duiapplicationmenubuttonstyle.h b/src/include/duiapplicationmenubuttonstyle.h index 5bf4881bd..5a44f9f96 100644 --- a/src/include/duiapplicationmenubuttonstyle.h +++ b/src/include/duiapplicationmenubuttonstyle.h @@ -17,4 +17,4 @@ ** ****************************************************************************/ -#include "../style/duiapplicationmenubuttonstyle.h" +#include "../views/style/duiapplicationmenubuttonstyle.h" diff --git a/src/include/duiapplicationmenumodel.h b/src/include/duiapplicationmenumodel.h index 22b098b3c..b0fc495e3 100644 --- a/src/include/duiapplicationmenumodel.h +++ b/src/include/duiapplicationmenumodel.h @@ -17,5 +17,5 @@ ** ****************************************************************************/ -#include "../widgets/duiapplicationmenumodel.h" +#include "../corelib/widgets/duiapplicationmenumodel.h" diff --git a/src/include/duiapplicationmenustyle.h b/src/include/duiapplicationmenustyle.h index 8ceb9e0f5..f0eb877e7 100644 --- a/src/include/duiapplicationmenustyle.h +++ b/src/include/duiapplicationmenustyle.h @@ -17,4 +17,4 @@ ** ****************************************************************************/ -#include "../style/duiapplicationmenustyle.h" +#include "../views/style/duiapplicationmenustyle.h" diff --git a/src/include/duiapplicationmenuview.h b/src/include/duiapplicationmenuview.h index fb4d8ac1c..8b94292ac 100644 --- a/src/include/duiapplicationmenuview.h +++ b/src/include/duiapplicationmenuview.h @@ -17,5 +17,5 @@ ** ****************************************************************************/ -#include "../widgets/views/duiapplicationmenuview.h" +#include "../views/duiapplicationmenuview.h" diff --git a/src/include/duiapplicationpage.h b/src/include/duiapplicationpage.h index aacf053fe..b0f5ec371 100644 --- a/src/include/duiapplicationpage.h +++ b/src/include/duiapplicationpage.h @@ -17,5 +17,5 @@ ** ****************************************************************************/ -#include "../widgets/duiapplicationpage.h" +#include "../corelib/widgets/duiapplicationpage.h" diff --git a/src/include/duiapplicationpagemodel.h b/src/include/duiapplicationpagemodel.h index 5b80a8890..215f40c85 100644 --- a/src/include/duiapplicationpagemodel.h +++ b/src/include/duiapplicationpagemodel.h @@ -17,5 +17,5 @@ ** ****************************************************************************/ -#include "../widgets/duiapplicationpagemodel.h" +#include "../corelib/widgets/duiapplicationpagemodel.h" diff --git a/src/include/duiapplicationpagestyle.h b/src/include/duiapplicationpagestyle.h index f3eb10560..f57a40b7d 100644 --- a/src/include/duiapplicationpagestyle.h +++ b/src/include/duiapplicationpagestyle.h @@ -17,5 +17,5 @@ ** ****************************************************************************/ -#include "../style/duiapplicationpagestyle.h" +#include "../views/style/duiapplicationpagestyle.h" diff --git a/src/include/duiapplicationservice.h b/src/include/duiapplicationservice.h index c3c290581..43bbc7fb8 100644 --- a/src/include/duiapplicationservice.h +++ b/src/include/duiapplicationservice.h @@ -17,4 +17,4 @@ ** ****************************************************************************/ -#include "../core/duiapplicationservice.h" +#include "../corelib/core/duiapplicationservice.h" diff --git a/src/include/duiapplicationwindow.h b/src/include/duiapplicationwindow.h index a272db48d..45da93c04 100644 --- a/src/include/duiapplicationwindow.h +++ b/src/include/duiapplicationwindow.h @@ -17,4 +17,4 @@ ** ****************************************************************************/ -#include "../widgets/duiapplicationwindow.h" +#include "../corelib/widgets/duiapplicationwindow.h" diff --git a/src/include/duiassembly.h b/src/include/duiassembly.h index bcff91d68..d95746bfa 100644 --- a/src/include/duiassembly.h +++ b/src/include/duiassembly.h @@ -17,5 +17,5 @@ ** ****************************************************************************/ -#include "../core/duiassembly.h" +#include "../corelib/core/duiassembly.h" diff --git a/src/include/duibasiclayoutanimation.h b/src/include/duibasiclayoutanimation.h index c3f4f092f..969f0b2c1 100644 --- a/src/include/duibasiclayoutanimation.h +++ b/src/include/duibasiclayoutanimation.h @@ -17,5 +17,5 @@ ** ****************************************************************************/ -#include "../layout/duibasiclayoutanimation.h" +#include "../corelib/layout/duibasiclayoutanimation.h" diff --git a/src/include/duibasiclayoutanimationstyle.h b/src/include/duibasiclayoutanimationstyle.h index 03192dace..9172956c9 100644 --- a/src/include/duibasiclayoutanimationstyle.h +++ b/src/include/duibasiclayoutanimationstyle.h @@ -17,4 +17,4 @@ ** ****************************************************************************/ -#include "../style/duibasiclayoutanimationstyle.h" +#include "../corelib/style/duibasiclayoutanimationstyle.h" diff --git a/src/include/duibreakiterator.h b/src/include/duibreakiterator.h index a3a6c8096..cc73a2393 100644 --- a/src/include/duibreakiterator.h +++ b/src/include/duibreakiterator.h @@ -17,5 +17,5 @@ ** ****************************************************************************/ -#include "../i18n/duibreakiterator.h" +#include "../corelib/i18n/duibreakiterator.h" diff --git a/src/include/duibutton.h b/src/include/duibutton.h index 794f2a392..e68163d9d 100644 --- a/src/include/duibutton.h +++ b/src/include/duibutton.h @@ -17,4 +17,4 @@ ** ****************************************************************************/ -#include "../widgets/duibutton.h" +#include "../corelib/widgets/duibutton.h" diff --git a/src/include/duibuttongroup.h b/src/include/duibuttongroup.h index 0a820f7d5..9e431d99b 100644 --- a/src/include/duibuttongroup.h +++ b/src/include/duibuttongroup.h @@ -17,5 +17,5 @@ ** ****************************************************************************/ -#include "../widgets/duibuttongroup.h" +#include "../corelib/widgets/duibuttongroup.h" diff --git a/src/include/duibuttoniconstyle.h b/src/include/duibuttoniconstyle.h index c4e01729e..98ebab0f9 100644 --- a/src/include/duibuttoniconstyle.h +++ b/src/include/duibuttoniconstyle.h @@ -17,5 +17,5 @@ ** ****************************************************************************/ -#include "../style/duibuttoniconstyle.h" +#include "../views/style/duibuttoniconstyle.h" diff --git a/src/include/duibuttoniconview.h b/src/include/duibuttoniconview.h index 774a21f40..1406a30a6 100644 --- a/src/include/duibuttoniconview.h +++ b/src/include/duibuttoniconview.h @@ -17,5 +17,5 @@ ** ****************************************************************************/ -#include "../widgets/views/duibuttoniconview.h" +#include "../views/duibuttoniconview.h" diff --git a/src/include/duibuttonmodel.h b/src/include/duibuttonmodel.h index 03b97618d..d04a2c928 100644 --- a/src/include/duibuttonmodel.h +++ b/src/include/duibuttonmodel.h @@ -17,5 +17,5 @@ ** ****************************************************************************/ -#include "../widgets/duibuttonmodel.h" +#include "../corelib/widgets/duibuttonmodel.h" diff --git a/src/include/duibuttonstyle.h b/src/include/duibuttonstyle.h index 7f6b27b90..3250f0f06 100644 --- a/src/include/duibuttonstyle.h +++ b/src/include/duibuttonstyle.h @@ -17,5 +17,5 @@ ** ****************************************************************************/ -#include "../style/duibuttonstyle.h" +#include "../views/style/duibuttonstyle.h" diff --git a/src/include/duibuttonview.h b/src/include/duibuttonview.h index 140b16801..df6f6287a 100644 --- a/src/include/duibuttonview.h +++ b/src/include/duibuttonview.h @@ -17,5 +17,5 @@ ** ****************************************************************************/ -#include "../widgets/views/duibuttonview.h" +#include "../views/duibuttonview.h" diff --git a/src/include/duicalendar.h b/src/include/duicalendar.h index 191f41fce..ab286812a 100644 --- a/src/include/duicalendar.h +++ b/src/include/duicalendar.h @@ -17,4 +17,4 @@ ** ****************************************************************************/ -#include "../i18n/duicalendar.h" +#include "../corelib/i18n/duicalendar.h" diff --git a/src/include/duicancelevent.h b/src/include/duicancelevent.h index d7b9328c7..11635ecbe 100644 --- a/src/include/duicancelevent.h +++ b/src/include/duicancelevent.h @@ -17,4 +17,4 @@ ** ****************************************************************************/ -#include "../events/duicancelevent.h" +#include "../corelib/events/duicancelevent.h" diff --git a/src/include/duiclassfactory.h b/src/include/duiclassfactory.h new file mode 100644 index 000000000..3d36e757c --- /dev/null +++ b/src/include/duiclassfactory.h @@ -0,0 +1,2 @@ +#include "../corelib/core/duiclassfactory.h" + diff --git a/src/include/duicollator.h b/src/include/duicollator.h index b9ce650ea..2c3f51ba6 100644 --- a/src/include/duicollator.h +++ b/src/include/duicollator.h @@ -17,4 +17,4 @@ ** ****************************************************************************/ -#include "../i18n/duicollator.h" +#include "../corelib/i18n/duicollator.h" diff --git a/src/include/duicombobox.h b/src/include/duicombobox.h index df0cff733..81518ff75 100644 --- a/src/include/duicombobox.h +++ b/src/include/duicombobox.h @@ -17,4 +17,4 @@ ** ****************************************************************************/ -#include "../widgets/duicombobox.h" +#include "../corelib/widgets/duicombobox.h" diff --git a/src/include/duicomboboxstyle.h b/src/include/duicomboboxstyle.h index 5bcdcf075..94148919d 100644 --- a/src/include/duicomboboxstyle.h +++ b/src/include/duicomboboxstyle.h @@ -17,5 +17,5 @@ ** ****************************************************************************/ -#include "../style/duicomboboxstyle.h" +#include "../views/style/duicomboboxstyle.h" diff --git a/src/include/duicomboboxview.h b/src/include/duicomboboxview.h new file mode 100644 index 000000000..eeff9b9d4 --- /dev/null +++ b/src/include/duicomboboxview.h @@ -0,0 +1 @@ +#include "../views/duicomboboxview.h" diff --git a/src/include/duicompleter.h b/src/include/duicompleter.h index 571fc3379..9efd91368 100644 --- a/src/include/duicompleter.h +++ b/src/include/duicompleter.h @@ -17,4 +17,4 @@ ** ****************************************************************************/ -#include "../widgets/duicompleter.h" +#include "../corelib/widgets/duicompleter.h" diff --git a/src/include/duicompletermodel.h b/src/include/duicompletermodel.h index 25725871c..aa0779819 100644 --- a/src/include/duicompletermodel.h +++ b/src/include/duicompletermodel.h @@ -17,5 +17,5 @@ ** ****************************************************************************/ -#include "../widgets/duicompletermodel.h" +#include "../corelib/widgets/duicompletermodel.h" diff --git a/src/include/duicompleterview.h b/src/include/duicompleterview.h index 3b4ceb54c..a6d858594 100644 --- a/src/include/duicompleterview.h +++ b/src/include/duicompleterview.h @@ -17,4 +17,4 @@ ** ****************************************************************************/ -#include "../widgets/views/duicompleterview.h" +#include "../views/duicompleterview.h" diff --git a/src/include/duicomponentdata.h b/src/include/duicomponentdata.h index 31cb68204..07b210423 100644 --- a/src/include/duicomponentdata.h +++ b/src/include/duicomponentdata.h @@ -17,4 +17,4 @@ ** ****************************************************************************/ -#include "../core/duicomponentdata.h" +#include "../corelib/core/duicomponentdata.h" diff --git a/src/include/duicontainer.h b/src/include/duicontainer.h index 2910c5fdf..8f0f64a70 100644 --- a/src/include/duicontainer.h +++ b/src/include/duicontainer.h @@ -17,4 +17,4 @@ ** ****************************************************************************/ -#include "../widgets/duicontainer.h" +#include "../corelib/widgets/duicontainer.h" diff --git a/src/include/duicontainermodel.h b/src/include/duicontainermodel.h index a82dda107..f92bd2378 100644 --- a/src/include/duicontainermodel.h +++ b/src/include/duicontainermodel.h @@ -17,5 +17,5 @@ ** ****************************************************************************/ -#include "../widgets/duicontainermodel.h" +#include "../corelib/widgets/duicontainermodel.h" diff --git a/src/include/duicontainerstyle.h b/src/include/duicontainerstyle.h index 236737aac..c093b527f 100644 --- a/src/include/duicontainerstyle.h +++ b/src/include/duicontainerstyle.h @@ -17,5 +17,5 @@ ** ****************************************************************************/ -#include "../style/duicontainerstyle.h" +#include "../views/style/duicontainerstyle.h" diff --git a/src/include/duicontainerview.h b/src/include/duicontainerview.h index 49853e2dd..adc4a7c6f 100644 --- a/src/include/duicontainerview.h +++ b/src/include/duicontainerview.h @@ -17,5 +17,5 @@ ** ****************************************************************************/ -#include "../widgets/views/duicontainerview.h" +#include "../views/duicontainerview.h" diff --git a/src/include/duicontentitem.h b/src/include/duicontentitem.h index b03000188..80025347a 100644 --- a/src/include/duicontentitem.h +++ b/src/include/duicontentitem.h @@ -17,4 +17,4 @@ ** ****************************************************************************/ -#include "../widgets/duicontentitem.h" +#include "../corelib/widgets/duicontentitem.h" diff --git a/src/include/duidataaccess.h b/src/include/duidataaccess.h index 3f85ccbe8..2c303172a 100644 --- a/src/include/duidataaccess.h +++ b/src/include/duidataaccess.h @@ -17,4 +17,4 @@ ** ****************************************************************************/ -#include "../mashup/mashup/duidataaccess.h" +#include "../corelib/core/duidataaccess.h" diff --git a/src/include/duidatastore.h b/src/include/duidatastore.h index 2fca6d3c2..bd0881465 100644 --- a/src/include/duidatastore.h +++ b/src/include/duidatastore.h @@ -17,4 +17,4 @@ ** ****************************************************************************/ -#include "../mashup/mashup/duidatastore.h" +#include "../corelib/core/duidatastore.h" diff --git a/src/include/duidebug.h b/src/include/duidebug.h index aedd09297..2f3a4fdee 100644 --- a/src/include/duidebug.h +++ b/src/include/duidebug.h @@ -17,4 +17,4 @@ ** ****************************************************************************/ -#include "../core/duidebug.h" +#include "../corelib/core/duidebug.h" diff --git a/src/include/duidesktopentry.h b/src/include/duidesktopentry.h index f8ff04b6c..cf23be86b 100644 --- a/src/include/duidesktopentry.h +++ b/src/include/duidesktopentry.h @@ -17,5 +17,5 @@ ** ****************************************************************************/ -#include "../core/duidesktopentry.h" +#include "../corelib/core/duidesktopentry.h" diff --git a/src/include/duideviceprofile.h b/src/include/duideviceprofile.h index d33c038a7..79e824711 100644 --- a/src/include/duideviceprofile.h +++ b/src/include/duideviceprofile.h @@ -17,4 +17,4 @@ ** ****************************************************************************/ -#include "../workspace/duideviceprofile.h" +#include "../corelib/workspace/duideviceprofile.h" diff --git a/src/include/duidialog.h b/src/include/duidialog.h index fd38bbe2b..e58d05f9a 100644 --- a/src/include/duidialog.h +++ b/src/include/duidialog.h @@ -17,5 +17,5 @@ ** ****************************************************************************/ -#include "../widgets/duidialog.h" +#include "../corelib/widgets/duidialog.h" diff --git a/src/include/duidialogmodel.h b/src/include/duidialogmodel.h index 12ddac0a3..46490edc9 100644 --- a/src/include/duidialogmodel.h +++ b/src/include/duidialogmodel.h @@ -17,5 +17,5 @@ ** ****************************************************************************/ -#include "../widgets/duidialogmodel.h" +#include "../corelib/widgets/duidialogmodel.h" diff --git a/src/include/duidismissevent.h b/src/include/duidismissevent.h index c7db0e44b..1e716e7cd 100644 --- a/src/include/duidismissevent.h +++ b/src/include/duidismissevent.h @@ -17,4 +17,4 @@ ** ****************************************************************************/ -#include "../events/duidismissevent.h" +#include "../corelib/events/duidismissevent.h" diff --git a/src/include/duiescapebuttonpanel.h b/src/include/duiescapebuttonpanel.h index fbce31239..12c98d418 100644 --- a/src/include/duiescapebuttonpanel.h +++ b/src/include/duiescapebuttonpanel.h @@ -17,4 +17,4 @@ ** ****************************************************************************/ -#include "../widgets/duiescapebuttonpanel.h" +#include "../corelib/widgets/duiescapebuttonpanel.h" diff --git a/src/include/duiescapebuttonpanelmodel.h b/src/include/duiescapebuttonpanelmodel.h index cfbf1bb25..ea8c9a455 100644 --- a/src/include/duiescapebuttonpanelmodel.h +++ b/src/include/duiescapebuttonpanelmodel.h @@ -17,4 +17,4 @@ ** ****************************************************************************/ -#include "../widgets/duiescapebuttonpanelmodel.h" +#include "../corelib/widgets/duiescapebuttonpanelmodel.h" diff --git a/src/include/duiexport.h b/src/include/duiexport.h index ed58a9594..7ee7d7baf 100644 --- a/src/include/duiexport.h +++ b/src/include/duiexport.h @@ -17,4 +17,4 @@ ** ****************************************************************************/ -#include "../core/duiexport.h" +#include "../corelib/core/duiexport.h" diff --git a/src/include/duiextendingbackgroundstyle.h b/src/include/duiextendingbackgroundstyle.h index e63b6d9e8..beab70405 100644 --- a/src/include/duiextendingbackgroundstyle.h +++ b/src/include/duiextendingbackgroundstyle.h @@ -17,5 +17,5 @@ ** ****************************************************************************/ -#include "../style/duiextendingbackgroundstyle.h" +#include "../views/style/duiextendingbackgroundstyle.h" diff --git a/src/include/duiextendingbackgroundview.h b/src/include/duiextendingbackgroundview.h index 967c5189c..c8f7f6758 100644 --- a/src/include/duiextendingbackgroundview.h +++ b/src/include/duiextendingbackgroundview.h @@ -17,4 +17,4 @@ ** ****************************************************************************/ -#include "../widgets/views/duiextendingbackgroundview.h" +#include "../views/duiextendingbackgroundview.h" diff --git a/src/include/duiextensionarea.h b/src/include/duiextensionarea.h index ca30620f4..631349de2 100644 --- a/src/include/duiextensionarea.h +++ b/src/include/duiextensionarea.h @@ -17,4 +17,4 @@ ** ****************************************************************************/ -#include "../applicationextension/duiextensionarea.h" +#include "../extensions/applicationextension/duiextensionarea.h" diff --git a/src/include/duiextensionareamodel.h b/src/include/duiextensionareamodel.h index 24b7268f6..b91b3fa0d 100644 --- a/src/include/duiextensionareamodel.h +++ b/src/include/duiextensionareamodel.h @@ -17,4 +17,4 @@ ** ****************************************************************************/ -#include "../applicationextension/duiextensionareamodel.h" +#include "../extensions/applicationextension/duiextensionareamodel.h" diff --git a/src/include/duiextensionareaview.h b/src/include/duiextensionareaview.h new file mode 100644 index 000000000..e6092cf8c --- /dev/null +++ b/src/include/duiextensionareaview.h @@ -0,0 +1 @@ +#include "../extensions/applicationextension/duiextensionareaview.h" diff --git a/src/include/duiextensionhandle.h b/src/include/duiextensionhandle.h new file mode 100644 index 000000000..374824eec --- /dev/null +++ b/src/include/duiextensionhandle.h @@ -0,0 +1 @@ +#include "../extensions/applicationextension/duiextensionhandle.h" diff --git a/src/include/duiextensionhandlemodel.h b/src/include/duiextensionhandlemodel.h new file mode 100644 index 000000000..8c116ef77 --- /dev/null +++ b/src/include/duiextensionhandlemodel.h @@ -0,0 +1 @@ +#include "../extensions/applicationextension/duiextensionhandlemodel.h" diff --git a/src/include/duiextensionhandleview.h b/src/include/duiextensionhandleview.h new file mode 100644 index 000000000..92a3983b7 --- /dev/null +++ b/src/include/duiextensionhandleview.h @@ -0,0 +1 @@ +#include "../extensions/applicationextension/duiextensionhandleview.h" diff --git a/src/include/duiextensionrunner.h b/src/include/duiextensionrunner.h new file mode 100644 index 000000000..68547f4a7 --- /dev/null +++ b/src/include/duiextensionrunner.h @@ -0,0 +1 @@ +#include "../extensions/applicationextension/duiextensionrunner.h" diff --git a/src/include/duifeedback.h b/src/include/duifeedback.h index e8b0f4f6e..4fc15ac82 100644 --- a/src/include/duifeedback.h +++ b/src/include/duifeedback.h @@ -17,4 +17,4 @@ ** ****************************************************************************/ -#include "../feedback/duifeedback.h" +#include "../corelib/feedback/duifeedback.h" diff --git a/src/include/duifeedbackplayer.h b/src/include/duifeedbackplayer.h index 36463903c..66fe9d858 100644 --- a/src/include/duifeedbackplayer.h +++ b/src/include/duifeedbackplayer.h @@ -17,4 +17,4 @@ ** ****************************************************************************/ -#include "../feedback/duifeedbackplayer.h" +#include "../corelib/feedback/duifeedbackplayer.h" diff --git a/src/include/duifiledatastore.h b/src/include/duifiledatastore.h new file mode 100644 index 000000000..68677c864 --- /dev/null +++ b/src/include/duifiledatastore.h @@ -0,0 +1 @@ +#include "../corelib/core/duifiledatastore.h" diff --git a/src/include/duiflowlayoutpolicy.h b/src/include/duiflowlayoutpolicy.h index c601dd119..109ce5e14 100644 --- a/src/include/duiflowlayoutpolicy.h +++ b/src/include/duiflowlayoutpolicy.h @@ -17,5 +17,5 @@ ** ****************************************************************************/ -#include "../layout/duiflowlayoutpolicy.h" +#include "../corelib/layout/duiflowlayoutpolicy.h" diff --git a/src/include/duifreestylelayoutpolicy.h b/src/include/duifreestylelayoutpolicy.h index 7b518030b..6346fb689 100644 --- a/src/include/duifreestylelayoutpolicy.h +++ b/src/include/duifreestylelayoutpolicy.h @@ -17,5 +17,5 @@ ** ****************************************************************************/ -#include "../layout/duifreestylelayoutpolicy.h" +#include "../corelib/layout/duifreestylelayoutpolicy.h" diff --git a/src/include/duigconfdatastore.h b/src/include/duigconfdatastore.h index a7c8b3c16..eb7ca7e4a 100644 --- a/src/include/duigconfdatastore.h +++ b/src/include/duigconfdatastore.h @@ -17,4 +17,4 @@ ** ****************************************************************************/ -#include "../mashup/mashup/duigconfdatastore.h" +#include "../extensions/mashup/mashup/duigconfdatastore.h" diff --git a/src/include/duigconfitem.h b/src/include/duigconfitem.h index 1bab4f399..c5353defa 100644 --- a/src/include/duigconfitem.h +++ b/src/include/duigconfitem.h @@ -17,4 +17,4 @@ ** ****************************************************************************/ -#include "../core/duigconfitem.h" +#include "../corelib/core/duigconfitem.h" diff --git a/src/include/duigles2renderer.h b/src/include/duigles2renderer.h index ea6260cbb..7a845ff32 100644 --- a/src/include/duigles2renderer.h +++ b/src/include/duigles2renderer.h @@ -17,4 +17,4 @@ ** ****************************************************************************/ -#include "../painting/duigles2renderer.h" +#include "../corelib/painting/duigles2renderer.h" diff --git a/src/include/duigridlayoutpolicy.h b/src/include/duigridlayoutpolicy.h index a82149ff4..7b7029089 100644 --- a/src/include/duigridlayoutpolicy.h +++ b/src/include/duigridlayoutpolicy.h @@ -17,4 +17,4 @@ ** ****************************************************************************/ -#include "../layout/duigridlayoutpolicy.h" +#include "../corelib/layout/duigridlayoutpolicy.h" diff --git a/src/include/duigroupanimation.h b/src/include/duigroupanimation.h index 65b035c2e..3c0b2dbe6 100644 --- a/src/include/duigroupanimation.h +++ b/src/include/duigroupanimation.h @@ -17,5 +17,5 @@ ** ****************************************************************************/ -#include "../animation/core/duigroupanimation.h" +#include "../corelib/animation/core/duigroupanimation.h" diff --git a/src/include/duigroupanimationstyle.h b/src/include/duigroupanimationstyle.h index 93b644833..147888c42 100644 --- a/src/include/duigroupanimationstyle.h +++ b/src/include/duigroupanimationstyle.h @@ -17,4 +17,4 @@ ** ****************************************************************************/ -#include "../style/duigroupanimationstyle.h" +#include "../corelib/style/duigroupanimationstyle.h" diff --git a/src/include/duihomebuttonpanel.h b/src/include/duihomebuttonpanel.h index af01d2620..586b9d2a7 100644 --- a/src/include/duihomebuttonpanel.h +++ b/src/include/duihomebuttonpanel.h @@ -17,4 +17,4 @@ ** ****************************************************************************/ -#include "../widgets/duihomebuttonpanel.h" +#include "../corelib/widgets/duihomebuttonpanel.h" diff --git a/src/include/duiimagewidget.h b/src/include/duiimagewidget.h index 0545c58b2..eef47c626 100644 --- a/src/include/duiimagewidget.h +++ b/src/include/duiimagewidget.h @@ -17,4 +17,4 @@ ** ****************************************************************************/ -#include "../widgets/duiimagewidget.h" +#include "../corelib/widgets/duiimagewidget.h" diff --git a/src/include/duiimagewidgetview.h b/src/include/duiimagewidgetview.h index e35a13167..d948f7545 100644 --- a/src/include/duiimagewidgetview.h +++ b/src/include/duiimagewidgetview.h @@ -17,5 +17,5 @@ ** ****************************************************************************/ -#include "../widgets/views/duiimagewidgetview.h" +#include "../views/duiimagewidgetview.h" diff --git a/src/include/duiinfobanner.h b/src/include/duiinfobanner.h index 3d3e6e6b8..041488897 100644 --- a/src/include/duiinfobanner.h +++ b/src/include/duiinfobanner.h @@ -17,5 +17,5 @@ ** ****************************************************************************/ -#include "../widgets/duiinfobanner.h" +#include "../corelib/widgets/duiinfobanner.h" diff --git a/src/include/duiinfobannereventview.h b/src/include/duiinfobannereventview.h index 9580c3d76..9f3a51933 100644 --- a/src/include/duiinfobannereventview.h +++ b/src/include/duiinfobannereventview.h @@ -17,5 +17,5 @@ ** ****************************************************************************/ -#include "../widgets/views/duiinfobannereventview.h" +#include "../views/duiinfobannereventview.h" diff --git a/src/include/duiinfobannerinformationview.h b/src/include/duiinfobannerinformationview.h index d2d7789f6..9313a5c0d 100644 --- a/src/include/duiinfobannerinformationview.h +++ b/src/include/duiinfobannerinformationview.h @@ -17,5 +17,5 @@ ** ****************************************************************************/ -#include "../widgets/views/duiinfobannerinformationview.h" +#include "../views/duiinfobannerinformationview.h" diff --git a/src/include/duiinfobannermodel.h b/src/include/duiinfobannermodel.h index ba1f85dbf..eeed88fe0 100644 --- a/src/include/duiinfobannermodel.h +++ b/src/include/duiinfobannermodel.h @@ -17,5 +17,5 @@ ** ****************************************************************************/ -#include "../widgets/duiinfobannermodel.h" +#include "../corelib/widgets/duiinfobannermodel.h" diff --git a/src/include/duiinputmethodstate.h b/src/include/duiinputmethodstate.h index 0e81eb34a..66bef9c19 100644 --- a/src/include/duiinputmethodstate.h +++ b/src/include/duiinputmethodstate.h @@ -17,4 +17,4 @@ ** ****************************************************************************/ -#include "../core/duiinputmethodstate.h" +#include "../corelib/core/duiinputmethodstate.h" diff --git a/src/include/duikeyboardstatetracker.h b/src/include/duikeyboardstatetracker.h index c654555ce..98a5ec2a8 100644 --- a/src/include/duikeyboardstatetracker.h +++ b/src/include/duikeyboardstatetracker.h @@ -17,5 +17,5 @@ ** ****************************************************************************/ -#include "../events/duikeyboardstatetracker.h" +#include "../corelib/events/duikeyboardstatetracker.h" diff --git a/src/include/duilabel.h b/src/include/duilabel.h index 7b89c51c5..b566ac795 100644 --- a/src/include/duilabel.h +++ b/src/include/duilabel.h @@ -17,4 +17,4 @@ ** ****************************************************************************/ -#include "../widgets/duilabel.h" +#include "../corelib/widgets/duilabel.h" diff --git a/src/include/duilabelhighlighter.h b/src/include/duilabelhighlighter.h index 240d03a1b..0b74df6f3 100644 --- a/src/include/duilabelhighlighter.h +++ b/src/include/duilabelhighlighter.h @@ -17,4 +17,4 @@ ** ****************************************************************************/ -#include "../widgets/duilabelhighlighter.h" +#include "../corelib/widgets/duilabelhighlighter.h" diff --git a/src/include/duilabelmodel.h b/src/include/duilabelmodel.h index 212b575fe..af20953ee 100644 --- a/src/include/duilabelmodel.h +++ b/src/include/duilabelmodel.h @@ -17,5 +17,5 @@ ** ****************************************************************************/ -#include "../widgets/duilabelmodel.h" +#include "../corelib/widgets/duilabelmodel.h" diff --git a/src/include/duilabelstyle.h b/src/include/duilabelstyle.h index a7e221612..028f99bea 100644 --- a/src/include/duilabelstyle.h +++ b/src/include/duilabelstyle.h @@ -17,5 +17,5 @@ ** ****************************************************************************/ -#include "../style/duilabelstyle.h" +#include "../views/style/duilabelstyle.h" diff --git a/src/include/duilabelview.h b/src/include/duilabelview.h index a4a459c8f..d02801d64 100644 --- a/src/include/duilabelview.h +++ b/src/include/duilabelview.h @@ -17,5 +17,5 @@ ** ****************************************************************************/ -#include "../widgets/views/duilabelview.h" +#include "../views/duilabelview.h" diff --git a/src/include/duilayout.h b/src/include/duilayout.h index e8b266dbf..fb932905e 100644 --- a/src/include/duilayout.h +++ b/src/include/duilayout.h @@ -17,4 +17,4 @@ ** ****************************************************************************/ -#include "../layout/duilayout.h" +#include "../corelib/layout/duilayout.h" diff --git a/src/include/duilayoutanimation.h b/src/include/duilayoutanimation.h index 5ca537f02..b38e07747 100644 --- a/src/include/duilayoutanimation.h +++ b/src/include/duilayoutanimation.h @@ -17,4 +17,4 @@ ** ****************************************************************************/ -#include "../layout/duilayoutanimation.h" +#include "../corelib/layout/duilayoutanimation.h" diff --git a/src/include/duilayoutanimationstyle.h b/src/include/duilayoutanimationstyle.h index d8005e5d0..e0f648770 100644 --- a/src/include/duilayoutanimationstyle.h +++ b/src/include/duilayoutanimationstyle.h @@ -17,4 +17,4 @@ ** ****************************************************************************/ -#include "../style/duilayoutanimationstyle.h" +#include "../corelib/style/duilayoutanimationstyle.h" diff --git a/src/include/duilibrary.h b/src/include/duilibrary.h index 235c19f05..1d9416e05 100644 --- a/src/include/duilibrary.h +++ b/src/include/duilibrary.h @@ -17,5 +17,5 @@ ** ****************************************************************************/ -#include "../core/duilibrary.h" +#include "../corelib/core/duilibrary.h" diff --git a/src/include/duilinearlayoutpolicy.h b/src/include/duilinearlayoutpolicy.h index 339a26628..27d2298de 100644 --- a/src/include/duilinearlayoutpolicy.h +++ b/src/include/duilinearlayoutpolicy.h @@ -17,4 +17,4 @@ ** ****************************************************************************/ -#include "../layout/duilinearlayoutpolicy.h" +#include "../corelib/layout/duilinearlayoutpolicy.h" diff --git a/src/include/duilist.h b/src/include/duilist.h index 0d4c3c6aa..33977989c 100644 --- a/src/include/duilist.h +++ b/src/include/duilist.h @@ -17,5 +17,5 @@ ** ****************************************************************************/ -#include "../widgets/duilist.h" +#include "../corelib/widgets/duilist.h" diff --git a/src/include/duilistmodel.h b/src/include/duilistmodel.h index 70e766aad..861e1b7e9 100644 --- a/src/include/duilistmodel.h +++ b/src/include/duilistmodel.h @@ -17,5 +17,5 @@ ** ****************************************************************************/ -#include "../widgets/duilistmodel.h" +#include "../corelib/widgets/duilistmodel.h" diff --git a/src/include/duiliststyle.h b/src/include/duiliststyle.h index 3458405e6..a9671ec6c 100644 --- a/src/include/duiliststyle.h +++ b/src/include/duiliststyle.h @@ -17,5 +17,5 @@ ** ****************************************************************************/ -#include "../style/duiliststyle.h" +#include "../views/style/duiliststyle.h" diff --git a/src/include/duilocale.h b/src/include/duilocale.h index a5806cf62..7f37fcce2 100644 --- a/src/include/duilocale.h +++ b/src/include/duilocale.h @@ -17,4 +17,4 @@ ** ****************************************************************************/ -#include "../i18n/duilocale.h" +#include "../corelib/i18n/duilocale.h" diff --git a/src/include/duimashupcanvas.h b/src/include/duimashupcanvas.h index 8905d083a..1092135fb 100644 --- a/src/include/duimashupcanvas.h +++ b/src/include/duimashupcanvas.h @@ -17,4 +17,4 @@ ** ****************************************************************************/ -#include "../mashup/mashup/duimashupcanvas.h" +#include "../extensions/mashup/mashup/duimashupcanvas.h" diff --git a/src/include/duimashupcanvasmodel.h b/src/include/duimashupcanvasmodel.h index 24c5a1993..2e432b604 100644 --- a/src/include/duimashupcanvasmodel.h +++ b/src/include/duimashupcanvasmodel.h @@ -17,4 +17,4 @@ ** ****************************************************************************/ -#include "../mashup/mashup/duimashupcanvasmodel.h" +#include "../extensions/mashup/mashup/duimashupcanvasmodel.h" diff --git a/src/include/duimenuobjectview.h b/src/include/duimenuobjectview.h index 7573a28aa..aa122ab6e 100644 --- a/src/include/duimenuobjectview.h +++ b/src/include/duimenuobjectview.h @@ -17,5 +17,5 @@ ** ****************************************************************************/ -#include "../widgets/views/duimenuobjectview.h" +#include "../views/duimenuobjectview.h" diff --git a/src/include/duimessagebox.h b/src/include/duimessagebox.h index e14ef4de3..ee89675d5 100644 --- a/src/include/duimessagebox.h +++ b/src/include/duimessagebox.h @@ -17,5 +17,5 @@ ** ****************************************************************************/ -#include "../widgets/duimessagebox.h" +#include "../corelib/widgets/duimessagebox.h" diff --git a/src/include/duimessageboxmodel.h b/src/include/duimessageboxmodel.h index 61d2b08ca..0da95e43d 100644 --- a/src/include/duimessageboxmodel.h +++ b/src/include/duimessageboxmodel.h @@ -17,5 +17,5 @@ ** ****************************************************************************/ -#include "../widgets/duimessageboxmodel.h" +#include "../corelib/widgets/duimessageboxmodel.h" diff --git a/src/include/duimessageboxview.h b/src/include/duimessageboxview.h index 88905aaa0..276605b0d 100644 --- a/src/include/duimessageboxview.h +++ b/src/include/duimessageboxview.h @@ -17,5 +17,5 @@ ** ****************************************************************************/ -#include "../widgets/views/duimessageboxview.h" +#include "../views/duimessageboxview.h" diff --git a/src/include/duimodalscenewindow.h b/src/include/duimodalscenewindow.h index 80b0c69f8..913bc83e5 100644 --- a/src/include/duimodalscenewindow.h +++ b/src/include/duimodalscenewindow.h @@ -17,5 +17,5 @@ ** ****************************************************************************/ -#include "../widgets/duimodalscenewindow.h" +#include "../corelib/widgets/duimodalscenewindow.h" diff --git a/src/include/duimodalscenewindowmodel.h b/src/include/duimodalscenewindowmodel.h index 2e5fd6207..3c3297a8b 100644 --- a/src/include/duimodalscenewindowmodel.h +++ b/src/include/duimodalscenewindowmodel.h @@ -17,5 +17,5 @@ ** ****************************************************************************/ -#include "../widgets/duimodalscenewindowmodel.h" +#include "../corelib/widgets/duimodalscenewindowmodel.h" diff --git a/src/include/duinamespace.h b/src/include/duinamespace.h index 1fc837ec8..ef4ba09df 100644 --- a/src/include/duinamespace.h +++ b/src/include/duinamespace.h @@ -17,5 +17,5 @@ ** ****************************************************************************/ -#include "../core/duinamespace.h" +#include "../corelib/core/duinamespace.h" diff --git a/src/include/duinavigationbar.h b/src/include/duinavigationbar.h index e7f920ac7..76d1a462f 100644 --- a/src/include/duinavigationbar.h +++ b/src/include/duinavigationbar.h @@ -17,5 +17,5 @@ ** ****************************************************************************/ -#include "../widgets/duinavigationbar.h" +#include "../corelib/widgets/duinavigationbar.h" diff --git a/src/include/duinavigationbarmodel.h b/src/include/duinavigationbarmodel.h index 5bd59f1b2..3d3b3abf6 100644 --- a/src/include/duinavigationbarmodel.h +++ b/src/include/duinavigationbarmodel.h @@ -17,5 +17,5 @@ ** ****************************************************************************/ -#include "../widgets/duinavigationbarmodel.h" +#include "../corelib/widgets/duinavigationbarmodel.h" diff --git a/src/include/duinavigationbarstyle.h b/src/include/duinavigationbarstyle.h index 11e8c3343..1e75288a8 100644 --- a/src/include/duinavigationbarstyle.h +++ b/src/include/duinavigationbarstyle.h @@ -17,5 +17,5 @@ ** ****************************************************************************/ -#include "../style/duinavigationbarstyle.h" +#include "../views/style/duinavigationbarstyle.h" diff --git a/src/include/duinavigationbarview.h b/src/include/duinavigationbarview.h index 5671ca204..abd7ccb23 100644 --- a/src/include/duinavigationbarview.h +++ b/src/include/duinavigationbarview.h @@ -17,5 +17,5 @@ ** ****************************************************************************/ -#include "../widgets/views/duinavigationbarview.h" +#include "../views/duinavigationbarview.h" diff --git a/src/include/duinotification.h b/src/include/duinotification.h index 92ba58ba3..425ae9112 100644 --- a/src/include/duinotification.h +++ b/src/include/duinotification.h @@ -17,4 +17,4 @@ ** ****************************************************************************/ -#include "../notification/duinotification.h" +#include "../corelib/notification/duinotification.h" diff --git a/src/include/duinotificationgroup.h b/src/include/duinotificationgroup.h index ecf332946..b3ab57824 100644 --- a/src/include/duinotificationgroup.h +++ b/src/include/duinotificationgroup.h @@ -17,5 +17,5 @@ ** ****************************************************************************/ -#include "../notification/duinotificationgroup.h" +#include "../corelib/notification/duinotificationgroup.h" diff --git a/src/include/duiobjectmenu.h b/src/include/duiobjectmenu.h new file mode 100644 index 000000000..9fd46deb9 --- /dev/null +++ b/src/include/duiobjectmenu.h @@ -0,0 +1 @@ +#include "../corelib/widgets/duiobjectmenu.h" diff --git a/src/include/duiobjectmenumodel.h b/src/include/duiobjectmenumodel.h new file mode 100644 index 000000000..7682db721 --- /dev/null +++ b/src/include/duiobjectmenumodel.h @@ -0,0 +1,2 @@ +#include "../corelib/widgets/duiobjectmenumodel.h" + diff --git a/src/include/duiondisplaychangeevent.h b/src/include/duiondisplaychangeevent.h index bca909fe7..775608fd6 100644 --- a/src/include/duiondisplaychangeevent.h +++ b/src/include/duiondisplaychangeevent.h @@ -17,4 +17,4 @@ ** ****************************************************************************/ -#include "../events/duiondisplaychangeevent.h" +#include "../corelib/events/duiondisplaychangeevent.h" diff --git a/src/include/duiorientationchangeevent.h b/src/include/duiorientationchangeevent.h index 4df272f1e..0c6387956 100644 --- a/src/include/duiorientationchangeevent.h +++ b/src/include/duiorientationchangeevent.h @@ -17,4 +17,4 @@ ** ****************************************************************************/ -#include "../events/duiorientationchangeevent.h" +#include "../corelib/events/duiorientationchangeevent.h" diff --git a/src/include/duiorientationtracker.h b/src/include/duiorientationtracker.h new file mode 100644 index 000000000..d0acb2518 --- /dev/null +++ b/src/include/duiorientationtracker.h @@ -0,0 +1 @@ +#include "../corelib/events/duiorientationtracker.h" diff --git a/src/include/duioverlay.h b/src/include/duioverlay.h index ad5db6b50..9a96b3966 100644 --- a/src/include/duioverlay.h +++ b/src/include/duioverlay.h @@ -17,4 +17,4 @@ ** ****************************************************************************/ -#include "../widgets/duioverlay.h" +#include "../corelib/widgets/duioverlay.h" diff --git a/src/include/duioverlayview.h b/src/include/duioverlayview.h index 3d59de529..3a65d6565 100644 --- a/src/include/duioverlayview.h +++ b/src/include/duioverlayview.h @@ -17,4 +17,4 @@ ** ****************************************************************************/ -#include "../widgets/views/duioverlayview.h" +#include "../views/duioverlayview.h" diff --git a/src/include/duipageswitchanimation.h b/src/include/duipageswitchanimation.h index 440cf1fbe..d64e4205c 100644 --- a/src/include/duipageswitchanimation.h +++ b/src/include/duipageswitchanimation.h @@ -17,4 +17,4 @@ ** ****************************************************************************/ -#include "../animation/scene/duipageswitchanimation.h" +#include "../corelib/animation/scene/duipageswitchanimation.h" diff --git a/src/include/duipannableviewport.h b/src/include/duipannableviewport.h index a66f6a32f..a0201251d 100644 --- a/src/include/duipannableviewport.h +++ b/src/include/duipannableviewport.h @@ -17,4 +17,4 @@ ** ****************************************************************************/ -#include "../widgets/duipannableviewport.h" +#include "../corelib/widgets/duipannableviewport.h" diff --git a/src/include/duipannableviewportmodel.h b/src/include/duipannableviewportmodel.h index bc3663441..84413d648 100644 --- a/src/include/duipannableviewportmodel.h +++ b/src/include/duipannableviewportmodel.h @@ -17,5 +17,5 @@ ** ****************************************************************************/ -#include "../widgets/duipannableviewportmodel.h" +#include "../corelib/widgets/duipannableviewportmodel.h" diff --git a/src/include/duipannablewidget.h b/src/include/duipannablewidget.h index 9981c56ab..f3d297db5 100644 --- a/src/include/duipannablewidget.h +++ b/src/include/duipannablewidget.h @@ -17,4 +17,4 @@ ** ****************************************************************************/ -#include "../widgets/duipannablewidget.h" +#include "../corelib/widgets/duipannablewidget.h" diff --git a/src/include/duipannablewidgetmodel.h b/src/include/duipannablewidgetmodel.h index 70ede943b..cd1a882d8 100644 --- a/src/include/duipannablewidgetmodel.h +++ b/src/include/duipannablewidgetmodel.h @@ -17,5 +17,5 @@ ** ****************************************************************************/ -#include "../widgets/duipannablewidgetmodel.h" +#include "../corelib/widgets/duipannablewidgetmodel.h" diff --git a/src/include/duipannablewidgetview.h b/src/include/duipannablewidgetview.h index 80b997ef4..5cde18357 100644 --- a/src/include/duipannablewidgetview.h +++ b/src/include/duipannablewidgetview.h @@ -17,5 +17,5 @@ ** ****************************************************************************/ -#include "../widgets/views/duipannablewidgetview.h" +#include "../views/duipannablewidgetview.h" diff --git a/src/include/duiparallelanimationgroup.h b/src/include/duiparallelanimationgroup.h index 00b42a61a..991a869e1 100644 --- a/src/include/duiparallelanimationgroup.h +++ b/src/include/duiparallelanimationgroup.h @@ -17,4 +17,4 @@ ** ****************************************************************************/ -#include "../animation/core/duiparallelanimationgroup.h" +#include "../corelib/animation/core/duiparallelanimationgroup.h" diff --git a/src/include/duiphysics2dpanning.h b/src/include/duiphysics2dpanning.h index 23918706e..bb1255daa 100644 --- a/src/include/duiphysics2dpanning.h +++ b/src/include/duiphysics2dpanning.h @@ -17,5 +17,5 @@ ** ****************************************************************************/ -#include "../widgets/duiphysics2dpanning.h" +#include "../corelib/widgets/duiphysics2dpanning.h" diff --git a/src/include/duipopuplist.h b/src/include/duipopuplist.h index 8a170df5c..0af706d54 100644 --- a/src/include/duipopuplist.h +++ b/src/include/duipopuplist.h @@ -17,4 +17,4 @@ ** ****************************************************************************/ -#include "../widgets/duipopuplist.h" +#include "../corelib/widgets/duipopuplist.h" diff --git a/src/include/duipopupliststyle.h b/src/include/duipopupliststyle.h index 199307c89..5376b788f 100644 --- a/src/include/duipopupliststyle.h +++ b/src/include/duipopupliststyle.h @@ -17,5 +17,5 @@ ** ****************************************************************************/ -#include "../style/duipopupliststyle.h" +#include "../views/style/duipopupliststyle.h" diff --git a/src/include/duipopuplistview.h b/src/include/duipopuplistview.h index bc031de43..2eb6c85d7 100644 --- a/src/include/duipopuplistview.h +++ b/src/include/duipopuplistview.h @@ -17,4 +17,4 @@ ** ****************************************************************************/ -#include "../widgets/views/duipopuplistview.h" +#include "../views/duipopuplistview.h" diff --git a/src/include/duipositionindicator.h b/src/include/duipositionindicator.h index bc49ec4ec..f8bbbfa37 100644 --- a/src/include/duipositionindicator.h +++ b/src/include/duipositionindicator.h @@ -17,5 +17,5 @@ ** ****************************************************************************/ -#include "../widgets/duipositionindicator.h" +#include "../corelib/widgets/duipositionindicator.h" diff --git a/src/include/duipositionindicatormodel.h b/src/include/duipositionindicatormodel.h index 8150a8e4e..266cdb8b9 100644 --- a/src/include/duipositionindicatormodel.h +++ b/src/include/duipositionindicatormodel.h @@ -17,5 +17,5 @@ ** ****************************************************************************/ -#include "../widgets/duipositionindicatormodel.h" +#include "../corelib/widgets/duipositionindicatormodel.h" diff --git a/src/include/duipositionindicatorstyle.h b/src/include/duipositionindicatorstyle.h index 8722f8954..c90ba7c47 100644 --- a/src/include/duipositionindicatorstyle.h +++ b/src/include/duipositionindicatorstyle.h @@ -17,5 +17,5 @@ ** ****************************************************************************/ -#include "../style/duipositionindicatorstyle.h" +#include "../views/style/duipositionindicatorstyle.h" diff --git a/src/include/duipositionindicatorview.h b/src/include/duipositionindicatorview.h index 5e8340a55..9d36f7c36 100644 --- a/src/include/duipositionindicatorview.h +++ b/src/include/duipositionindicatorview.h @@ -17,5 +17,5 @@ ** ****************************************************************************/ -#include "../widgets/views/duipositionindicatorview.h" +#include "../views/duipositionindicatorview.h" diff --git a/src/include/duipreeditinjectionevent.h b/src/include/duipreeditinjectionevent.h index 7d25e126f..9d3dc510c 100644 --- a/src/include/duipreeditinjectionevent.h +++ b/src/include/duipreeditinjectionevent.h @@ -17,5 +17,5 @@ ** ****************************************************************************/ -#include "../events/duipreeditinjectionevent.h" +#include "../corelib/events/duipreeditinjectionevent.h" diff --git a/src/include/duiprogressindicator.h b/src/include/duiprogressindicator.h index db8c18cba..3e0d5f601 100644 --- a/src/include/duiprogressindicator.h +++ b/src/include/duiprogressindicator.h @@ -17,4 +17,4 @@ ** ****************************************************************************/ -#include "../widgets/duiprogressindicator.h" +#include "../corelib/widgets/duiprogressindicator.h" diff --git a/src/include/duiprogressindicatorbarview.h b/src/include/duiprogressindicatorbarview.h index fc422e877..58e351e58 100644 --- a/src/include/duiprogressindicatorbarview.h +++ b/src/include/duiprogressindicatorbarview.h @@ -17,4 +17,4 @@ ** ****************************************************************************/ -#include "../widgets/views/duiprogressindicatorbarview.h" +#include "../views/duiprogressindicatorbarview.h" diff --git a/src/include/duiprogressindicatormodel.h b/src/include/duiprogressindicatormodel.h index e09cb6bc3..cdb997527 100644 --- a/src/include/duiprogressindicatormodel.h +++ b/src/include/duiprogressindicatormodel.h @@ -17,4 +17,4 @@ ** ****************************************************************************/ -#include "../widgets/duiprogressindicatormodel.h" +#include "../corelib/widgets/duiprogressindicatormodel.h" diff --git a/src/include/duiremoteaction.h b/src/include/duiremoteaction.h index 4cb8d0176..152eb4a65 100644 --- a/src/include/duiremoteaction.h +++ b/src/include/duiremoteaction.h @@ -17,5 +17,5 @@ ** ****************************************************************************/ -#include "../core/duiremoteaction.h" +#include "../corelib/core/duiremoteaction.h" diff --git a/src/include/duiscalableimage.h b/src/include/duiscalableimage.h index e68a0f5cc..3d3da8f0e 100644 --- a/src/include/duiscalableimage.h +++ b/src/include/duiscalableimage.h @@ -17,4 +17,4 @@ ** ****************************************************************************/ -#include "../painting/duiscalableimage.h" +#include "../corelib/painting/duiscalableimage.h" diff --git a/src/include/duiscene.h b/src/include/duiscene.h index ad4f39801..1fe993cc8 100644 --- a/src/include/duiscene.h +++ b/src/include/duiscene.h @@ -17,5 +17,5 @@ ** ****************************************************************************/ -#include "../scene/duiscene.h" +#include "../corelib/scene/duiscene.h" diff --git a/src/include/duiscenelayereffect.h b/src/include/duiscenelayereffect.h index fc72052a3..026e6056f 100644 --- a/src/include/duiscenelayereffect.h +++ b/src/include/duiscenelayereffect.h @@ -17,5 +17,5 @@ ** ****************************************************************************/ -#include "../scene/duiscenelayereffect.h" +#include "../corelib/scene/duiscenelayereffect.h" diff --git a/src/include/duiscenemanager.h b/src/include/duiscenemanager.h index 1d69bd317..d3fcafa30 100644 --- a/src/include/duiscenemanager.h +++ b/src/include/duiscenemanager.h @@ -17,5 +17,5 @@ ** ****************************************************************************/ -#include "../scene/duiscenemanager.h" +#include "../corelib/scene/duiscenemanager.h" diff --git a/src/include/duiscenewindow.h b/src/include/duiscenewindow.h index 0cee66d77..ef7d1ba9d 100644 --- a/src/include/duiscenewindow.h +++ b/src/include/duiscenewindow.h @@ -17,5 +17,5 @@ ** ****************************************************************************/ -#include "../widgets/duiscenewindow.h" +#include "../corelib/widgets/duiscenewindow.h" diff --git a/src/include/duiscenewindowmodel.h b/src/include/duiscenewindowmodel.h index e8a6d8478..64b0e6705 100644 --- a/src/include/duiscenewindowmodel.h +++ b/src/include/duiscenewindowmodel.h @@ -17,5 +17,5 @@ ** ****************************************************************************/ -#include "../widgets/duiscenewindowmodel.h" +#include "../corelib/widgets/duiscenewindowmodel.h" diff --git a/src/include/duiscenewindowstyle.h b/src/include/duiscenewindowstyle.h index ce1f74c17..f8110847b 100644 --- a/src/include/duiscenewindowstyle.h +++ b/src/include/duiscenewindowstyle.h @@ -17,5 +17,5 @@ ** ****************************************************************************/ -#include "../style/duiscenewindowstyle.h" +#include "../views/style/duiscenewindowstyle.h" diff --git a/src/include/duiscenewindowview.h b/src/include/duiscenewindowview.h new file mode 100644 index 000000000..ab41dd81c --- /dev/null +++ b/src/include/duiscenewindowview.h @@ -0,0 +1 @@ +#include "../views/duiscenewindowview.h" diff --git a/src/include/duiseekbar.h b/src/include/duiseekbar.h index c10824429..2f1e0b87e 100644 --- a/src/include/duiseekbar.h +++ b/src/include/duiseekbar.h @@ -17,5 +17,5 @@ ** ****************************************************************************/ -#include "../widgets/duiseekbar.h" +#include "../corelib/widgets/duiseekbar.h" diff --git a/src/include/duiseekbarmodel.h b/src/include/duiseekbarmodel.h index 8575652e3..dfd19eede 100644 --- a/src/include/duiseekbarmodel.h +++ b/src/include/duiseekbarmodel.h @@ -17,5 +17,5 @@ ** ****************************************************************************/ -#include "../widgets/duiseekbarmodel.h" +#include "../corelib/widgets/duiseekbarmodel.h" diff --git a/src/include/duiseparator.h b/src/include/duiseparator.h index cd8da504e..62aba3183 100644 --- a/src/include/duiseparator.h +++ b/src/include/duiseparator.h @@ -17,4 +17,4 @@ ** ****************************************************************************/ -#include "../widgets/duiseparator.h" +#include "../corelib/widgets/duiseparator.h" diff --git a/src/include/duiseparatorstyle.h b/src/include/duiseparatorstyle.h index c5f6ddcc6..bcf9ac284 100644 --- a/src/include/duiseparatorstyle.h +++ b/src/include/duiseparatorstyle.h @@ -17,5 +17,5 @@ ** ****************************************************************************/ -#include "../style/duiseparatorstyle.h" +#include "../views/style/duiseparatorstyle.h" diff --git a/src/include/duiservicefwbaseif.h b/src/include/duiservicefwbaseif.h index 4472f451f..f9b001702 100644 --- a/src/include/duiservicefwbaseif.h +++ b/src/include/duiservicefwbaseif.h @@ -17,4 +17,4 @@ ** ****************************************************************************/ -#include "../servicefwif/duiservicefwbaseif.h" +#include "../corelib/servicefwif/duiservicefwbaseif.h" diff --git a/src/include/duiservicefwproxy.h b/src/include/duiservicefwproxy.h index 8acab1c6d..a0b0a1ac7 100644 --- a/src/include/duiservicefwproxy.h +++ b/src/include/duiservicefwproxy.h @@ -17,4 +17,4 @@ ** ****************************************************************************/ -#include "../servicefwif/include/duiservicefwproxy.h" +#include "../corelib/servicefwif/include/duiservicefwproxy.h" diff --git a/src/include/duisettingslanguagebinary.h b/src/include/duisettingslanguagebinary.h index adf5c60f8..10dd34a02 100644 --- a/src/include/duisettingslanguagebinary.h +++ b/src/include/duisettingslanguagebinary.h @@ -17,4 +17,4 @@ ** ****************************************************************************/ -#include "../settingslanguage/duisettingslanguagebinary.h" +#include "../settings/settingslanguage/duisettingslanguagebinary.h" diff --git a/src/include/duisettingslanguageparser.h b/src/include/duisettingslanguageparser.h index ff96603bf..6ff9f87fe 100644 --- a/src/include/duisettingslanguageparser.h +++ b/src/include/duisettingslanguageparser.h @@ -17,4 +17,4 @@ ** ****************************************************************************/ -#include "../settingslanguage/duisettingslanguageparser.h" +#include "../settings/settingslanguage/duisettingslanguageparser.h" diff --git a/src/include/duisettingslanguagewidget.h b/src/include/duisettingslanguagewidget.h index 5c5f670a8..3f36b56a8 100644 --- a/src/include/duisettingslanguagewidget.h +++ b/src/include/duisettingslanguagewidget.h @@ -17,4 +17,4 @@ ** ****************************************************************************/ -#include "../settingslanguage/duisettingslanguagewidget.h" +#include "../settings/settingslanguage/duisettingslanguagewidget.h" diff --git a/src/include/duisettingslanguagewidgetfactory.h b/src/include/duisettingslanguagewidgetfactory.h index c1a7c18aa..501731377 100644 --- a/src/include/duisettingslanguagewidgetfactory.h +++ b/src/include/duisettingslanguagewidgetfactory.h @@ -17,4 +17,4 @@ ** ****************************************************************************/ -#include "../settingslanguage/duisettingslanguagewidgetfactory.h" +#include "../settings/settingslanguage/duisettingslanguagewidgetfactory.h" diff --git a/src/include/duishareddata.h b/src/include/duishareddata.h index 58f0be7bb..449e299cf 100644 --- a/src/include/duishareddata.h +++ b/src/include/duishareddata.h @@ -17,4 +17,4 @@ ** ****************************************************************************/ -#include "../core/duishareddata.h" +#include "../corelib/core/duishareddata.h" diff --git a/src/include/duislider.h b/src/include/duislider.h index 295fda845..49f81785d 100644 --- a/src/include/duislider.h +++ b/src/include/duislider.h @@ -17,4 +17,4 @@ ** ****************************************************************************/ -#include "../widgets/duislider.h" +#include "../corelib/widgets/duislider.h" diff --git a/src/include/duislidermodel.h b/src/include/duislidermodel.h index 3e38e609f..346808629 100644 --- a/src/include/duislidermodel.h +++ b/src/include/duislidermodel.h @@ -17,5 +17,5 @@ ** ****************************************************************************/ -#include "../widgets/duislidermodel.h" +#include "../corelib/widgets/duislidermodel.h" diff --git a/src/include/duisliderstyle.h b/src/include/duisliderstyle.h index 5e814003e..f822fbff6 100644 --- a/src/include/duisliderstyle.h +++ b/src/include/duisliderstyle.h @@ -17,5 +17,5 @@ ** ****************************************************************************/ -#include "../style/duisliderstyle.h" +#include "../views/style/duisliderstyle.h" diff --git a/src/include/duisliderview.h b/src/include/duisliderview.h index 74eb193aa..da2b409ea 100644 --- a/src/include/duisliderview.h +++ b/src/include/duisliderview.h @@ -17,5 +17,5 @@ ** ****************************************************************************/ -#include "../widgets/views/duisliderview.h" +#include "../views/duisliderview.h" diff --git a/src/include/duistylablewidget.h b/src/include/duistylablewidget.h index e81ac405d..35d9b4cf3 100644 --- a/src/include/duistylablewidget.h +++ b/src/include/duistylablewidget.h @@ -17,4 +17,4 @@ ** ****************************************************************************/ -#include "../widgets/duistylablewidget.h" +#include "../corelib/widgets/duistylablewidget.h" diff --git a/src/include/duistyle.h b/src/include/duistyle.h index ac0c05370..736da5b32 100644 --- a/src/include/duistyle.h +++ b/src/include/duistyle.h @@ -17,4 +17,4 @@ ** ****************************************************************************/ -#include "../style/duistyle.h" +#include "../corelib/style/duistyle.h" diff --git a/src/include/duistylecreator.h b/src/include/duistylecreator.h index ffeb19f83..b0df307e6 100644 --- a/src/include/duistylecreator.h +++ b/src/include/duistylecreator.h @@ -17,4 +17,4 @@ ** ****************************************************************************/ -#include "../style/duistylecreator.h" +#include "../corelib/style/duistylecreator.h" diff --git a/src/include/duistylesheet.h b/src/include/duistylesheet.h index 90bdd43fc..5f1acf882 100644 --- a/src/include/duistylesheet.h +++ b/src/include/duistylesheet.h @@ -17,4 +17,4 @@ ** ****************************************************************************/ -#include "../style/duistylesheet.h" +#include "../corelib/style/duistylesheet.h" diff --git a/src/include/duistylesheetattribute.h b/src/include/duistylesheetattribute.h index c97b34ce8..9aa334dd3 100644 --- a/src/include/duistylesheetattribute.h +++ b/src/include/duistylesheetattribute.h @@ -17,4 +17,4 @@ ** ****************************************************************************/ -#include "../style/duistylesheetattribute.h" +#include "../corelib/style/duistylesheetattribute.h" diff --git a/src/include/duistylesheetparser.h b/src/include/duistylesheetparser.h index 45e767b57..887fc19a4 100644 --- a/src/include/duistylesheetparser.h +++ b/src/include/duistylesheetparser.h @@ -17,4 +17,4 @@ ** ****************************************************************************/ -#include "../style/duistylesheetparser.h" +#include "../corelib/style/duistylesheetparser.h" diff --git a/src/include/duistylesheetselector.h b/src/include/duistylesheetselector.h index 9af564f01..4a5c8a835 100644 --- a/src/include/duistylesheetselector.h +++ b/src/include/duistylesheetselector.h @@ -17,4 +17,4 @@ ** ****************************************************************************/ -#include "../style/duistylesheetselector.h" +#include "../corelib/style/duistylesheetselector.h" diff --git a/src/include/duitextedit.h b/src/include/duitextedit.h index e9b8a7577..ba8416d6f 100644 --- a/src/include/duitextedit.h +++ b/src/include/duitextedit.h @@ -17,4 +17,4 @@ ** ****************************************************************************/ -#include "../widgets/duitextedit.h" +#include "../corelib/widgets/duitextedit.h" diff --git a/src/include/duitexteditmodel.h b/src/include/duitexteditmodel.h index a91e76aa0..ab710a772 100644 --- a/src/include/duitexteditmodel.h +++ b/src/include/duitexteditmodel.h @@ -17,5 +17,5 @@ ** ****************************************************************************/ -#include "../widgets/duitexteditmodel.h" +#include "../corelib/widgets/duitexteditmodel.h" diff --git a/src/include/duitexteditstyle.h b/src/include/duitexteditstyle.h index 55ab42f5f..7c322783b 100644 --- a/src/include/duitexteditstyle.h +++ b/src/include/duitexteditstyle.h @@ -17,5 +17,5 @@ ** ****************************************************************************/ -#include "../style/duitexteditstyle.h" +#include "../views/style/duitexteditstyle.h" diff --git a/src/include/duitexteditview.h b/src/include/duitexteditview.h index fa1f9cf25..63f78c352 100644 --- a/src/include/duitexteditview.h +++ b/src/include/duitexteditview.h @@ -17,5 +17,5 @@ ** ****************************************************************************/ -#include "../widgets/views/duitexteditview.h" +#include "../views/duitexteditview.h" diff --git a/src/include/duitheme.h b/src/include/duitheme.h index 641e415d0..6f753f508 100644 --- a/src/include/duitheme.h +++ b/src/include/duitheme.h @@ -17,4 +17,4 @@ ** ****************************************************************************/ -#include "../theme/duitheme.h" +#include "../corelib/theme/duitheme.h" diff --git a/src/include/duithemedaemon.h b/src/include/duithemedaemon.h index af268c56f..8f47f01ee 100644 --- a/src/include/duithemedaemon.h +++ b/src/include/duithemedaemon.h @@ -17,5 +17,5 @@ ** ****************************************************************************/ -#include "../theme/duithemedaemon.h" +#include "../corelib/theme/duithemedaemon.h" diff --git a/src/include/duitoolbar.h b/src/include/duitoolbar.h index cf58a9b57..010270574 100644 --- a/src/include/duitoolbar.h +++ b/src/include/duitoolbar.h @@ -17,5 +17,5 @@ ** ****************************************************************************/ -#include "../widgets/duitoolbar.h" +#include "../corelib/widgets/duitoolbar.h" diff --git a/src/include/duitoolbartabview.h b/src/include/duitoolbartabview.h index 59a010c0d..0f7ad9fdf 100644 --- a/src/include/duitoolbartabview.h +++ b/src/include/duitoolbartabview.h @@ -17,5 +17,5 @@ ** ****************************************************************************/ -#include "../widgets/views/duitoolbartabview.h" +#include "../views/duitoolbartabview.h" diff --git a/src/include/duitoolbarview.h b/src/include/duitoolbarview.h index 4daff5bfa..928223e05 100644 --- a/src/include/duitoolbarview.h +++ b/src/include/duitoolbarview.h @@ -17,5 +17,5 @@ ** ****************************************************************************/ -#include "../widgets/views/duitoolbarview.h" +#include "../views/duitoolbarview.h" diff --git a/src/include/duivideowidget.h b/src/include/duivideowidget.h index 8741fe494..e38e2d466 100644 --- a/src/include/duivideowidget.h +++ b/src/include/duivideowidget.h @@ -1,2 +1,2 @@ -#include "../video/duivideowidget.h" +#include "../corelib/video/duivideowidget.h" diff --git a/src/include/duivideowidgetmodel.h b/src/include/duivideowidgetmodel.h index 52ddf05d6..0d9e20456 100644 --- a/src/include/duivideowidgetmodel.h +++ b/src/include/duivideowidgetmodel.h @@ -1,2 +1,2 @@ -#include "../video/duivideowidgetmodel.h" +#include "../corelib/video/duivideowidgetmodel.h" diff --git a/src/include/duivideowidgetview.h b/src/include/duivideowidgetview.h index 6c0eba136..423edcf05 100644 --- a/src/include/duivideowidgetview.h +++ b/src/include/duivideowidgetview.h @@ -1,2 +1,2 @@ -#include "../video/duivideowidgetview.h" +#include "../corelib/video/duivideowidgetview.h" diff --git a/src/include/duiviewcreator.h b/src/include/duiviewcreator.h index a9feca32a..65001a3f6 100644 --- a/src/include/duiviewcreator.h +++ b/src/include/duiviewcreator.h @@ -17,4 +17,4 @@ ** ****************************************************************************/ -#include "../widgets/duiviewcreator.h" +#include "../corelib/widgets/duiviewcreator.h" diff --git a/src/include/duiwidget.h b/src/include/duiwidget.h index bf14e7cbc..9f6e2e2b6 100644 --- a/src/include/duiwidget.h +++ b/src/include/duiwidget.h @@ -17,4 +17,4 @@ ** ****************************************************************************/ -#include "../widgets/core/duiwidget.h" +#include "../corelib/widgets/core/duiwidget.h" diff --git a/src/include/duiwidgetaction.h b/src/include/duiwidgetaction.h index d5ba0cf7e..ba7cf4624 100644 --- a/src/include/duiwidgetaction.h +++ b/src/include/duiwidgetaction.h @@ -17,5 +17,5 @@ ** ****************************************************************************/ -#include "../core/duiwidgetaction.h" +#include "../corelib/core/duiwidgetaction.h" diff --git a/src/include/duiwidgetcontroller.h b/src/include/duiwidgetcontroller.h index 7e52ff926..bc871d7ac 100644 --- a/src/include/duiwidgetcontroller.h +++ b/src/include/duiwidgetcontroller.h @@ -17,4 +17,4 @@ ** ****************************************************************************/ -#include "../widgets/core/duiwidgetcontroller.h" +#include "../corelib/widgets/core/duiwidgetcontroller.h" diff --git a/src/include/duiwidgetcreator.h b/src/include/duiwidgetcreator.h index 88537baec..b3563a0a3 100644 --- a/src/include/duiwidgetcreator.h +++ b/src/include/duiwidgetcreator.h @@ -17,4 +17,4 @@ ** ****************************************************************************/ -#include "../widgets/core/duiwidgetcreator.h" +#include "../corelib/widgets/core/duiwidgetcreator.h" diff --git a/src/include/duiwidgetfadeinanimationstyle.h b/src/include/duiwidgetfadeinanimationstyle.h index 46ceeb527..fe0985bf8 100644 --- a/src/include/duiwidgetfadeinanimationstyle.h +++ b/src/include/duiwidgetfadeinanimationstyle.h @@ -17,4 +17,4 @@ ** ****************************************************************************/ -#include "../style/duiwidgetfadeinanimationstyle.h" +#include "../corelib/style/duiwidgetfadeinanimationstyle.h" diff --git a/src/include/duiwidgetfadeoutanimationstyle.h b/src/include/duiwidgetfadeoutanimationstyle.h index f9fc49f61..66e004502 100644 --- a/src/include/duiwidgetfadeoutanimationstyle.h +++ b/src/include/duiwidgetfadeoutanimationstyle.h @@ -17,4 +17,4 @@ ** ****************************************************************************/ -#include "../style/duiwidgetfadeoutanimationstyle.h" +#include "../corelib/style/duiwidgetfadeoutanimationstyle.h" diff --git a/src/include/duiwidgetmodel.h b/src/include/duiwidgetmodel.h index a8f4a17f9..1a30c9c7d 100644 --- a/src/include/duiwidgetmodel.h +++ b/src/include/duiwidgetmodel.h @@ -17,5 +17,5 @@ ** ****************************************************************************/ -#include "../widgets/duiwidgetmodel.h" +#include "../corelib/widgets/duiwidgetmodel.h" diff --git a/src/include/duiwidgetrecycler.h b/src/include/duiwidgetrecycler.h index cf803ed2d..0fd81f0a0 100644 --- a/src/include/duiwidgetrecycler.h +++ b/src/include/duiwidgetrecycler.h @@ -17,4 +17,4 @@ ** ****************************************************************************/ -#include "../widgets/duiwidgetrecycler.h" +#include "../corelib/widgets/duiwidgetrecycler.h" diff --git a/src/include/duiwidgetstyle.h b/src/include/duiwidgetstyle.h index 2c5397d09..9e8a1d7c0 100644 --- a/src/include/duiwidgetstyle.h +++ b/src/include/duiwidgetstyle.h @@ -17,5 +17,5 @@ ** ****************************************************************************/ -#include "../style/duiwidgetstyle.h" +#include "../corelib/style/duiwidgetstyle.h" diff --git a/src/include/duiwidgetview.h b/src/include/duiwidgetview.h index 81a012356..d8b194e16 100644 --- a/src/include/duiwidgetview.h +++ b/src/include/duiwidgetview.h @@ -17,5 +17,5 @@ ** ****************************************************************************/ -#include "../widgets/core/duiwidgetview.h" +#include "../corelib/widgets/core/duiwidgetview.h" diff --git a/src/include/duiwindow.h b/src/include/duiwindow.h index 2d70a7a84..d6f91997b 100644 --- a/src/include/duiwindow.h +++ b/src/include/duiwindow.h @@ -17,4 +17,4 @@ ** ****************************************************************************/ -#include "../widgets/duiwindow.h" +#include "../corelib/widgets/duiwindow.h" diff --git a/src/include/iduithemedaemon.h b/src/include/iduithemedaemon.h index 6d296a891..7ae0885cd 100644 --- a/src/include/iduithemedaemon.h +++ b/src/include/iduithemedaemon.h @@ -17,5 +17,5 @@ ** ****************************************************************************/ -#include "../theme/iduithemedaemon.h" +#include "../corelib/theme/iduithemedaemon.h" diff --git a/src/include/private/duiextendingbackgroundview_p.h b/src/include/private/duiextendingbackgroundview_p.h index e315d2122..692efcb50 100644 --- a/src/include/private/duiextendingbackgroundview_p.h +++ b/src/include/private/duiextendingbackgroundview_p.h @@ -17,4 +17,4 @@ ** ****************************************************************************/ -#include "../widgets/views/duiextendingbackgroundview_p.h" +#include "../corelib/widgets/views/duiextendingbackgroundview_p.h" diff --git a/src/include/private/duiwidget_p.h b/src/include/private/duiwidget_p.h index d2bca918d..bebfad2f8 100644 --- a/src/include/private/duiwidget_p.h +++ b/src/include/private/duiwidget_p.h @@ -17,4 +17,4 @@ ** ****************************************************************************/ -#include "../widgets/core/duiwidget_p.h" +#include "../corelib/widgets/core/duiwidget_p.h" diff --git a/src/include/private/duiwidgetcontroller_p.h b/src/include/private/duiwidgetcontroller_p.h index e5ba66040..42f4d177d 100644 --- a/src/include/private/duiwidgetcontroller_p.h +++ b/src/include/private/duiwidgetcontroller_p.h @@ -17,4 +17,4 @@ ** ****************************************************************************/ -#include "../widgets/core/duiwidgetcontroller_p.h" +#include "../corelib/widgets/core/duiwidgetcontroller_p.h" diff --git a/src/include/private/duiwidgetview_p.h b/src/include/private/duiwidgetview_p.h index f9695d44e..4dfe55313 100644 --- a/src/include/private/duiwidgetview_p.h +++ b/src/include/private/duiwidgetview_p.h @@ -17,4 +17,4 @@ ** ****************************************************************************/ -#include "../widgets/core/duiwidgetview_p.h" +#include "../corelib/widgets/core/duiwidgetview_p.h" diff --git a/src/include/testabilityinterface.h b/src/include/testabilityinterface.h index 4276223f1..304d76173 100644 --- a/src/include/testabilityinterface.h +++ b/src/include/testabilityinterface.h @@ -17,5 +17,5 @@ ** ****************************************************************************/ -#include "../core/testabilityinterface.h" +#include "../corelib/core/testabilityinterface.h" diff --git a/src/settings/duisettingslibrary.cpp b/src/settings/duisettingslibrary.cpp new file mode 100644 index 000000000..c4e4cc1da --- /dev/null +++ b/src/settings/duisettingslibrary.cpp @@ -0,0 +1,5 @@ +// initialize the duisettings library for styles etc. here + +#include "duilibrary.h" + +DUI_LIBRARY diff --git a/src/settings/settings.pro b/src/settings/settings.pro new file mode 100644 index 000000000..862a1a178 --- /dev/null +++ b/src/settings/settings.pro @@ -0,0 +1,14 @@ +include( ../common_top.pri ) + +TARGET = duisettings + +INCLUDEPATH += \ + ../include \ + settingslanguage \ + ../.gen \ + +include(settingslanguage/settingslanguage.pri) + +SOURCES += duisettingslibrary.cpp + +include(../common_bot.pri) diff --git a/src/settingslanguage/duisettingslanguagebinary.cpp b/src/settings/settingslanguage/duisettingslanguagebinary.cpp similarity index 100% rename from src/settingslanguage/duisettingslanguagebinary.cpp rename to src/settings/settingslanguage/duisettingslanguagebinary.cpp diff --git a/src/settingslanguage/duisettingslanguagebinary.h b/src/settings/settingslanguage/duisettingslanguagebinary.h similarity index 100% rename from src/settingslanguage/duisettingslanguagebinary.h rename to src/settings/settingslanguage/duisettingslanguagebinary.h diff --git a/src/settingslanguage/duisettingslanguageboolean.cpp b/src/settings/settingslanguage/duisettingslanguageboolean.cpp similarity index 100% rename from src/settingslanguage/duisettingslanguageboolean.cpp rename to src/settings/settingslanguage/duisettingslanguageboolean.cpp diff --git a/src/settingslanguage/duisettingslanguageboolean.h b/src/settings/settingslanguage/duisettingslanguageboolean.h similarity index 100% rename from src/settingslanguage/duisettingslanguageboolean.h rename to src/settings/settingslanguage/duisettingslanguageboolean.h diff --git a/src/settingslanguage/duisettingslanguagebooleancontroller.cpp b/src/settings/settingslanguage/duisettingslanguagebooleancontroller.cpp similarity index 100% rename from src/settingslanguage/duisettingslanguagebooleancontroller.cpp rename to src/settings/settingslanguage/duisettingslanguagebooleancontroller.cpp diff --git a/src/settingslanguage/duisettingslanguagebooleancontroller.h b/src/settings/settingslanguage/duisettingslanguagebooleancontroller.h similarity index 100% rename from src/settingslanguage/duisettingslanguagebooleancontroller.h rename to src/settings/settingslanguage/duisettingslanguagebooleancontroller.h diff --git a/src/settingslanguage/duisettingslanguagebooleanfactory.cpp b/src/settings/settingslanguage/duisettingslanguagebooleanfactory.cpp similarity index 100% rename from src/settingslanguage/duisettingslanguagebooleanfactory.cpp rename to src/settings/settingslanguage/duisettingslanguagebooleanfactory.cpp diff --git a/src/settingslanguage/duisettingslanguagebooleanfactory.h b/src/settings/settingslanguage/duisettingslanguagebooleanfactory.h similarity index 100% rename from src/settingslanguage/duisettingslanguagebooleanfactory.h rename to src/settings/settingslanguage/duisettingslanguagebooleanfactory.h diff --git a/src/settingslanguage/duisettingslanguagegroup.h b/src/settings/settingslanguage/duisettingslanguagegroup.h similarity index 100% rename from src/settingslanguage/duisettingslanguagegroup.h rename to src/settings/settingslanguage/duisettingslanguagegroup.h diff --git a/src/settingslanguage/duisettingslanguagegroupfactory.cpp b/src/settings/settingslanguage/duisettingslanguagegroupfactory.cpp similarity index 100% rename from src/settingslanguage/duisettingslanguagegroupfactory.cpp rename to src/settings/settingslanguage/duisettingslanguagegroupfactory.cpp diff --git a/src/settingslanguage/duisettingslanguagegroupfactory.h b/src/settings/settingslanguage/duisettingslanguagegroupfactory.h similarity index 100% rename from src/settingslanguage/duisettingslanguagegroupfactory.h rename to src/settings/settingslanguage/duisettingslanguagegroupfactory.h diff --git a/src/settingslanguage/duisettingslanguageinteger.cpp b/src/settings/settingslanguage/duisettingslanguageinteger.cpp similarity index 100% rename from src/settingslanguage/duisettingslanguageinteger.cpp rename to src/settings/settingslanguage/duisettingslanguageinteger.cpp diff --git a/src/settingslanguage/duisettingslanguageinteger.h b/src/settings/settingslanguage/duisettingslanguageinteger.h similarity index 100% rename from src/settingslanguage/duisettingslanguageinteger.h rename to src/settings/settingslanguage/duisettingslanguageinteger.h diff --git a/src/settingslanguage/duisettingslanguageintegercontroller.cpp b/src/settings/settingslanguage/duisettingslanguageintegercontroller.cpp similarity index 100% rename from src/settingslanguage/duisettingslanguageintegercontroller.cpp rename to src/settings/settingslanguage/duisettingslanguageintegercontroller.cpp diff --git a/src/settingslanguage/duisettingslanguageintegercontroller.h b/src/settings/settingslanguage/duisettingslanguageintegercontroller.h similarity index 100% rename from src/settingslanguage/duisettingslanguageintegercontroller.h rename to src/settings/settingslanguage/duisettingslanguageintegercontroller.h diff --git a/src/settingslanguage/duisettingslanguageintegerfactory.cpp b/src/settings/settingslanguage/duisettingslanguageintegerfactory.cpp similarity index 100% rename from src/settingslanguage/duisettingslanguageintegerfactory.cpp rename to src/settings/settingslanguage/duisettingslanguageintegerfactory.cpp diff --git a/src/settingslanguage/duisettingslanguageintegerfactory.h b/src/settings/settingslanguage/duisettingslanguageintegerfactory.h similarity index 100% rename from src/settingslanguage/duisettingslanguageintegerfactory.h rename to src/settings/settingslanguage/duisettingslanguageintegerfactory.h diff --git a/src/settingslanguage/duisettingslanguagenode.cpp b/src/settings/settingslanguage/duisettingslanguagenode.cpp similarity index 100% rename from src/settingslanguage/duisettingslanguagenode.cpp rename to src/settings/settingslanguage/duisettingslanguagenode.cpp diff --git a/src/settingslanguage/duisettingslanguagenode.h b/src/settings/settingslanguage/duisettingslanguagenode.h similarity index 100% rename from src/settingslanguage/duisettingslanguagenode.h rename to src/settings/settingslanguage/duisettingslanguagenode.h diff --git a/src/settingslanguage/duisettingslanguageoption.cpp b/src/settings/settingslanguage/duisettingslanguageoption.cpp similarity index 100% rename from src/settingslanguage/duisettingslanguageoption.cpp rename to src/settings/settingslanguage/duisettingslanguageoption.cpp diff --git a/src/settingslanguage/duisettingslanguageoption.h b/src/settings/settingslanguage/duisettingslanguageoption.h similarity index 100% rename from src/settingslanguage/duisettingslanguageoption.h rename to src/settings/settingslanguage/duisettingslanguageoption.h diff --git a/src/settingslanguage/duisettingslanguageparser.cpp b/src/settings/settingslanguage/duisettingslanguageparser.cpp similarity index 100% rename from src/settingslanguage/duisettingslanguageparser.cpp rename to src/settings/settingslanguage/duisettingslanguageparser.cpp diff --git a/src/settingslanguage/duisettingslanguageparser.h b/src/settings/settingslanguage/duisettingslanguageparser.h similarity index 100% rename from src/settingslanguage/duisettingslanguageparser.h rename to src/settings/settingslanguage/duisettingslanguageparser.h diff --git a/src/settingslanguage/duisettingslanguageparser_p.h b/src/settings/settingslanguage/duisettingslanguageparser_p.h similarity index 100% rename from src/settingslanguage/duisettingslanguageparser_p.h rename to src/settings/settingslanguage/duisettingslanguageparser_p.h diff --git a/src/settingslanguage/duisettingslanguageselection.cpp b/src/settings/settingslanguage/duisettingslanguageselection.cpp similarity index 100% rename from src/settingslanguage/duisettingslanguageselection.cpp rename to src/settings/settingslanguage/duisettingslanguageselection.cpp diff --git a/src/settingslanguage/duisettingslanguageselection.h b/src/settings/settingslanguage/duisettingslanguageselection.h similarity index 100% rename from src/settingslanguage/duisettingslanguageselection.h rename to src/settings/settingslanguage/duisettingslanguageselection.h diff --git a/src/settingslanguage/duisettingslanguageselectioncontroller.cpp b/src/settings/settingslanguage/duisettingslanguageselectioncontroller.cpp similarity index 100% rename from src/settingslanguage/duisettingslanguageselectioncontroller.cpp rename to src/settings/settingslanguage/duisettingslanguageselectioncontroller.cpp diff --git a/src/settingslanguage/duisettingslanguageselectioncontroller.h b/src/settings/settingslanguage/duisettingslanguageselectioncontroller.h similarity index 100% rename from src/settingslanguage/duisettingslanguageselectioncontroller.h rename to src/settings/settingslanguage/duisettingslanguageselectioncontroller.h diff --git a/src/settingslanguage/duisettingslanguageselectionfactory.cpp b/src/settings/settingslanguage/duisettingslanguageselectionfactory.cpp similarity index 100% rename from src/settingslanguage/duisettingslanguageselectionfactory.cpp rename to src/settings/settingslanguage/duisettingslanguageselectionfactory.cpp diff --git a/src/settingslanguage/duisettingslanguageselectionfactory.h b/src/settings/settingslanguage/duisettingslanguageselectionfactory.h similarity index 100% rename from src/settingslanguage/duisettingslanguageselectionfactory.h rename to src/settings/settingslanguage/duisettingslanguageselectionfactory.h diff --git a/src/settingslanguage/duisettingslanguagesettings.cpp b/src/settings/settingslanguage/duisettingslanguagesettings.cpp similarity index 100% rename from src/settingslanguage/duisettingslanguagesettings.cpp rename to src/settings/settingslanguage/duisettingslanguagesettings.cpp diff --git a/src/settingslanguage/duisettingslanguagesettings.h b/src/settings/settingslanguage/duisettingslanguagesettings.h similarity index 100% rename from src/settingslanguage/duisettingslanguagesettings.h rename to src/settings/settingslanguage/duisettingslanguagesettings.h diff --git a/src/settingslanguage/duisettingslanguagesettingsfactory.cpp b/src/settings/settingslanguage/duisettingslanguagesettingsfactory.cpp similarity index 100% rename from src/settingslanguage/duisettingslanguagesettingsfactory.cpp rename to src/settings/settingslanguage/duisettingslanguagesettingsfactory.cpp diff --git a/src/settingslanguage/duisettingslanguagesettingsfactory.h b/src/settings/settingslanguage/duisettingslanguagesettingsfactory.h similarity index 100% rename from src/settingslanguage/duisettingslanguagesettingsfactory.h rename to src/settings/settingslanguage/duisettingslanguagesettingsfactory.h diff --git a/src/style/duisettingslanguagesettingsfactorystyle.h b/src/settings/settingslanguage/duisettingslanguagesettingsfactorystyle.h similarity index 94% rename from src/style/duisettingslanguagesettingsfactorystyle.h rename to src/settings/settingslanguage/duisettingslanguagesettingsfactorystyle.h index bc0d5ef7f..7e5efd03e 100644 --- a/src/style/duisettingslanguagesettingsfactorystyle.h +++ b/src/settings/settingslanguage/duisettingslanguagesettingsfactorystyle.h @@ -28,7 +28,7 @@ class DUI_EXPORT DuiSettingsLanguageSettingsFactoryStyle : public DuiWidgetStyle { Q_OBJECT - DUI_STYLE_INTERNAL(DuiSettingsLanguageSettingsFactoryStyle) + DUI_STYLE(DuiSettingsLanguageSettingsFactoryStyle) //! The image ID of the content indicator to be shown next to clickable items DUI_STYLE_ATTRIBUTE(QString, contentIndicator, ContentIndicator) @@ -58,7 +58,7 @@ class DUI_EXPORT DuiSettingsLanguageSettingsFactoryStyle : public DuiWidgetStyle */ class DUI_EXPORT DuiSettingsLanguageSettingsFactoryStyleContainer : public DuiWidgetStyleContainer { - DUI_STYLE_CONTAINER_INTERNAL(DuiSettingsLanguageSettingsFactoryStyle) + DUI_STYLE_CONTAINER(DuiSettingsLanguageSettingsFactoryStyle) }; #endif /* DUISETTINGSLANGUAGESETTINGSFACTORYSTYLE_H_ */ diff --git a/src/settingslanguage/duisettingslanguagetext.cpp b/src/settings/settingslanguage/duisettingslanguagetext.cpp similarity index 100% rename from src/settingslanguage/duisettingslanguagetext.cpp rename to src/settings/settingslanguage/duisettingslanguagetext.cpp diff --git a/src/settingslanguage/duisettingslanguagetext.h b/src/settings/settingslanguage/duisettingslanguagetext.h similarity index 100% rename from src/settingslanguage/duisettingslanguagetext.h rename to src/settings/settingslanguage/duisettingslanguagetext.h diff --git a/src/settingslanguage/duisettingslanguagetextcontroller.cpp b/src/settings/settingslanguage/duisettingslanguagetextcontroller.cpp similarity index 100% rename from src/settingslanguage/duisettingslanguagetextcontroller.cpp rename to src/settings/settingslanguage/duisettingslanguagetextcontroller.cpp diff --git a/src/settingslanguage/duisettingslanguagetextcontroller.h b/src/settings/settingslanguage/duisettingslanguagetextcontroller.h similarity index 100% rename from src/settingslanguage/duisettingslanguagetextcontroller.h rename to src/settings/settingslanguage/duisettingslanguagetextcontroller.h diff --git a/src/settingslanguage/duisettingslanguagetextfactory.cpp b/src/settings/settingslanguage/duisettingslanguagetextfactory.cpp similarity index 100% rename from src/settingslanguage/duisettingslanguagetextfactory.cpp rename to src/settings/settingslanguage/duisettingslanguagetextfactory.cpp diff --git a/src/settingslanguage/duisettingslanguagetextfactory.h b/src/settings/settingslanguage/duisettingslanguagetextfactory.h similarity index 100% rename from src/settingslanguage/duisettingslanguagetextfactory.h rename to src/settings/settingslanguage/duisettingslanguagetextfactory.h diff --git a/src/settingslanguage/duisettingslanguagewidget.cpp b/src/settings/settingslanguage/duisettingslanguagewidget.cpp similarity index 100% rename from src/settingslanguage/duisettingslanguagewidget.cpp rename to src/settings/settingslanguage/duisettingslanguagewidget.cpp diff --git a/src/settingslanguage/duisettingslanguagewidget.h b/src/settings/settingslanguage/duisettingslanguagewidget.h similarity index 100% rename from src/settingslanguage/duisettingslanguagewidget.h rename to src/settings/settingslanguage/duisettingslanguagewidget.h diff --git a/src/settingslanguage/duisettingslanguagewidgetfactory.cpp b/src/settings/settingslanguage/duisettingslanguagewidgetfactory.cpp similarity index 100% rename from src/settingslanguage/duisettingslanguagewidgetfactory.cpp rename to src/settings/settingslanguage/duisettingslanguagewidgetfactory.cpp diff --git a/src/settingslanguage/duisettingslanguagewidgetfactory.h b/src/settings/settingslanguage/duisettingslanguagewidgetfactory.h similarity index 100% rename from src/settingslanguage/duisettingslanguagewidgetfactory.h rename to src/settings/settingslanguage/duisettingslanguagewidgetfactory.h diff --git a/src/settings/settingslanguage/settingslanguage.pri b/src/settings/settingslanguage/settingslanguage.pri new file mode 100644 index 000000000..712e46592 --- /dev/null +++ b/src/settings/settingslanguage/settingslanguage.pri @@ -0,0 +1,48 @@ +DUIGEN_STYLE_HEADERS += \ + settingslanguage/duisettingslanguagesettingsfactorystyle.h + +HEADERS += \ + $$DUIGEN_STYLE_HEADERS \ + settingslanguage/duisettingslanguageparser.h \ + settingslanguage/duisettingslanguagebinary.h \ + settingslanguage/duisettingslanguagewidget.h \ + settingslanguage/duisettingslanguagewidgetfactory.h \ + settingslanguage/duisettingslanguagesettingsfactory.h \ + settingslanguage/duisettingslanguageselectionfactory.h \ + settingslanguage/duisettingslanguagetextfactory.h \ + settingslanguage/duisettingslanguageintegerfactory.h \ + settingslanguage/duisettingslanguageselectioncontroller.h \ + settingslanguage/duisettingslanguagetextcontroller.h \ + settingslanguage/duisettingslanguageintegercontroller.h \ + settingslanguage/duisettingslanguagenode.h \ + settingslanguage/duisettingslanguageoption.h \ + settingslanguage/duisettingslanguageselection.h \ + settingslanguage/duisettingslanguagesettings.h \ + settingslanguage/duisettingslanguagetext.h \ + settingslanguage/duisettingslanguagebooleancontroller.h \ + settingslanguage/duisettingslanguagebooleanfactory.h \ + settingslanguage/duisettingslanguageboolean.h \ + settingslanguage/duisettingslanguageinteger.h \ + settingslanguage/duisettingslanguagegroup.h + +SOURCES += \ + settingslanguage/duisettingslanguageparser.cpp \ + settingslanguage/duisettingslanguagebinary.cpp \ + settingslanguage/duisettingslanguagewidget.cpp \ + settingslanguage/duisettingslanguagewidgetfactory.cpp \ + settingslanguage/duisettingslanguagesettingsfactory.cpp \ + settingslanguage/duisettingslanguageselectionfactory.cpp \ + settingslanguage/duisettingslanguagetextfactory.cpp \ + settingslanguage/duisettingslanguageintegerfactory.cpp \ + settingslanguage/duisettingslanguageselectioncontroller.cpp \ + settingslanguage/duisettingslanguagetextcontroller.cpp \ + settingslanguage/duisettingslanguageintegercontroller.cpp \ + settingslanguage/duisettingslanguagenode.cpp \ + settingslanguage/duisettingslanguageoption.cpp \ + settingslanguage/duisettingslanguageselection.cpp \ + settingslanguage/duisettingslanguagesettings.cpp \ + settingslanguage/duisettingslanguagetext.cpp \ + settingslanguage/duisettingslanguagebooleancontroller.cpp \ + settingslanguage/duisettingslanguagebooleanfactory.cpp \ + settingslanguage/duisettingslanguageboolean.cpp \ + settingslanguage/duisettingslanguageinteger.cpp diff --git a/src/settingslanguage/settingslanguage.pri b/src/settingslanguage/settingslanguage.pri deleted file mode 100644 index d20e11e13..000000000 --- a/src/settingslanguage/settingslanguage.pri +++ /dev/null @@ -1,71 +0,0 @@ -# Input -SETTINGSLANGUAGE_SRC_DIR = ./settingslanguage -INCLUDEPATH += ./settingslanguage -QT += xml - -duigen_model_settingslanguage.name = duigenerator \ - model -duigen_model_settingslanguage.input = SETTINGSLANGUAGE_MODEL_HEADERS -duigen_model_settingslanguage.output = $$GEN_DIR/gen_${QMAKE_FILE_BASE}data.cpp -duigen_model_settingslanguage.depends = $$DUIGEN_EXECUTABLE -duigen_model_settingslanguage.commands += $$DUIGEN_EXECUTABLE --model \ - ${QMAKE_FILE_NAME} \ - $$GEN_DIR/ -duigen_model_settingslanguage.clean += $$GEN_DIR/gen_* -duigen_model_settingslanguage.CONFIG = target_predeps no_link -duigen_model_settingslanguage.variable_out = GENERATED_SOURCES -QMAKE_EXTRA_COMPILERS += duigen_model_settingslanguage - -duigen_style_settingslanguage.name = duigenerator style -duigen_style_settingslanguage.input = SETTINGSLANGUAGE_STYLE_HEADERS -duigen_style_settingslanguage.depends = $$DUIGEN_EXECUTABLE -duigen_style_settingslanguage.output = $$GEN_DIR/gen_${QMAKE_FILE_BASE}data.cpp -duigen_style_settingslanguage.commands += $$DUIGEN_EXECUTABLE --style ${QMAKE_FILE_NAME} $$GEN_DIR -duigen_style_settingslanguage.clean += $$GEN_DIR/gen_* -duigen_style_settingslanguage.CONFIG = target_predeps no_link -duigen_style_settingslanguage.variable_out = GENERATED_SOURCES - -QMAKE_EXTRA_COMPILERS += duigen_style_settingslanguage -HEADERS += $$SETTINGSLANGUAGE_MODEL_HEADERS \ - $$SETTINGSLANGUAGE_STYLE_HEADERS \ - $$SETTINGSLANGUAGE_SRC_DIR/duisettingslanguageparser.h \ - $$SETTINGSLANGUAGE_SRC_DIR/duisettingslanguagebinary.h \ - $$SETTINGSLANGUAGE_SRC_DIR/duisettingslanguagewidget.h \ - $$SETTINGSLANGUAGE_SRC_DIR/duisettingslanguagewidgetfactory.h \ - $$SETTINGSLANGUAGE_SRC_DIR/duisettingslanguagesettingsfactory.h \ - $$SETTINGSLANGUAGE_SRC_DIR/duisettingslanguageselectionfactory.h \ - $$SETTINGSLANGUAGE_SRC_DIR/duisettingslanguagetextfactory.h \ - $$SETTINGSLANGUAGE_SRC_DIR/duisettingslanguageintegerfactory.h \ - $$SETTINGSLANGUAGE_SRC_DIR/duisettingslanguageselectioncontroller.h \ - $$SETTINGSLANGUAGE_SRC_DIR/duisettingslanguagetextcontroller.h \ - $$SETTINGSLANGUAGE_SRC_DIR/duisettingslanguageintegercontroller.h \ - $$SETTINGSLANGUAGE_SRC_DIR/duisettingslanguagenode.h \ - $$SETTINGSLANGUAGE_SRC_DIR/duisettingslanguageoption.h \ - $$SETTINGSLANGUAGE_SRC_DIR/duisettingslanguageselection.h \ - $$SETTINGSLANGUAGE_SRC_DIR/duisettingslanguagesettings.h \ - $$SETTINGSLANGUAGE_SRC_DIR/duisettingslanguagetext.h \ - $$SETTINGSLANGUAGE_SRC_DIR/duisettingslanguagebooleancontroller.h \ - $$SETTINGSLANGUAGE_SRC_DIR/duisettingslanguagebooleanfactory.h \ - $$SETTINGSLANGUAGE_SRC_DIR/duisettingslanguageboolean.h \ - $$SETTINGSLANGUAGE_SRC_DIR/duisettingslanguageinteger.h \ - $$SETTINGSLANGUAGE_SRC_DIR/duisettingslanguagegroup.h -SOURCES += $$SETTINGSLANGUAGE_SRC_DIR/duisettingslanguageparser.cpp \ - $$SETTINGSLANGUAGE_SRC_DIR/duisettingslanguagebinary.cpp \ - $$SETTINGSLANGUAGE_SRC_DIR/duisettingslanguagewidget.cpp \ - $$SETTINGSLANGUAGE_SRC_DIR/duisettingslanguagewidgetfactory.cpp \ - $$SETTINGSLANGUAGE_SRC_DIR/duisettingslanguagesettingsfactory.cpp \ - $$SETTINGSLANGUAGE_SRC_DIR/duisettingslanguageselectionfactory.cpp \ - $$SETTINGSLANGUAGE_SRC_DIR/duisettingslanguagetextfactory.cpp \ - $$SETTINGSLANGUAGE_SRC_DIR/duisettingslanguageintegerfactory.cpp \ - $$SETTINGSLANGUAGE_SRC_DIR/duisettingslanguageselectioncontroller.cpp \ - $$SETTINGSLANGUAGE_SRC_DIR/duisettingslanguagetextcontroller.cpp \ - $$SETTINGSLANGUAGE_SRC_DIR/duisettingslanguageintegercontroller.cpp \ - $$SETTINGSLANGUAGE_SRC_DIR/duisettingslanguagenode.cpp \ - $$SETTINGSLANGUAGE_SRC_DIR/duisettingslanguageoption.cpp \ - $$SETTINGSLANGUAGE_SRC_DIR/duisettingslanguageselection.cpp \ - $$SETTINGSLANGUAGE_SRC_DIR/duisettingslanguagesettings.cpp \ - $$SETTINGSLANGUAGE_SRC_DIR/duisettingslanguagetext.cpp \ - $$SETTINGSLANGUAGE_SRC_DIR/duisettingslanguagebooleancontroller.cpp \ - $$SETTINGSLANGUAGE_SRC_DIR/duisettingslanguagebooleanfactory.cpp \ - $$SETTINGSLANGUAGE_SRC_DIR/duisettingslanguageboolean.cpp \ - $$SETTINGSLANGUAGE_SRC_DIR/duisettingslanguageinteger.cpp diff --git a/src/src.pro b/src/src.pro index 7c726469d..ac917ab9d 100644 --- a/src/src.pro +++ b/src/src.pro @@ -1,213 +1,7 @@ -MOC_DIR = .moc -GEN_DIR = .gen -OBJECTS_DIR = .obj -DESTDIR = ../lib -TEMPLATE = lib -TARGET = dui - -include(../mkspecs/common.pri) -include(predeps.pri) - -include(animation/animation.pri) -include(core/core.pri) -include(events/events.pri) -include(feedback/feedback.pri) -include(layout/layout.pri) -include(settingslanguage/settingslanguage.pri) -include(painting/painting.pri) -include(scene/scene.pri) -include(service/service.pri) -include(style/style.pri) -include(theme/theme.pri) -include(i18n/i18n.pri) -include(widgets/widgets.pri) -include(workspace/workspace.pri) -!macx:include(video/video.pri) -contains(DEFINES, HAVE_DBUS) { - include(applicationextension/applicationextension.pri) - include(mashup/appletcommunication/appletcommunication.pri) - include(mashup/appletinterface/appletinterface.pri) - include(mashup/appletinstallation/appletinstallation.pri) - include(mashup/mashup/mashup.pri) - include(servicefwif/servicefwif.pri) - include(notification/notification.pri) -} - - -## Build configuration - -VERSION = $${DUI_VERSION} -DEFINES += DUI_VERSION=\\\"$${DUI_VERSION}\\\" - -INCLUDEPATH += include -INCLUDEPATH += $${OUT_PWD}/.moc -INCLUDEPATH += $${OUT_PWD}/.gen - -QMAKE_STRIP = echo - -PRE_TARGETDEPS += $$DUIGEN_EXECUTABLE - -CONFIG += qt warn_on depend_includepath qmake_cache target_qt dll create_prl -!win32:CONFIG += link_pkgconfig -macx:CONFIG += lib_bundle - -win32 { - QMAKE_MOC = perl $${IN_PWD}\..\duimoc\duimoc - INCLUDEPATH += . -} else { - QMAKE_MOC = $${IN_PWD}/../duimoc/duimoc -} - -QMAKE_CFLAGS += -Werror - -QMAKE_CXXFLAGS += -DDUI_EXPORTS -!win32-msvc*:QMAKE_CXXFLAGS += -Wno-long-long -pedantic -!win32:QMAKE_CXXFLAGS += -Werror -Wno-variadic-macros -fvisibility=hidden - -!win32-msvc*:LIBS += -lm -lX11 -macx:LIBS -= -lX11 -win32:LIBS -= -lX11 - -# enable QString optimizations -DEFINES += QT_USE_FAST_CONCATENATION QT_USE_FAST_OPERATOR_PLUS - -# Check for mixing of const and non-const iterators, -# which can cause problems when built with some compilers: -DEFINES += QT_STRICT_ITERATORS - - -## Features - -contains(DUI_BUILD_FEATURES, coverage) { - QMAKE_CXXFLAGS += --coverage - QMAKE_LFLAGS += --coverage -} - -contains(DUI_BUILD_FEATURES, timestamps) { - DEFINES += DUI_TIMESTAMP -} - -contains(DUI_BUILD_FEATURES, testable) { - DEFINES += TESTABLE - HEADERS += ./core/testabilityinterface.h -} - -contains(DUI_BUILD_FEATURES, pch) { - DEFINES += USING_PCH - PRECOMPILED_HEADER = pch/stable_pch.h - HEADERS += pch/stable_pch.h - CONFIG += precompile_header -} - -contains(DUI_PROFILE_PARTS, theme) { - DEFINES += DUI_THEMESYSTEM_PROFILING_SUPPORT -} - -## Dependencies - -# list pkg-config dependencies here -!macx:PKGCONFIG += xdamage - -contains(DEFINES, HAVE_ICU) { - LIBS += -licui18n -licuuc -licudata - include(icu-extradata/extradata.pri) - EXTRADATA_SOURCE=icu-extradata/extradata.txt -} - -contains(DEFINES, HAVE_CONTEXTSUBSCRIBER) { - PKGCONFIG += contextsubscriber-1.0 -} - -contains(DEFINES, HAVE_CONTENTACTION) { - PKGCONFIG += contentaction-0.1 -} - -contains(DEFINES, HAVE_GSTREAMER) { - PKGCONFIG += gstreamer-0.10 - # TODO: Is this necessary? - LIBS += -lgstbase-0.10 -lgstinterfaces-0.10 -lgstvideo-0.10 - - # On Mac, GStreamer can be also in /opt if installed via macports.org or /usr/local if installed from sources - macx:INCLUDEPATH += /opt/local/include/gstreamer-0.10 -} - -contains(DEFINES, HAVE_GCONF) { - PKGCONFIG += gconf-2.0 - # TODO: Why is this necessary? - # The PKGCONFIG call above usually causes qmake to link to the correct libraries - # automatically, but that does not happen if we remove these explicit mentions. - LIBS += -lgconf-2 -} - -contains(DEFINES, HAVE_DBUS) { - QT += dbus -} - -contains(DEFINES, HAVE_GLIB) { - LIBS += -lglib-2.0 -} - -QT += \ - svg \ - network \ - core \ - gui \ - opengl - - -## Files and paths - -macx { - FRAMEWORK_HEADERS.version = Versions - FRAMEWORK_HEADERS.files = $$system(find include/Dui*) $$HEADERS - FRAMEWORK_HEADERS.path = Headers - QMAKE_BUNDLE_DATA += FRAMEWORK_HEADERS -} - -target.path = $$DUI_INSTALL_LIBS - -HEADERS += $$PUBLIC_HEADERS $$PRIVATE_HEADERS - -win32 { - # for windows we can live with the broken pattern matching - FORWARDING_HEADERS = include/Dui* -} else { - # match only the camel case forwarding headers here - FORWARDING_HEADERS = $$system( find include/Dui* ) -} - -install_headers.path = $$DUI_INSTALL_HEADERS -install_headers.files = \ - $$FORWARDING_HEADERS \ - $$HEADERS # Remove this after all subdirs define PUBLIC_HEADERS - # $$PUBLIC_HEADERS - -install_pkgconfig.path = $$DUI_INSTALL_LIBS/pkgconfig -install_pkgconfig.files = Dui.pc - -install_prf.path = $$[QT_INSTALL_DATA]/mkspecs/features -install_prf.files = ../mkspecs/features/dui.prf \ - ../mkspecs/features/dui_translations.prf \ - $${DUI_BUILD_TREE}/mkspecs/features/dui_defines.prf - -INSTALLS += \ - target \ - install_headers \ - install_pkgconfig - -# causes problems when installing on windows with INSTALL_ROOT -!win32 { - INSTALLS += install_prf -} - -QMAKE_EXTRA_TARGETS += check -check.depends = $$DESTDIR/lib$${TARGET}.so.$$VERSION -check.commands = $$system(true) - -QMAKE_EXTRA_TARGETS += check-xml -check-xml.depends = $$DESTDIR/lib$${TARGET}.so.$$VERSION -check-xml.commands = $$system(true) -QMAKE_CLEAN += \ - *.gcov \ - ./.obj/*.gcno \ - ./.obj/*.gcda \ +CONFIG += ordered +TEMPLATE = subdirs +SUBDIRS += \ + corelib \ + views \ + settings \ + extensions diff --git a/src/style/style.pri b/src/style/style.pri deleted file mode 100644 index a4d9abdca..000000000 --- a/src/style/style.pri +++ /dev/null @@ -1,106 +0,0 @@ -############################################################################### -# DuiTheme module -# This module contains all classes that handle style and CSS support. -############################################################################### -STYLE_SRC_DIR=./style -INCLUDEPATH+=./style - -duigen_style.name = duigenerator style -duigen_style.input = WIDGET_STYLE_HEADERS -duigen_style.depends = $$DUIGEN_EXECUTABLE -duigen_style.output = $$GEN_DIR/gen_${QMAKE_FILE_BASE}data.cpp -duigen_style.commands += $$DUIGEN_EXECUTABLE --style ${QMAKE_FILE_NAME} $$GEN_DIR -duigen_style.clean += $$GEN_DIR/gen_* -duigen_style.CONFIG = target_predeps no_link -duigen_style.variable_out = GENERATED_SOURCES -QMAKE_EXTRA_COMPILERS += duigen_style - -PUBLIC_HEADERS += \ - $$STYLE_SRC_DIR/duistylecreator.h \ - $$STYLE_SRC_DIR/duistylesheet.h \ - $$STYLE_SRC_DIR/duistylesheetparser.h \ - $$STYLE_SRC_DIR/duistylesheetselector.h \ - $$STYLE_SRC_DIR/duistylesheetattribute.h - -PRIVATE_HEADERS += \ - $$STYLE_SRC_DIR/duistyle_p.h \ - $$STYLE_SRC_DIR/duistylesheet_p.h - -WIDGET_STYLE_HEADERS += \ - $$STYLE_SRC_DIR/duiabstractlayoutpolicystyle.h \ - $$STYLE_SRC_DIR/duiabstractwidgetanimationstyle.h \ - $$STYLE_SRC_DIR/duianimationstyle.h \ - $$STYLE_SRC_DIR/duiappletinventorystyle.h \ - $$STYLE_SRC_DIR/duiscenewindowanimationstyle.h \ - $$STYLE_SRC_DIR/duiapplicationpagestyle.h \ - $$STYLE_SRC_DIR/duiapplethandlestyle.h \ - $$STYLE_SRC_DIR/duibasiclayoutanimationstyle.h \ - $$STYLE_SRC_DIR/duibuttonstyle.h \ - $$STYLE_SRC_DIR/duibuttoniconstyle.h \ - $$STYLE_SRC_DIR/duibuttonswitchstyle.h \ - $$STYLE_SRC_DIR/duicheckboxstyle.h \ - $$STYLE_SRC_DIR/duicomboboxstyle.h \ - $$STYLE_SRC_DIR/duicontainerstyle.h \ - $$STYLE_SRC_DIR/duimodalscenewindowstyle.h \ - $$STYLE_SRC_DIR/duidialogstyle.h \ - $$STYLE_SRC_DIR/duidockwidgetstyle.h \ - $$STYLE_SRC_DIR/duiextendingbackgroundstyle.h \ - $$STYLE_SRC_DIR/duiescapebuttonpanelstyle.h \ - $$STYLE_SRC_DIR/duiextensionhandlestyle.h \ - $$STYLE_SRC_DIR/duigriditemstyle.h \ - $$STYLE_SRC_DIR/duigroupanimationstyle.h \ - $$STYLE_SRC_DIR/duihomebuttonpanelstyle.h \ - $$STYLE_SRC_DIR/duiimagewidgetstyle.h \ - $$STYLE_SRC_DIR/duiinfobannerstyle.h \ - $$STYLE_SRC_DIR/duilabelstyle.h \ - $$STYLE_SRC_DIR/duilayoutanimationstyle.h \ - $$STYLE_SRC_DIR/duiliststyle.h \ - $$STYLE_SRC_DIR/duimashupcanvasstyle.h \ - $$STYLE_SRC_DIR/duiextensionareastyle.h \ - $$STYLE_SRC_DIR/duiapplicationextensionareastyle.h \ - $$STYLE_SRC_DIR/duiapplicationmenustyle.h \ - $$STYLE_SRC_DIR/duiapplicationmenubuttonstyle.h \ - $$STYLE_SRC_DIR/duimessageboxstyle.h \ - $$STYLE_SRC_DIR/duiscenelayereffectstyle.h \ - $$STYLE_SRC_DIR/duiscenelayereffectdimstyle.h \ - $$STYLE_SRC_DIR/duinavigationbarstyle.h \ - $$STYLE_SRC_DIR/duioverlaystyle.h \ - $$STYLE_SRC_DIR/duiobjectmenustyle.h \ - $$STYLE_SRC_DIR/duipannablewidgetstyle.h \ - $$STYLE_SRC_DIR/duipopupliststyle.h \ - $$STYLE_SRC_DIR/duipositionindicatorstyle.h \ - $$STYLE_SRC_DIR/duiprogressindicatorstyle.h \ - $$STYLE_SRC_DIR/duiscenewindowanimatorstyle.h \ - $$STYLE_SRC_DIR/duiscenewindowstyle.h \ - $$STYLE_SRC_DIR/duiseparatorstyle.h \ - $$STYLE_SRC_DIR/duisliderstyle.h \ - $$STYLE_SRC_DIR/duistyle.h \ - $$STYLE_SRC_DIR/duispinnerstyle.h \ - $$STYLE_SRC_DIR/duitexteditstyle.h \ - $$STYLE_SRC_DIR/duicompleterstyle.h \ - $$STYLE_SRC_DIR/duitoolbartabstyle.h \ - $$STYLE_SRC_DIR/duitoolbarstyle.h \ - $$STYLE_SRC_DIR/duiwidgetstyle.h \ - $$STYLE_SRC_DIR/duisettingslanguagesettingsfactorystyle.h \ - $$STYLE_SRC_DIR/duidevicestyle.h \ - $$STYLE_SRC_DIR/duiwidgetfadeinanimationstyle.h \ - $$STYLE_SRC_DIR/duiwidgetfadeoutanimationstyle.h \ - $$STYLE_SRC_DIR/duiwidgetslideinanimationstyle.h \ - $$STYLE_SRC_DIR/duiwidgetslideoutanimationstyle.h \ - $$STYLE_SRC_DIR/duiwidgetzoominanimationstyle.h \ - $$STYLE_SRC_DIR/duiwidgetzoomoutanimationstyle.h \ - $$STYLE_SRC_DIR/duicontainerheaderstyle.h \ - $$STYLE_SRC_DIR/duicontentitemstyle.h \ - $$STYLE_SRC_DIR/duipageswitchanimationstyle.h \ - $$STYLE_SRC_DIR/duibasicorientationanimationstyle.h \ - -HEADERS += \ - $$WIDGET_STYLE_HEADERS \ - -SOURCES += \ - $$STYLE_SRC_DIR/duistyle.cpp \ - $$STYLE_SRC_DIR/duistylecreator.cpp \ - $$STYLE_SRC_DIR/duistylesheet.cpp \ - $$STYLE_SRC_DIR/duistylesheetparser.cpp \ - $$STYLE_SRC_DIR/duistylesheetselector.cpp \ - $$STYLE_SRC_DIR/duistylesheetattribute.cpp diff --git a/src/widgets/views/duiapplicationmenubuttonview.cpp b/src/views/duiapplicationmenubuttonview.cpp similarity index 100% rename from src/widgets/views/duiapplicationmenubuttonview.cpp rename to src/views/duiapplicationmenubuttonview.cpp diff --git a/src/widgets/views/duiapplicationmenubuttonview.h b/src/views/duiapplicationmenubuttonview.h similarity index 100% rename from src/widgets/views/duiapplicationmenubuttonview.h rename to src/views/duiapplicationmenubuttonview.h diff --git a/src/widgets/views/duiapplicationmenubuttonview_p.h b/src/views/duiapplicationmenubuttonview_p.h similarity index 100% rename from src/widgets/views/duiapplicationmenubuttonview_p.h rename to src/views/duiapplicationmenubuttonview_p.h diff --git a/src/widgets/views/duiapplicationmenuview.cpp b/src/views/duiapplicationmenuview.cpp similarity index 98% rename from src/widgets/views/duiapplicationmenuview.cpp rename to src/views/duiapplicationmenuview.cpp index 2bff1b814..ecd5e8815 100644 --- a/src/widgets/views/duiapplicationmenuview.cpp +++ b/src/views/duiapplicationmenuview.cpp @@ -44,7 +44,8 @@ const int maxCommandActions = 8; const int maxCommandActionsWithStyle = 6; DuiApplicationMenuViewPrivate::DuiApplicationMenuViewPrivate(DuiApplicationMenu *menu) - : controllerLayout(0), + : q_ptr(0), + controllerLayout(0), styleCommandLayout(0), actionCommandLayout(0), landscapePolicy(0), @@ -52,7 +53,8 @@ DuiApplicationMenuViewPrivate::DuiApplicationMenuViewPrivate(DuiApplicationMenu stylePolicy(0), styleButtonGroup(0), leasedWidgets(), - buttons() + buttons(), + controller(0) { controller = menu; @@ -649,21 +651,26 @@ void DuiApplicationMenuViewPrivate::makeLandscapePolicyColumnsEqual() } DuiApplicationMenuView::DuiApplicationMenuView(DuiApplicationMenu *controller) : - DuiSceneWindowView(* new DuiApplicationMenuViewPrivate(controller), controller) + DuiSceneWindowView(controller), + d_ptr(new DuiApplicationMenuViewPrivate(controller)) { Q_D(DuiApplicationMenuView); + d->q_ptr = this; d->init(); } DuiApplicationMenuView::DuiApplicationMenuView(DuiApplicationMenuViewPrivate &dd, DuiApplicationMenu *controller) : - DuiSceneWindowView(dd, controller) + DuiSceneWindowView(controller), + d_ptr(&dd) { Q_D(DuiApplicationMenuView); + d->q_ptr = this; d->init(); } DuiApplicationMenuView::~DuiApplicationMenuView() { + delete d_ptr; } void DuiApplicationMenuView::drawBackground(QPainter *painter, const QStyleOptionGraphicsItem *option) const diff --git a/src/widgets/views/duiapplicationmenuview.h b/src/views/duiapplicationmenuview.h similarity index 98% rename from src/widgets/views/duiapplicationmenuview.h rename to src/views/duiapplicationmenuview.h index 1b899d59b..c80382da9 100644 --- a/src/widgets/views/duiapplicationmenuview.h +++ b/src/views/duiapplicationmenuview.h @@ -81,6 +81,9 @@ class DUI_EXPORT DuiApplicationMenuView : public DuiSceneWindowView Q_OBJECT DUI_VIEW(DuiApplicationMenuModel, DuiApplicationMenuStyle) +protected: + DuiApplicationMenuViewPrivate *const d_ptr; + public: /*! \brief Constructs DuiApplicationMenuView with a pointer to the controller diff --git a/src/widgets/views/duiapplicationmenuview_p.h b/src/views/duiapplicationmenuview_p.h similarity index 96% rename from src/widgets/views/duiapplicationmenuview_p.h rename to src/views/duiapplicationmenuview_p.h index c8441fe5f..0272e2b94 100644 --- a/src/widgets/views/duiapplicationmenuview_p.h +++ b/src/views/duiapplicationmenuview_p.h @@ -24,7 +24,6 @@ #include #include #include "duiaction.h" -#include "duiscenewindowview_p.h" #include "duinamespace.h" #include "duiapplicationmenuview.h" @@ -44,10 +43,13 @@ class DuiWidget; class DuiContentItem; class DuiComboBox; -class DuiApplicationMenuViewPrivate : public DuiSceneWindowViewPrivate, public QObject +class DuiApplicationMenuViewPrivate : public QObject { Q_DECLARE_PUBLIC(DuiApplicationMenuView) +protected: + DuiApplicationMenuView *q_ptr; + public: DuiApplicationMenuViewPrivate(DuiApplicationMenu *menu); virtual ~DuiApplicationMenuViewPrivate(); @@ -106,6 +108,8 @@ class DuiApplicationMenuViewPrivate : public DuiSceneWindowViewPrivate, public Q DuiButtonGroup *styleButtonGroup; QHash leasedWidgets; QHash buttons; + + DuiApplicationMenu *controller; }; #endif diff --git a/src/widgets/views/duiapplicationpageview.cpp b/src/views/duiapplicationpageview.cpp similarity index 89% rename from src/widgets/views/duiapplicationpageview.cpp rename to src/views/duiapplicationpageview.cpp index f32f0b316..38bf23d67 100644 --- a/src/widgets/views/duiapplicationpageview.cpp +++ b/src/views/duiapplicationpageview.cpp @@ -28,6 +28,7 @@ #include "duiviewcreator.h" DuiApplicationPageViewPrivate::DuiApplicationPageViewPrivate() + : q_ptr(0) { } @@ -36,12 +37,16 @@ DuiApplicationPageViewPrivate::~DuiApplicationPageViewPrivate() } DuiApplicationPageView::DuiApplicationPageView(DuiApplicationPage *controller) : - DuiSceneWindowView(*new DuiApplicationPageViewPrivate, controller) + DuiSceneWindowView(controller), + d_ptr(new DuiApplicationPageViewPrivate) { + Q_D(DuiApplicationPageView); + d->q_ptr = this; } DuiApplicationPageView::~DuiApplicationPageView() { + delete d_ptr; } /* QRectF DuiApplicationPageView::boundingRect() const diff --git a/src/widgets/views/duiapplicationpageview.h b/src/views/duiapplicationpageview.h similarity index 95% rename from src/widgets/views/duiapplicationpageview.h rename to src/views/duiapplicationpageview.h index aaed4bbac..b6c476609 100644 --- a/src/widgets/views/duiapplicationpageview.h +++ b/src/views/duiapplicationpageview.h @@ -39,6 +39,9 @@ class DUI_EXPORT DuiApplicationPageView : public DuiSceneWindowView //virtual QRectF boundingRect() const; //! \reimp_end +protected: + DuiApplicationPageViewPrivate *const d_ptr; + private: Q_DECLARE_PRIVATE(DuiApplicationPageView) }; diff --git a/src/widgets/views/duiapplicationpageview_p.h b/src/views/duiapplicationpageview_p.h similarity index 88% rename from src/widgets/views/duiapplicationpageview_p.h rename to src/views/duiapplicationpageview_p.h index 5df91afa2..f420435fc 100644 --- a/src/widgets/views/duiapplicationpageview_p.h +++ b/src/views/duiapplicationpageview_p.h @@ -21,14 +21,17 @@ #define DUIAPPLICATIONPAGEVIEW_P_H #include "duiapplicationpageview.h" -#include "duiscenewindowview_p.h" -class DuiApplicationPageViewPrivate : public DuiSceneWindowViewPrivate +class DuiApplicationPageViewPrivate { + Q_DECLARE_PUBLIC(DuiApplicationPageView) + +protected: + DuiApplicationPageView *q_ptr; + public: DuiApplicationPageViewPrivate(); virtual ~DuiApplicationPageViewPrivate(); - }; #endif diff --git a/src/widgets/views/duibuttongrouplayoutpolicy_p.cpp b/src/views/duibuttongrouplayoutpolicy_p.cpp similarity index 100% rename from src/widgets/views/duibuttongrouplayoutpolicy_p.cpp rename to src/views/duibuttongrouplayoutpolicy_p.cpp diff --git a/src/widgets/views/duibuttongrouplayoutpolicy_p.h b/src/views/duibuttongrouplayoutpolicy_p.h similarity index 100% rename from src/widgets/views/duibuttongrouplayoutpolicy_p.h rename to src/views/duibuttongrouplayoutpolicy_p.h diff --git a/src/widgets/views/duibuttoniconview.cpp b/src/views/duibuttoniconview.cpp similarity index 100% rename from src/widgets/views/duibuttoniconview.cpp rename to src/views/duibuttoniconview.cpp diff --git a/src/widgets/views/duibuttoniconview.h b/src/views/duibuttoniconview.h similarity index 100% rename from src/widgets/views/duibuttoniconview.h rename to src/views/duibuttoniconview.h diff --git a/src/widgets/views/duibuttoniconview_p.h b/src/views/duibuttoniconview_p.h similarity index 100% rename from src/widgets/views/duibuttoniconview_p.h rename to src/views/duibuttoniconview_p.h diff --git a/src/widgets/views/duibuttonswitchview.cpp b/src/views/duibuttonswitchview.cpp similarity index 100% rename from src/widgets/views/duibuttonswitchview.cpp rename to src/views/duibuttonswitchview.cpp diff --git a/src/widgets/views/duibuttonswitchview.h b/src/views/duibuttonswitchview.h similarity index 100% rename from src/widgets/views/duibuttonswitchview.h rename to src/views/duibuttonswitchview.h diff --git a/src/widgets/views/duibuttonswitchview_p.h b/src/views/duibuttonswitchview_p.h similarity index 100% rename from src/widgets/views/duibuttonswitchview_p.h rename to src/views/duibuttonswitchview_p.h diff --git a/src/widgets/views/duibuttonview.cpp b/src/views/duibuttonview.cpp similarity index 100% rename from src/widgets/views/duibuttonview.cpp rename to src/views/duibuttonview.cpp diff --git a/src/widgets/views/duibuttonview.h b/src/views/duibuttonview.h similarity index 100% rename from src/widgets/views/duibuttonview.h rename to src/views/duibuttonview.h diff --git a/src/widgets/views/duibuttonview_p.h b/src/views/duibuttonview_p.h similarity index 100% rename from src/widgets/views/duibuttonview_p.h rename to src/views/duibuttonview_p.h diff --git a/src/widgets/views/duicheckboxview.cpp b/src/views/duicheckboxview.cpp similarity index 100% rename from src/widgets/views/duicheckboxview.cpp rename to src/views/duicheckboxview.cpp diff --git a/src/widgets/views/duicheckboxview.h b/src/views/duicheckboxview.h similarity index 100% rename from src/widgets/views/duicheckboxview.h rename to src/views/duicheckboxview.h diff --git a/src/widgets/views/duicheckboxview_p.h b/src/views/duicheckboxview_p.h similarity index 100% rename from src/widgets/views/duicheckboxview_p.h rename to src/views/duicheckboxview_p.h diff --git a/src/widgets/views/duicomboboxview.cpp b/src/views/duicomboboxview.cpp similarity index 96% rename from src/widgets/views/duicomboboxview.cpp rename to src/views/duicomboboxview.cpp index 4e94a0688..7a580cbd9 100644 --- a/src/widgets/views/duicomboboxview.cpp +++ b/src/views/duicomboboxview.cpp @@ -36,7 +36,7 @@ #include DuiComboBoxViewPrivate::DuiComboBoxViewPrivate() - : controller(0), contentItem(0), popuplist(0) + : q_ptr(0), controller(0), contentItem(0), popuplist(0) { } @@ -125,24 +125,28 @@ void DuiComboBoxViewPrivate::_q_showPopup() } DuiComboBoxView::DuiComboBoxView(DuiComboBox *controller) : - DuiWidgetView(* new DuiComboBoxViewPrivate, controller) + DuiWidgetView(controller), + d_ptr(new DuiComboBoxViewPrivate) { Q_D(DuiComboBoxView); + d->q_ptr = this; d->controller = controller; d->init(); - } DuiComboBoxView::DuiComboBoxView(DuiComboBoxViewPrivate &dd, DuiComboBox *controller) : - DuiWidgetView(dd, controller) + DuiWidgetView(controller), + d_ptr(&dd) { Q_D(DuiComboBoxView); + d->q_ptr = this; d->controller = controller; d->init(); } DuiComboBoxView::~DuiComboBoxView() { + delete d_ptr; } void DuiComboBoxView::applyStyle() diff --git a/src/widgets/views/duicomboboxview.h b/src/views/duicomboboxview.h similarity index 98% rename from src/widgets/views/duicomboboxview.h rename to src/views/duicomboboxview.h index ffcbb2ebc..1e1048690 100644 --- a/src/widgets/views/duicomboboxview.h +++ b/src/views/duicomboboxview.h @@ -68,6 +68,7 @@ protected Q_SLOTS: //! \internal DuiComboBoxView(DuiComboBoxViewPrivate &dd, DuiComboBox *controller); + DuiComboBoxViewPrivate *const d_ptr; //! \internal_end private: diff --git a/src/widgets/views/duicomboboxview_p.h b/src/views/duicomboboxview_p.h similarity index 93% rename from src/widgets/views/duicomboboxview_p.h rename to src/views/duicomboboxview_p.h index 1446b0df6..24cfd8260 100644 --- a/src/widgets/views/duicomboboxview_p.h +++ b/src/views/duicomboboxview_p.h @@ -20,17 +20,18 @@ #ifndef DUICOMBOBOXVIEW_P_H #define DUICOMBOBOXVIEW_P_H -#include "private/duiwidgetview_p.h" - class QGraphicsLinearLayout; class DuiComboBox; class DuiContentItem; class DuiPopupList; -class DuiComboBoxViewPrivate : public DuiWidgetViewPrivate +class DuiComboBoxViewPrivate { Q_DECLARE_PUBLIC(DuiComboBoxView) +protected: + DuiComboBoxView *q_ptr; + public: DuiComboBoxViewPrivate(); virtual ~DuiComboBoxViewPrivate(); diff --git a/src/widgets/views/duicompleterview.cpp b/src/views/duicompleterview.cpp similarity index 100% rename from src/widgets/views/duicompleterview.cpp rename to src/views/duicompleterview.cpp diff --git a/src/widgets/views/duicompleterview.h b/src/views/duicompleterview.h similarity index 100% rename from src/widgets/views/duicompleterview.h rename to src/views/duicompleterview.h diff --git a/src/widgets/views/duicompleterview_p.h b/src/views/duicompleterview_p.h similarity index 100% rename from src/widgets/views/duicompleterview_p.h rename to src/views/duicompleterview_p.h diff --git a/src/widgets/views/duicontainerview.cpp b/src/views/duicontainerview.cpp similarity index 100% rename from src/widgets/views/duicontainerview.cpp rename to src/views/duicontainerview.cpp diff --git a/src/widgets/views/duicontainerview.h b/src/views/duicontainerview.h similarity index 100% rename from src/widgets/views/duicontainerview.h rename to src/views/duicontainerview.h diff --git a/src/widgets/views/duicontainerview_p.h b/src/views/duicontainerview_p.h similarity index 100% rename from src/widgets/views/duicontainerview_p.h rename to src/views/duicontainerview_p.h diff --git a/src/widgets/views/duicontentitem.cpp b/src/views/duicontentitem.cpp similarity index 100% rename from src/widgets/views/duicontentitem.cpp rename to src/views/duicontentitem.cpp diff --git a/src/widgets/views/duicontentitemview.cpp b/src/views/duicontentitemview.cpp similarity index 100% rename from src/widgets/views/duicontentitemview.cpp rename to src/views/duicontentitemview.cpp diff --git a/src/widgets/views/duicontentitemview.h b/src/views/duicontentitemview.h similarity index 100% rename from src/widgets/views/duicontentitemview.h rename to src/views/duicontentitemview.h diff --git a/src/widgets/views/duicontentitemview_p.h b/src/views/duicontentitemview_p.h similarity index 100% rename from src/widgets/views/duicontentitemview_p.h rename to src/views/duicontentitemview_p.h diff --git a/src/widgets/views/duidialogview.cpp b/src/views/duidialogview.cpp similarity index 98% rename from src/widgets/views/duidialogview.cpp rename to src/views/duidialogview.cpp index e42536e94..3015b2cf4 100644 --- a/src/widgets/views/duidialogview.cpp +++ b/src/views/duidialogview.cpp @@ -35,7 +35,9 @@ #include DuiDialogViewPrivate::DuiDialogViewPrivate() - : rootLayout(0), + : q_ptr(0), + controller(0), + rootLayout(0), topSpacer(0), bottomSpacer(0), leftSpacer(0), @@ -197,17 +199,21 @@ void DuiDialogViewPrivate::createTitleBar() } DuiDialogView::DuiDialogView(DuiDialog *controller) : - DuiSceneWindowView(*new DuiDialogViewPrivate, controller) + DuiSceneWindowView(controller), + d_ptr(new DuiDialogViewPrivate) { Q_D(DuiDialogView); + d->q_ptr = this; d->controller = controller; d->createWidgetHierarchy(); } DuiDialogView::DuiDialogView(DuiDialogViewPrivate &dd, DuiDialog *controller) - : DuiSceneWindowView(dd, controller) + : DuiSceneWindowView(controller), + d_ptr(&dd) { Q_D(DuiDialogView); + d->q_ptr = this; d->controller = controller; d->createWidgetHierarchy(); } @@ -219,6 +225,8 @@ DuiDialogView::~DuiDialogView() // Make sure the model's centralWidget doesn't get deleted along with us. d->setCentralWidget(0); + + delete d_ptr; } void DuiDialogView::applyStyle() diff --git a/src/widgets/views/duidialogview.h b/src/views/duidialogview.h similarity index 99% rename from src/widgets/views/duidialogview.h rename to src/views/duidialogview.h index 9bddb40f2..f9b373e9c 100644 --- a/src/widgets/views/duidialogview.h +++ b/src/views/duidialogview.h @@ -93,6 +93,7 @@ class DUI_EXPORT DuiDialogView : public DuiSceneWindowView protected: DuiDialogView(DuiDialogViewPrivate &dd, DuiDialog *controller); + DuiDialogViewPrivate *const d_ptr; /*! * \brief Returns the layout used to arrange the dialog's contents. diff --git a/src/widgets/views/duidialogview_p.h b/src/views/duidialogview_p.h similarity index 97% rename from src/widgets/views/duidialogview_p.h rename to src/views/duidialogview_p.h index fc4aa3ebe..da0f39bcf 100644 --- a/src/widgets/views/duidialogview_p.h +++ b/src/views/duidialogview_p.h @@ -21,7 +21,6 @@ #define DUIDIALOGVIEW_P_H #include "duidialogview.h" -#include "duiscenewindowview_p.h" #include #include @@ -69,10 +68,13 @@ DuiDialog (DuiSceneWindow), rootLayout |- bottom spacer (only when dialog-vertical-alignment = center) */ -class DuiDialogViewPrivate : public DuiSceneWindowViewPrivate +class DuiDialogViewPrivate { Q_DECLARE_PUBLIC(DuiDialogView) +protected: + DuiDialogView *q_ptr; + public: DuiDialogViewPrivate(); virtual ~DuiDialogViewPrivate(); diff --git a/src/widgets/views/duidockwidgetview.cpp b/src/views/duidockwidgetview.cpp similarity index 100% rename from src/widgets/views/duidockwidgetview.cpp rename to src/views/duidockwidgetview.cpp diff --git a/src/widgets/views/duidockwidgetview.h b/src/views/duidockwidgetview.h similarity index 100% rename from src/widgets/views/duidockwidgetview.h rename to src/views/duidockwidgetview.h diff --git a/src/widgets/views/duidockwidgetview_p.h b/src/views/duidockwidgetview_p.h similarity index 100% rename from src/widgets/views/duidockwidgetview_p.h rename to src/views/duidockwidgetview_p.h diff --git a/src/widgets/views/duiescapebuttonpanelview.cpp b/src/views/duiescapebuttonpanelview.cpp similarity index 95% rename from src/widgets/views/duiescapebuttonpanelview.cpp rename to src/views/duiescapebuttonpanelview.cpp index ad3cb5b63..167eccb3e 100644 --- a/src/widgets/views/duiescapebuttonpanelview.cpp +++ b/src/views/duiescapebuttonpanelview.cpp @@ -28,8 +28,10 @@ #include DuiEscapeButtonPanelViewPrivate::DuiEscapeButtonPanelViewPrivate() : + q_ptr(0), opacityTimeLine(0), - escapeMode(DuiEscapeButtonPanelModel::CloseMode) + escapeMode(DuiEscapeButtonPanelModel::CloseMode), + controller(0) { } @@ -103,15 +105,18 @@ void DuiEscapeButtonPanelViewPrivate::opacityChange(qreal step) } DuiEscapeButtonPanelView::DuiEscapeButtonPanelView(DuiEscapeButtonPanel *controller) : - DuiSceneWindowView(* new DuiEscapeButtonPanelViewPrivate, controller) + DuiSceneWindowView(controller), + d_ptr(new DuiEscapeButtonPanelViewPrivate) { Q_D(DuiEscapeButtonPanelView); + d->q_ptr = this; d->controller = controller; d->init(); } DuiEscapeButtonPanelView::~DuiEscapeButtonPanelView() { + delete d_ptr; } void DuiEscapeButtonPanelView::applyStyle() diff --git a/src/widgets/views/duiescapebuttonpanelview.h b/src/views/duiescapebuttonpanelview.h similarity index 97% rename from src/widgets/views/duiescapebuttonpanelview.h rename to src/views/duiescapebuttonpanelview.h index 0f8560ebe..dda1039c0 100644 --- a/src/widgets/views/duiescapebuttonpanelview.h +++ b/src/views/duiescapebuttonpanelview.h @@ -43,6 +43,8 @@ class DUI_EXPORT DuiEscapeButtonPanelView : public DuiSceneWindowView virtual ~DuiEscapeButtonPanelView(); protected: + DuiEscapeButtonPanelViewPrivate *const d_ptr; + //! \reimp virtual void applyStyle(); //! \reimp_end diff --git a/src/widgets/views/duiescapebuttonpanelview_p.h b/src/views/duiescapebuttonpanelview_p.h similarity index 92% rename from src/widgets/views/duiescapebuttonpanelview_p.h rename to src/views/duiescapebuttonpanelview_p.h index c6c0033d5..5ecbdbdaa 100644 --- a/src/widgets/views/duiescapebuttonpanelview_p.h +++ b/src/views/duiescapebuttonpanelview_p.h @@ -20,17 +20,19 @@ #ifndef DUIESCAPEBUTTONPANELVIEW_P_H #define DUIESCAPEBUTTONPANELVIEW_P_H -#include "duiscenewindowview_p.h" #include "duiescapebuttonpanelmodel.h" class DuiEscapeButtonPanel; class DuiButton; class QTimeLine; -class DuiEscapeButtonPanelViewPrivate : public DuiSceneWindowViewPrivate +class DuiEscapeButtonPanelViewPrivate { Q_DECLARE_PUBLIC(DuiEscapeButtonPanelView) +protected: + DuiEscapeButtonPanelView *q_ptr; + public: DuiEscapeButtonPanelViewPrivate(); virtual ~DuiEscapeButtonPanelViewPrivate(); diff --git a/src/widgets/views/duiextendingbackgroundview.cpp b/src/views/duiextendingbackgroundview.cpp similarity index 94% rename from src/widgets/views/duiextendingbackgroundview.cpp rename to src/views/duiextendingbackgroundview.cpp index d11ebea9c..7ba3500ce 100644 --- a/src/widgets/views/duiextendingbackgroundview.cpp +++ b/src/views/duiextendingbackgroundview.cpp @@ -30,7 +30,7 @@ #include DuiExtendingBackgroundViewPrivate::DuiExtendingBackgroundViewPrivate() : - controller(NULL) + q_ptr(0), controller(0) { } @@ -78,21 +78,26 @@ QRect DuiExtendingBackgroundViewPrivate::backgroundGeometry() const DuiExtendingBackgroundView::DuiExtendingBackgroundView(DuiWidgetController *controller) : - DuiWidgetView(* new DuiExtendingBackgroundViewPrivate, controller) + DuiWidgetView(controller), + d_ptr(new DuiExtendingBackgroundViewPrivate) { Q_D(DuiExtendingBackgroundView); + d->q_ptr = this; d->init(controller); } DuiExtendingBackgroundView::DuiExtendingBackgroundView(DuiExtendingBackgroundViewPrivate &dd, DuiWidgetController *controller) : - DuiWidgetView(dd, controller) + DuiWidgetView(controller), + d_ptr(&dd) { Q_D(DuiExtendingBackgroundView); + d->q_ptr = this; d->init(controller); } DuiExtendingBackgroundView::~DuiExtendingBackgroundView() { + delete d_ptr; } void DuiExtendingBackgroundView::drawBackground(QPainter *painter, const QStyleOptionGraphicsItem *) const diff --git a/src/widgets/views/duiextendingbackgroundview.h b/src/views/duiextendingbackgroundview.h similarity index 97% rename from src/widgets/views/duiextendingbackgroundview.h rename to src/views/duiextendingbackgroundview.h index a3e6e9e3e..00a76c8a9 100644 --- a/src/widgets/views/duiextendingbackgroundview.h +++ b/src/views/duiextendingbackgroundview.h @@ -63,6 +63,7 @@ class DUI_EXPORT DuiExtendingBackgroundView : public DuiWidgetView * \param controller the DuiWidgetController to be used */ DuiExtendingBackgroundView(DuiExtendingBackgroundViewPrivate &dd, DuiWidgetController *controller); + DuiExtendingBackgroundViewPrivate *const d_ptr; private: Q_DISABLE_COPY(DuiExtendingBackgroundView) diff --git a/src/widgets/views/duiextendingbackgroundview_p.h b/src/views/duiextendingbackgroundview_p.h similarity index 94% rename from src/widgets/views/duiextendingbackgroundview_p.h rename to src/views/duiextendingbackgroundview_p.h index af62630a9..9cfa950f1 100644 --- a/src/widgets/views/duiextendingbackgroundview_p.h +++ b/src/views/duiextendingbackgroundview_p.h @@ -20,18 +20,19 @@ #ifndef DUIEXTENDINGBACKGROUNDVIEW_P_H_ #define DUIEXTENDINGBACKGROUNDVIEW_P_H_ -#include "private/duiwidgetview_p.h" - class DuiWidgetController; class DuiExtendingBackgroundView; /*! * The private class for DuiExtendingBackgroundView. */ -class DuiExtendingBackgroundViewPrivate : public DuiWidgetViewPrivate +class DuiExtendingBackgroundViewPrivate { Q_DECLARE_PUBLIC(DuiExtendingBackgroundView) +protected: + DuiExtendingBackgroundView *q_ptr; + public: /*! * Creates an instance of DuiExtendingBackgroundViewPrivate. diff --git a/src/widgets/views/duigriditemview.cpp b/src/views/duigriditemview.cpp similarity index 95% rename from src/widgets/views/duigriditemview.cpp rename to src/views/duigriditemview.cpp index e064189d4..9bdb01f97 100644 --- a/src/widgets/views/duigriditemview.cpp +++ b/src/views/duigriditemview.cpp @@ -31,7 +31,7 @@ #include DuiGridItemViewPrivate::DuiGridItemViewPrivate() - : controller(0), layout(0), title(0), subtitle(0), image(0), layoutDirty(false) + : q_ptr(0), controller(0), layout(0), title(0), subtitle(0), image(0), layoutDirty(false) { } @@ -159,9 +159,11 @@ void DuiGridItemViewPrivate::_q_updateImage() } DuiGridItemView::DuiGridItemView(DuiGridItem *controller) : - DuiWidgetView(* new DuiGridItemViewPrivate, controller) + DuiWidgetView(controller), + d_ptr(new DuiGridItemViewPrivate) { Q_D(DuiGridItemView); + d->q_ptr = this; d->controller = controller; d->init(); @@ -169,9 +171,11 @@ DuiGridItemView::DuiGridItemView(DuiGridItem *controller) : } DuiGridItemView::DuiGridItemView(DuiGridItemViewPrivate &dd, DuiGridItem *controller) : - DuiWidgetView(dd, controller) + DuiWidgetView(controller), + d_ptr(&dd) { Q_D(DuiGridItemView); + d->q_ptr = this; d->controller = controller; d->init(); @@ -180,6 +184,7 @@ DuiGridItemView::DuiGridItemView(DuiGridItemViewPrivate &dd, DuiGridItem *contro DuiGridItemView::~DuiGridItemView() { + delete d_ptr; } void DuiGridItemView::applyStyle() diff --git a/src/widgets/views/duigriditemview.h b/src/views/duigriditemview.h similarity index 98% rename from src/widgets/views/duigriditemview.h rename to src/views/duigriditemview.h index 3c1554ea8..beb201cf1 100644 --- a/src/widgets/views/duigriditemview.h +++ b/src/views/duigriditemview.h @@ -68,6 +68,7 @@ protected slots: //! \internal DuiGridItemView(DuiGridItemViewPrivate &dd, DuiGridItem *controller); + DuiGridItemViewPrivate *const d_ptr; //! \internal_end private: diff --git a/src/widgets/views/duigriditemview_p.h b/src/views/duigriditemview_p.h similarity index 94% rename from src/widgets/views/duigriditemview_p.h rename to src/views/duigriditemview_p.h index ae0300a96..709efa29e 100644 --- a/src/widgets/views/duigriditemview_p.h +++ b/src/views/duigriditemview_p.h @@ -20,18 +20,19 @@ #ifndef DUIGRIDITEMVIEW_P_H #define DUIGRIDITEMVIEW_P_H -#include "private/duiwidgetview_p.h" - class QPixmap; class QGraphicsGridLayout; class DuiGridItem; class DuiImageWidget; class DuiLabel; -class DuiGridItemViewPrivate : public DuiWidgetViewPrivate +class DuiGridItemViewPrivate { Q_DECLARE_PUBLIC(DuiGridItemView) +protected: + DuiGridItemView *q_ptr; + public: DuiGridItemViewPrivate(); virtual ~DuiGridItemViewPrivate(); diff --git a/src/widgets/views/duihomebuttonpanelview.cpp b/src/views/duihomebuttonpanelview.cpp similarity index 93% rename from src/widgets/views/duihomebuttonpanelview.cpp rename to src/views/duihomebuttonpanelview.cpp index 1b6a39e9c..68888e8c3 100644 --- a/src/widgets/views/duihomebuttonpanelview.cpp +++ b/src/views/duihomebuttonpanelview.cpp @@ -26,7 +26,7 @@ #include DuiHomeButtonPanelViewPrivate::DuiHomeButtonPanelViewPrivate() - : button(0), controller(0) + : q_ptr(0), button(0), controller(0) { } @@ -52,9 +52,11 @@ void DuiHomeButtonPanelViewPrivate::init() } DuiHomeButtonPanelView::DuiHomeButtonPanelView(DuiHomeButtonPanel *controller) : - DuiSceneWindowView(* new DuiHomeButtonPanelViewPrivate, controller) + DuiSceneWindowView(controller), + d_ptr(new DuiHomeButtonPanelViewPrivate) { Q_D(DuiHomeButtonPanelView); + d->q_ptr = this; d->controller = controller; d->init(); } diff --git a/src/widgets/views/duihomebuttonpanelview.h b/src/views/duihomebuttonpanelview.h similarity index 96% rename from src/widgets/views/duihomebuttonpanelview.h rename to src/views/duihomebuttonpanelview.h index 6e486d9ac..630b0f363 100644 --- a/src/widgets/views/duihomebuttonpanelview.h +++ b/src/views/duihomebuttonpanelview.h @@ -42,6 +42,8 @@ class DUI_EXPORT DuiHomeButtonPanelView : public DuiSceneWindowView virtual ~DuiHomeButtonPanelView(); protected: + DuiHomeButtonPanelViewPrivate *const d_ptr; + //! \reimp virtual void applyStyle(); //! \reimp_end diff --git a/src/widgets/views/duihomebuttonpanelview_p.h b/src/views/duihomebuttonpanelview_p.h similarity index 91% rename from src/widgets/views/duihomebuttonpanelview_p.h rename to src/views/duihomebuttonpanelview_p.h index 6e7a7f1be..21239f9af 100644 --- a/src/widgets/views/duihomebuttonpanelview_p.h +++ b/src/views/duihomebuttonpanelview_p.h @@ -20,16 +20,18 @@ #ifndef DUIHOMEBUTTONPANELVIEW_P_H #define DUIHOMEBUTTONPANELVIEW_P_H -#include "duiscenewindowview_p.h" #include "duihomebuttonpanelview.h" class DuiHomeButtonPanel; class DuiButton; -class DuiHomeButtonPanelViewPrivate : public DuiSceneWindowViewPrivate +class DuiHomeButtonPanelViewPrivate { Q_DECLARE_PUBLIC(DuiHomeButtonPanelView) +protected: + DuiHomeButtonPanelView *q_ptr; + public: DuiHomeButtonPanelViewPrivate(); virtual ~DuiHomeButtonPanelViewPrivate(); diff --git a/src/widgets/views/duiimagewidgetview.cpp b/src/views/duiimagewidgetview.cpp similarity index 100% rename from src/widgets/views/duiimagewidgetview.cpp rename to src/views/duiimagewidgetview.cpp diff --git a/src/widgets/views/duiimagewidgetview.h b/src/views/duiimagewidgetview.h similarity index 100% rename from src/widgets/views/duiimagewidgetview.h rename to src/views/duiimagewidgetview.h diff --git a/src/widgets/views/duiinfobannereventview.cpp b/src/views/duiinfobannereventview.cpp similarity index 93% rename from src/widgets/views/duiinfobannereventview.cpp rename to src/views/duiinfobannereventview.cpp index 77cd42ad7..a0dcfb656 100644 --- a/src/widgets/views/duiinfobannereventview.cpp +++ b/src/views/duiinfobannereventview.cpp @@ -31,8 +31,8 @@ #include DuiInfoBannerEventViewPrivate::DuiInfoBannerEventViewPrivate(DuiInfoBanner *controller) : - DuiSceneWindowViewPrivate(), - banner(controller), label(0), image(0), icon(0), layout(0) + q_ptr(0), banner(controller), label(0), image(0), icon(0), layout(0), + controller(controller) { } @@ -64,21 +64,26 @@ void DuiInfoBannerEventViewPrivate::init() } DuiInfoBannerEventView::DuiInfoBannerEventView(DuiInfoBanner *controller) : - DuiSceneWindowView(* new DuiInfoBannerEventViewPrivate(controller), controller) + DuiSceneWindowView(controller), + d_ptr(new DuiInfoBannerEventViewPrivate(controller)) { Q_D(DuiInfoBannerEventView); + d->q_ptr = this; d->init(); } DuiInfoBannerEventView::DuiInfoBannerEventView(DuiInfoBannerEventViewPrivate &dd, DuiInfoBanner *controller) : - DuiSceneWindowView(dd, controller) + DuiSceneWindowView(controller), + d_ptr(&dd) { Q_D(DuiInfoBannerEventView); + d->q_ptr = this; d->init(); } DuiInfoBannerEventView::~DuiInfoBannerEventView() { + delete d_ptr; } void DuiInfoBannerEventView::updateData(const QList& modifications) diff --git a/src/widgets/views/duiinfobannereventview.h b/src/views/duiinfobannereventview.h similarity index 98% rename from src/widgets/views/duiinfobannereventview.h rename to src/views/duiinfobannereventview.h index c02e53911..f5a77b7e0 100644 --- a/src/widgets/views/duiinfobannereventview.h +++ b/src/views/duiinfobannereventview.h @@ -85,6 +85,9 @@ class DUI_EXPORT DuiInfoBannerEventView : public DuiSceneWindowView Q_OBJECT DUI_VIEW(DuiInfoBannerModel, DuiInfoBannerStyle) +protected: + DuiInfoBannerEventViewPrivate *const d_ptr; + public: /*! \brief Constructor diff --git a/src/widgets/views/duiinfobannereventview_p.h b/src/views/duiinfobannereventview_p.h similarity index 91% rename from src/widgets/views/duiinfobannereventview_p.h rename to src/views/duiinfobannereventview_p.h index d45415a9d..4850d5d49 100644 --- a/src/widgets/views/duiinfobannereventview_p.h +++ b/src/views/duiinfobannereventview_p.h @@ -20,16 +20,17 @@ #ifndef DUIINFOBANNEREVENTVIEW_P_H #define DUIINFOBANNEREVENTVIEW_P_H -#include "duiscenewindowview_p.h" - class DuiLabel; class DuiImageWidget; class QGraphicsLinearLayout; -class DuiInfoBannerEventViewPrivate : public DuiSceneWindowViewPrivate +class DuiInfoBannerEventViewPrivate { Q_DECLARE_PUBLIC(DuiInfoBannerEventView) +protected: + DuiInfoBannerEventView *q_ptr; + public: DuiInfoBannerEventViewPrivate(DuiInfoBanner *controller); virtual ~DuiInfoBannerEventViewPrivate(); @@ -44,6 +45,8 @@ class DuiInfoBannerEventViewPrivate : public DuiSceneWindowViewPrivate //! The layout of the notification QGraphicsLinearLayout *layout; + + DuiInfoBanner *controller; }; #endif diff --git a/src/widgets/views/duiinfobannerinformationview.cpp b/src/views/duiinfobannerinformationview.cpp similarity index 94% rename from src/widgets/views/duiinfobannerinformationview.cpp rename to src/views/duiinfobannerinformationview.cpp index f9a59aa0c..ffe791d26 100644 --- a/src/widgets/views/duiinfobannerinformationview.cpp +++ b/src/views/duiinfobannerinformationview.cpp @@ -30,8 +30,8 @@ #include DuiInfoBannerInformationViewPrivate::DuiInfoBannerInformationViewPrivate(DuiInfoBanner *banner) : - DuiSceneWindowViewPrivate(), - banner(banner), label(0), image(0), button(0), layout(0) + q_ptr(0), banner(banner), label(0), image(0), button(0), layout(0), + controller(banner) { } @@ -78,21 +78,26 @@ void DuiInfoBannerInformationViewPrivate::setButtonText(const QString &text) } DuiInfoBannerInformationView::DuiInfoBannerInformationView(DuiInfoBanner *controller) : - DuiSceneWindowView(* new DuiInfoBannerInformationViewPrivate(controller), controller) + DuiSceneWindowView(controller), + d_ptr(new DuiInfoBannerInformationViewPrivate(controller)) { Q_D(DuiInfoBannerInformationView); + d->q_ptr = this; d->init(); } DuiInfoBannerInformationView::DuiInfoBannerInformationView(DuiInfoBannerInformationViewPrivate &dd, DuiInfoBanner *controller) : - DuiSceneWindowView(dd, controller) + DuiSceneWindowView(controller), + d_ptr(&dd) { Q_D(DuiInfoBannerInformationView); + d->q_ptr = this; d->init(); } DuiInfoBannerInformationView::~DuiInfoBannerInformationView() { + delete d_ptr; } QSizeF DuiInfoBannerInformationView::sizeHint(Qt::SizeHint which, const QSizeF &constraint) const diff --git a/src/widgets/views/duiinfobannerinformationview.h b/src/views/duiinfobannerinformationview.h similarity index 98% rename from src/widgets/views/duiinfobannerinformationview.h rename to src/views/duiinfobannerinformationview.h index 20514e5f0..fb129f6bc 100644 --- a/src/widgets/views/duiinfobannerinformationview.h +++ b/src/views/duiinfobannerinformationview.h @@ -117,6 +117,9 @@ class DUI_EXPORT DuiInfoBannerInformationView : public DuiSceneWindowView Q_OBJECT DUI_VIEW(DuiInfoBannerModel, DuiInfoBannerStyle) +protected: + DuiInfoBannerInformationViewPrivate *const d_ptr; + public: /*! \brief Constructor @@ -153,6 +156,7 @@ protected Q_SLOTS: virtual void updateData(const QList& modifications); //! \reimp_end private: + Q_DISABLE_COPY(DuiInfoBannerInformationView) Q_DECLARE_PRIVATE(DuiInfoBannerInformationView) }; diff --git a/src/widgets/views/duiinfobannerinformationview_p.h b/src/views/duiinfobannerinformationview_p.h similarity index 91% rename from src/widgets/views/duiinfobannerinformationview_p.h rename to src/views/duiinfobannerinformationview_p.h index 26bba595a..dc9344110 100644 --- a/src/widgets/views/duiinfobannerinformationview_p.h +++ b/src/views/duiinfobannerinformationview_p.h @@ -20,17 +20,18 @@ #ifndef DUIINFOBANNERINFORMATIONVIEW_P_H #define DUIINFOBANNERINFORMATIONVIEW_P_H -#include "duiscenewindowview_p.h" - class DuiLabel; class DuiImageWidget; class DuiButton; class QGraphicsGridLayout; -class DuiInfoBannerInformationViewPrivate : public DuiSceneWindowViewPrivate +class DuiInfoBannerInformationViewPrivate { Q_DECLARE_PUBLIC(DuiInfoBannerInformationView) +protected: + DuiInfoBannerInformationView *q_ptr; + public: DuiInfoBannerInformationViewPrivate(DuiInfoBanner *banner); virtual ~DuiInfoBannerInformationViewPrivate(); @@ -46,6 +47,8 @@ class DuiInfoBannerInformationViewPrivate : public DuiSceneWindowViewPrivate //! The layout of the notification QGraphicsGridLayout *layout; + + DuiInfoBanner *controller; }; #endif diff --git a/src/widgets/views/duilabelview.cpp b/src/views/duilabelview.cpp similarity index 100% rename from src/widgets/views/duilabelview.cpp rename to src/views/duilabelview.cpp diff --git a/src/widgets/views/duilabelview.h b/src/views/duilabelview.h similarity index 100% rename from src/widgets/views/duilabelview.h rename to src/views/duilabelview.h diff --git a/src/widgets/views/duilabelview_p.h b/src/views/duilabelview_p.h similarity index 100% rename from src/widgets/views/duilabelview_p.h rename to src/views/duilabelview_p.h diff --git a/src/widgets/views/duilabelview_rich.cpp b/src/views/duilabelview_rich.cpp similarity index 100% rename from src/widgets/views/duilabelview_rich.cpp rename to src/views/duilabelview_rich.cpp diff --git a/src/widgets/views/duilabelview_simple.cpp b/src/views/duilabelview_simple.cpp similarity index 100% rename from src/widgets/views/duilabelview_simple.cpp rename to src/views/duilabelview_simple.cpp diff --git a/src/widgets/views/duilistview.cpp b/src/views/duilistview.cpp similarity index 100% rename from src/widgets/views/duilistview.cpp rename to src/views/duilistview.cpp diff --git a/src/widgets/views/duilistview.h b/src/views/duilistview.h similarity index 100% rename from src/widgets/views/duilistview.h rename to src/views/duilistview.h diff --git a/src/widgets/views/duilistview_p.cpp b/src/views/duilistview_p.cpp similarity index 100% rename from src/widgets/views/duilistview_p.cpp rename to src/views/duilistview_p.cpp diff --git a/src/widgets/views/duilistview_p.h b/src/views/duilistview_p.h similarity index 100% rename from src/widgets/views/duilistview_p.h rename to src/views/duilistview_p.h diff --git a/src/widgets/views/duimenuobjectview.cpp b/src/views/duimenuobjectview.cpp similarity index 98% rename from src/widgets/views/duimenuobjectview.cpp rename to src/views/duimenuobjectview.cpp index 00fcc5110..9a7e08ab5 100644 --- a/src/widgets/views/duimenuobjectview.cpp +++ b/src/views/duimenuobjectview.cpp @@ -113,7 +113,7 @@ QSizeF DuiObjectMenuLayoutPolicy::sizeHint(Qt::SizeHint which, const QSizeF &con DuiMenuObjectViewPrivate::DuiMenuObjectViewPrivate(DuiApplicationMenu *menu) - : controller(menu), + : q_ptr(0), controller(menu), linearPolicy(0), customPolicy(0) { } @@ -371,21 +371,26 @@ bool DuiMenuObjectViewPrivate::eventFilter(QObject *obj, QEvent *e) DuiMenuObjectView::DuiMenuObjectView(DuiApplicationMenu *controller) : - DuiSceneWindowView(* new DuiMenuObjectViewPrivate(controller), controller) + DuiSceneWindowView(controller), + d_ptr(new DuiMenuObjectViewPrivate(controller)) { Q_D(DuiMenuObjectView); + d->q_ptr = this; d->init(); } DuiMenuObjectView::DuiMenuObjectView(DuiMenuObjectViewPrivate &dd, DuiApplicationMenu *controller) : - DuiSceneWindowView(dd, controller) + DuiSceneWindowView(controller), + d_ptr(&dd) { Q_D(DuiMenuObjectView); + d->q_ptr = this; d->init(); } DuiMenuObjectView::~DuiMenuObjectView() { + delete d_ptr; } void DuiMenuObjectView::applyStyle() diff --git a/src/widgets/views/duimenuobjectview.h b/src/views/duimenuobjectview.h similarity index 97% rename from src/widgets/views/duimenuobjectview.h rename to src/views/duimenuobjectview.h index 062674771..3d5363fdb 100644 --- a/src/widgets/views/duimenuobjectview.h +++ b/src/views/duimenuobjectview.h @@ -38,6 +38,9 @@ class DUI_EXPORT DuiMenuObjectView : public DuiSceneWindowView Q_OBJECT DUI_VIEW(DuiApplicationMenuModel, DuiApplicationMenuStyle) +protected: + DuiMenuObjectViewPrivate *const d_ptr; + public: /*! * \brief Constructor diff --git a/src/widgets/views/duimenuobjectview_p.h b/src/views/duimenuobjectview_p.h similarity index 94% rename from src/widgets/views/duimenuobjectview_p.h rename to src/views/duimenuobjectview_p.h index 94cdb101e..6d1918e6f 100644 --- a/src/widgets/views/duimenuobjectview_p.h +++ b/src/views/duimenuobjectview_p.h @@ -20,7 +20,6 @@ #ifndef DUIMENUOBJECTVIEW_P_H #define DUIMENUOBJECTVIEW_P_H -#include "duiscenewindowview_p.h" #include #include "duiabstractlayoutpolicy.h" @@ -50,10 +49,13 @@ class DuiObjectMenuLayoutPolicy : public DuiAbstractLayoutPolicy QHash geometries; }; -class DuiMenuObjectViewPrivate : public DuiSceneWindowViewPrivate, public QObject +class DuiMenuObjectViewPrivate : public QObject { Q_DECLARE_PUBLIC(DuiMenuObjectView) +protected: + DuiMenuObjectView *q_ptr; + public: DuiMenuObjectViewPrivate(DuiApplicationMenu *menu); @@ -79,7 +81,6 @@ class DuiMenuObjectViewPrivate : public DuiSceneWindowViewPrivate, public QObjec protected: bool eventFilter(QObject *obj, QEvent *event); - }; #endif diff --git a/src/widgets/views/duimessageboxview.cpp b/src/views/duimessageboxview.cpp similarity index 100% rename from src/widgets/views/duimessageboxview.cpp rename to src/views/duimessageboxview.cpp diff --git a/src/widgets/views/duimessageboxview.h b/src/views/duimessageboxview.h similarity index 100% rename from src/widgets/views/duimessageboxview.h rename to src/views/duimessageboxview.h diff --git a/src/widgets/views/duimessageboxview_p.h b/src/views/duimessageboxview_p.h similarity index 100% rename from src/widgets/views/duimessageboxview_p.h rename to src/views/duimessageboxview_p.h diff --git a/src/widgets/views/duimodalscenewindowview.cpp b/src/views/duimodalscenewindowview.cpp similarity index 88% rename from src/widgets/views/duimodalscenewindowview.cpp rename to src/views/duimodalscenewindowview.cpp index c8768c2a7..f8bfe4cb9 100644 --- a/src/widgets/views/duimodalscenewindowview.cpp +++ b/src/views/duimodalscenewindowview.cpp @@ -25,6 +25,8 @@ #include "duiviewcreator.h" DuiModalSceneWindowViewPrivate::DuiModalSceneWindowViewPrivate() + : q_ptr(0), + controller(0) { } @@ -34,22 +36,27 @@ DuiModalSceneWindowViewPrivate::~DuiModalSceneWindowViewPrivate() DuiModalSceneWindowView::DuiModalSceneWindowView(DuiModalSceneWindow *controller) : - DuiSceneWindowView(*new DuiModalSceneWindowViewPrivate, controller) + DuiSceneWindowView(controller), + d_ptr(new DuiModalSceneWindowViewPrivate) { Q_D(DuiModalSceneWindowView); + d->q_ptr = this; d->controller = controller; } DuiModalSceneWindowView::DuiModalSceneWindowView(DuiModalSceneWindowViewPrivate &dd, DuiModalSceneWindow *controller) - : DuiSceneWindowView(dd, controller) + : DuiSceneWindowView(controller), + d_ptr(&dd) { Q_D(DuiModalSceneWindowView); + d->q_ptr = this; d->controller = controller; } DuiModalSceneWindowView::~DuiModalSceneWindowView() { + delete d_ptr; } void DuiModalSceneWindowView::applyStyle() diff --git a/src/widgets/views/duimodalscenewindowview.h b/src/views/duimodalscenewindowview.h similarity index 97% rename from src/widgets/views/duimodalscenewindowview.h rename to src/views/duimodalscenewindowview.h index 635dcd486..094e99a8c 100644 --- a/src/widgets/views/duimodalscenewindowview.h +++ b/src/views/duimodalscenewindowview.h @@ -38,6 +38,7 @@ class DUI_EXPORT DuiModalSceneWindowView : public DuiSceneWindowView protected: DuiModalSceneWindowView(DuiModalSceneWindowViewPrivate &dd, DuiModalSceneWindow *controller); + DuiModalSceneWindowViewPrivate *const d_ptr; //! \reimp virtual void applyStyle(); diff --git a/src/widgets/views/duimodalscenewindowview_p.h b/src/views/duimodalscenewindowview_p.h similarity index 91% rename from src/widgets/views/duimodalscenewindowview_p.h rename to src/views/duimodalscenewindowview_p.h index 78d591c9a..85cd30135 100644 --- a/src/widgets/views/duimodalscenewindowview_p.h +++ b/src/views/duimodalscenewindowview_p.h @@ -21,15 +21,17 @@ #define DUIMODALSCENEWINDOWVIEW_P_H #include "duimodalscenewindowview.h" -#include "duiscenewindowview_p.h" class DuiModalSceneWindow; class DuiModalSceneWindowPrivate; -class DuiModalSceneWindowViewPrivate : public DuiSceneWindowViewPrivate +class DuiModalSceneWindowViewPrivate { Q_DECLARE_PUBLIC(DuiModalSceneWindowView) +protected: + DuiModalSceneWindowView *q_ptr; + public: DuiModalSceneWindowViewPrivate(); virtual ~DuiModalSceneWindowViewPrivate(); diff --git a/src/widgets/views/duinavigationbarview.cpp b/src/views/duinavigationbarview.cpp similarity index 100% rename from src/widgets/views/duinavigationbarview.cpp rename to src/views/duinavigationbarview.cpp diff --git a/src/widgets/views/duinavigationbarview.h b/src/views/duinavigationbarview.h similarity index 100% rename from src/widgets/views/duinavigationbarview.h rename to src/views/duinavigationbarview.h diff --git a/src/widgets/views/duinavigationbarview_p.h b/src/views/duinavigationbarview_p.h similarity index 100% rename from src/widgets/views/duinavigationbarview_p.h rename to src/views/duinavigationbarview_p.h diff --git a/src/widgets/views/duiobjectmenuview.cpp b/src/views/duiobjectmenuview.cpp similarity index 95% rename from src/widgets/views/duiobjectmenuview.cpp rename to src/views/duiobjectmenuview.cpp index ef9d5285b..672e1038c 100644 --- a/src/widgets/views/duiobjectmenuview.cpp +++ b/src/views/duiobjectmenuview.cpp @@ -36,6 +36,20 @@ #include "duiapplication.h" #include "duiapplicationwindow.h" +DuiObjectMenuViewPrivate::DuiObjectMenuViewPrivate() + : viewport(0), + container(0), + layout(0), + portraitPolicy(0), + landscapePolicy(0), + controller(0) +{ +} + +DuiObjectMenuViewPrivate::~DuiObjectMenuViewPrivate() +{ +} + void DuiObjectMenuViewPrivate::init() { // create pannable viewport @@ -64,16 +78,22 @@ void DuiObjectMenuViewPrivate::init() DuiObjectMenuView::DuiObjectMenuView(DuiObjectMenu *controller) : - DuiSceneWindowView(* new DuiObjectMenuViewPrivate, controller) + DuiSceneWindowView(controller), + d_ptr(new DuiObjectMenuViewPrivate) { Q_D(DuiObjectMenuView); + d->q_ptr = this; + d->controller = controller; d->init(); } DuiObjectMenuView::DuiObjectMenuView(DuiObjectMenuViewPrivate &dd, DuiObjectMenu *controller) : - DuiSceneWindowView(dd, controller) + DuiSceneWindowView(controller), + d_ptr(&dd) { Q_D(DuiObjectMenuView); + d->q_ptr = this; + d->controller = controller; d->init(); } @@ -95,6 +115,8 @@ DuiObjectMenuView::~DuiObjectMenuView() for (int i = 0; i < count; ++i) { actionRemoved(actions.at(i)); } + + delete d_ptr; } void DuiObjectMenuView::actionAdded(DuiAction *action) diff --git a/src/widgets/views/duiobjectmenuview.h b/src/views/duiobjectmenuview.h similarity index 98% rename from src/widgets/views/duiobjectmenuview.h rename to src/views/duiobjectmenuview.h index a1be60ecf..bc2b53c51 100644 --- a/src/widgets/views/duiobjectmenuview.h +++ b/src/views/duiobjectmenuview.h @@ -43,6 +43,7 @@ class DUI_EXPORT DuiObjectMenuView : public DuiSceneWindowView protected: DuiObjectMenuView(DuiObjectMenuViewPrivate &dd, DuiObjectMenu *controller); + DuiObjectMenuViewPrivate *const d_ptr; public: /*! diff --git a/src/widgets/views/duiobjectmenuview_p.h b/src/views/duiobjectmenuview_p.h similarity index 88% rename from src/widgets/views/duiobjectmenuview_p.h rename to src/views/duiobjectmenuview_p.h index 3a16c0ecd..e970a958b 100644 --- a/src/widgets/views/duiobjectmenuview_p.h +++ b/src/views/duiobjectmenuview_p.h @@ -20,7 +20,6 @@ #ifndef DUIOBJECTMENUVIEW_P_H #define DUIOBJECTMENUVIEW_P_H -#include "duiscenewindowview_p.h" #include "duiobjectmenuview.h" #ifdef HAVE_CONTENTACTION @@ -35,10 +34,17 @@ class DuiPannableViewport; class DuiLinearLayoutPolicy; class DuiGridLayoutPolicy; -class DuiObjectMenuViewPrivate : public DuiSceneWindowViewPrivate +class DuiObjectMenuViewPrivate { Q_DECLARE_PUBLIC(DuiObjectMenuView) +protected: + DuiObjectMenuView *q_ptr; + +public: + DuiObjectMenuViewPrivate(); + virtual ~DuiObjectMenuViewPrivate(); + void init(); QHash buttons; @@ -53,6 +59,9 @@ class DuiObjectMenuViewPrivate : public DuiSceneWindowViewPrivate DuiLayout *layout; DuiLinearLayoutPolicy *portraitPolicy; DuiGridLayoutPolicy *landscapePolicy; + + DuiObjectMenu *controller; + private: void contentActionTriggered(); }; diff --git a/src/widgets/views/duioverlayview.cpp b/src/views/duioverlayview.cpp similarity index 100% rename from src/widgets/views/duioverlayview.cpp rename to src/views/duioverlayview.cpp diff --git a/src/widgets/views/duioverlayview.h b/src/views/duioverlayview.h similarity index 100% rename from src/widgets/views/duioverlayview.h rename to src/views/duioverlayview.h diff --git a/src/widgets/views/duipannablewidgetview.cpp b/src/views/duipannablewidgetview.cpp similarity index 94% rename from src/widgets/views/duipannablewidgetview.cpp rename to src/views/duipannablewidgetview.cpp index 9dbcac36d..b685b82f8 100644 --- a/src/widgets/views/duipannablewidgetview.cpp +++ b/src/views/duipannablewidgetview.cpp @@ -27,7 +27,7 @@ #include "duiviewcreator.h" DuiPannableWidgetViewPrivate::DuiPannableWidgetViewPrivate() : - controller(0) + q_ptr(0), controller(0) { } @@ -51,15 +51,18 @@ void DuiPannableWidgetViewPrivate::_q_applyStyleToPhysics() } DuiPannableWidgetView::DuiPannableWidgetView(DuiPannableWidget *controller) : - DuiWidgetView(* new DuiPannableWidgetViewPrivate, controller) + DuiWidgetView(controller), + d_ptr(new DuiPannableWidgetViewPrivate) { Q_D(DuiPannableWidgetView); + d->q_ptr = this; d->controller = controller; connect(d->controller, SIGNAL(physicsChanged()), this, SLOT(_q_applyStyleToPhysics())); } DuiPannableWidgetView::~DuiPannableWidgetView() { + delete d_ptr; } void DuiPannableWidgetView::drawContents(QPainter *painter, const QStyleOptionGraphicsItem *option) const diff --git a/src/widgets/views/duipannablewidgetview.h b/src/views/duipannablewidgetview.h similarity index 97% rename from src/widgets/views/duipannablewidgetview.h rename to src/views/duipannablewidgetview.h index c1aa2ee33..eb03223c4 100644 --- a/src/widgets/views/duipannablewidgetview.h +++ b/src/views/duipannablewidgetview.h @@ -45,6 +45,7 @@ class DUI_EXPORT DuiPannableWidgetView : public DuiWidgetView virtual void drawContents(QPainter *painter, const QStyleOptionGraphicsItem *option) const; virtual void applyStyle(); //! \reimp_end + DuiPannableWidgetViewPrivate *const d_ptr; private: diff --git a/src/widgets/views/duipannablewidgetview_p.h b/src/views/duipannablewidgetview_p.h similarity index 91% rename from src/widgets/views/duipannablewidgetview_p.h rename to src/views/duipannablewidgetview_p.h index 4e8d749d3..b2780707f 100644 --- a/src/widgets/views/duipannablewidgetview_p.h +++ b/src/views/duipannablewidgetview_p.h @@ -20,14 +20,15 @@ #ifndef DUIPANNABLEWIDGETVIEW_P_H #define DUIPANNABLEWIDGETVIEW_P_H -#include "private/duiwidgetview_p.h" - class DuiPannableWidget; -class DuiPannableWidgetViewPrivate : public DuiWidgetViewPrivate +class DuiPannableWidgetViewPrivate { Q_DECLARE_PUBLIC(DuiPannableWidgetView) +protected: + DuiPannableWidgetView *q_ptr; + public: DuiPannableWidgetViewPrivate(); @@ -36,6 +37,6 @@ class DuiPannableWidgetViewPrivate : public DuiWidgetViewPrivate DuiPannableWidget *controller; void _q_applyStyleToPhysics(); - }; + #endif diff --git a/src/widgets/views/duipopupheaderview_p.h b/src/views/duipopupheaderview_p.h similarity index 100% rename from src/widgets/views/duipopupheaderview_p.h rename to src/views/duipopupheaderview_p.h diff --git a/src/widgets/views/duipopuplistview.cpp b/src/views/duipopuplistview.cpp similarity index 100% rename from src/widgets/views/duipopuplistview.cpp rename to src/views/duipopuplistview.cpp diff --git a/src/widgets/views/duipopuplistview.h b/src/views/duipopuplistview.h similarity index 100% rename from src/widgets/views/duipopuplistview.h rename to src/views/duipopuplistview.h diff --git a/src/widgets/views/duipopuplistview_p.h b/src/views/duipopuplistview_p.h similarity index 100% rename from src/widgets/views/duipopuplistview_p.h rename to src/views/duipopuplistview_p.h diff --git a/src/widgets/views/duipositionindicatorview.cpp b/src/views/duipositionindicatorview.cpp similarity index 100% rename from src/widgets/views/duipositionindicatorview.cpp rename to src/views/duipositionindicatorview.cpp diff --git a/src/widgets/views/duipositionindicatorview.h b/src/views/duipositionindicatorview.h similarity index 100% rename from src/widgets/views/duipositionindicatorview.h rename to src/views/duipositionindicatorview.h diff --git a/src/widgets/views/duipositionindicatorview_p.h b/src/views/duipositionindicatorview_p.h similarity index 100% rename from src/widgets/views/duipositionindicatorview_p.h rename to src/views/duipositionindicatorview_p.h diff --git a/src/widgets/views/duiprogressindicatorbarview.cpp b/src/views/duiprogressindicatorbarview.cpp similarity index 97% rename from src/widgets/views/duiprogressindicatorbarview.cpp rename to src/views/duiprogressindicatorbarview.cpp index b7cdad81d..fd0aea804 100644 --- a/src/widgets/views/duiprogressindicatorbarview.cpp +++ b/src/views/duiprogressindicatorbarview.cpp @@ -36,7 +36,8 @@ const int ProgressBarUpdateInterval = 1000 / 30; DuiProgressIndicatorBarViewPrivate::DuiProgressIndicatorBarViewPrivate() - : controller(0), + : q_ptr(0), + controller(0), elementSize(0), activeElementCount(0), speed(0), @@ -53,18 +54,20 @@ DuiProgressIndicatorBarViewPrivate::~DuiProgressIndicatorBarViewPrivate() DuiProgressIndicatorBarView::DuiProgressIndicatorBarView(DuiProgressIndicator *controller) : - DuiWidgetView(* new DuiProgressIndicatorBarViewPrivate, controller) + DuiWidgetView(controller), + d_ptr(new DuiProgressIndicatorBarViewPrivate) { Q_D(DuiProgressIndicatorBarView); + d->q_ptr = this; d->controller = controller; connect(controller, SIGNAL(visibleChanged()), this, SLOT(visibilityChangedSlot())); - } DuiProgressIndicatorBarView::~DuiProgressIndicatorBarView() { + delete d_ptr; } void DuiProgressIndicatorBarView::animationTimeout() diff --git a/src/widgets/views/duiprogressindicatorbarview.h b/src/views/duiprogressindicatorbarview.h similarity index 98% rename from src/widgets/views/duiprogressindicatorbarview.h rename to src/views/duiprogressindicatorbarview.h index 0a2099842..18075df71 100644 --- a/src/widgets/views/duiprogressindicatorbarview.h +++ b/src/views/duiprogressindicatorbarview.h @@ -90,6 +90,7 @@ private Q_SLOTS: virtual void drawContents(QPainter *painter, const QStyleOptionGraphicsItem *option) const; virtual void setupModel(); //! \reimp_end + DuiProgressIndicatorBarViewPrivate *const d_ptr; protected Q_SLOTS: //! \reimp diff --git a/src/widgets/views/duiprogressindicatorbarview_p.h b/src/views/duiprogressindicatorbarview_p.h similarity index 89% rename from src/widgets/views/duiprogressindicatorbarview_p.h rename to src/views/duiprogressindicatorbarview_p.h index 49574c58a..92dd9d315 100644 --- a/src/widgets/views/duiprogressindicatorbarview_p.h +++ b/src/views/duiprogressindicatorbarview_p.h @@ -21,15 +21,19 @@ #define DUIPROGRESSINDICATORBARVIEW_P_H #include -#include "private/duiwidgetview_p.h" class DuiStyle; class DuiProgressIndicator; class QPixmap; class QTimer; -class DuiProgressIndicatorBarViewPrivate : public DuiWidgetViewPrivate +class DuiProgressIndicatorBarViewPrivate { + Q_DECLARE_PUBLIC(DuiProgressIndicatorBarView) + +protected: + DuiProgressIndicatorBarView *q_ptr; + public: DuiProgressIndicatorBarViewPrivate(); virtual ~DuiProgressIndicatorBarViewPrivate(); diff --git a/src/scene/scenelayereffectviews/duiscenelayereffectdimview.cpp b/src/views/duiscenelayereffectdimview.cpp similarity index 100% rename from src/scene/scenelayereffectviews/duiscenelayereffectdimview.cpp rename to src/views/duiscenelayereffectdimview.cpp diff --git a/src/scene/scenelayereffectviews/duiscenelayereffectdimview.h b/src/views/duiscenelayereffectdimview.h similarity index 97% rename from src/scene/scenelayereffectviews/duiscenelayereffectdimview.h rename to src/views/duiscenelayereffectdimview.h index c1e81467f..d59d5b2a5 100644 --- a/src/scene/scenelayereffectviews/duiscenelayereffectdimview.h +++ b/src/views/duiscenelayereffectdimview.h @@ -20,7 +20,7 @@ #ifndef DUISCENELAYEREFFECTDIMVIEW_H #define DUISCENELAYEREFFECTDIMVIEW_H -#include +#include #include #include diff --git a/src/widgets/views/duiscenewindowview.cpp b/src/views/duiscenewindowview.cpp similarity index 100% rename from src/widgets/views/duiscenewindowview.cpp rename to src/views/duiscenewindowview.cpp diff --git a/src/widgets/views/duiscenewindowview.h b/src/views/duiscenewindowview.h similarity index 100% rename from src/widgets/views/duiscenewindowview.h rename to src/views/duiscenewindowview.h diff --git a/src/widgets/views/duiscenewindowview_p.h b/src/views/duiscenewindowview_p.h similarity index 100% rename from src/widgets/views/duiscenewindowview_p.h rename to src/views/duiscenewindowview_p.h diff --git a/src/widgets/views/duiseparatorview.cpp b/src/views/duiseparatorview.cpp similarity index 87% rename from src/widgets/views/duiseparatorview.cpp rename to src/views/duiseparatorview.cpp index 08be5f3a0..243c4e803 100644 --- a/src/widgets/views/duiseparatorview.cpp +++ b/src/views/duiseparatorview.cpp @@ -25,7 +25,8 @@ #include -DuiSeparatorViewPrivate::DuiSeparatorViewPrivate() +DuiSeparatorViewPrivate::DuiSeparatorViewPrivate() : + q_ptr(0), controller(0) { } @@ -34,12 +35,18 @@ DuiSeparatorViewPrivate::~DuiSeparatorViewPrivate() } DuiSeparatorView::DuiSeparatorView(DuiSeparator *controller) : - DuiWidgetView(* new DuiSeparatorViewPrivate, controller) + DuiWidgetView(controller), + d_ptr(new DuiSeparatorViewPrivate) { + Q_D(DuiSeparatorView); + + d->q_ptr = this; + d->controller = controller; } DuiSeparatorView::~DuiSeparatorView() { + delete d_ptr; } void DuiSeparatorView::updateData(const QList& modifications) diff --git a/src/widgets/views/duiseparatorview.h b/src/views/duiseparatorview.h similarity index 97% rename from src/widgets/views/duiseparatorview.h rename to src/views/duiseparatorview.h index c9c9479bc..f477171de 100644 --- a/src/widgets/views/duiseparatorview.h +++ b/src/views/duiseparatorview.h @@ -53,6 +53,7 @@ class DUI_EXPORT DuiSeparatorView : public DuiWidgetView //! \reimp virtual QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint = QSizeF()) const; //! \reimp_end + DuiSeparatorViewPrivate *const d_ptr; protected slots: //! \reimp diff --git a/src/widgets/views/duiseparatorview_p.h b/src/views/duiseparatorview_p.h similarity index 88% rename from src/widgets/views/duiseparatorview_p.h rename to src/views/duiseparatorview_p.h index d2bf70484..014a02522 100644 --- a/src/widgets/views/duiseparatorview_p.h +++ b/src/views/duiseparatorview_p.h @@ -20,15 +20,20 @@ #ifndef DUISEPARATORVIEW_P_H #define DUISEPARATORVIEW_P_H -#include "private/duiwidgetview_p.h" +class DuiSeparator; -class DuiSeparatorViewPrivate : public DuiWidgetViewPrivate +class DuiSeparatorViewPrivate { Q_DECLARE_PUBLIC(DuiSeparatorView) +protected: + DuiSeparatorView *q_ptr; + public: DuiSeparatorViewPrivate(); ~DuiSeparatorViewPrivate(); + + DuiSeparator *controller; }; #endif //DUISEPARATORVIEW_P_H diff --git a/src/widgets/views/duisliderview.cpp b/src/views/duisliderview.cpp similarity index 99% rename from src/widgets/views/duisliderview.cpp rename to src/views/duisliderview.cpp index 9dc79d59c..64e13c776 100644 --- a/src/widgets/views/duisliderview.cpp +++ b/src/views/duisliderview.cpp @@ -845,6 +845,7 @@ qreal DuiSliderGroove::valueToScreenCoordinate(int value) const } DuiSliderViewPrivate::DuiSliderViewPrivate() : + q_ptr(0), controller(0), sliderGroove(0), minIndicator(0), @@ -1088,14 +1089,17 @@ void DuiSliderViewPrivate::updateSeekBar() } DuiSliderView::DuiSliderView(DuiSlider *controller): - DuiWidgetView(*new DuiSliderViewPrivate, controller) + DuiWidgetView(controller), + d_ptr(new DuiSliderViewPrivate) { Q_D(DuiSliderView); + d->q_ptr = this; d->init(controller); } DuiSliderView::~DuiSliderView() { + delete d_ptr; } void DuiSliderView::updateData(const QList& modifications) diff --git a/src/widgets/views/duisliderview.h b/src/views/duisliderview.h similarity index 99% rename from src/widgets/views/duisliderview.h rename to src/views/duisliderview.h index dabd4e8f3..1d45ff99d 100644 --- a/src/widgets/views/duisliderview.h +++ b/src/views/duisliderview.h @@ -145,6 +145,8 @@ class DUI_EXPORT DuiSliderView : public DuiWidgetView */ virtual void hideEvent(QHideEvent* event); + DuiSliderViewPrivate *const d_ptr; + private: Q_DISABLE_COPY(DuiSliderView) Q_DECLARE_PRIVATE(DuiSliderView) diff --git a/src/widgets/views/duisliderview_p.h b/src/views/duisliderview_p.h similarity index 98% rename from src/widgets/views/duisliderview_p.h rename to src/views/duisliderview_p.h index 6b37b0112..14d328c8e 100644 --- a/src/widgets/views/duisliderview_p.h +++ b/src/views/duisliderview_p.h @@ -21,7 +21,6 @@ #define DUISLIDERVIEW_P_H #include "duisliderview.h" -#include "private/duiwidgetview_p.h" #include #include "duislidermodel.h" @@ -188,10 +187,13 @@ class DuiSliderGroove : public DuiWidget #endif // UNIT_TEST }; -class DuiSliderViewPrivate : public DuiWidgetViewPrivate +class DuiSliderViewPrivate { Q_DECLARE_PUBLIC(DuiSliderView) - + +protected: + DuiSliderView *q_ptr; + public: DuiSliderViewPrivate(); virtual ~DuiSliderViewPrivate(); diff --git a/src/widgets/views/duispinnerview.cpp b/src/views/duispinnerview.cpp similarity index 97% rename from src/widgets/views/duispinnerview.cpp rename to src/views/duispinnerview.cpp index 29e9c68be..005be6932 100644 --- a/src/widgets/views/duispinnerview.cpp +++ b/src/views/duispinnerview.cpp @@ -41,7 +41,8 @@ const int SpinnerRefreshRate = 30; DuiSpinnerViewPrivate::DuiSpinnerViewPrivate() - : controller(0), + : q_ptr(0), + controller(0), inactiveElement(0), activeElement(0), position(0), @@ -61,9 +62,11 @@ DuiSpinnerViewPrivate::~DuiSpinnerViewPrivate() DuiSpinnerView::DuiSpinnerView(DuiProgressIndicator *controller) : - DuiWidgetView(* new DuiSpinnerViewPrivate, controller) + DuiWidgetView(controller), + d_ptr(new DuiSpinnerViewPrivate) { Q_D(DuiSpinnerView); + d->q_ptr = this; d->controller = controller; connect(controller, SIGNAL(visibleChanged()), this, SLOT(visibilityChanged())); } @@ -71,6 +74,7 @@ DuiSpinnerView::DuiSpinnerView(DuiProgressIndicator *controller) : DuiSpinnerView::~DuiSpinnerView() { + delete d_ptr; } void DuiSpinnerViewPrivate::animationTimeout() diff --git a/src/widgets/views/duispinnerview.h b/src/views/duispinnerview.h similarity index 98% rename from src/widgets/views/duispinnerview.h rename to src/views/duispinnerview.h index dd6e204c9..4b5f301d4 100644 --- a/src/widgets/views/duispinnerview.h +++ b/src/views/duispinnerview.h @@ -86,6 +86,7 @@ class DUI_EXPORT DuiSpinnerView : public DuiWidgetView virtual void setupModel(); virtual void applyStyle(); //! \reimp_end + DuiSpinnerViewPrivate *const d_ptr; protected slots: //! \reimp diff --git a/src/widgets/views/duispinnerview_p.h b/src/views/duispinnerview_p.h similarity index 93% rename from src/widgets/views/duispinnerview_p.h rename to src/views/duispinnerview_p.h index cd40d6bc8..fc828b9ca 100644 --- a/src/widgets/views/duispinnerview_p.h +++ b/src/views/duispinnerview_p.h @@ -22,18 +22,21 @@ #include #include -#include "private/duiwidgetview_p.h" class DuiStyle; class DuiProgressIndicator; class QPixmap; class QTimer; -class DuiSpinnerViewPrivate : public DuiWidgetViewPrivate +class DuiSpinnerViewPrivate { -public: Q_DECLARE_PUBLIC(DuiSpinnerView) +protected: + DuiSpinnerView *q_ptr; + +public: + DuiSpinnerViewPrivate(); virtual ~DuiSpinnerViewPrivate(); diff --git a/src/widgets/views/duistatusbarview.cpp b/src/views/duistatusbarview.cpp similarity index 100% rename from src/widgets/views/duistatusbarview.cpp rename to src/views/duistatusbarview.cpp diff --git a/src/widgets/views/duistatusbarview.h b/src/views/duistatusbarview.h similarity index 96% rename from src/widgets/views/duistatusbarview.h rename to src/views/duistatusbarview.h index 5f4499bda..fb8156dd7 100644 --- a/src/widgets/views/duistatusbarview.h +++ b/src/views/duistatusbarview.h @@ -20,7 +20,7 @@ #ifndef DUISTATUSBARVIEW_H #define DUISTATUSBARVIEW_H -#include +#include #include class DuiStatusBar; diff --git a/src/widgets/views/duistylablewidgetview.cpp b/src/views/duistylablewidgetview.cpp similarity index 95% rename from src/widgets/views/duistylablewidgetview.cpp rename to src/views/duistylablewidgetview.cpp index fb56f36f9..bf16604f6 100644 --- a/src/widgets/views/duistylablewidgetview.cpp +++ b/src/views/duistylablewidgetview.cpp @@ -23,10 +23,10 @@ #include "duiviewcreator.h" #include "private/duiwidgetview_p.h" -DuiStylableWidgetView::DuiStylableWidgetView(DuiStylableWidget *_controller) : - DuiWidgetView(* new DuiWidgetViewPrivate, _controller) +DuiStylableWidgetView::DuiStylableWidgetView(DuiStylableWidget *controller) : + DuiWidgetView(controller) { - controller = _controller; + this->controller = controller; } DuiStylableWidgetView::~DuiStylableWidgetView() diff --git a/src/widgets/views/duistylablewidgetview_p.h b/src/views/duistylablewidgetview_p.h similarity index 100% rename from src/widgets/views/duistylablewidgetview_p.h rename to src/views/duistylablewidgetview_p.h diff --git a/src/widgets/views/duitexteditview.cpp b/src/views/duitexteditview.cpp similarity index 100% rename from src/widgets/views/duitexteditview.cpp rename to src/views/duitexteditview.cpp diff --git a/src/widgets/views/duitexteditview.h b/src/views/duitexteditview.h similarity index 100% rename from src/widgets/views/duitexteditview.h rename to src/views/duitexteditview.h diff --git a/src/widgets/views/duitexteditview_p.h b/src/views/duitexteditview_p.h similarity index 100% rename from src/widgets/views/duitexteditview_p.h rename to src/views/duitexteditview_p.h diff --git a/src/widgets/views/duitoolbartabview.cpp b/src/views/duitoolbartabview.cpp similarity index 98% rename from src/widgets/views/duitoolbartabview.cpp rename to src/views/duitoolbartabview.cpp index 366bec33a..863d46ffc 100644 --- a/src/widgets/views/duitoolbartabview.cpp +++ b/src/views/duitoolbartabview.cpp @@ -40,8 +40,8 @@ const int DuiToolbarTabViewPrivate::maxWidgets = 4; DuiToolbarTabViewPrivate::DuiToolbarTabViewPrivate(DuiToolBar *controller) - : DuiWidgetViewPrivate(), - QObject(), + : QObject(), + q_ptr(0), widgetsContainer(0), layout(0), landscapePolicy(0), @@ -508,21 +508,27 @@ bool DuiToolbarTabViewPrivate::refreshPolicyData(QAction *action, DuiAction::Loc } DuiToolbarTabView::DuiToolbarTabView(DuiToolBar *controller) : - DuiWidgetView(* new DuiToolbarTabViewPrivate(controller), controller) + DuiWidgetView(controller), + d_ptr(new DuiToolbarTabViewPrivate(controller)) { Q_D(DuiToolbarTabView); + d->q_ptr = this; d->init(); } DuiToolbarTabView::DuiToolbarTabView(DuiToolbarTabViewPrivate &dd, DuiToolBar *controller) : - DuiWidgetView(dd, controller) + DuiWidgetView(controller), + d_ptr(&dd) { Q_D(DuiToolbarTabView); + d->q_ptr = this; + d->controller = controller; d->init(); } DuiToolbarTabView::~DuiToolbarTabView() { + delete d_ptr; } // bind view and controller together diff --git a/src/widgets/views/duitoolbartabview.h b/src/views/duitoolbartabview.h similarity index 98% rename from src/widgets/views/duitoolbartabview.h rename to src/views/duitoolbartabview.h index 5bd40ca14..a04f5858b 100644 --- a/src/widgets/views/duitoolbartabview.h +++ b/src/views/duitoolbartabview.h @@ -77,6 +77,7 @@ class DUI_EXPORT DuiToolbarTabView : public DuiWidgetView \param controller The controller associated with the view. */ DuiToolbarTabView(DuiToolbarTabViewPrivate &dd, DuiToolBar *controller); + DuiToolbarTabViewPrivate *const d_ptr; private: Q_DISABLE_COPY(DuiToolbarTabView) diff --git a/src/widgets/views/duitoolbartabview_p.h b/src/views/duitoolbartabview_p.h similarity index 96% rename from src/widgets/views/duitoolbartabview_p.h rename to src/views/duitoolbartabview_p.h index 7b5151390..4e9a5f60a 100644 --- a/src/widgets/views/duitoolbartabview_p.h +++ b/src/views/duitoolbartabview_p.h @@ -23,7 +23,6 @@ #include #include -#include "private/duiwidgetview_p.h" #include "duiaction.h" #include "duinamespace.h" @@ -40,10 +39,14 @@ class QGraphicsLayoutItem; class QGraphicsWidget; class DuiButtonGroup; -class DuiToolbarTabViewPrivate : public DuiWidgetViewPrivate, public QObject +class DuiToolbarTabViewPrivate : public QObject { Q_DECLARE_PUBLIC(DuiToolbarTabView) +protected: + DuiToolbarTabView *q_ptr; + DuiToolBar *controller; + public: DuiToolbarTabViewPrivate(DuiToolBar *controller); virtual ~DuiToolbarTabViewPrivate(); diff --git a/src/widgets/views/duitoolbarview.cpp b/src/views/duitoolbarview.cpp similarity index 98% rename from src/widgets/views/duitoolbarview.cpp rename to src/views/duitoolbarview.cpp index 6a849c4cf..6c402096b 100644 --- a/src/widgets/views/duitoolbarview.cpp +++ b/src/views/duitoolbarview.cpp @@ -38,8 +38,8 @@ const int DuiToolBarViewPrivate::maxWidgets = 4; DuiToolBarViewPrivate::DuiToolBarViewPrivate(DuiToolBar *controller) - : DuiWidgetViewPrivate(), - QObject(), + : QObject(), + q_ptr(0), widgetsContainer(0), layout(0), landscapePolicy(0), @@ -549,21 +549,27 @@ bool DuiToolBarViewPrivate::refreshPolicyData(QAction *action, } DuiToolBarView::DuiToolBarView(DuiToolBar *controller) : - DuiWidgetView(* new DuiToolBarViewPrivate(controller), controller) + DuiWidgetView(controller), + d_ptr(new DuiToolBarViewPrivate(controller)) { Q_D(DuiToolBarView); + d->q_ptr = this; d->init(); } DuiToolBarView::DuiToolBarView(DuiToolBarViewPrivate &dd, DuiToolBar *controller) : - DuiWidgetView(dd, controller) + DuiWidgetView(controller), + d_ptr(&dd) { Q_D(DuiToolBarView); + d->q_ptr = this; + d->controller = controller; d->init(); } DuiToolBarView::~DuiToolBarView() { + delete d_ptr; } // bind view and controller together diff --git a/src/widgets/views/duitoolbarview.h b/src/views/duitoolbarview.h similarity index 98% rename from src/widgets/views/duitoolbarview.h rename to src/views/duitoolbarview.h index 545e2e2cf..ed9126662 100644 --- a/src/widgets/views/duitoolbarview.h +++ b/src/views/duitoolbarview.h @@ -79,6 +79,7 @@ class DUI_EXPORT DuiToolBarView : public DuiWidgetView \param controller The controller associated with the view. */ DuiToolBarView(DuiToolBarViewPrivate &dd, DuiToolBar *controller); + DuiToolBarViewPrivate *const d_ptr; private: Q_DISABLE_COPY(DuiToolBarView) diff --git a/src/widgets/views/duitoolbarview_p.h b/src/views/duitoolbarview_p.h similarity index 97% rename from src/widgets/views/duitoolbarview_p.h rename to src/views/duitoolbarview_p.h index d22a6d772..3e96f953b 100644 --- a/src/widgets/views/duitoolbarview_p.h +++ b/src/views/duitoolbarview_p.h @@ -23,7 +23,6 @@ #include #include -#include "private/duiwidgetview_p.h" #include "duiaction.h" #include "duinamespace.h" @@ -39,7 +38,7 @@ class DuiLayout; class QGraphicsLayoutItem; class QGraphicsWidget; -class DuiToolBarViewPrivate : public DuiWidgetViewPrivate, public QObject +class DuiToolBarViewPrivate : public QObject { Q_DECLARE_PUBLIC(DuiToolBarView) @@ -79,6 +78,8 @@ class DuiToolBarViewPrivate : public DuiWidgetViewPrivate, public QObject void refreshSpacers(); protected: + DuiToolBarView *q_ptr; + DuiToolBar *controller; DuiWidget *widgetsContainer; DuiLayout *layout; DuiLinearLayoutPolicy *landscapePolicy; diff --git a/src/views/duiviewslibrary.cpp b/src/views/duiviewslibrary.cpp new file mode 100644 index 000000000..a59a6f8e0 --- /dev/null +++ b/src/views/duiviewslibrary.cpp @@ -0,0 +1,3 @@ +#include "duilibrary.h" + +DUI_LIBRARY diff --git a/src/widgets/.gitignore b/src/views/style/.gitignore similarity index 100% rename from src/widgets/.gitignore rename to src/views/style/.gitignore diff --git a/src/style/duiapplicationmenubuttonstyle.h b/src/views/style/duiapplicationmenubuttonstyle.h similarity index 95% rename from src/style/duiapplicationmenubuttonstyle.h rename to src/views/style/duiapplicationmenubuttonstyle.h index c3627f624..df7d187c8 100644 --- a/src/style/duiapplicationmenubuttonstyle.h +++ b/src/views/style/duiapplicationmenubuttonstyle.h @@ -61,7 +61,7 @@ class DUI_EXPORT DuiApplicationMenuButtonStyle : public DuiButtonStyle \ingroup styles \sa DuiApplicationMenuButtonStyle */ -class DuiApplicationMenuButtonStyleContainer : public DuiButtonStyleContainer +class DUI_EXPORT DuiApplicationMenuButtonStyleContainer : public DuiButtonStyleContainer { DUI_STYLE_CONTAINER_INTERNAL(DuiApplicationMenuButtonStyle) }; diff --git a/src/style/duiapplicationmenustyle.h b/src/views/style/duiapplicationmenustyle.h similarity index 100% rename from src/style/duiapplicationmenustyle.h rename to src/views/style/duiapplicationmenustyle.h diff --git a/src/style/duiapplicationpagestyle.h b/src/views/style/duiapplicationpagestyle.h similarity index 100% rename from src/style/duiapplicationpagestyle.h rename to src/views/style/duiapplicationpagestyle.h diff --git a/src/style/duibuttoniconstyle.h b/src/views/style/duibuttoniconstyle.h similarity index 100% rename from src/style/duibuttoniconstyle.h rename to src/views/style/duibuttoniconstyle.h diff --git a/src/style/duibuttonstyle.h b/src/views/style/duibuttonstyle.h similarity index 97% rename from src/style/duibuttonstyle.h rename to src/views/style/duibuttonstyle.h index 0d8a67a95..74e4cbcbe 100644 --- a/src/style/duibuttonstyle.h +++ b/src/views/style/duibuttonstyle.h @@ -54,7 +54,7 @@ class DUI_EXPORT DuiButtonStyle : public DuiWidgetStyle { Q_OBJECT - DUI_STYLE_INTERNAL(DuiButtonStyle) + DUI_STYLE(DuiButtonStyle) /*! \property DuiButtonStyle::font @@ -134,7 +134,7 @@ class DUI_EXPORT DuiButtonStyle : public DuiWidgetStyle */ class DUI_EXPORT DuiButtonStyleContainer : public DuiWidgetStyleContainer { - DUI_STYLE_CONTAINER_INTERNAL(DuiButtonStyle) + DUI_STYLE_CONTAINER(DuiButtonStyle) /*! \brief Style mode for a pressed button. diff --git a/src/style/duibuttonswitchstyle.h b/src/views/style/duibuttonswitchstyle.h similarity index 100% rename from src/style/duibuttonswitchstyle.h rename to src/views/style/duibuttonswitchstyle.h diff --git a/src/style/duicheckboxstyle.h b/src/views/style/duicheckboxstyle.h similarity index 100% rename from src/style/duicheckboxstyle.h rename to src/views/style/duicheckboxstyle.h diff --git a/src/style/duicomboboxstyle.h b/src/views/style/duicomboboxstyle.h similarity index 95% rename from src/style/duicomboboxstyle.h rename to src/views/style/duicomboboxstyle.h index 2f6b11c52..d88d800a1 100644 --- a/src/style/duicomboboxstyle.h +++ b/src/views/style/duicomboboxstyle.h @@ -32,7 +32,7 @@ class DUI_EXPORT DuiComboBoxStyle : public DuiWidgetStyle { Q_OBJECT - DUI_STYLE_INTERNAL(DuiComboBoxStyle) + DUI_STYLE(DuiComboBoxStyle) /*! \property DuiComboBoxStyle::itemMode @@ -57,7 +57,7 @@ class DUI_EXPORT DuiComboBoxStyle : public DuiWidgetStyle */ class DUI_EXPORT DuiComboBoxStyleContainer : public DuiWidgetStyleContainer { - DUI_STYLE_CONTAINER_INTERNAL(DuiComboBoxStyle) + DUI_STYLE_CONTAINER(DuiComboBoxStyle) /*! \brief Style mode for a pressed comboBox. diff --git a/src/style/duicompleterstyle.h b/src/views/style/duicompleterstyle.h similarity index 100% rename from src/style/duicompleterstyle.h rename to src/views/style/duicompleterstyle.h diff --git a/src/style/duicontainerheaderstyle.h b/src/views/style/duicontainerheaderstyle.h similarity index 91% rename from src/style/duicontainerheaderstyle.h rename to src/views/style/duicontainerheaderstyle.h index dbd17a1b4..d07fb97f4 100644 --- a/src/style/duicontainerheaderstyle.h +++ b/src/views/style/duicontainerheaderstyle.h @@ -31,7 +31,7 @@ class DUI_EXPORT DuiContainerHeaderStyle : public DuiWidgetStyle { Q_OBJECT - DUI_STYLE_INTERNAL(DuiContainerHeaderStyle) + DUI_STYLE(DuiContainerHeaderStyle) }; /*! @@ -40,7 +40,7 @@ class DUI_EXPORT DuiContainerHeaderStyle : public DuiWidgetStyle class DUI_EXPORT DuiContainerHeaderStyleContainer : public DuiWidgetStyleContainer { - DUI_STYLE_CONTAINER_INTERNAL(DuiContainerHeaderStyle) + DUI_STYLE_CONTAINER(DuiContainerHeaderStyle) DUI_STYLE_MODE(Pressed) }; diff --git a/src/style/duicontainerstyle.h b/src/views/style/duicontainerstyle.h similarity index 92% rename from src/style/duicontainerstyle.h rename to src/views/style/duicontainerstyle.h index 57121ae14..1651bb57a 100644 --- a/src/style/duicontainerstyle.h +++ b/src/views/style/duicontainerstyle.h @@ -27,7 +27,7 @@ class DUI_EXPORT DuiContainerStyle : public DuiWidgetStyle { Q_OBJECT - DUI_STYLE_INTERNAL(DuiContainerStyle) + DUI_STYLE(DuiContainerStyle) DUI_STYLE_ATTRIBUTE(QSize, iconSize, IconSize) DUI_STYLE_ATTRIBUTE(int, internalMargins, InternalMargins) @@ -36,7 +36,7 @@ class DUI_EXPORT DuiContainerStyle : public DuiWidgetStyle class DUI_EXPORT DuiContainerStyleContainer : public DuiWidgetStyleContainer { - DUI_STYLE_CONTAINER_INTERNAL(DuiContainerStyle) + DUI_STYLE_CONTAINER(DuiContainerStyle) }; #endif diff --git a/src/style/duicontentitemstyle.h b/src/views/style/duicontentitemstyle.h similarity index 96% rename from src/style/duicontentitemstyle.h rename to src/views/style/duicontentitemstyle.h index c73d63a74..a2adde054 100644 --- a/src/style/duicontentitemstyle.h +++ b/src/views/style/duicontentitemstyle.h @@ -25,7 +25,7 @@ class DUI_EXPORT DuiContentItemStyle : public DuiWidgetStyle { Q_OBJECT - DUI_STYLE_INTERNAL(DuiContentItemStyle) + DUI_STYLE(DuiContentItemStyle) DUI_STYLE_PTR_ATTRIBUTE(DuiScalableImage *, backgroundImageTopLeft, BackgroundImageTopLeft) DUI_STYLE_PTR_ATTRIBUTE(DuiScalableImage *, backgroundImageTop, BackgroundImageTop) DUI_STYLE_PTR_ATTRIBUTE(DuiScalableImage *, backgroundImageTopRight, BackgroundImageTopRight) @@ -54,7 +54,7 @@ class DUI_EXPORT DuiContentItemStyle : public DuiWidgetStyle class DUI_EXPORT DuiContentItemStyleContainer : public DuiWidgetStyleContainer { - DUI_STYLE_CONTAINER_INTERNAL(DuiContentItemStyle) + DUI_STYLE_CONTAINER(DuiContentItemStyle) }; #endif diff --git a/src/style/duidevicestyle.h b/src/views/style/duidevicestyle.h similarity index 92% rename from src/style/duidevicestyle.h rename to src/views/style/duidevicestyle.h index ea8da097d..8fe921a36 100644 --- a/src/style/duidevicestyle.h +++ b/src/views/style/duidevicestyle.h @@ -28,7 +28,7 @@ class DUI_EXPORT DuiDeviceStyle : public DuiStyle { Q_OBJECT - DUI_STYLE_INTERNAL(DuiDeviceStyle) + DUI_STYLE(DuiDeviceStyle) DUI_STYLE_ATTRIBUTE(QSize, resolution, Resolution) DUI_STYLE_ATTRIBUTE(QSize, pixelsPerInch, PixelsPerInch) @@ -36,7 +36,7 @@ class DUI_EXPORT DuiDeviceStyle : public DuiStyle class DUI_EXPORT DuiDeviceStyleContainer : public DuiStyleContainer { - DUI_STYLE_CONTAINER_INTERNAL(DuiDeviceStyle) + DUI_STYLE_CONTAINER(DuiDeviceStyle) }; #endif diff --git a/src/style/duidialogstyle.h b/src/views/style/duidialogstyle.h similarity index 100% rename from src/style/duidialogstyle.h rename to src/views/style/duidialogstyle.h diff --git a/src/style/duidockwidgetstyle.h b/src/views/style/duidockwidgetstyle.h similarity index 100% rename from src/style/duidockwidgetstyle.h rename to src/views/style/duidockwidgetstyle.h diff --git a/src/style/duiescapebuttonpanelstyle.h b/src/views/style/duiescapebuttonpanelstyle.h similarity index 100% rename from src/style/duiescapebuttonpanelstyle.h rename to src/views/style/duiescapebuttonpanelstyle.h diff --git a/src/style/duiextendingbackgroundstyle.h b/src/views/style/duiextendingbackgroundstyle.h similarity index 91% rename from src/style/duiextendingbackgroundstyle.h rename to src/views/style/duiextendingbackgroundstyle.h index 71601e49a..9f9ff8c84 100644 --- a/src/style/duiextendingbackgroundstyle.h +++ b/src/views/style/duiextendingbackgroundstyle.h @@ -28,7 +28,7 @@ class DUI_EXPORT DuiExtendingBackgroundStyle : public DuiWidgetStyle { Q_OBJECT - DUI_STYLE_INTERNAL(DuiExtendingBackgroundStyle) + DUI_STYLE(DuiExtendingBackgroundStyle) //! The direction where to extend the background beyond the screen edges (left/right/top/bottom) DUI_STYLE_ATTRIBUTE(QString, extendDirection, ExtendDirection) @@ -36,7 +36,7 @@ class DUI_EXPORT DuiExtendingBackgroundStyle : public DuiWidgetStyle class DUI_EXPORT DuiExtendingBackgroundStyleContainer : public DuiWidgetStyleContainer { - DUI_STYLE_CONTAINER_INTERNAL(DuiExtendingBackgroundStyle) + DUI_STYLE_CONTAINER(DuiExtendingBackgroundStyle) }; #endif diff --git a/src/style/duigriditemstyle.h b/src/views/style/duigriditemstyle.h similarity index 95% rename from src/style/duigriditemstyle.h rename to src/views/style/duigriditemstyle.h index 5fcf986b2..5e59fd1b2 100644 --- a/src/style/duigriditemstyle.h +++ b/src/views/style/duigriditemstyle.h @@ -40,7 +40,7 @@ class DUI_EXPORT DuiGridItemStyle : public DuiWidgetStyle { Q_OBJECT - DUI_STYLE_INTERNAL(DuiGridItemStyle) + DUI_STYLE(DuiGridItemStyle) /*! \property DuiGridItemStyle::iconAlign @@ -64,7 +64,7 @@ class DUI_EXPORT DuiGridItemStyle : public DuiWidgetStyle */ class DUI_EXPORT DuiGridItemStyleContainer : public DuiWidgetStyleContainer { - DUI_STYLE_CONTAINER_INTERNAL(DuiGridItemStyle) + DUI_STYLE_CONTAINER(DuiGridItemStyle) }; #endif diff --git a/src/style/duihomebuttonpanelstyle.h b/src/views/style/duihomebuttonpanelstyle.h similarity index 100% rename from src/style/duihomebuttonpanelstyle.h rename to src/views/style/duihomebuttonpanelstyle.h diff --git a/src/style/duiimagewidgetstyle.h b/src/views/style/duiimagewidgetstyle.h similarity index 96% rename from src/style/duiimagewidgetstyle.h rename to src/views/style/duiimagewidgetstyle.h index 48fb0221b..66f67d17b 100644 --- a/src/style/duiimagewidgetstyle.h +++ b/src/views/style/duiimagewidgetstyle.h @@ -45,7 +45,7 @@ class DUI_EXPORT DuiImageWidgetStyle : public DuiWidgetStyle { Q_OBJECT - DUI_STYLE_INTERNAL(DuiImageWidgetStyle) + DUI_STYLE(DuiImageWidgetStyle) /*! \property DuiImageWidgetStyle::borderTop @@ -93,7 +93,7 @@ class DUI_EXPORT DuiImageWidgetStyle : public DuiWidgetStyle */ class DUI_EXPORT DuiImageWidgetStyleContainer : public DuiWidgetStyleContainer { - DUI_STYLE_CONTAINER_INTERNAL(DuiImageWidgetStyle) + DUI_STYLE_CONTAINER(DuiImageWidgetStyle) }; #endif diff --git a/src/style/duiinfobannerstyle.h b/src/views/style/duiinfobannerstyle.h similarity index 100% rename from src/style/duiinfobannerstyle.h rename to src/views/style/duiinfobannerstyle.h diff --git a/src/style/duilabelstyle.h b/src/views/style/duilabelstyle.h similarity index 96% rename from src/style/duilabelstyle.h rename to src/views/style/duilabelstyle.h index b6583a28e..5cffff7ba 100644 --- a/src/style/duilabelstyle.h +++ b/src/views/style/duilabelstyle.h @@ -41,7 +41,7 @@ class DUI_EXPORT DuiLabelStyle : public DuiWidgetStyle { Q_OBJECT - DUI_STYLE_INTERNAL(DuiLabelStyle) + DUI_STYLE(DuiLabelStyle) /*! \property DuiLabelStyle::color @@ -83,7 +83,7 @@ class DUI_EXPORT DuiLabelStyle : public DuiWidgetStyle */ class DUI_EXPORT DuiLabelStyleContainer : public DuiWidgetStyleContainer { - DUI_STYLE_CONTAINER_INTERNAL(DuiLabelStyle) + DUI_STYLE_CONTAINER(DuiLabelStyle) }; #endif diff --git a/src/style/duiliststyle.h b/src/views/style/duiliststyle.h similarity index 96% rename from src/style/duiliststyle.h rename to src/views/style/duiliststyle.h index df35758e1..6f85db77b 100644 --- a/src/style/duiliststyle.h +++ b/src/views/style/duiliststyle.h @@ -45,7 +45,7 @@ class DUI_EXPORT DuiListStyle : public DuiWidgetStyle { Q_OBJECT - DUI_STYLE_INTERNAL(DuiListStyle) + DUI_STYLE(DuiListStyle) /*! \property DuiListStyle::groupHeaderObjectName @@ -77,7 +77,7 @@ class DUI_EXPORT DuiListStyle : public DuiWidgetStyle class DUI_EXPORT DuiListStyleContainer : public DuiWidgetStyleContainer { - DUI_STYLE_CONTAINER_INTERNAL(DuiListStyle) + DUI_STYLE_CONTAINER(DuiListStyle) }; #endif diff --git a/src/style/duimessageboxstyle.h b/src/views/style/duimessageboxstyle.h similarity index 100% rename from src/style/duimessageboxstyle.h rename to src/views/style/duimessageboxstyle.h diff --git a/src/style/duimodalscenewindowstyle.h b/src/views/style/duimodalscenewindowstyle.h similarity index 100% rename from src/style/duimodalscenewindowstyle.h rename to src/views/style/duimodalscenewindowstyle.h diff --git a/src/style/duinavigationbarstyle.h b/src/views/style/duinavigationbarstyle.h similarity index 100% rename from src/style/duinavigationbarstyle.h rename to src/views/style/duinavigationbarstyle.h diff --git a/src/style/duiobjectmenustyle.h b/src/views/style/duiobjectmenustyle.h similarity index 100% rename from src/style/duiobjectmenustyle.h rename to src/views/style/duiobjectmenustyle.h diff --git a/src/style/duioverlaystyle.h b/src/views/style/duioverlaystyle.h similarity index 100% rename from src/style/duioverlaystyle.h rename to src/views/style/duioverlaystyle.h diff --git a/src/style/duipannablewidgetstyle.h b/src/views/style/duipannablewidgetstyle.h similarity index 96% rename from src/style/duipannablewidgetstyle.h rename to src/views/style/duipannablewidgetstyle.h index c8280be03..664177780 100644 --- a/src/style/duipannablewidgetstyle.h +++ b/src/views/style/duipannablewidgetstyle.h @@ -48,7 +48,7 @@ class DUI_EXPORT DuiPannableWidgetStyle : public DuiWidgetStyle { Q_OBJECT - DUI_STYLE_INTERNAL(DuiPannableWidgetStyle) + DUI_STYLE(DuiPannableWidgetStyle) DUI_STYLE_ATTRIBUTE(qreal, panThreshold, PanThreshold) DUI_STYLE_ATTRIBUTE(qreal, pointerSpringK, PointerSpringK) @@ -61,7 +61,7 @@ class DUI_EXPORT DuiPannableWidgetStyle : public DuiWidgetStyle class DUI_EXPORT DuiPannableWidgetStyleContainer : public DuiWidgetStyleContainer { - DUI_STYLE_CONTAINER_INTERNAL(DuiPannableWidgetStyle) + DUI_STYLE_CONTAINER(DuiPannableWidgetStyle) }; #endif diff --git a/src/style/duipopupliststyle.h b/src/views/style/duipopupliststyle.h similarity index 100% rename from src/style/duipopupliststyle.h rename to src/views/style/duipopupliststyle.h diff --git a/src/style/duipositionindicatorstyle.h b/src/views/style/duipositionindicatorstyle.h similarity index 92% rename from src/style/duipositionindicatorstyle.h rename to src/views/style/duipositionindicatorstyle.h index 6f1173790..dc0853b7f 100644 --- a/src/style/duipositionindicatorstyle.h +++ b/src/views/style/duipositionindicatorstyle.h @@ -28,7 +28,7 @@ class QPixmap; class DUI_EXPORT DuiPositionIndicatorStyle : public DuiWidgetStyle { Q_OBJECT - DUI_STYLE_INTERNAL(DuiPositionIndicatorStyle) + DUI_STYLE(DuiPositionIndicatorStyle) DUI_STYLE_PTR_ATTRIBUTE(QPixmap *, onPixmap, OnPixmap) DUI_STYLE_PTR_ATTRIBUTE(QPixmap *, offPixmap, OffPixmap) @@ -39,7 +39,7 @@ class DUI_EXPORT DuiPositionIndicatorStyle : public DuiWidgetStyle class DUI_EXPORT DuiPositionIndicatorStyleContainer : public DuiWidgetStyleContainer { - DUI_STYLE_CONTAINER_INTERNAL(DuiPositionIndicatorStyle) + DUI_STYLE_CONTAINER(DuiPositionIndicatorStyle) }; #endif diff --git a/src/style/duiprogressindicatorstyle.h b/src/views/style/duiprogressindicatorstyle.h similarity index 95% rename from src/style/duiprogressindicatorstyle.h rename to src/views/style/duiprogressindicatorstyle.h index c4b34e417..90dc099c5 100644 --- a/src/style/duiprogressindicatorstyle.h +++ b/src/views/style/duiprogressindicatorstyle.h @@ -32,7 +32,7 @@ class DUI_EXPORT DuiProgressIndicatorStyle : public DuiWidgetStyle { Q_OBJECT - DUI_STYLE_INTERNAL(DuiProgressIndicatorStyle) + DUI_STYLE(DuiProgressIndicatorStyle) /*! \property DuiProgressIndicatorStyle::activeImage @@ -80,7 +80,7 @@ class DUI_EXPORT DuiProgressIndicatorStyle : public DuiWidgetStyle */ class DUI_EXPORT DuiProgressIndicatorStyleContainer : public DuiWidgetStyleContainer { - DUI_STYLE_CONTAINER_INTERNAL(DuiProgressIndicatorStyle) + DUI_STYLE_CONTAINER(DuiProgressIndicatorStyle) }; #endif diff --git a/src/style/duiscenelayereffectdimstyle.h b/src/views/style/duiscenelayereffectdimstyle.h similarity index 100% rename from src/style/duiscenelayereffectdimstyle.h rename to src/views/style/duiscenelayereffectdimstyle.h diff --git a/src/style/duiscenelayereffectstyle.h b/src/views/style/duiscenelayereffectstyle.h similarity index 100% rename from src/style/duiscenelayereffectstyle.h rename to src/views/style/duiscenelayereffectstyle.h diff --git a/src/style/duiscenewindowanimatorstyle.h b/src/views/style/duiscenewindowanimatorstyle.h similarity index 93% rename from src/style/duiscenewindowanimatorstyle.h rename to src/views/style/duiscenewindowanimatorstyle.h index 6d10ce2dc..36d9cf233 100644 --- a/src/style/duiscenewindowanimatorstyle.h +++ b/src/views/style/duiscenewindowanimatorstyle.h @@ -26,7 +26,7 @@ class DUI_EXPORT DuiSceneWindowAnimatorStyle : public DuiStyle { Q_OBJECT - DUI_STYLE_INTERNAL(DuiSceneWindowAnimatorStyle) + DUI_STYLE(DuiSceneWindowAnimatorStyle) DUI_STYLE_ATTRIBUTE(QString, transitionInType, TransitionInType) DUI_STYLE_ATTRIBUTE(int, transitionInDuration, TransitionInDuration) @@ -40,7 +40,7 @@ class DUI_EXPORT DuiSceneWindowAnimatorStyle : public DuiStyle class DUI_EXPORT DuiSceneWindowAnimatorStyleContainer : public DuiStyleContainer { - DUI_STYLE_CONTAINER_INTERNAL(DuiSceneWindowAnimatorStyle) + DUI_STYLE_CONTAINER(DuiSceneWindowAnimatorStyle) }; #endif diff --git a/src/style/duiscenewindowstyle.h b/src/views/style/duiscenewindowstyle.h similarity index 93% rename from src/style/duiscenewindowstyle.h rename to src/views/style/duiscenewindowstyle.h index b48290ebb..1e0ad2712 100644 --- a/src/style/duiscenewindowstyle.h +++ b/src/views/style/duiscenewindowstyle.h @@ -26,7 +26,7 @@ class DUI_EXPORT DuiSceneWindowStyle : public DuiWidgetStyle { Q_OBJECT - DUI_STYLE_INTERNAL(DuiSceneWindowStyle) + DUI_STYLE(DuiSceneWindowStyle) DUI_STYLE_ATTRIBUTE(QString, dismissAnimation, DismissAnimation) @@ -37,7 +37,7 @@ class DUI_EXPORT DuiSceneWindowStyle : public DuiWidgetStyle class DUI_EXPORT DuiSceneWindowStyleContainer : public DuiWidgetStyleContainer { - DUI_STYLE_CONTAINER_INTERNAL(DuiSceneWindowStyle) + DUI_STYLE_CONTAINER(DuiSceneWindowStyle) }; #endif diff --git a/src/style/duiseparatorstyle.h b/src/views/style/duiseparatorstyle.h similarity index 94% rename from src/style/duiseparatorstyle.h rename to src/views/style/duiseparatorstyle.h index be501f7d3..8e3e98d51 100644 --- a/src/style/duiseparatorstyle.h +++ b/src/views/style/duiseparatorstyle.h @@ -39,7 +39,7 @@ class DUI_EXPORT DuiSeparatorStyle : public DuiWidgetStyle { Q_OBJECT - DUI_STYLE_INTERNAL(DuiSeparatorStyle) + DUI_STYLE(DuiSeparatorStyle) /*! \property DuiSeparatorStyle::span @@ -57,7 +57,7 @@ class DUI_EXPORT DuiSeparatorStyle : public DuiWidgetStyle */ class DUI_EXPORT DuiSeparatorStyleContainer : public DuiWidgetStyleContainer { - DUI_STYLE_CONTAINER_INTERNAL(DuiSeparatorStyle) + DUI_STYLE_CONTAINER(DuiSeparatorStyle) }; #endif diff --git a/src/style/duisliderstyle.h b/src/views/style/duisliderstyle.h similarity index 98% rename from src/style/duisliderstyle.h rename to src/views/style/duisliderstyle.h index 5e973cd16..e3b86be9b 100644 --- a/src/style/duisliderstyle.h +++ b/src/views/style/duisliderstyle.h @@ -39,7 +39,7 @@ class DuiScalableImage; class DUI_EXPORT DuiSliderStyle : public DuiWidgetStyle { Q_OBJECT - DUI_STYLE_INTERNAL(DuiSliderStyle) + DUI_STYLE(DuiSliderStyle) /*! \property DuiSliderStyle::handlePixmap @@ -115,7 +115,7 @@ class DUI_EXPORT DuiSliderStyle : public DuiWidgetStyle class DUI_EXPORT DuiSliderStyleContainer : public DuiWidgetStyleContainer { - DUI_STYLE_CONTAINER_INTERNAL(DuiSliderStyle) + DUI_STYLE_CONTAINER(DuiSliderStyle) }; #endif diff --git a/src/style/duispinnerstyle.h b/src/views/style/duispinnerstyle.h similarity index 96% rename from src/style/duispinnerstyle.h rename to src/views/style/duispinnerstyle.h index 6e95e861a..393f23ae4 100644 --- a/src/style/duispinnerstyle.h +++ b/src/views/style/duispinnerstyle.h @@ -32,7 +32,7 @@ class DUI_EXPORT DuiSpinnerStyle : public DuiWidgetStyle { Q_OBJECT - DUI_STYLE_INTERNAL(DuiSpinnerStyle) + DUI_STYLE(DuiSpinnerStyle) /*! \property DuiSpinnerStyle::activeImage @@ -81,7 +81,7 @@ class DUI_EXPORT DuiSpinnerStyle : public DuiWidgetStyle */ class DUI_EXPORT DuiSpinnerStyleContainer : public DuiWidgetStyleContainer { - DUI_STYLE_CONTAINER_INTERNAL(DuiSpinnerStyle) + DUI_STYLE_CONTAINER(DuiSpinnerStyle) }; #endif diff --git a/src/style/duitexteditstyle.h b/src/views/style/duitexteditstyle.h similarity index 95% rename from src/style/duitexteditstyle.h rename to src/views/style/duitexteditstyle.h index c56a37f2e..9d6b9c365 100644 --- a/src/style/duitexteditstyle.h +++ b/src/views/style/duitexteditstyle.h @@ -28,7 +28,7 @@ class DUI_EXPORT DuiTextEditStyle : public DuiWidgetStyle { Q_OBJECT - DUI_STYLE_INTERNAL(DuiTextEditStyle) + DUI_STYLE(DuiTextEditStyle) DUI_STYLE_ATTRIBUTE(QFont, font, Font) DUI_STYLE_ATTRIBUTE(QColor, textColor, TextColor) @@ -45,7 +45,7 @@ class DUI_EXPORT DuiTextEditStyle : public DuiWidgetStyle class DUI_EXPORT DuiTextEditStyleContainer : public DuiWidgetStyleContainer { - DUI_STYLE_CONTAINER_INTERNAL(DuiTextEditStyle) + DUI_STYLE_CONTAINER(DuiTextEditStyle) }; #endif diff --git a/src/style/duitoolbarstyle.h b/src/views/style/duitoolbarstyle.h similarity index 93% rename from src/style/duitoolbarstyle.h rename to src/views/style/duitoolbarstyle.h index fb7f3d2cc..5706c70c0 100644 --- a/src/style/duitoolbarstyle.h +++ b/src/views/style/duitoolbarstyle.h @@ -33,7 +33,7 @@ class DUI_EXPORT DuiToolbarStyle : public DuiWidgetStyle { Q_OBJECT - DUI_STYLE_INTERNAL(DuiToolbarStyle) + DUI_STYLE(DuiToolbarStyle) }; /*! @@ -45,7 +45,7 @@ class DUI_EXPORT DuiToolbarStyle : public DuiWidgetStyle */ class DUI_EXPORT DuiToolbarStyleContainer : public DuiWidgetStyleContainer { - DUI_STYLE_CONTAINER_INTERNAL(DuiToolbarStyle) + DUI_STYLE_CONTAINER(DuiToolbarStyle) }; #endif diff --git a/src/style/duitoolbartabstyle.h b/src/views/style/duitoolbartabstyle.h similarity index 100% rename from src/style/duitoolbartabstyle.h rename to src/views/style/duitoolbartabstyle.h diff --git a/src/views/style/style.pri b/src/views/style/style.pri new file mode 100644 index 000000000..d9f7ee044 --- /dev/null +++ b/src/views/style/style.pri @@ -0,0 +1,48 @@ +STYLE_SRC_DIR=./style +INCLUDEPATH+=./style + +DUIGEN_STYLE_HEADERS += \ + $$STYLE_SRC_DIR/duiapplicationpagestyle.h \ + $$STYLE_SRC_DIR/duibuttonstyle.h \ + $$STYLE_SRC_DIR/duibuttoniconstyle.h \ + $$STYLE_SRC_DIR/duibuttonswitchstyle.h \ + $$STYLE_SRC_DIR/duicheckboxstyle.h \ + $$STYLE_SRC_DIR/duicomboboxstyle.h \ + $$STYLE_SRC_DIR/duicontainerstyle.h \ + $$STYLE_SRC_DIR/duimodalscenewindowstyle.h \ + $$STYLE_SRC_DIR/duidialogstyle.h \ + $$STYLE_SRC_DIR/duidockwidgetstyle.h \ + $$STYLE_SRC_DIR/duiextendingbackgroundstyle.h \ + $$STYLE_SRC_DIR/duiescapebuttonpanelstyle.h \ + $$STYLE_SRC_DIR/duigriditemstyle.h \ + $$STYLE_SRC_DIR/duihomebuttonpanelstyle.h \ + $$STYLE_SRC_DIR/duiimagewidgetstyle.h \ + $$STYLE_SRC_DIR/duiinfobannerstyle.h \ + $$STYLE_SRC_DIR/duilabelstyle.h \ + $$STYLE_SRC_DIR/duiliststyle.h \ + $$STYLE_SRC_DIR/duiapplicationmenustyle.h \ + $$STYLE_SRC_DIR/duiapplicationmenubuttonstyle.h \ + $$STYLE_SRC_DIR/duimessageboxstyle.h \ + $$STYLE_SRC_DIR/duiscenelayereffectstyle.h \ + $$STYLE_SRC_DIR/duiscenelayereffectdimstyle.h \ + $$STYLE_SRC_DIR/duinavigationbarstyle.h \ + $$STYLE_SRC_DIR/duioverlaystyle.h \ + $$STYLE_SRC_DIR/duiobjectmenustyle.h \ + $$STYLE_SRC_DIR/duipannablewidgetstyle.h \ + $$STYLE_SRC_DIR/duipopupliststyle.h \ + $$STYLE_SRC_DIR/duipositionindicatorstyle.h \ + $$STYLE_SRC_DIR/duiprogressindicatorstyle.h \ + $$STYLE_SRC_DIR/duiscenewindowstyle.h \ + $$STYLE_SRC_DIR/duiseparatorstyle.h \ + $$STYLE_SRC_DIR/duisliderstyle.h \ + $$STYLE_SRC_DIR/duispinnerstyle.h \ + $$STYLE_SRC_DIR/duitexteditstyle.h \ + $$STYLE_SRC_DIR/duicompleterstyle.h \ + $$STYLE_SRC_DIR/duitoolbartabstyle.h \ + $$STYLE_SRC_DIR/duitoolbarstyle.h \ + $$STYLE_SRC_DIR/duidevicestyle.h \ + $$STYLE_SRC_DIR/duicontainerheaderstyle.h \ + $$STYLE_SRC_DIR/duicontentitemstyle.h \ + +HEADERS += \ + $$DUIGEN_STYLE_HEADERS \ diff --git a/src/views/views.pri b/src/views/views.pri new file mode 100644 index 000000000..02a54f08a --- /dev/null +++ b/src/views/views.pri @@ -0,0 +1,111 @@ +############################################################################### +# DuiWidget/Views module +# This module contains all classes implemeting widget views. +############################################################################### + +PUBLIC_HEADERS += \ + duiapplicationpageview.h \ + duicomboboxview.h \ + duidialogview.h \ + duimodalscenewindowview.h \ + duiextendingbackgroundview.h \ + duiescapebuttonpanelview.h \ + duihomebuttonpanelview.h \ + duiinfobannereventview.h \ + duiinfobannerinformationview.h \ + duigriditemview.h \ + duiapplicationmenuview.h \ + duimenuobjectview.h \ + duimessageboxview.h \ + duioverlayview.h \ + duiobjectmenuview.h \ + duipannablewidgetview.h \ + duipopuplistview.h \ + duiprogressindicatorbarview.h \ + duisliderview.h \ + duispinnerview.h \ + duitexteditview.h \ + duitoolbartabview.h \ + duitoolbarview.h \ + duiseparatorview.h \ + duicompleterview.h \ + duilistview.h \ + duiscenewindowview.h \ + duilabelview.h \ + duipositionindicatorview.h \ + duiapplicationmenubuttonview.h \ + duibuttonview.h \ + duiimagewidgetview.h \ + duibuttoniconview.h \ + duibuttonswitchview.h \ + duicheckboxview.h \ + duicontainerview.h \ + duidockwidgetview.h \ + duicontentitemview.h \ + duinavigationbarview.h \ + duiscenelayereffectdimview.h \ + + +PRIVATE_HEADERS += \ + duistylablewidgetview_p.h \ + duistatusbarview.h \ + duiextendingbackgroundview_p.h \ + duitexteditview_p.h \ + duiapplicationmenuview_p.h \ + duiobjectmenuview_p.h \ + duicompleterview_p.h \ + duisliderview_p.h \ + duispinnerview_p.h \ + duilistview_p.h \ + duibuttongrouplayoutpolicy_p.h \ + duitoolbartabview_p.h \ + duipannablewidgetview_p.h \ + +SOURCES += \ + duiapplicationpageview.cpp \ + duicomboboxview.cpp \ + duidialogview.cpp \ + duimodalscenewindowview.cpp \ + duiextendingbackgroundview.cpp \ + duiescapebuttonpanelview.cpp \ + duihomebuttonpanelview.cpp \ + duiinfobannereventview.cpp \ + duiinfobannerinformationview.cpp \ + duigriditemview.cpp \ + duiapplicationmenuview.cpp \ + duimenuobjectview.cpp \ + duimessageboxview.cpp \ + duioverlayview.cpp \ + duiobjectmenuview.cpp \ + duipannablewidgetview.cpp \ + duipopuplistview.cpp \ + duiprogressindicatorbarview.cpp \ + duisliderview.cpp \ + duispinnerview.cpp \ + duistatusbarview.cpp \ + duitexteditview.cpp \ + duitoolbartabview.cpp \ + duitoolbarview.cpp \ + duiseparatorview.cpp \ + duistylablewidgetview.cpp \ + duicompleterview.cpp \ + duilistview.cpp \ + duilistview_p.cpp \ + duibuttongrouplayoutpolicy_p.cpp \ + duiscenewindowview.cpp \ + duilabelview.cpp \ + duilabelview_rich.cpp \ + duilabelview_simple.cpp \ + duipositionindicatorview.cpp \ + duiapplicationmenubuttonview.cpp \ + duibuttonview.cpp \ + duiimagewidgetview.cpp \ + duibuttoniconview.cpp \ + duibuttonswitchview.cpp \ + duicheckboxview.cpp \ + duicontainerview.cpp \ + duidockwidgetview.cpp \ + duicontentitemview.cpp \ + duinavigationbarview.cpp \ + duiscenelayereffectdimview.cpp \ + diff --git a/src/views/views.pro b/src/views/views.pro new file mode 100644 index 000000000..7f2f8b028 --- /dev/null +++ b/src/views/views.pro @@ -0,0 +1,26 @@ +include(../common_top.pri) + +TARGET = duiviews + +INCLUDEPATH += \ + .moc \ + ../include \ + ../corelib/animation/widget/core \ + ../corelib/style \ + ../corelib/widgets/views \ + ../corelib/widgets \ + ../corelib/core \ + ../corelib/.gen \ + +include(views.pri) +include(widgets/widgets.pri) +include(style/style.pri) + +LIBS += -lduicore + +LIBS += \ + -lduicore \ + +SOURCES += duiviewslibrary.cpp + +include(../common_bot.pri) diff --git a/src/widgets/duiapplicationmenubutton.cpp b/src/views/widgets/duiapplicationmenubutton.cpp similarity index 100% rename from src/widgets/duiapplicationmenubutton.cpp rename to src/views/widgets/duiapplicationmenubutton.cpp diff --git a/src/widgets/duiapplicationmenubutton.h b/src/views/widgets/duiapplicationmenubutton.h similarity index 100% rename from src/widgets/duiapplicationmenubutton.h rename to src/views/widgets/duiapplicationmenubutton.h diff --git a/src/widgets/duiapplicationmenubuttonmodel.h b/src/views/widgets/duiapplicationmenubuttonmodel.h similarity index 96% rename from src/widgets/duiapplicationmenubuttonmodel.h rename to src/views/widgets/duiapplicationmenubuttonmodel.h index b8f7d2fe5..05fc5d65c 100644 --- a/src/widgets/duiapplicationmenubuttonmodel.h +++ b/src/views/widgets/duiapplicationmenubuttonmodel.h @@ -34,7 +34,7 @@ class DuiApplicationMenuButtonModel : public DuiButtonModel { Q_OBJECT - DUI_MODEL_INTERNAL(DuiApplicationMenuButtonModel) + DUI_MODEL(DuiApplicationMenuButtonModel) /*! \property DuiApplicationMenuButtonModel::progressIndicatorVisible diff --git a/src/widgets/duicontainerheader.cpp b/src/views/widgets/duicontainerheader.cpp similarity index 100% rename from src/widgets/duicontainerheader.cpp rename to src/views/widgets/duicontainerheader.cpp diff --git a/src/widgets/duicontainerheader_p.h b/src/views/widgets/duicontainerheader_p.h similarity index 100% rename from src/widgets/duicontainerheader_p.h rename to src/views/widgets/duicontainerheader_p.h diff --git a/src/views/widgets/widgets.pri b/src/views/widgets/widgets.pri new file mode 100644 index 000000000..ea9e5e8e1 --- /dev/null +++ b/src/views/widgets/widgets.pri @@ -0,0 +1,18 @@ +WIDGETS_SRC_DIR=./widgets +INCLUDEPATH+=./widgets + +PUBLIC_HEADERS += \ + $$WIDGETS_SRC_DIR/duiapplicationmenubutton.h \ + +DUIGEN_MODEL_HEADERS += \ + $$WIDGETS_SRC_DIR/duiapplicationmenubuttonmodel.h \ + +PRIVATE_HEADERS += \ + $$WIDGETS_SRC_DIR/duicontainerheader_p.h \ + +HEADERS += \ + $$DUIGEN_MODEL_HEADERS \ + +SOURCES += \ + $$WIDGETS_SRC_DIR/duiapplicationmenubutton.cpp \ + $$WIDGETS_SRC_DIR/duicontainerheader.cpp \ diff --git a/src/widgets/views/views.pri b/src/widgets/views/views.pri deleted file mode 100644 index a73e76a4f..000000000 --- a/src/widgets/views/views.pri +++ /dev/null @@ -1,112 +0,0 @@ -############################################################################### -# DuiWidget/Views module -# This module contains all classes implemeting widget views. -############################################################################### - -WIDGETS_VIEWS_SRC_DIR=./widgets/views -INCLUDEPATH+=./widgets/views - -PUBLIC_HEADERS += \ - $$WIDGETS_VIEWS_SRC_DIR/duiapplicationpageview.h \ - $$WIDGETS_VIEWS_SRC_DIR/duibuttoniconview.h \ - $$WIDGETS_VIEWS_SRC_DIR/duibuttonview.h \ - $$WIDGETS_VIEWS_SRC_DIR/duibuttonswitchview.h \ - $$WIDGETS_VIEWS_SRC_DIR/duicheckboxview.h \ - $$WIDGETS_VIEWS_SRC_DIR/duicomboboxview.h \ - $$WIDGETS_VIEWS_SRC_DIR/duicontainerview.h \ - $$WIDGETS_VIEWS_SRC_DIR/duidialogview.h \ - $$WIDGETS_VIEWS_SRC_DIR/duimodalscenewindowview.h \ - $$WIDGETS_VIEWS_SRC_DIR/duidockwidgetview.h \ - $$WIDGETS_VIEWS_SRC_DIR/duiextendingbackgroundview.h \ - $$WIDGETS_VIEWS_SRC_DIR/duiescapebuttonpanelview.h \ - $$WIDGETS_VIEWS_SRC_DIR/duihomebuttonpanelview.h \ - $$WIDGETS_VIEWS_SRC_DIR/duiimagewidgetview.h \ - $$WIDGETS_VIEWS_SRC_DIR/duiinfobannereventview.h \ - $$WIDGETS_VIEWS_SRC_DIR/duiinfobannerinformationview.h \ - $$WIDGETS_VIEWS_SRC_DIR/duilabelview.h \ - $$WIDGETS_VIEWS_SRC_DIR/duigriditemview.h \ - $$WIDGETS_VIEWS_SRC_DIR/duiapplicationmenuview.h \ - $$WIDGETS_VIEWS_SRC_DIR/duiapplicationmenubuttonview.h \ - $$WIDGETS_VIEWS_SRC_DIR/duimenuobjectview.h \ - $$WIDGETS_VIEWS_SRC_DIR/duimessageboxview.h \ - $$WIDGETS_VIEWS_SRC_DIR/duinavigationbarview.h \ - $$WIDGETS_VIEWS_SRC_DIR/duioverlayview.h \ - $$WIDGETS_VIEWS_SRC_DIR/duiobjectmenuview.h \ - $$WIDGETS_VIEWS_SRC_DIR/duipannablewidgetview.h \ - $$WIDGETS_VIEWS_SRC_DIR/duipopuplistview.h \ - $$WIDGETS_VIEWS_SRC_DIR/duipositionindicatorview.h \ - $$WIDGETS_VIEWS_SRC_DIR/duiprogressindicatorbarview.h \ - $$WIDGETS_VIEWS_SRC_DIR/duiscenewindowview.h \ - $$WIDGETS_VIEWS_SRC_DIR/duisliderview.h \ - $$WIDGETS_VIEWS_SRC_DIR/duispinnerview.h \ - $$WIDGETS_VIEWS_SRC_DIR/duitexteditview.h \ - $$WIDGETS_VIEWS_SRC_DIR/duitoolbartabview.h \ - $$WIDGETS_VIEWS_SRC_DIR/duitoolbarview.h \ - $$WIDGETS_VIEWS_SRC_DIR/duiseparatorview.h \ - $$WIDGETS_VIEWS_SRC_DIR/duicompleterview.h \ - $$WIDGETS_VIEWS_SRC_DIR/duilistview.h \ - $$WIDGETS_VIEWS_SRC_DIR/duicontentitemview.h \ - - -PRIVATE_HEADERS += \ - $$WIDGETS_VIEWS_SRC_DIR/duistylablewidgetview_p.h \ - $$WIDGETS_VIEWS_SRC_DIR/duistatusbarview.h \ - $$WIDGETS_VIEWS_SRC_DIR/duiextendingbackgroundview_p.h \ - $$WIDGETS_VIEWS_SRC_DIR/duitexteditview_p.h \ - $$WIDGETS_VIEWS_SRC_DIR/duiapplicationmenuview_p.h \ - $$WIDGETS_VIEWS_SRC_DIR/duiobjectmenuview_p.h \ - $$WIDGETS_VIEWS_SRC_DIR/duicompleterview_p.h \ - $$WIDGETS_VIEWS_SRC_DIR/duisliderview_p.h \ - $$WIDGETS_VIEWS_SRC_DIR/duispinnerview_p.h \ - $$WIDGETS_VIEWS_SRC_DIR/duilistview_p.h \ - $$WIDGETS_VIEWS_SRC_DIR/duicontentitemview_p.h \ - $$WIDGETS_VIEWS_SRC_DIR/duibuttongrouplayoutpolicy_p.h \ - $$WIDGETS_VIEWS_SRC_DIR/duitoolbartabview_p.h \ - $$WIDGETS_VIEWS_SRC_DIR/duipannablewidgetview_p.h \ - -SOURCES += \ - $$WIDGETS_VIEWS_SRC_DIR/duiapplicationpageview.cpp \ - $$WIDGETS_VIEWS_SRC_DIR/duibuttoniconview.cpp \ - $$WIDGETS_VIEWS_SRC_DIR/duibuttonview.cpp \ - $$WIDGETS_VIEWS_SRC_DIR/duibuttonswitchview.cpp \ - $$WIDGETS_VIEWS_SRC_DIR/duicheckboxview.cpp \ - $$WIDGETS_VIEWS_SRC_DIR/duicomboboxview.cpp \ - $$WIDGETS_VIEWS_SRC_DIR/duicontainerview.cpp \ - $$WIDGETS_VIEWS_SRC_DIR/duidialogview.cpp \ - $$WIDGETS_VIEWS_SRC_DIR/duimodalscenewindowview.cpp \ - $$WIDGETS_VIEWS_SRC_DIR/duidockwidgetview.cpp \ - $$WIDGETS_VIEWS_SRC_DIR/duiextendingbackgroundview.cpp \ - $$WIDGETS_VIEWS_SRC_DIR/duiescapebuttonpanelview.cpp \ - $$WIDGETS_VIEWS_SRC_DIR/duihomebuttonpanelview.cpp \ - $$WIDGETS_VIEWS_SRC_DIR/duiimagewidgetview.cpp \ - $$WIDGETS_VIEWS_SRC_DIR/duiinfobannereventview.cpp \ - $$WIDGETS_VIEWS_SRC_DIR/duiinfobannerinformationview.cpp \ - $$WIDGETS_VIEWS_SRC_DIR/duilabelview.cpp \ - $$WIDGETS_VIEWS_SRC_DIR/duilabelview_simple.cpp \ - $$WIDGETS_VIEWS_SRC_DIR/duilabelview_rich.cpp \ - $$WIDGETS_VIEWS_SRC_DIR/duigriditemview.cpp \ - $$WIDGETS_VIEWS_SRC_DIR/duiapplicationmenuview.cpp \ - $$WIDGETS_VIEWS_SRC_DIR/duiapplicationmenubuttonview.cpp \ - $$WIDGETS_VIEWS_SRC_DIR/duimenuobjectview.cpp \ - $$WIDGETS_VIEWS_SRC_DIR/duimessageboxview.cpp \ - $$WIDGETS_VIEWS_SRC_DIR/duinavigationbarview.cpp \ - $$WIDGETS_VIEWS_SRC_DIR/duioverlayview.cpp \ - $$WIDGETS_VIEWS_SRC_DIR/duiobjectmenuview.cpp \ - $$WIDGETS_VIEWS_SRC_DIR/duipannablewidgetview.cpp \ - $$WIDGETS_VIEWS_SRC_DIR/duipopuplistview.cpp \ - $$WIDGETS_VIEWS_SRC_DIR/duipositionindicatorview.cpp \ - $$WIDGETS_VIEWS_SRC_DIR/duiprogressindicatorbarview.cpp \ - $$WIDGETS_VIEWS_SRC_DIR/duiscenewindowview.cpp \ - $$WIDGETS_VIEWS_SRC_DIR/duisliderview.cpp \ - $$WIDGETS_VIEWS_SRC_DIR/duispinnerview.cpp \ - $$WIDGETS_VIEWS_SRC_DIR/duistatusbarview.cpp \ - $$WIDGETS_VIEWS_SRC_DIR/duitexteditview.cpp \ - $$WIDGETS_VIEWS_SRC_DIR/duitoolbartabview.cpp \ - $$WIDGETS_VIEWS_SRC_DIR/duitoolbarview.cpp \ - $$WIDGETS_VIEWS_SRC_DIR/duiseparatorview.cpp \ - $$WIDGETS_VIEWS_SRC_DIR/duistylablewidgetview.cpp \ - $$WIDGETS_VIEWS_SRC_DIR/duicompleterview.cpp \ - $$WIDGETS_VIEWS_SRC_DIR/duilistview.cpp \ - $$WIDGETS_VIEWS_SRC_DIR/duilistview_p.cpp \ - $$WIDGETS_VIEWS_SRC_DIR/duicontentitemview.cpp \ - $$WIDGETS_VIEWS_SRC_DIR/duibuttongrouplayoutpolicy_p.cpp \ diff --git a/tests/common_duiextensions.pri b/tests/common_duiextensions.pri new file mode 100644 index 000000000..e363dc821 --- /dev/null +++ b/tests/common_duiextensions.pri @@ -0,0 +1,11 @@ +include(common_duisettings.pri) + +INCLUDEPATH += \ + $$DUISRCDIR/extensions/applicationextension \ + $$DUISRCDIR/extensions/mashup/appletcommunication \ + $$DUISRCDIR/extensions/mashup/appletinstallation \ + $$DUISRCDIR/extensions/mashup/appletinterface \ + $$DUISRCDIR/extensions/mashup/mashup \ + $$DUISRCDIR/extensions/style \ + +LIBS += -lduiextensions diff --git a/tests/common_duisettings.pri b/tests/common_duisettings.pri new file mode 100644 index 000000000..c506c6501 --- /dev/null +++ b/tests/common_duisettings.pri @@ -0,0 +1,5 @@ +INCLUDEPATH += \ + $$DUISRCDIR/settings/settingslanguage \ + +LIBS += -lduisettings + diff --git a/tests/common_top.pri b/tests/common_top.pri index 943b7964b..fe81efdc0 100644 --- a/tests/common_top.pri +++ b/tests/common_top.pri @@ -5,7 +5,13 @@ include(../mkspecs/common.pri) DUISRCDIR = ../../src STUBSDIR = ../stubs -INCLUDEPATH += . $$DUISRCDIR $$STUBSDIR $$DUISRCDIR/include +INCLUDEPATH += \ + . \ + $$DUISRCDIR \ + $$STUBSDIR \ + $$DUISRCDIR/include \ + $$DUISRCDIR/views/style \ + DEPENDPATH = $$INCLUDEPATH QMAKE_LIBDIR += ../../lib /usr/local/lib CONFIG += debug @@ -22,9 +28,9 @@ win32|macx { QMAKE_LFLAGS += -F../../lib LIBS += -framework dui } - win32:LIBS += -L../../lib -ldui0 + win32:LIBS += -lduicore0 -lduiviews0 } else { - LIBS += ../../lib/libdui.so + LIBS += -lduicore -lduiviews } QMAKE_CXXFLAGS += -Werror diff --git a/tests/ft_duiscalableimage/ft_duiscalableimage.cpp b/tests/ft_duiscalableimage/ft_duiscalableimage.cpp index 2a0b37347..d415f4afb 100644 --- a/tests/ft_duiscalableimage/ft_duiscalableimage.cpp +++ b/tests/ft_duiscalableimage/ft_duiscalableimage.cpp @@ -19,8 +19,8 @@ #include "ft_duiscalableimage.h" #include "duiapplication.h" -#include -#include +#include +#include #include #include diff --git a/tests/ft_duiscenemanager/ft_duiscenemanager.cpp b/tests/ft_duiscenemanager/ft_duiscenemanager.cpp index 509bd4aa6..69a7eb5b9 100644 --- a/tests/ft_duiscenemanager/ft_duiscenemanager.cpp +++ b/tests/ft_duiscenemanager/ft_duiscenemanager.cpp @@ -18,7 +18,7 @@ ****************************************************************************/ #include "ft_duiscenemanager.h" -#include +#include #include #include #include diff --git a/tests/ft_duistylesheet/ft_duistylesheet.cpp b/tests/ft_duistylesheet/ft_duistylesheet.cpp index ff4b0456d..a34871221 100644 --- a/tests/ft_duistylesheet/ft_duistylesheet.cpp +++ b/tests/ft_duistylesheet/ft_duistylesheet.cpp @@ -32,7 +32,7 @@ #include "testwidget3.h" // include this to get theme profiling support -//#include "../../src/theme/duitheme_p.h" +//#include "../../src/corelib/theme/duitheme_p.h" Ft_DuiStyleSheet::Ft_DuiStyleSheet() diff --git a/tests/ft_duistylesheet/ft_duistylesheet.pro b/tests/ft_duistylesheet/ft_duistylesheet.pro index d15c9fa95..8260d2a54 100644 --- a/tests/ft_duistylesheet/ft_duistylesheet.pro +++ b/tests/ft_duistylesheet/ft_duistylesheet.pro @@ -25,8 +25,8 @@ STYLE_HEADERS += testobjectstyle.h testobject2style.h testobject3style.h SOURCES += \ ft_duistylesheet.cpp \ - ../../src/theme/duilogicalvalues.cpp \ - ../../src/style/duistylesheetattribute.cpp + ../../src/corelib/theme/duilogicalvalues.cpp \ + ../../src/corelib/style/duistylesheetattribute.cpp HEADERS += \ ft_duistylesheet.h \ @@ -36,8 +36,8 @@ HEADERS += \ testwidget.h \ testwidget2.h \ testwidget3.h \ - ../../src/theme/duilogicalvalues.h \ - ../../src/style/duistylesheetattribute.h + ../../src/corelib/theme/duilogicalvalues.h \ + ../../src/corelib/style/duistylesheetattribute.h support_files.files += \ *.css diff --git a/tests/ft_duistylesheetparser/ft_duistylesheetparser.cpp b/tests/ft_duistylesheetparser/ft_duistylesheetparser.cpp index 410582e9c..58298ce1c 100644 --- a/tests/ft_duistylesheetparser/ft_duistylesheetparser.cpp +++ b/tests/ft_duistylesheetparser/ft_duistylesheetparser.cpp @@ -22,11 +22,11 @@ #include #include #include -#include "../../src/style/duistylesheetattribute.h" -#include "../../src/theme/duilogicalvalues.h" +#include "../../src/corelib/style/duistylesheetattribute.h" +#include "../../src/corelib/theme/duilogicalvalues.h" // include this to get theme profiling support -//#include "../../src/theme/duitheme_p.h" +//#include "../../src/corelib/theme/duitheme_p.h" const int NUMBER_OF_LOOPS = 100; diff --git a/tests/ft_duistylesheetparser/ft_duistylesheetparser.pro b/tests/ft_duistylesheetparser/ft_duistylesheetparser.pro index 54c166f57..ae7618bb4 100644 --- a/tests/ft_duistylesheetparser/ft_duistylesheetparser.pro +++ b/tests/ft_duistylesheetparser/ft_duistylesheetparser.pro @@ -5,14 +5,14 @@ LIBRARYPATH += $$DUISRCDIR SOURCES += \ ft_duistylesheetparser.cpp \ - ../../src/theme/duilogicalvalues.cpp \ - ../../src/style/duistylesheetattribute.cpp + ../../src/corelib/theme/duilogicalvalues.cpp \ + ../../src/corelib/style/duistylesheetattribute.cpp HEADERS += \ ft_duistylesheetparser.h \ - ../../src/theme/duilogicalvalues.h \ - ../../src/style/duistylesheetattribute.h + ../../src/corelib/theme/duilogicalvalues.h \ + ../../src/corelib/style/duistylesheetattribute.h support_files.files += \ *.css \ diff --git a/tests/ft_prestart/ft_prestart.pro b/tests/ft_prestart/ft_prestart.pro index 9e51e6289..af92ed513 100644 --- a/tests/ft_prestart/ft_prestart.pro +++ b/tests/ft_prestart/ft_prestart.pro @@ -1,5 +1,5 @@ include(../common_top.pri) -INCLUDEPATH += $$DUISRCDIR/core +INCLUDEPATH += $$DUISRCDIR/corelib/core TARGET = ft_prestart # unit test and unit diff --git a/tests/ft_theme/ft_theme.cpp b/tests/ft_theme/ft_theme.cpp index 6e8de9b53..2d75710b0 100644 --- a/tests/ft_theme/ft_theme.cpp +++ b/tests/ft_theme/ft_theme.cpp @@ -27,7 +27,7 @@ #include #include "duicomponentdata.h" -#include "../../src/theme/duitheme_p.h" +#include "../../src/corelib/theme/duitheme_p.h" #include "testthemedaemon.h" #include "ft_theme_data.h" @@ -71,10 +71,26 @@ void makeFile(const QString &path, const QString &content) void Ft_Theme::init() { QStringList paths; - paths << QString("Ft_Theme") + QDir::separator() + "theme1" + QDir::separator() + "dui" + QDir::separator() + "libdui" + QDir::separator() + "style"; - paths << QString("Ft_Theme") + QDir::separator() + "theme2" + QDir::separator() + "dui" + QDir::separator() + "libdui" + QDir::separator() + "style"; - paths << QString("Ft_Theme") + QDir::separator() + "theme2" + QDir::separator() + "dui" + QDir::separator() + "Ft_Theme" + QDir::separator() + "style"; - paths << QString("Ft_Theme") + QDir::separator() + "theme1" + QDir::separator() + "dui" + QDir::separator() + "locale" + QDir::separator() + "fi"; + paths << QString("Ft_Theme") + QDir::separator() + + "theme1" + QDir::separator() + + "dui" + QDir::separator() + + "libduicore" + QDir::separator() + + "style"; + paths << QString("Ft_Theme") + QDir::separator() + + "theme2" + QDir::separator() + + "dui" + QDir::separator() + + "libduicore" + QDir::separator() + + "style"; + paths << QString("Ft_Theme") + QDir::separator() + + "theme2" + QDir::separator() + + "dui" + QDir::separator() + + "Ft_Theme" + QDir::separator() + + "style"; + paths << QString("Ft_Theme") + QDir::separator() + + "theme1" + QDir::separator() + + "dui" + QDir::separator() + + "locale" + QDir::separator() + + "fi"; foreach(QString path, paths) { // create test theme to tmp/ @@ -89,14 +105,38 @@ void Ft_Theme::init() makeFile(QString("theme1") + QDir::separator() + QString("dui") + QDir::separator() + QString("locale") + QDir::separator() + QString("fi") + QDir::separator() + QString("constants.ini"), FINNISH_CONSTANTS_INI); // create view configuration files - makeFile(QString("theme1") + QDir::separator() + QString("dui") + QDir::separator() + QString("libdui") + QDir::separator() + QString("libdui.conf"), LIBDUI_THEME_1_VIEW_CONFIGURATION); - makeFile(QString("theme2") + QDir::separator() + QString("dui") + QDir::separator() + QString("libdui") + QDir::separator() + QString("libdui.conf"), LIBDUI_THEME_2_VIEW_CONFIGURATION); - makeFile(QString("theme2") + QDir::separator() + QString("dui") + QDir::separator() + QString("Ft_Theme") + QDir::separator() + QString("Ft_Theme.conf"), TESTAPP_VIEW_CONFIGURATION); + makeFile( QString("theme1") + QDir::separator() + + QString("dui") + QDir::separator() + + QString("libduicore") + QDir::separator() + + QString("libduicore.conf"), LIBDUI_THEME_1_VIEW_CONFIGURATION); + + makeFile( QString("theme2") + QDir::separator() + + QString("dui") + QDir::separator() + + QString("libduicore") + QDir::separator() + + QString("libduicore.conf"), LIBDUI_THEME_2_VIEW_CONFIGURATION); + makeFile( QString("theme2") + QDir::separator() + + QString("dui") + QDir::separator() + + QString("Ft_Theme") + QDir::separator() + + QString("Ft_Theme.conf"), TESTAPP_VIEW_CONFIGURATION); // create stylesheets - makeFile(QString("theme1") + QDir::separator() + QString("dui") + QDir::separator() + QString("libdui") + QDir::separator() + QString("style") + QDir::separator() + QString("libdui.css"), THEME_1_LIBDUI_CSS); - makeFile(QString("theme2") + QDir::separator() + QString("dui") + QDir::separator() + QString("libdui") + QDir::separator() + QString("style") + QDir::separator() + QString("libdui.css"), THEME_2_LIBDUI_CSS); - makeFile(QString("theme2") + QDir::separator() + QString("dui") + QDir::separator() + QString("Ft_Theme") + QDir::separator() + QString("style") + QDir::separator() + QString("Ft_Theme.css"), THEME_2_APP_CSS); + makeFile( QString("theme1") + QDir::separator() + + QString("dui") + QDir::separator() + + QString("libduicore") + QDir::separator() + + QString("style") + QDir::separator() + + QString("libduicore.css"), THEME_1_LIBDUI_CSS); + + makeFile( QString("theme2") + QDir::separator() + + QString("dui") + QDir::separator() + + QString("libduicore") + QDir::separator() + + QString("style") + QDir::separator() + + QString("libduicore.css"), THEME_2_LIBDUI_CSS); + + makeFile(QString("theme2") + QDir::separator() + + QString("dui") + QDir::separator() + + QString("Ft_Theme") + QDir::separator() + + QString("style") + QDir::separator() + + QString("Ft_Theme.css"), THEME_2_APP_CSS); } void Ft_Theme::cleanup() diff --git a/tests/ft_theme/ft_theme.pro b/tests/ft_theme/ft_theme.pro index e49c4d998..a643a4f7c 100644 --- a/tests/ft_theme/ft_theme.pro +++ b/tests/ft_theme/ft_theme.pro @@ -14,6 +14,6 @@ HEADERS += \ testthemedaemon.h \ testview.h \ testview2.h \ - $$DUISRCDIR/theme/iduithemedaemon.h + $$DUISRCDIR/corelib/theme/iduithemedaemon.h include(../common_bot.pri) diff --git a/tests/ft_theme/testthemedaemon.h b/tests/ft_theme/testthemedaemon.h index 055e80896..ef4970257 100644 --- a/tests/ft_theme/testthemedaemon.h +++ b/tests/ft_theme/testthemedaemon.h @@ -21,7 +21,7 @@ #define TESTTHEMEDAEMON_H #include -#include "../../src/theme/iduithemedaemon.h" +#include "../../src/corelib/theme/iduithemedaemon.h" class QPixmap; diff --git a/tests/stubs/duiextensionhandle_stub.h b/tests/stubs/duiextensionhandle_stub.h index 45d5b73dd..4dd72ceaf 100644 --- a/tests/stubs/duiextensionhandle_stub.h +++ b/tests/stubs/duiextensionhandle_stub.h @@ -250,7 +250,7 @@ DuiExtensionHandleStub* gDuiExtensionHandleStub = &gDefaultDuiExtensionHandleStu // 4. CREATE A PROXY WHICH CALLS THE STUB -DuiExtensionHandle::DuiExtensionHandle(QGraphicsItem *parent) { +DuiExtensionHandle::DuiExtensionHandle(QGraphicsItem *parent) : d_ptr(NULL) { gDuiExtensionHandleStub->DuiExtensionHandleConstructor(parent); } @@ -298,7 +298,7 @@ void DuiExtensionHandle::setSizeHints(const QVector &sizeHints) { gDuiExtensionHandleStub->setSizeHints(sizeHints); } -DuiExtensionHandle::DuiExtensionHandle(DuiExtensionHandlePrivate *dd, DuiExtensionHandleModel *model, QGraphicsItem *parent) { +DuiExtensionHandle::DuiExtensionHandle(DuiExtensionHandlePrivate *dd, DuiExtensionHandleModel *model, QGraphicsItem *parent) : d_ptr(NULL) { gDuiExtensionHandleStub->DuiExtensionHandleConstructor(dd, model, parent); } diff --git a/tests/ut_duiaggregatedataaccess/ut_duiaggregatedataaccess.pro b/tests/ut_duiaggregatedataaccess/ut_duiaggregatedataaccess.pro index 81791d39b..9376b680f 100644 --- a/tests/ut_duiaggregatedataaccess/ut_duiaggregatedataaccess.pro +++ b/tests/ut_duiaggregatedataaccess/ut_duiaggregatedataaccess.pro @@ -1,6 +1,5 @@ include(../common_top.pri) -TARGET = ut_duiaggregatedataaccess -INCLUDEPATH += $$DUISRCDIR/mashup/mashup +include(../common_duiextensions.pri) # unit test and unit SOURCES += \ diff --git a/tests/ut_duiappletalivemessagerequest/ut_duiappletalivemessagerequest.pro b/tests/ut_duiappletalivemessagerequest/ut_duiappletalivemessagerequest.pro index f03155185..bec45912b 100644 --- a/tests/ut_duiappletalivemessagerequest/ut_duiappletalivemessagerequest.pro +++ b/tests/ut_duiappletalivemessagerequest/ut_duiappletalivemessagerequest.pro @@ -1,6 +1,5 @@ include(../common_top.pri) -TARGET = ut_duiappletalivemessagerequest -INCLUDEPATH += $$DUISRCDIR/mashup/appletcommunication $$DUISRCDIR/mashup/appletinterface $$DUISRCDIR/mashup/mashup +include(../common_duiextensions.pri) # unit test and unit classes SOURCES += \ diff --git a/tests/ut_duiappletalivemessageresponse/ut_duiappletalivemessageresponse.pro b/tests/ut_duiappletalivemessageresponse/ut_duiappletalivemessageresponse.pro index 00839e177..4a09223b0 100644 --- a/tests/ut_duiappletalivemessageresponse/ut_duiappletalivemessageresponse.pro +++ b/tests/ut_duiappletalivemessageresponse/ut_duiappletalivemessageresponse.pro @@ -1,6 +1,5 @@ include(../common_top.pri) -TARGET = ut_duiappletalivemessageresponse -INCLUDEPATH += $$DUISRCDIR/mashup/appletcommunication $$DUISRCDIR/mashup/appletinterface $$DUISRCDIR/mashup/mashup +include(../common_duiextensions.pri) # unit test and unit classes SOURCES += \ diff --git a/tests/ut_duiappletbutton/ut_duiappletbutton.pro b/tests/ut_duiappletbutton/ut_duiappletbutton.pro index 5ffe5c062..50160932d 100644 --- a/tests/ut_duiappletbutton/ut_duiappletbutton.pro +++ b/tests/ut_duiappletbutton/ut_duiappletbutton.pro @@ -1,10 +1,9 @@ include(../common_top.pri) -TARGET = ut_duiappletbutton -INCLUDEPATH += $$DUISRCDIR/mashup/mashup $$DUISRCDIR/mashup/appletinterface +include(../common_duiextensions.pri) SOURCES += \ ut_duiappletbutton.cpp \ - $$DUISRCDIR/mashup/mashup/duiappletbutton.cpp + $$DUISRCDIR/extensions/mashup/mashup/duiappletbutton.cpp # service classes SOURCES += \ @@ -13,6 +12,6 @@ SOURCES += \ # unit test and unit classes HEADERS += \ ut_duiappletbutton.h \ - $$DUISRCDIR/mashup/mashup/duiappletbutton.h + $$DUISRCDIR/extensions/mashup/mashup/duiappletbutton.h include(../common_bot.pri) diff --git a/tests/ut_duiappletcancelmessage/ut_duiappletcancelmessage.pro b/tests/ut_duiappletcancelmessage/ut_duiappletcancelmessage.pro index 346861390..435152a9d 100644 --- a/tests/ut_duiappletcancelmessage/ut_duiappletcancelmessage.pro +++ b/tests/ut_duiappletcancelmessage/ut_duiappletcancelmessage.pro @@ -1,6 +1,5 @@ include(../common_top.pri) -TARGET = ut_duiappletcancelmessage -INCLUDEPATH += $$DUISRCDIR/mashup/appletcommunication $$DUISRCDIR/mashup/appletinterface $$DUISRCDIR/mashup/mashup +include(../common_duiextensions.pri) # unit test and unit classes SOURCES += \ diff --git a/tests/ut_duiappletclient/ut_duiappletclient.pro b/tests/ut_duiappletclient/ut_duiappletclient.pro index e5693ac9a..85e470b78 100644 --- a/tests/ut_duiappletclient/ut_duiappletclient.pro +++ b/tests/ut_duiappletclient/ut_duiappletclient.pro @@ -1,6 +1,5 @@ include(../common_top.pri) -TARGET = ut_duiappletclient -INCLUDEPATH += $$DUISRCDIR/mashup/appletcommunication $$DUISRCDIR/mashup/appletinterface $$DUISRCDIR/mashup/mashup +include(../common_duiextensions.pri) QT += core network gui svg dbus diff --git a/tests/ut_duiappletcommunicator/ut_duiappletcommunicator.pro b/tests/ut_duiappletcommunicator/ut_duiappletcommunicator.pro index 1d7bfd447..ad3d893b1 100644 --- a/tests/ut_duiappletcommunicator/ut_duiappletcommunicator.pro +++ b/tests/ut_duiappletcommunicator/ut_duiappletcommunicator.pro @@ -1,13 +1,12 @@ include(../common_top.pri) -TARGET = ut_duiappletcommunicator -INCLUDEPATH += $$DUISRCDIR/mashup/appletcommunication +include(../common_duiextensions.pri) SOURCES += \ ut_duiappletcommunicator.cpp \ - $$DUISRCDIR/mashup/appletcommunication/duiappletcommunicator.cpp + $$DUISRCDIR/extensions/mashup/appletcommunication/duiappletcommunicator.cpp HEADERS += \ ut_duiappletcommunicator.h \ - $$DUISRCDIR/mashup/appletcommunication/duiappletcommunicator.h + $$DUISRCDIR/extensions/mashup/appletcommunication/duiappletcommunicator.h include(../common_bot.pri) diff --git a/tests/ut_duiapplethandle/ut_duiapplethandle.pro b/tests/ut_duiapplethandle/ut_duiapplethandle.pro index eb7cd7d43..c0dd2fcf6 100644 --- a/tests/ut_duiapplethandle/ut_duiapplethandle.pro +++ b/tests/ut_duiapplethandle/ut_duiapplethandle.pro @@ -1,11 +1,9 @@ include(../common_top.pri) +include(../common_duiextensions.pri) -TARGET = ut_duiapplethandle -INCLUDEPATH += $$DUISRCDIR/applicationextension \ - $$DUISRCDIR/mashup/mashup \ - $$DUISRCDIR/mashup/appletcommunication \ - $$DUISRCDIR/widgets \ - $$DUISRCDIR/style +INCLUDEPATH += \ + $$DUISRCDIR/corelib/widgets \ + $$DUISRCDIR/corelib/style QT += xml win32 { @@ -34,36 +32,39 @@ duigenerator_style.CONFIG = target_predeps no_link duigenerator_style.variable_out = GENERATED_SOURCES QMAKE_EXTRA_COMPILERS += duigenerator_model duigenerator_style -MODEL_HEADERS += $$DUISRCDIR/widgets/duiwidgetmodel.h \ - $$DUISRCDIR/applicationextension/duiextensionhandlemodel.h \ - $$DUISRCDIR/mashup/mashup/duiapplethandlemodel.h +MODEL_HEADERS += \ + $$DUISRCDIR/corelib/widgets/duiwidgetmodel.h \ + $$DUISRCDIR/extensions/applicationextension/duiextensionhandlemodel.h \ + $$DUISRCDIR/extensions/mashup/mashup/duiapplethandlemodel.h -STYLE_HEADERS += $$DUISRCDIR/style/duiextensionhandlestyle.h \ - $$DUISRCDIR/style/duiapplethandlestyle.h +STYLE_HEADERS += \ + $$DUISRCDIR/extensions/style/duiextensionhandlestyle.h \ + $$DUISRCDIR/extensions/style/duiapplethandlestyle.h -SOURCES += ut_duiapplethandle.cpp \ - $$DUISRCDIR/applicationextension/duiextensionhandle.cpp \ - $$DUISRCDIR/mashup/mashup/duiapplethandle.cpp \ - $$DUISRCDIR/widgets/core/duiwidgetcontroller.cpp \ - $$DUISRCDIR/widgets/duiwidgetmodel.cpp +SOURCES += \ + ut_duiapplethandle.cpp \ + $$DUISRCDIR/extensions/applicationextension/duiextensionhandle.cpp \ + $$DUISRCDIR/extensions/mashup/mashup/duiapplethandle.cpp \ + $$DUISRCDIR/corelib/widgets/core/duiwidgetcontroller.cpp \ + $$DUISRCDIR/corelib/widgets/duiwidgetmodel.cpp # service classes SOURCES += \ $$STUBSDIR/stubbase.cpp \ -HEADERS += ut_duiapplethandle.h \ - $$DUISRCDIR/applicationextension/duiextensionhandle.h \ - $$DUISRCDIR/applicationextension/duiextensionhandle_p.h \ - $$DUISRCDIR/applicationextension/duiextensionhandlemodel.h \ - $$DUISRCDIR/mashup/mashup/duiapplethandle.h \ - $$DUISRCDIR/mashup/mashup/duiapplethandle_p.h \ - $$DUISRCDIR/mashup/mashup/duiapplethandlemodel.h \ - $$DUISRCDIR/widgets/core/duiwidgetcontroller_p.h \ - $$DUISRCDIR/widgets/core/duiwidget_p.h \ - $$DUISRCDIR/widgets/duiwidgetmodel_p.h \ - $$DUISRCDIR/widgets/duiscenewindow_p.h \ - $$DUISRCDIR/widgets/duiobjectmenu.h \ - $$DUISRCDIR/style/duiextensionhandlestyle.h \ - $$DUISRCDIR/style/duiapplethandlestyle.h +HEADERS += \ + ut_duiapplethandle.h \ + $$DUISRCDIR/extensions/applicationextension/duiextensionhandle.h \ + $$DUISRCDIR/extensions/applicationextension/duiextensionhandle_p.h \ + $$DUISRCDIR/extensions/applicationextension/duiextensionhandlemodel.h \ + $$DUISRCDIR/extensions/mashup/mashup/duiapplethandle.h \ + $$DUISRCDIR/extensions/mashup/mashup/duiapplethandle_p.h \ + $$DUISRCDIR/extensions/mashup/mashup/duiapplethandlemodel.h \ + $$DUISRCDIR/corelib/widgets/core/duiwidgetcontroller_p.h \ + $$DUISRCDIR/corelib/widgets/core/duiwidget_p.h \ + $$DUISRCDIR/corelib/widgets/duiwidgetmodel_p.h \ + $$DUISRCDIR/corelib/widgets/duiscenewindow_p.h \ + $$DUISRCDIR/corelib/widgets/duiobjectmenu.h \ + $$STYLE_HEADERS include(../common_bot.pri) diff --git a/tests/ut_duiapplethandleview/dummy.cpp b/tests/ut_duiapplethandleview/dummy.cpp new file mode 100644 index 000000000..97d33a26c --- /dev/null +++ b/tests/ut_duiapplethandleview/dummy.cpp @@ -0,0 +1,12 @@ +#include "duiextensionhandle_p.h" + +void DuiExtensionHandlePrivate::operationComplete(QString const&, +QString const&, QString const&) +{ +} + +void DuiExtensionHandlePrivate::operationProgress(QString const&, QString const&, int) +{ +} + +#include "moc_duiextensionhandle.cpp" diff --git a/tests/ut_duiapplethandleview/ut_duiapplethandleview.pro b/tests/ut_duiapplethandleview/ut_duiapplethandleview.pro index 26715fcc3..6b9805f25 100644 --- a/tests/ut_duiapplethandleview/ut_duiapplethandleview.pro +++ b/tests/ut_duiapplethandleview/ut_duiapplethandleview.pro @@ -1,13 +1,11 @@ include(../common_top.pri) +include(../common_duiextensions.pri) -TARGET = ut_duiapplethandleview -INCLUDEPATH += $$DUISRCDIR/applicationextension \ - $$DUISRCDIR/mashup/appletcommunication \ - $$DUISRCDIR/mashup/mashup \ - $$DUISRCDIR/widgets \ - $$DUISRCDIR/widgets/core \ - $$DUISRCDIR/core \ - $$DUISRCDIR/style +INCLUDEPATH += \ + $$DUISRCDIR/corelib/widgets \ + $$DUISRCDIR/corelib/widgets/core \ + $$DUISRCDIR/corelib/core \ + $$DUISRCDIR/corelib/style DUIGEN_OUTDIR = . duigenerator_model.name = duigenerator model @@ -28,30 +26,32 @@ duigenerator_style.CONFIG = target_predeps no_link duigenerator_style.variable_out = GENERATED_SOURCES QMAKE_EXTRA_COMPILERS += duigenerator_model duigenerator_style -MODEL_HEADERS += $$DUISRCDIR/widgets/duiwidgetmodel.h \ - $$DUISRCDIR/applicationextension/duiextensionhandlemodel.h \ - $$DUISRCDIR/mashup/mashup/duiapplethandlemodel.h +MODEL_HEADERS += \ + $$DUISRCDIR/corelib/widgets/duiwidgetmodel.h \ + $$DUISRCDIR/extensions/applicationextension/duiextensionhandlemodel.h \ + $$DUISRCDIR/extensions/mashup/mashup/duiapplethandlemodel.h -STYLE_HEADERS += $$DUISRCDIR/style/duiextensionhandlestyle.h \ - $$DUISRCDIR/style/duiapplethandlestyle.h +STYLE_HEADERS += \ + $$DUISRCDIR/extensions/style/duiextensionhandlestyle.h \ + $$DUISRCDIR/extensions/style/duiapplethandlestyle.h SOURCES += ut_duiapplethandleview.cpp \ - $$DUISRCDIR/applicationextension/duiextensionhandleview.cpp \ - $$DUISRCDIR/mashup/mashup/duiapplethandleview.cpp \ - $$DUISRCDIR/widgets/duiwidgetmodel.cpp \ - ../stubs/stubbase.cpp + $$DUISRCDIR/extensions/applicationextension/duiextensionhandleview.cpp \ + $$DUISRCDIR/extensions/mashup/mashup/duiapplethandleview.cpp \ + $$DUISRCDIR/corelib/widgets/duiwidgetmodel.cpp \ + dummy.cpp \ + ../stubs/stubbase.cpp HEADERS += ut_duiapplethandleview.h \ - $$DUISRCDIR/applicationextension/duiextensionhandleview.h \ - $$DUISRCDIR/applicationextension/duiextensionhandle.h \ - $$DUISRCDIR/applicationextension/duiextensionhandlemodel.h \ - $$DUISRCDIR/mashup/mashup/duiapplethandleview.h \ - $$DUISRCDIR/mashup/mashup/duiapplethandle.h \ - $$DUISRCDIR/mashup/mashup/duiapplethandlemodel.h \ - $$DUISRCDIR/mashup/mashup/duiappletid.h \ - $$DUISRCDIR/widgets/duiwidgetmodel_p.h \ - $$DUISRCDIR/widgets/core/duiwidgetview_p.h \ - $$DUISRCDIR/style/duiextensionhandlestyle.h \ - $$DUISRCDIR/style/duiapplethandlestyle.h + $$DUISRCDIR/extensions/applicationextension/duiextensionhandleview.h \ + $$DUISRCDIR/extensions/applicationextension/duiextensionhandle.h \ + $$DUISRCDIR/extensions/applicationextension/duiextensionhandlemodel.h \ + $$DUISRCDIR/extensions/mashup/mashup/duiapplethandleview.h \ + $$DUISRCDIR/extensions/mashup/mashup/duiapplethandle.h \ + $$DUISRCDIR/extensions/mashup/mashup/duiapplethandlemodel.h \ + $$DUISRCDIR/extensions/mashup/mashup/duiappletid.h \ + $$DUISRCDIR/corelib/widgets/duiwidgetmodel_p.h \ + $$DUISRCDIR/corelib/widgets/core/duiwidgetview_p.h \ + $$STYLE_HEADERS include(../common_bot.pri) diff --git a/tests/ut_duiappletid/ut_duiappletid.pro b/tests/ut_duiappletid/ut_duiappletid.pro index a60f2d759..699362ea4 100644 --- a/tests/ut_duiappletid/ut_duiappletid.pro +++ b/tests/ut_duiappletid/ut_duiappletid.pro @@ -1,15 +1,15 @@ include(../common_top.pri) TARGET = ut_duiappletid -INCLUDEPATH += $$DUISRCDIR/mashup/mashup \ - $$DUISRCDIR/mashup/appletcommunication +INCLUDEPATH += $$DUISRCDIR/extensions/mashup/mashup \ + $$DUISRCDIR/extensions/mashup/appletcommunication QT += network SOURCES += ut_duiappletid.cpp \ - $$DUISRCDIR/mashup/mashup/duiappletid.cpp + $$DUISRCDIR/extensions/mashup/mashup/duiappletid.cpp HEADERS += ut_duiappletid.h \ - $$DUISRCDIR/mashup/mashup/duiappletid.h + $$DUISRCDIR/extensions/mashup/mashup/duiappletid.h include(../common_bot.pri) diff --git a/tests/ut_duiappletinstancedata/ut_duiappletinstancedata.pro b/tests/ut_duiappletinstancedata/ut_duiappletinstancedata.pro index e70bb8796..af86b7279 100644 --- a/tests/ut_duiappletinstancedata/ut_duiappletinstancedata.pro +++ b/tests/ut_duiappletinstancedata/ut_duiappletinstancedata.pro @@ -1,11 +1,15 @@ include(../common_top.pri) TARGET = ut_duiappletinstancedata -INCLUDEPATH += $$DUISRCDIR/mashup/appletcommunication $$DUISRCDIR/mashup/appletinterface $$DUISRCDIR/mashup/mashup $$DUISRCDIR/widgets +INCLUDEPATH += \ + $$DUISRCDIR/extensions/mashup/appletcommunication \ + $$DUISRCDIR/extensions/mashup/appletinterface \ + $$DUISRCDIR/extensions/mashup/mashup \ + $$DUISRCDIR/corelib/widgets # unit test and unit classes SOURCES += \ ut_duiappletinstancedata.cpp \ - $$DUISRCDIR/mashup/mashup/duiappletinstancedata.cpp + $$DUISRCDIR/extensions/mashup/mashup/duiappletinstancedata.cpp # service classes SOURCES += \ @@ -14,7 +18,7 @@ SOURCES += \ # unit test and unit classes HEADERS += \ ut_duiappletinstancedata.h \ - $$DUISRCDIR/mashup/mashup/duiappletinstancedata.h \ - $$DUISRCDIR/mashup/mashup/duiappletid.h + $$DUISRCDIR/extensions/mashup/mashup/duiappletinstancedata.h \ + $$DUISRCDIR/extensions/mashup/mashup/duiappletid.h include(../common_bot.pri) diff --git a/tests/ut_duiappletinstancemanager/dummy.cpp b/tests/ut_duiappletinstancemanager/dummy.cpp new file mode 100644 index 000000000..97d33a26c --- /dev/null +++ b/tests/ut_duiappletinstancemanager/dummy.cpp @@ -0,0 +1,12 @@ +#include "duiextensionhandle_p.h" + +void DuiExtensionHandlePrivate::operationComplete(QString const&, +QString const&, QString const&) +{ +} + +void DuiExtensionHandlePrivate::operationProgress(QString const&, QString const&, int) +{ +} + +#include "moc_duiextensionhandle.cpp" diff --git a/tests/ut_duiappletinstancemanager/ut_duiappletinstancemanager.pro b/tests/ut_duiappletinstancemanager/ut_duiappletinstancemanager.pro index a254aef43..e50911ef5 100644 --- a/tests/ut_duiappletinstancemanager/ut_duiappletinstancemanager.pro +++ b/tests/ut_duiappletinstancemanager/ut_duiappletinstancemanager.pro @@ -1,28 +1,31 @@ include(../common_top.pri) -TARGET = ut_duiappletinstancemanager -INCLUDEPATH += $$DUISRCDIR/mashup/appletcommunication $$DUISRCDIR/mashup/appletinterface $$DUISRCDIR/mashup/mashup $$DUISRCDIR/events $$DUISRCDIR/applicationextension +include(../common_duiextensions.pri) + +INCLUDEPATH += \ + $$DUISRCDIR/events \ QT += core network gui svg dbus # unit test and unit classes SOURCES += \ ut_duiappletinstancemanager.cpp \ - $$DUISRCDIR/mashup/mashup/duiappletinstancemanager.cpp \ - $$DUISRCDIR/mashup/mashup/duiappletinstancedata.cpp \ - $$DUISRCDIR/mashup/mashup/duiappletid.cpp \ + $$DUISRCDIR/extensions/mashup/mashup/duiappletinstancemanager.cpp \ + $$DUISRCDIR/extensions/mashup/mashup/duiappletinstancedata.cpp \ + $$DUISRCDIR/extensions/mashup/mashup/duiappletid.cpp \ + dummy.cpp \ ../stubs/stubbase.cpp # unit test and unit classes HEADERS += \ ut_duiappletinstancemanager.h \ - $$DUISRCDIR/mashup/mashup/duiappletinstancemanager.h \ - $$DUISRCDIR/mashup/mashup/duiappletinstancedata.h \ - $$DUISRCDIR/mashup/mashup/duiappletid.h \ - $$DUISRCDIR/mashup/mashup/duiapplethandle.h \ - $$DUISRCDIR/mashup/mashup/duiapplethandlemodel.h \ - $$DUISRCDIR/mashup/mashup/duiappletinstancemanagerdbusadaptor.h \ - $$DUISRCDIR/applicationextension/duiextensionhandle.h \ - $$DUISRCDIR/applicationextension/duiextensionhandlemodel.h \ + $$DUISRCDIR/extensions/mashup/mashup/duiappletinstancemanager.h \ + $$DUISRCDIR/extensions/mashup/mashup/duiappletinstancedata.h \ + $$DUISRCDIR/extensions/mashup/mashup/duiappletid.h \ + $$DUISRCDIR/extensions/mashup/mashup/duiapplethandle.h \ + $$DUISRCDIR/extensions/mashup/mashup/duiapplethandlemodel.h \ + $$DUISRCDIR/extensions/mashup/mashup/duiappletinstancemanagerdbusadaptor.h \ + $$DUISRCDIR/extensions/applicationextension/duiextensionhandle.h \ + $$DUISRCDIR/extensions/applicationextension/duiextensionhandlemodel.h \ $$DUISRCDIR/events/duiorientationtracker.h include(../common_bot.pri) diff --git a/tests/ut_duiappletinstantiator/ut_duiappletinstantiator.pro b/tests/ut_duiappletinstantiator/ut_duiappletinstantiator.pro index ffbd36059..cf031fb13 100644 --- a/tests/ut_duiappletinstantiator/ut_duiappletinstantiator.pro +++ b/tests/ut_duiappletinstantiator/ut_duiappletinstantiator.pro @@ -1,17 +1,17 @@ include(../common_top.pri) -TARGET = ut_duiappletinstantiator + INCLUDEPATH += \ - $$DUISRCDIR/mashup/appletinstallation + $$DUISRCDIR/extensions/mashup/appletinstallation # unit test and unit classes SOURCES += \ ut_duiappletinstantiator.cpp \ - $$DUISRCDIR/mashup/appletinstallation/duiappletinstantiator.cpp + $$DUISRCDIR/extensions/mashup/appletinstallation/duiappletinstantiator.cpp # unit test and unit classes HEADERS += \ ut_duiappletinstantiator.h \ - $$DUISRCDIR/mashup/appletinstallation/duiappletinstantiator_p.h \ - $$DUISRCDIR/mashup/appletinstallation/duiappletinstantiator.h + $$DUISRCDIR/extensions/mashup/appletinstallation/duiappletinstantiator_p.h \ + $$DUISRCDIR/extensions/mashup/appletinstallation/duiappletinstantiator.h include(../common_bot.pri) diff --git a/tests/ut_duiappletinventory/ut_duiappletinventory.pro b/tests/ut_duiappletinventory/ut_duiappletinventory.pro index df34b1775..cec6df3e5 100644 --- a/tests/ut_duiappletinventory/ut_duiappletinventory.pro +++ b/tests/ut_duiappletinventory/ut_duiappletinventory.pro @@ -1,10 +1,9 @@ include(../common_top.pri) -TARGET = ut_duiappletinventory -INCLUDEPATH += $$DUISRCDIR/mashup/appletcommunication \ - $$DUISRCDIR/mashup/appletinterface \ - $$DUISRCDIR/mashup/appletinstallation \ - $$DUISRCDIR/mashup/mashup \ - $$DUISRCDIR/widgets \ +include(../common_duiextensions.pri) + +INCLUDEPATH += \ + $$DUISRCDIR/include \ + $$DUISRCDIR/corelib/widgets \ $$DUISRCDIR/events win32 { @@ -25,16 +24,17 @@ duigenerator_model.CONFIG = target_predeps no_link duigenerator_model.variable_out = GENERATED_SOURCES QMAKE_EXTRA_COMPILERS += duigenerator_model -MODEL_HEADERS += $$DUISRCDIR/widgets/duiwidgetmodel.h \ - $$DUISRCDIR/mashup/mashup/duiappletinventorymodel.h +MODEL_HEADERS += \ + $$DUISRCDIR/corelib/widgets/duiwidgetmodel.h \ + $$DUISRCDIR/extensions/mashup/mashup/duiappletinventorymodel.h SOURCES += \ ut_duiappletinventory.cpp \ - $$DUISRCDIR/mashup/mashup/duiappletinventory.cpp \ - $$DUISRCDIR/mashup/appletinstallation/duiappletinstantiator.cpp \ - $$DUISRCDIR/widgets/core/duiwidgetcontroller.cpp \ - $$DUISRCDIR/widgets/core/duiwidget.cpp \ - $$DUISRCDIR/widgets/duiwidgetmodel.cpp + $$DUISRCDIR/extensions/mashup/mashup/duiappletinventory.cpp \ + $$DUISRCDIR/extensions/mashup/appletinstallation/duiappletinstantiator.cpp \ + $$DUISRCDIR/corelib/widgets/core/duiwidgetcontroller.cpp \ + $$DUISRCDIR/corelib/widgets/core/duiwidget.cpp \ + $$DUISRCDIR/corelib/widgets/duiwidgetmodel.cpp # service classes SOURCES += \ @@ -43,17 +43,17 @@ SOURCES += \ # unit test and unit classes HEADERS += \ ut_duiappletinventory.h \ - $$DUISRCDIR/mashup/mashup/duiappletinventory.h \ - $$DUISRCDIR/mashup/mashup/duiappletinventorymodel.h \ - $$DUISRCDIR/mashup/appletinstallation/duiappletinstantiator.h \ - $$DUISRCDIR/mashup/appletinstallation/duiappletinstantiator_p.h \ - $$DUISRCDIR/mashup/mashup/duiappletbutton.h \ - $$DUISRCDIR/mashup/mashup/duiappletinstancemanager.h \ - $$DUISRCDIR/mashup/mashup/duiappletid.h \ - $$DUISRCDIR/widgets/core/duiwidgetcontroller_p.h \ - $$DUISRCDIR/widgets/core/duiwidget_p.h \ - $$DUISRCDIR/widgets/duiwidgetmodel_p.h \ - $$DUISRCDIR/widgets/duiscenewindow_p.h \ - $$DUISRCDIR/widgets/duiobjectmenu.h + $$DUISRCDIR/extensions/mashup/mashup/duiappletinventory.h \ + $$DUISRCDIR/extensions/mashup/mashup/duiappletinventorymodel.h \ + $$DUISRCDIR/extensions/mashup/appletinstallation/duiappletinstantiator.h \ + $$DUISRCDIR/extensions/mashup/appletinstallation/duiappletinstantiator_p.h \ + $$DUISRCDIR/extensions/mashup/mashup/duiappletbutton.h \ + $$DUISRCDIR/extensions/mashup/mashup/duiappletinstancemanager.h \ + $$DUISRCDIR/extensions/mashup/mashup/duiappletid.h \ + $$DUISRCDIR/corelib/widgets/core/duiwidgetcontroller_p.h \ + $$DUISRCDIR/corelib/widgets/core/duiwidget_p.h \ + $$DUISRCDIR/corelib/widgets/duiwidgetmodel_p.h \ + $$DUISRCDIR/corelib/widgets/duiscenewindow_p.h \ + $$DUISRCDIR/corelib/widgets/duiobjectmenu.h include(../common_bot.pri) diff --git a/tests/ut_duiappletinventoryview/ut_duiappletinventoryview.pro b/tests/ut_duiappletinventoryview/ut_duiappletinventoryview.pro index fda605d63..4c2a2ee25 100644 --- a/tests/ut_duiappletinventoryview/ut_duiappletinventoryview.pro +++ b/tests/ut_duiappletinventoryview/ut_duiappletinventoryview.pro @@ -2,10 +2,10 @@ include(../common_top.pri) TARGET = ut_duiappletinventoryview INCLUDEPATH += $$DUISRCDIR/mashup/mashup INCLUDEPATH += $$DUISRCDIR/mashup/appletinstallation -INCLUDEPATH += $$DUISRCDIR/style -INCLUDEPATH += $$DUISRCDIR/widgets -INCLUDEPATH += $$DUISRCDIR/widgets/core -INCLUDEPATH += $$DUISRCDIR/core +INCLUDEPATH += $$DUISRCDIR/corelib/style +INCLUDEPATH += $$DUISRCDIR/corelib/widgets +INCLUDEPATH += $$DUISRCDIR/corelib/widgets/core +INCLUDEPATH += $$DUISRCDIR/corelib/core DUIGEN_OUTDIR = . duigenerator_model.name = duigenerator model @@ -18,8 +18,8 @@ duigenerator_model.CONFIG = target_predeps no_link duigenerator_model.variable_out = GENERATED_SOURCES QMAKE_EXTRA_COMPILERS += duigenerator_model -STYLE_HEADERS += $$DUISRCDIR/style/duiappletinventorystyle.h -MODEL_HEADERS += $$DUISRCDIR/widgets/duiwidgetmodel.h \ +STYLE_HEADERS += $$DUISRCDIR/corelib/style/duiappletinventorystyle.h +MODEL_HEADERS += $$DUISRCDIR/corelib/widgets/duiwidgetmodel.h \ $$DUISRCDIR/mashup/mashup/duiappletinventorymodel.h # unit test and unit @@ -30,9 +30,9 @@ SOURCES += \ # base classes SOURCES += \ - $$DUISRCDIR/widgets/core/duiwidgetcontroller.cpp \ - $$DUISRCDIR/widgets/core/duiwidget.cpp \ - $$DUISRCDIR/widgets/duiwidgetmodel.cpp + $$DUISRCDIR/corelib/widgets/core/duiwidgetcontroller.cpp \ + $$DUISRCDIR/corelib/widgets/core/duiwidget.cpp \ + $$DUISRCDIR/corelib/widgets/duiwidgetmodel.cpp # service classes SOURCES += \ @@ -41,14 +41,14 @@ SOURCES += \ # unit test and unit HEADERS += \ ut_duiappletinventoryview.h \ - $$DUISRCDIR/widgets/core/duiwidgetcontroller_p.h \ - $$DUISRCDIR/widgets/views/duiextendingbackgroundview_p.h \ + $$DUISRCDIR/corelib/widgets/core/duiwidgetcontroller_p.h \ + $$DUISRCDIR/corelib/widgets/views/duiextendingbackgroundview_p.h \ $$DUISRCDIR/mashup/mashup/duiappletbutton.h \ $$DUISRCDIR/mashup/mashup/duiappletinventory.h \ $$DUISRCDIR/mashup/mashup/duiappletinventoryview.h \ $$DUISRCDIR/mashup/mashup/duiappletinventorymodel.h \ - $$DUISRCDIR/widgets/duiwidgetmodel_p.h \ - $$DUISRCDIR/widgets/duiscenewindow_p.h \ - $$DUISRCDIR/widgets/duiobjectmenu.h + $$DUISRCDIR/corelib/widgets/duiwidgetmodel_p.h \ + $$DUISRCDIR/corelib/widgets/duiscenewindow_p.h \ + $$DUISRCDIR/corelib/widgets/duiobjectmenu.h include(../common_bot.pri) diff --git a/tests/ut_duiappletloader/ut_duiappletloader.pro b/tests/ut_duiappletloader/ut_duiappletloader.pro index fab952228..1abd87401 100644 --- a/tests/ut_duiappletloader/ut_duiappletloader.pro +++ b/tests/ut_duiappletloader/ut_duiappletloader.pro @@ -1,12 +1,8 @@ include(../common_top.pri) -TARGET = ut_duiappletloader - -INCLUDEPATH += \ - $$DUISRCDIR/mashup/mashup \ - $$DUISRCDIR/mashup/appletinterface +include(../common_duiextensions.pri) TEST_SOURCES = \ - $$DUISRCDIR/mashup/mashup/duiappletloader.cpp + $$DUISRCDIR/extensions/mashup/mashup/duiappletloader.cpp # unit test and unit SOURCES += \ @@ -16,6 +12,6 @@ SOURCES += \ # unit test and unit HEADERS += \ ut_duiappletloader.h \ - $$DUISRCDIR/mashup/mashup/duiappletloader.h + $$DUISRCDIR/extensions/mashup/mashup/duiappletloader.h include(../common_bot.pri) diff --git a/tests/ut_duiappletmessage/ut_duiappletmessage.pro b/tests/ut_duiappletmessage/ut_duiappletmessage.pro index a3b62b4d0..33bc14d66 100644 --- a/tests/ut_duiappletmessage/ut_duiappletmessage.pro +++ b/tests/ut_duiappletmessage/ut_duiappletmessage.pro @@ -1,6 +1,5 @@ include(../common_top.pri) -TARGET = ut_duiappletmessage -INCLUDEPATH += $$DUISRCDIR/mashup/appletcommunication $$DUISRCDIR/mashup/appletinterface $$DUISRCDIR/mashup/mashup +include(../common_duiextensions.pri) # unit test and unit classes SOURCES += \ diff --git a/tests/ut_duiappletmessagefactory/ut_duiappletmessagefactory.pro b/tests/ut_duiappletmessagefactory/ut_duiappletmessagefactory.pro index 39496d8eb..6d2ecaa9c 100644 --- a/tests/ut_duiappletmessagefactory/ut_duiappletmessagefactory.pro +++ b/tests/ut_duiappletmessagefactory/ut_duiappletmessagefactory.pro @@ -1,6 +1,5 @@ include(../common_top.pri) -TARGET = ut_duiappletmessagefactory -INCLUDEPATH += $$DUISRCDIR/mashup/appletcommunication $$DUISRCDIR/mashup/appletinterface $$DUISRCDIR/mashup/mashup +include(../common_duiextensions.pri) # unit test and unit classes SOURCES += \ diff --git a/tests/ut_duiappletmetadata/ut_duiappletmetadata.pro b/tests/ut_duiappletmetadata/ut_duiappletmetadata.pro index e97f2cb60..8e560f4e0 100644 --- a/tests/ut_duiappletmetadata/ut_duiappletmetadata.pro +++ b/tests/ut_duiappletmetadata/ut_duiappletmetadata.pro @@ -1,18 +1,15 @@ include(../common_top.pri) -TARGET = ut_duiappletmetadata -INCLUDEPATH += $$DUISRCDIR/mashup/appletcommunication \ - $$DUISRCDIR/mashup/appletinterface \ - $$DUISRCDIR/mashup/mashup +include(../common_duiextensions.pri) # unit test and unit classes SOURCES += \ ut_duiappletmetadata.cpp \ - $$DUISRCDIR/mashup/appletinterface/duiappletmetadata.cpp + $$DUISRCDIR/extensions/mashup/appletinterface/duiappletmetadata.cpp # unit test and unit classes HEADERS += \ ut_duiappletmetadata.h \ - $$DUISRCDIR/mashup/appletinterface/duiappletmetadata.h + $$DUISRCDIR/extensions/mashup/appletinterface/duiappletmetadata.h DEFINES += DUI_INSTALL_LIBS=\\\"\"$$DUI_INSTALL_LIBS\"\\\" diff --git a/tests/ut_duiappletmousemessage/ut_duiappletmousemessage.pro b/tests/ut_duiappletmousemessage/ut_duiappletmousemessage.pro index 99a45b2d7..9837cae5c 100644 --- a/tests/ut_duiappletmousemessage/ut_duiappletmousemessage.pro +++ b/tests/ut_duiappletmousemessage/ut_duiappletmousemessage.pro @@ -1,6 +1,5 @@ include(../common_top.pri) -TARGET = ut_duiappletmousemessage -INCLUDEPATH += $$DUISRCDIR/mashup/appletcommunication $$DUISRCDIR/mashup/appletinterface $$DUISRCDIR/mashup/mashup +include(../common_duiextensions.pri) # unit test and unit classes SOURCES += \ diff --git a/tests/ut_duiappletobjectmenuactionselectedmessage/ut_duiappletobjectmenuactionselectedmessage.pro b/tests/ut_duiappletobjectmenuactionselectedmessage/ut_duiappletobjectmenuactionselectedmessage.pro index ca72d04c2..0fbc67dc9 100644 --- a/tests/ut_duiappletobjectmenuactionselectedmessage/ut_duiappletobjectmenuactionselectedmessage.pro +++ b/tests/ut_duiappletobjectmenuactionselectedmessage/ut_duiappletobjectmenuactionselectedmessage.pro @@ -1,6 +1,5 @@ include(../common_top.pri) -TARGET = ut_duiappletobjectmenuactionselectedmessage -INCLUDEPATH += $$DUISRCDIR/mashup/appletcommunication $$DUISRCDIR/mashup/appletinterface $$DUISRCDIR/mashup/mashup +include(../common_duiextensions.pri) # unit test and unit classes SOURCES += \ diff --git a/tests/ut_duiappletobjectmenumessage/ut_duiappletobjectmenumessage.pro b/tests/ut_duiappletobjectmenumessage/ut_duiappletobjectmenumessage.pro index 14e86dfc5..b3f8f59cf 100644 --- a/tests/ut_duiappletobjectmenumessage/ut_duiappletobjectmenumessage.pro +++ b/tests/ut_duiappletobjectmenumessage/ut_duiappletobjectmenumessage.pro @@ -1,6 +1,5 @@ include(../common_top.pri) -TARGET = ut_duiappletobjectmenumessage -INCLUDEPATH += $$DUISRCDIR/mashup/appletcommunication $$DUISRCDIR/mashup/appletinterface $$DUISRCDIR/mashup/mashup +include(../common_duiextensions.pri) # unit test and unit classes SOURCES += \ diff --git a/tests/ut_duiappletobjectmenurequestmessage/ut_duiappletobjectmenurequestmessage.pro b/tests/ut_duiappletobjectmenurequestmessage/ut_duiappletobjectmenurequestmessage.pro index 96a4350b1..b0b250634 100644 --- a/tests/ut_duiappletobjectmenurequestmessage/ut_duiappletobjectmenurequestmessage.pro +++ b/tests/ut_duiappletobjectmenurequestmessage/ut_duiappletobjectmenurequestmessage.pro @@ -1,6 +1,5 @@ include(../common_top.pri) -TARGET = ut_duiappletobjectmenurequestmessage -INCLUDEPATH += $$DUISRCDIR/mashup/appletcommunication $$DUISRCDIR/mashup/appletinterface $$DUISRCDIR/mashup/mashup +include(../common_duiextensions.pri) # unit test and unit classes SOURCES += \ diff --git a/tests/ut_duiappletorientationmessage/ut_duiappletorientationmessage.pro b/tests/ut_duiappletorientationmessage/ut_duiappletorientationmessage.pro index 37b381a0b..355906333 100644 --- a/tests/ut_duiappletorientationmessage/ut_duiappletorientationmessage.pro +++ b/tests/ut_duiappletorientationmessage/ut_duiappletorientationmessage.pro @@ -1,6 +1,5 @@ include(../common_top.pri) -TARGET = ut_duiappletorientationmessage -INCLUDEPATH += $$DUISRCDIR/mashup/appletcommunication $$DUISRCDIR/mashup/appletinterface $$DUISRCDIR/mashup/mashup +include(../common_duiextensions.pri) # unit test and unit classes SOURCES += \ diff --git a/tests/ut_duiappletpixmapmodifiedmessage/ut_duiappletpixmapmodifiedmessage.pro b/tests/ut_duiappletpixmapmodifiedmessage/ut_duiappletpixmapmodifiedmessage.pro index 7420d6614..979231a34 100644 --- a/tests/ut_duiappletpixmapmodifiedmessage/ut_duiappletpixmapmodifiedmessage.pro +++ b/tests/ut_duiappletpixmapmodifiedmessage/ut_duiappletpixmapmodifiedmessage.pro @@ -1,6 +1,5 @@ include(../common_top.pri) -TARGET = ut_duiappletpixmapmodifiedmessage -INCLUDEPATH += $$DUISRCDIR/mashup/appletcommunication $$DUISRCDIR/mashup/appletinterface $$DUISRCDIR/mashup/mashup +include(../common_duiextensions.pri) # unit test and unit classes SOURCES += \ diff --git a/tests/ut_duiappletpixmaptakenintousemessage/ut_duiappletpixmaptakenintousemessage.pro b/tests/ut_duiappletpixmaptakenintousemessage/ut_duiappletpixmaptakenintousemessage.pro index 686294856..ba971836d 100644 --- a/tests/ut_duiappletpixmaptakenintousemessage/ut_duiappletpixmaptakenintousemessage.pro +++ b/tests/ut_duiappletpixmaptakenintousemessage/ut_duiappletpixmaptakenintousemessage.pro @@ -1,6 +1,5 @@ include(../common_top.pri) -TARGET = ut_duiappletpixmaptakenintousemessage -INCLUDEPATH += $$DUISRCDIR/mashup/appletcommunication $$DUISRCDIR/mashup/appletinterface $$DUISRCDIR/mashup/mashup +include(../common_duiextensions.pri) # unit test and unit classes SOURCES += \ diff --git a/tests/ut_duiappletrunner/ut_duiappletrunner.pro b/tests/ut_duiappletrunner/ut_duiappletrunner.pro index c856f99dc..be079f6b9 100644 --- a/tests/ut_duiappletrunner/ut_duiappletrunner.pro +++ b/tests/ut_duiappletrunner/ut_duiappletrunner.pro @@ -1,10 +1,7 @@ include(../common_top.pri) +include(../common_duiextensions.pri) -TARGET = ut_duiappletrunner - -INCLUDEPATH += $$DUISRCDIR/applicationextension \ - $$DUISRCDIR/mashup/appletcommunication \ - $$DUISRCDIR/mashup/mashup \ +INCLUDEPATH += \ ../../duiappletrunner QT += network xml @@ -15,6 +12,6 @@ SOURCES += ut_duiappletrunner.cpp \ HEADERS += ut_duiappletrunner.h \ ../../duiappletrunner/duiappletrunner.h \ - $$DUISRCDIR/applicationextension/duiextensionrunner.h + $$DUISRCDIR/extensions/applicationextension/duiextensionrunner.h include(../common_bot.pri) diff --git a/tests/ut_duiappletserver/ut_duiappletserver.pro b/tests/ut_duiappletserver/ut_duiappletserver.pro index 6902e9947..6d93c68ed 100644 --- a/tests/ut_duiappletserver/ut_duiappletserver.pro +++ b/tests/ut_duiappletserver/ut_duiappletserver.pro @@ -1,6 +1,5 @@ include(../common_top.pri) -TARGET = ut_duiappletserver -INCLUDEPATH += $$DUISRCDIR/mashup/appletcommunication $$DUISRCDIR/mashup/appletinterface $$DUISRCDIR/mashup/mashup +include(../common_duiextensions.pri) QT += core network gui svg dbus diff --git a/tests/ut_duiappletsetgeometrymessage/ut_duiappletsetgeometrymessage.pro b/tests/ut_duiappletsetgeometrymessage/ut_duiappletsetgeometrymessage.pro index 913784a24..000186eba 100644 --- a/tests/ut_duiappletsetgeometrymessage/ut_duiappletsetgeometrymessage.pro +++ b/tests/ut_duiappletsetgeometrymessage/ut_duiappletsetgeometrymessage.pro @@ -1,6 +1,5 @@ include(../common_top.pri) -TARGET = ut_duiappletsetgeometrymessage -INCLUDEPATH += $$DUISRCDIR/mashup/appletcommunication $$DUISRCDIR/mashup/appletinterface $$DUISRCDIR/mashup/mashup +include(../common_duiextensions.pri) # unit test and unit classes SOURCES += \ diff --git a/tests/ut_duiappletsettings/ut_duiappletsettings.pro b/tests/ut_duiappletsettings/ut_duiappletsettings.pro index a664c0524..c93fa5402 100644 --- a/tests/ut_duiappletsettings/ut_duiappletsettings.pro +++ b/tests/ut_duiappletsettings/ut_duiappletsettings.pro @@ -1,12 +1,11 @@ include(../common_top.pri) -TARGET = ut_duiappletsettings -INCLUDEPATH += $$DUISRCDIR/mashup/mashup +include(../common_duiextensions.pri) QT += xml SOURCES += \ ut_duiappletsettings.cpp \ - $$DUISRCDIR/mashup/mashup/duiappletsettings.cpp + $$DUISRCDIR/extensions/mashup/mashup/duiappletsettings.cpp # service classes SOURCES += \ @@ -14,7 +13,7 @@ SOURCES += \ HEADERS += \ ut_duiappletsettings.h \ - $$DUISRCDIR/mashup/mashup/duiappletsettings.h \ - $$DUISRCDIR/mashup/mashup/duiappletid.h + $$DUISRCDIR/extensions/mashup/mashup/duiappletsettings.h \ + $$DUISRCDIR/extensions/mashup/mashup/duiappletid.h include(../common_bot.pri) diff --git a/tests/ut_duiappletsettingsdialog/ut_duiappletsettingsdialog.pro b/tests/ut_duiappletsettingsdialog/ut_duiappletsettingsdialog.pro index 34e980a09..7d9dac293 100644 --- a/tests/ut_duiappletsettingsdialog/ut_duiappletsettingsdialog.pro +++ b/tests/ut_duiappletsettingsdialog/ut_duiappletsettingsdialog.pro @@ -1,19 +1,16 @@ include(../common_top.pri) -include(../../mkspecs/common.pri) +include(../common_duiextensions.pri) -TARGET = ut_duiappletsettingsdialog -INCLUDEPATH += $$DUISRCDIR/mashup/mashup \ - $$DUISRCDIR/mashup/appletcommunication \ - $$DUISRCDIR/widgets +INCLUDEPATH += $$DUISRCDIR/corelib/widgets QT += xml SOURCES += ut_duiappletsettingsdialog.cpp \ - $$DUISRCDIR/mashup/mashup/duiappletsettingsdialog.cpp \ + $$DUISRCDIR/extensions/mashup/mashup/duiappletsettingsdialog.cpp \ ../stubs/stubbase.cpp HEADERS += ut_duiappletsettingsdialog.h \ - $$DUISRCDIR/mashup/mashup/duiappletsettingsdialog.h \ - $$DUISRCDIR/mashup/mashup/duiappletid.h + $$DUISRCDIR/extensions/mashup/mashup/duiappletsettingsdialog.h \ + $$DUISRCDIR/extensions/mashup/mashup/duiappletid.h include(../common_bot.pri) diff --git a/tests/ut_duiappletsharedmutex/ut_duiappletsharedmutex.pro b/tests/ut_duiappletsharedmutex/ut_duiappletsharedmutex.pro index bcca1cbb4..478c19d83 100644 --- a/tests/ut_duiappletsharedmutex/ut_duiappletsharedmutex.pro +++ b/tests/ut_duiappletsharedmutex/ut_duiappletsharedmutex.pro @@ -1,9 +1,8 @@ include(../common_top.pri) -TARGET = ut_duiappletsharedmutex -INCLUDEPATH += $$DUISRCDIR/mashup/mashup +INCLUDEPATH += $$DUISRCDIR/extensions/mashup/mashup TEST_SOURCES = \ - $$DUISRCDIR/mashup/mashup/duiappletsharedmutex.cpp \ + $$DUISRCDIR/extensions/mashup/mashup/duiappletsharedmutex.cpp \ # unit test and unit SOURCES += \ @@ -17,6 +16,6 @@ SOURCES += \ # unit test and unit HEADERS += \ ut_duiappletsharedmutex.h \ - $$DUISRCDIR/mashup/mashup/duiappletsharedmutex.h \ + $$DUISRCDIR/extensions/mashup/mashup/duiappletsharedmutex.h \ include(../common_bot.pri) diff --git a/tests/ut_duiappletupdategeometrymessage/ut_duiappletupdategeometrymessage.pro b/tests/ut_duiappletupdategeometrymessage/ut_duiappletupdategeometrymessage.pro index 24cd8ceb3..f97977380 100644 --- a/tests/ut_duiappletupdategeometrymessage/ut_duiappletupdategeometrymessage.pro +++ b/tests/ut_duiappletupdategeometrymessage/ut_duiappletupdategeometrymessage.pro @@ -1,6 +1,5 @@ include(../common_top.pri) -TARGET = ut_duiappletupdategeometrymessage -INCLUDEPATH += $$DUISRCDIR/mashup/appletcommunication $$DUISRCDIR/mashup/appletinterface $$DUISRCDIR/mashup/mashup +include(../common_duiextensions.pri) # unit test and unit classes SOURCES += \ diff --git a/tests/ut_duiappletvisibilitymessage/ut_duiappletvisibilitymessage.pro b/tests/ut_duiappletvisibilitymessage/ut_duiappletvisibilitymessage.pro index fe22119dd..c07e50793 100644 --- a/tests/ut_duiappletvisibilitymessage/ut_duiappletvisibilitymessage.pro +++ b/tests/ut_duiappletvisibilitymessage/ut_duiappletvisibilitymessage.pro @@ -1,6 +1,5 @@ include(../common_top.pri) -TARGET = ut_duiappletvisibilitymessage -INCLUDEPATH += $$DUISRCDIR/mashup/appletcommunication $$DUISRCDIR/mashup/appletinterface $$DUISRCDIR/mashup/mashup +include(../common_duiextensions.pri) # unit test and unit classes SOURCES += \ diff --git a/tests/ut_duiapplication/ut_duiapplication.pro b/tests/ut_duiapplication/ut_duiapplication.pro index 53671670d..948b38e17 100644 --- a/tests/ut_duiapplication/ut_duiapplication.pro +++ b/tests/ut_duiapplication/ut_duiapplication.pro @@ -6,12 +6,12 @@ TARGET = ut_duiapplication #holger FIXME check DEFINES += TRANSLATION_DIR=\'$$quote(\"$$[QT_INSTALL_DATA]/share/l10n/dui/\")\' -TEST_HEADERS = $$DUISRCDIR/core/duiapplication.h +TEST_HEADERS = $$DUISRCDIR/corelib/core/duiapplication.h -INCLUDEPATH += $$DUISRCDIR/feedback +INCLUDEPATH += $$DUISRCDIR/corelib/feedback TEST_SOURCES = \ - $$DUISRCDIR/core/duiapplication.cpp + $$DUISRCDIR/corelib/core/duiapplication.cpp # Input HEADERS += \ diff --git a/tests/ut_duiapplicationextensionarea/ut_duiapplicationextensionarea.pro b/tests/ut_duiapplicationextensionarea/ut_duiapplicationextensionarea.pro index e77e9d718..45245db0b 100644 --- a/tests/ut_duiapplicationextensionarea/ut_duiapplicationextensionarea.pro +++ b/tests/ut_duiapplicationextensionarea/ut_duiapplicationextensionarea.pro @@ -1,11 +1,10 @@ include(../common_top.pri) -TARGET = ut_duiapplicationextensionarea +include(../common_duiextensions.pri) + INCLUDEPATH += \ - $$DUISRCDIR/applicationextension \ - $$DUISRCDIR/mashup/mashup \ - $$DUISRCDIR/widgets \ - $$DUISRCDIR/style \ - $$DUISRCDIR/core \ + $$DUISRCDIR/corelib/widgets \ + $$DUISRCDIR/corelib/style \ + $$DUISRCDIR/corelib/core \ # unit test and unit classes SOURCES += \ diff --git a/tests/ut_duiapplicationextensionareaview/ut_duiapplicationextensionareaview.pro b/tests/ut_duiapplicationextensionareaview/ut_duiapplicationextensionareaview.pro index d5ddbd35d..dfb746091 100644 --- a/tests/ut_duiapplicationextensionareaview/ut_duiapplicationextensionareaview.pro +++ b/tests/ut_duiapplicationextensionareaview/ut_duiapplicationextensionareaview.pro @@ -1,6 +1,5 @@ include(../common_top.pri) -TARGET = ut_duiapplicationextensionareaview -INCLUDEPATH += $$DUISRCDIR/applicationextension $$DUISRCDIR/layout $$DUISRCDIR/style +include(../common_duiextensions.pri) QT += core network gui svg dbus diff --git a/tests/ut_duiapplicationextensionloader/ut_duiapplicationextensionloader.pro b/tests/ut_duiapplicationextensionloader/ut_duiapplicationextensionloader.pro index 4e4b3fe41..d98afe475 100644 --- a/tests/ut_duiapplicationextensionloader/ut_duiapplicationextensionloader.pro +++ b/tests/ut_duiapplicationextensionloader/ut_duiapplicationextensionloader.pro @@ -1,9 +1,8 @@ include(../common_top.pri) -TARGET = ut_duiapplicationextensionloader -INCLUDEPATH += $$DUISRCDIR/applicationextension +include(../common_duiextensions.pri) TEST_SOURCES = \ - $$DUISRCDIR/applicationextension/duiapplicationextensionloader.cpp \ + $$DUISRCDIR/extensions/applicationextension/duiapplicationextensionloader.cpp \ # unit test and unit SOURCES += \ @@ -17,6 +16,6 @@ SOURCES += \ # unit test and unit HEADERS += \ ut_duiapplicationextensionloader.h \ - $$DUISRCDIR/applicationextension/duiapplicationextensionloader.h \ + $$DUISRCDIR/extensions/applicationextension/duiapplicationextensionloader.h \ include(../common_bot.pri) diff --git a/tests/ut_duiapplicationextensionmanager/dummy.cpp b/tests/ut_duiapplicationextensionmanager/dummy.cpp new file mode 100644 index 000000000..97d33a26c --- /dev/null +++ b/tests/ut_duiapplicationextensionmanager/dummy.cpp @@ -0,0 +1,12 @@ +#include "duiextensionhandle_p.h" + +void DuiExtensionHandlePrivate::operationComplete(QString const&, +QString const&, QString const&) +{ +} + +void DuiExtensionHandlePrivate::operationProgress(QString const&, QString const&, int) +{ +} + +#include "moc_duiextensionhandle.cpp" diff --git a/tests/ut_duiapplicationextensionmanager/ut_duiapplicationextensionmanager.pro b/tests/ut_duiapplicationextensionmanager/ut_duiapplicationextensionmanager.pro index e4c3d0f21..1af209618 100644 --- a/tests/ut_duiapplicationextensionmanager/ut_duiapplicationextensionmanager.pro +++ b/tests/ut_duiapplicationextensionmanager/ut_duiapplicationextensionmanager.pro @@ -5,38 +5,39 @@ win32|macx { QMAKE_LFLAGS -= -F../../lib LIBS -= -framework dui } - win32:LIBS -= -L../../lib -ldui0 + win32:LIBS -= -lduicore0 -lduiviews0 } else { - LIBS -= ../../lib/libdui.so + LIBS -= -lduicore -lduiviews } -TARGET = ut_duiapplicationextensionmanager INCLUDEPATH += \ - $$DUISRCDIR/applicationextension \ - $$DUISRCDIR/mashup/mashup + $$DUISRCDIR/extensions/applicationextension \ + $$DUISRCDIR/extensions/mashup/appletcommunication \ + $$DUISRCDIR/extensions/mashup/mashup # unit test and unit classes SOURCES += \ ut_duiapplicationextensionmanager.cpp \ - $$DUISRCDIR/applicationextension/duiapplicationextensionmanager.cpp + $$DUISRCDIR/extensions/applicationextension/duiapplicationextensionmanager.cpp # service classes SOURCES += \ $$STUBSDIR/stubbase.cpp \ + dummy.cpp # unit test and unit classes HEADERS += \ ut_duiapplicationextensionmanager.h \ - $$DUISRCDIR/applicationextension/duiapplicationextensionmanager.h \ - $$DUISRCDIR/applicationextension/duiextensionhandle.h \ - $$DUISRCDIR/applicationextension/duiextensionhandlemodel.h \ - $$DUISRCDIR/widgets/duiwidgetmodel.h \ - $$DUISRCDIR/widgets/core/duiwidget.h \ - $$DUISRCDIR/widgets/core/duiwidgetcontroller.h \ - $$DUISRCDIR/core/duidesktopentry.h \ - $$DUISRCDIR/theme/duitheme.h \ - $$DUISRCDIR/mashup/mashup/duifiledatastore.h \ - $$DUISRCDIR/mashup/mashup/duidatastore.h \ - $$DUISRCDIR/mashup/mashup/duidataaccess.h + $$DUISRCDIR/extensions/applicationextension/duiapplicationextensionmanager.h \ + $$DUISRCDIR/extensions/applicationextension/duiextensionhandle.h \ + $$DUISRCDIR/extensions/applicationextension/duiextensionhandlemodel.h \ + $$DUISRCDIR/corelib/widgets/duiwidgetmodel.h \ + $$DUISRCDIR/corelib/widgets/core/duiwidget.h \ + $$DUISRCDIR/corelib/widgets/core/duiwidgetcontroller.h \ + $$DUISRCDIR/corelib/core/duidesktopentry.h \ + $$DUISRCDIR/corelib/theme/duitheme.h \ + $$DUISRCDIR/corelib/core/duifiledatastore.h \ + $$DUISRCDIR/corelib/core/duidatastore.h \ + $$DUISRCDIR/corelib/core/duidataaccess.h include(../common_bot.pri) diff --git a/tests/ut_duiapplicationextensionrunner/ut_duiapplicationextensionrunner.pro b/tests/ut_duiapplicationextensionrunner/ut_duiapplicationextensionrunner.pro index 72ed47682..fbba05609 100644 --- a/tests/ut_duiapplicationextensionrunner/ut_duiapplicationextensionrunner.pro +++ b/tests/ut_duiapplicationextensionrunner/ut_duiapplicationextensionrunner.pro @@ -1,11 +1,7 @@ include(../common_top.pri) +include(../common_duiextensions.pri) -TARGET = ut_duiapplicationextensionrunner - -INCLUDEPATH += $$DUISRCDIR/applicationextension \ - $$DUISRCDIR/mashup/appletcommunication \ - $$DUISRCDIR/mashup/mashup \ - ../../duiapplicationextensionrunner +INCLUDEPATH += ../../duiapplicationextensionrunner QT += network xml diff --git a/tests/ut_duiapplicationmenu/ut_duiapplicationmenu.pro b/tests/ut_duiapplicationmenu/ut_duiapplicationmenu.pro index 28c4ac2cb..bedf0b73a 100644 --- a/tests/ut_duiapplicationmenu/ut_duiapplicationmenu.pro +++ b/tests/ut_duiapplicationmenu/ut_duiapplicationmenu.pro @@ -2,7 +2,7 @@ include(../common_top.pri) TARGET = ut_duiapplicationmenu -INCLUDEPATH += $$DUISRCDIR/widgets $$DUISRCDIR/style $$DUISRCDIR/scene +INCLUDEPATH += $$DUISRCDIR/corelib/widgets $$DUISRCDIR/corelib/style $$DUISRCDIR/scene SOURCES += \ ut_duiapplicationmenu.cpp \ diff --git a/tests/ut_duiapplicationmenuview/ut_duiapplicationmenuview.pro b/tests/ut_duiapplicationmenuview/ut_duiapplicationmenuview.pro index f7ccb75c5..3c7b14a48 100644 --- a/tests/ut_duiapplicationmenuview/ut_duiapplicationmenuview.pro +++ b/tests/ut_duiapplicationmenuview/ut_duiapplicationmenuview.pro @@ -1,7 +1,7 @@ include(../common_top.pri) TARGET = ut_duiapplicationmenuview -INCLUDEPATH += $$DUISRCDIR/widgets $$DUISRCDIR/style +INCLUDEPATH += $$DUISRCDIR/corelib/widgets $$DUISRCDIR/corelib/style # unit test and unit SOURCES += \ diff --git a/tests/ut_duiapplicationpage/ut_duiapplicationpage.pro b/tests/ut_duiapplicationpage/ut_duiapplicationpage.pro index 7571e5c60..137b3434b 100644 --- a/tests/ut_duiapplicationpage/ut_duiapplicationpage.pro +++ b/tests/ut_duiapplicationpage/ut_duiapplicationpage.pro @@ -1,6 +1,6 @@ include(../common_top.pri) TARGET = ut_duiapplicationpage -INCLUDEPATH += $$DUISRCDIR/widgets \ +INCLUDEPATH += $$DUISRCDIR/corelib/widgets \ SOURCES += \ ut_duiapplicationpage.cpp diff --git a/tests/ut_duiapplicationservice/ut_duiapplicationservice.pro b/tests/ut_duiapplicationservice/ut_duiapplicationservice.pro index 65e983547..d36d55db1 100644 --- a/tests/ut_duiapplicationservice/ut_duiapplicationservice.pro +++ b/tests/ut_duiapplicationservice/ut_duiapplicationservice.pro @@ -1,11 +1,11 @@ include(../common_top.pri) -INCLUDEPATH += $$DUISRCDIR/core +INCLUDEPATH += $$DUISRCDIR/corelib/core TARGET = ut_duiapplicationservice # unit test and unit SOURCES = \ ut_duiapplicationservice.cpp \ - $$DUISRCDIR/core/duiapplicationservice.cpp \ + $$DUISRCDIR/corelib/core/duiapplicationservice.cpp \ # unit test and unit HEADERS += \ diff --git a/tests/ut_duiapplicationwindow/ut_duiapplicationwindow.pro b/tests/ut_duiapplicationwindow/ut_duiapplicationwindow.pro index 9a07cbac9..c459fdbfe 100644 --- a/tests/ut_duiapplicationwindow/ut_duiapplicationwindow.pro +++ b/tests/ut_duiapplicationwindow/ut_duiapplicationwindow.pro @@ -1,7 +1,7 @@ include(../common_top.pri) TARGET = ut_duiapplicationwindow -INCLUDEPATH += $$DUISRCDIR/core $$DUISRCDIR/scene $$DUISRCDIR/widgets +INCLUDEPATH += $$DUISRCDIR/corelib/core $$DUISRCDIR/scene $$DUISRCDIR/corelib/widgets SOURCES += \ ut_duiapplicationwindow.cpp \ diff --git a/tests/ut_duibutton/ut_duibutton.pro b/tests/ut_duibutton/ut_duibutton.pro index ea6b0c58e..9fdf1b24a 100644 --- a/tests/ut_duibutton/ut_duibutton.pro +++ b/tests/ut_duibutton/ut_duibutton.pro @@ -1,5 +1,5 @@ include(../common_top.pri) -INCLUDEPATH += $$DUISRCDIR/widgets $$DUISRCDIR/style +INCLUDEPATH += $$DUISRCDIR/corelib/widgets $$DUISRCDIR/corelib/style TARGET = ut_duibutton diff --git a/tests/ut_duibuttongroup/ut_duibuttongroup.pro b/tests/ut_duibuttongroup/ut_duibuttongroup.pro index 6aadb8eee..3b0514ece 100644 --- a/tests/ut_duibuttongroup/ut_duibuttongroup.pro +++ b/tests/ut_duibuttongroup/ut_duibuttongroup.pro @@ -1,5 +1,5 @@ include(../common_top.pri) -INCLUDEPATH += $$DUISRCDIR/widgets +INCLUDEPATH += $$DUISRCDIR/corelib/widgets TARGET = ut_duibuttongroup diff --git a/tests/ut_duibuttonview/ut_duibuttonview.pro b/tests/ut_duibuttonview/ut_duibuttonview.pro index 81669be98..23a22331c 100644 --- a/tests/ut_duibuttonview/ut_duibuttonview.pro +++ b/tests/ut_duibuttonview/ut_duibuttonview.pro @@ -1,6 +1,6 @@ include(../common_top.pri) -INCLUDEPATH += $$DUISRCDIR/widgets $$DUISRCDIR/style +INCLUDEPATH += $$DUISRCDIR/corelib/widgets $$DUISRCDIR/corelib/style TARGET = ut_duibuttonview diff --git a/tests/ut_duicombobox/ut_duicombobox.pro b/tests/ut_duicombobox/ut_duicombobox.pro index cc0d9f366..39087bb33 100644 --- a/tests/ut_duicombobox/ut_duicombobox.pro +++ b/tests/ut_duicombobox/ut_duicombobox.pro @@ -13,7 +13,8 @@ HEADERS += \ ut_duicombobox.h INCLUDEPATH += \ - ../../src/widgets/views \ - ../../src/widgets \ + ../../src/corelib/widgets/views \ + ../../src/corelib/widgets \ + ../../src/views \ include(../common_bot.pri) diff --git a/tests/ut_duicompleter/ut_duicompleter.pro b/tests/ut_duicompleter/ut_duicompleter.pro index 23b17700c..9d943cdce 100644 --- a/tests/ut_duicompleter/ut_duicompleter.pro +++ b/tests/ut_duicompleter/ut_duicompleter.pro @@ -11,6 +11,6 @@ HEADERS += \ $$STUBSDIR/duiwidgetview_stub.h \ ut_duicompleter.h \ -INCLUDEPATH += $$DUISRCDIR/widgets/ +INCLUDEPATH += $$DUISRCDIR/corelib/widgets/ include(../common_bot.pri) diff --git a/tests/ut_duicontainer/ut_duicontainer.pro b/tests/ut_duicontainer/ut_duicontainer.pro index 886d82660..fae70a6bf 100644 --- a/tests/ut_duicontainer/ut_duicontainer.pro +++ b/tests/ut_duicontainer/ut_duicontainer.pro @@ -1,5 +1,5 @@ include(../common_top.pri) -INCLUDEPATH += $$DUISRCDIR/widgets $$DUISRCDIR/style +INCLUDEPATH += $$DUISRCDIR/corelib/widgets $$DUISRCDIR/corelib/style TARGET = ut_duicontainer diff --git a/tests/ut_duidesktopentry/ut_duidesktopentry.pro b/tests/ut_duidesktopentry/ut_duidesktopentry.pro index 366ce4464..e2bb9df79 100644 --- a/tests/ut_duidesktopentry/ut_duidesktopentry.pro +++ b/tests/ut_duidesktopentry/ut_duidesktopentry.pro @@ -1,20 +1,21 @@ include(../common_top.pri) -LIBS -= ../../lib/libdui.so +#LIBS -= -lduicore +#LIBS -= -lduiviews TARGET = ut_duidesktopentry HEADERS += ut_duidesktopentry.h \ - $$DUISRCDIR/core/duidesktopentry.h \ - $$DUISRCDIR/core/duidesktopentry_p.h \ + $$DUISRCDIR/corelib/core/duidesktopentry.h \ + $$DUISRCDIR/corelib/core/duidesktopentry_p.h \ $$DUISRCDIR/i18n/duilocale.h \ $$STUBSDIR/stubbase.h SOURCES += ut_duidesktopentry.cpp \ - $$DUISRCDIR/core/duidesktopentry.cpp \ + $$DUISRCDIR/corelib/core/duidesktopentry.cpp \ $$STUBSDIR/stubbase.cpp -INCLUDEPATH += $$DUISRCDIR/core +INCLUDEPATH += $$DUISRCDIR/corelib/core include(../common_bot.pri) diff --git a/tests/ut_duidialog/ut_duidialog.pro b/tests/ut_duidialog/ut_duidialog.pro index 00fd5f298..79ff44dc2 100644 --- a/tests/ut_duidialog/ut_duidialog.pro +++ b/tests/ut_duidialog/ut_duidialog.pro @@ -1,5 +1,5 @@ include(../common_top.pri) -INCLUDEPATH += $$DUISRCDIR/widgets $$DUISRCDIR/style +INCLUDEPATH += $$DUISRCDIR/corelib/widgets $$DUISRCDIR/corelib/style TARGET = ut_duidialog diff --git a/tests/ut_duidialogview/ut_duidialogview.pro b/tests/ut_duidialogview/ut_duidialogview.pro index 09dee2efc..17cd78ab5 100644 --- a/tests/ut_duidialogview/ut_duidialogview.pro +++ b/tests/ut_duidialogview/ut_duidialogview.pro @@ -1,6 +1,6 @@ include(../common_top.pri) -INCLUDEPATH += $$DUISRCDIR/widgets $$DUISRCDIR/style +INCLUDEPATH += $$DUISRCDIR/corelib/widgets $$DUISRCDIR/corelib/style TARGET = ut_duidialogview diff --git a/tests/ut_duiextensionarea/ut_duiextensionarea.pro b/tests/ut_duiextensionarea/ut_duiextensionarea.pro index c7f34a070..b5e19aef3 100644 --- a/tests/ut_duiextensionarea/ut_duiextensionarea.pro +++ b/tests/ut_duiextensionarea/ut_duiextensionarea.pro @@ -1,17 +1,16 @@ include(../common_top.pri) -TARGET = ut_duiextensionarea +include(../common_duiextensions.pri) + INCLUDEPATH += \ - $$DUISRCDIR/applicationextension \ - $$DUISRCDIR/mashup/mashup \ - $$DUISRCDIR/widgets \ - $$DUISRCDIR/style + $$DUISRCDIR/corelib/widgets \ + $$DUISRCDIR/corelib/style # unit test and unit classes SOURCES += \ ut_duiextensionarea.cpp \ - $$DUISRCDIR/applicationextension/duiextensionarea.cpp \ - $$DUISRCDIR/widgets/core/duiwidgetcontroller.cpp \ - $$DUISRCDIR/widgets/core/duiwidget.cpp + $$DUISRCDIR/extensions/applicationextension/duiextensionarea.cpp \ + $$DUISRCDIR/corelib/widgets/core/duiwidgetcontroller.cpp \ + $$DUISRCDIR/corelib/widgets/core/duiwidget.cpp # service classes SOURCES += \ @@ -20,12 +19,12 @@ SOURCES += \ # unit test and unit classes HEADERS += \ ut_duiextensionarea.h \ - $$DUISRCDIR/applicationextension/duiextensionarea.h \ - $$DUISRCDIR/mashup/mashup/duiappletinstancemanager.h \ - $$DUISRCDIR/mashup/mashup/duiappletid.h \ - $$DUISRCDIR/widgets/core/duiwidgetcontroller_p.h \ - $$DUISRCDIR/widgets/core/duiwidget_p.h \ - $$DUISRCDIR/widgets/duiscenewindow_p.h \ - $$DUISRCDIR/widgets/duiobjectmenu.h + $$DUISRCDIR/extensions/applicationextension/duiextensionarea.h \ + $$DUISRCDIR/extensions/mashup/mashup/duiappletinstancemanager.h \ + $$DUISRCDIR/extensions/mashup/mashup/duiappletid.h \ + $$DUISRCDIR/corelib/widgets/core/duiwidgetcontroller_p.h \ + $$DUISRCDIR/corelib/widgets/core/duiwidget_p.h \ + $$DUISRCDIR/corelib/widgets/duiscenewindow_p.h \ + $$DUISRCDIR/corelib/widgets/duiobjectmenu.h include(../common_bot.pri) diff --git a/tests/ut_duiextensionhandle/ut_duiextensionhandle.cpp b/tests/ut_duiextensionhandle/ut_duiextensionhandle.cpp index 8eb734e10..f92373fb6 100644 --- a/tests/ut_duiextensionhandle/ut_duiextensionhandle.cpp +++ b/tests/ut_duiextensionhandle/ut_duiextensionhandle.cpp @@ -265,8 +265,9 @@ void Ut_DuiExtensionHandle::init() connect(this, SIGNAL(connectionFromRunnerEstablished()), handle, SLOT(connectionEstablished())); connect(this, SIGNAL(widgetVisibilityChanged(bool)), handle, SLOT(visibilityEvent(bool))); connect(this, SIGNAL(applicationVisibilityChanged(bool)), handle, SLOT(applicationVisibilityChanged(bool))); - connect(this, SIGNAL(operationComplete(QString, QString, QString)), handle->privateClass(), SLOT(operationComplete(QString, QString, QString))); - connect(this, SIGNAL(operationProgress(QString, QString, int)), handle->privateClass(), SLOT(operationProgress(QString, QString, int))); + connect(this, SIGNAL(operationComplete(QString, QString, QString)), handle, SLOT(operationComplete(QString, QString, QString))); + connect(this, SIGNAL(operationProgress(QString, QString, int)), handle, SLOT(operationProgress(QString, QString, int))); + listenForConnection = true; elapsedQTime = 0; timerCalled = false; diff --git a/tests/ut_duiextensionhandle/ut_duiextensionhandle.pro b/tests/ut_duiextensionhandle/ut_duiextensionhandle.pro index 448a914ef..903154215 100644 --- a/tests/ut_duiextensionhandle/ut_duiextensionhandle.pro +++ b/tests/ut_duiextensionhandle/ut_duiextensionhandle.pro @@ -1,11 +1,9 @@ include(../common_top.pri) +include(../common_duiextensions.pri) -TARGET = ut_duiextensionhandle -INCLUDEPATH += $$DUISRCDIR/applicationextension \ - $$DUISRCDIR/mashup/mashup \ - $$DUISRCDIR/mashup/appletcommunication \ - $$DUISRCDIR/widgets \ - $$DUISRCDIR/style +INCLUDEPATH += \ + $$DUISRCDIR/corelib/widgets \ + $$DUISRCDIR/corelib/style QT += xml win32 { @@ -34,29 +32,29 @@ duigenerator_style.CONFIG = target_predeps no_link duigenerator_style.variable_out = GENERATED_SOURCES QMAKE_EXTRA_COMPILERS += duigenerator_model duigenerator_style -MODEL_HEADERS += $$DUISRCDIR/widgets/duiwidgetmodel.h \ - $$DUISRCDIR/applicationextension/duiextensionhandlemodel.h +MODEL_HEADERS += $$DUISRCDIR/corelib/widgets/duiwidgetmodel.h \ + $$DUISRCDIR/extensions/applicationextension/duiextensionhandlemodel.h -STYLE_HEADERS += $$DUISRCDIR/style/duiextensionhandlestyle.h +STYLE_HEADERS += $$DUISRCDIR/extensions/style/duiextensionhandlestyle.h SOURCES += ut_duiextensionhandle.cpp \ - $$DUISRCDIR/applicationextension/duiextensionhandle.cpp \ - $$DUISRCDIR/widgets/core/duiwidgetcontroller.cpp \ - $$DUISRCDIR/widgets/duiwidgetmodel.cpp + $$DUISRCDIR/extensions/applicationextension/duiextensionhandle.cpp \ + $$DUISRCDIR/corelib/widgets/core/duiwidgetcontroller.cpp \ + $$DUISRCDIR/corelib/widgets/duiwidgetmodel.cpp # service classes SOURCES += \ $$STUBSDIR/stubbase.cpp \ HEADERS += ut_duiextensionhandle.h \ - $$DUISRCDIR/applicationextension/duiextensionhandle.h \ - $$DUISRCDIR/applicationextension/duiextensionhandle_p.h \ - $$DUISRCDIR/applicationextension/duiextensionhandlemodel.h \ - $$DUISRCDIR/widgets/core/duiwidgetcontroller_p.h \ - $$DUISRCDIR/widgets/core/duiwidget_p.h \ - $$DUISRCDIR/widgets/duiwidgetmodel_p.h \ - $$DUISRCDIR/widgets/duiscenewindow_p.h \ - $$DUISRCDIR/widgets/duiobjectmenu.h \ - $$DUISRCDIR/style/duiextensionhandlestyle.h + $$DUISRCDIR/extensions/applicationextension/duiextensionhandle.h \ + $$DUISRCDIR/extensions/applicationextension/duiextensionhandle_p.h \ + $$DUISRCDIR/extensions/applicationextension/duiextensionhandlemodel.h \ + $$DUISRCDIR/corelib/widgets/core/duiwidgetcontroller_p.h \ + $$DUISRCDIR/corelib/widgets/core/duiwidget_p.h \ + $$DUISRCDIR/corelib/widgets/duiwidgetmodel_p.h \ + $$DUISRCDIR/corelib/widgets/duiscenewindow_p.h \ + $$DUISRCDIR/corelib/widgets/duiobjectmenu.h \ + $$DUISRCDIR/extensions/style/duiextensionhandlestyle.h include(../common_bot.pri) diff --git a/tests/ut_duiextensionhandleview/dummy.cpp b/tests/ut_duiextensionhandleview/dummy.cpp new file mode 100644 index 000000000..97d33a26c --- /dev/null +++ b/tests/ut_duiextensionhandleview/dummy.cpp @@ -0,0 +1,12 @@ +#include "duiextensionhandle_p.h" + +void DuiExtensionHandlePrivate::operationComplete(QString const&, +QString const&, QString const&) +{ +} + +void DuiExtensionHandlePrivate::operationProgress(QString const&, QString const&, int) +{ +} + +#include "moc_duiextensionhandle.cpp" diff --git a/tests/ut_duiextensionhandleview/ut_duiextensionhandleview.pro b/tests/ut_duiextensionhandleview/ut_duiextensionhandleview.pro index 36461351b..0bd73ca84 100644 --- a/tests/ut_duiextensionhandleview/ut_duiextensionhandleview.pro +++ b/tests/ut_duiextensionhandleview/ut_duiextensionhandleview.pro @@ -1,13 +1,11 @@ include(../common_top.pri) +include(../common_duiextensions.pri) -TARGET = ut_duiextensionhandleview -INCLUDEPATH += $$DUISRCDIR/applicationextension \ - $$DUISRCDIR/mashup/appletcommunication \ - $$DUISRCDIR/mashup/mashup \ - $$DUISRCDIR/widgets \ - $$DUISRCDIR/widgets/core \ - $$DUISRCDIR/core \ - $$DUISRCDIR/style +INCLUDEPATH += \ + $$DUISRCDIR/corelib/widgets \ + $$DUISRCDIR/corelib/widgets/core \ + $$DUISRCDIR/corelib/core \ + $$DUISRCDIR/corelib/style DUIGEN_OUTDIR = . duigenerator_model.name = duigenerator model @@ -28,22 +26,23 @@ duigenerator_style.CONFIG = target_predeps no_link duigenerator_style.variable_out = GENERATED_SOURCES QMAKE_EXTRA_COMPILERS += duigenerator_model duigenerator_style -MODEL_HEADERS += $$DUISRCDIR/widgets/duiwidgetmodel.h \ - $$DUISRCDIR/applicationextension/duiextensionhandlemodel.h +MODEL_HEADERS += $$DUISRCDIR/corelib/widgets/duiwidgetmodel.h \ + $$DUISRCDIR/extensions/applicationextension/duiextensionhandlemodel.h -STYLE_HEADERS += $$DUISRCDIR/style/duiextensionhandlestyle.h +STYLE_HEADERS += $$DUISRCDIR/extensions/style/duiextensionhandlestyle.h SOURCES += ut_duiextensionhandleview.cpp \ - $$DUISRCDIR/applicationextension/duiextensionhandleview.cpp \ - $$DUISRCDIR/widgets/duiwidgetmodel.cpp \ - ../stubs/stubbase.cpp + $$DUISRCDIR/extensions/applicationextension/duiextensionhandleview.cpp \ + $$DUISRCDIR/corelib/widgets/duiwidgetmodel.cpp \ + dummy.cpp \ + ../stubs/stubbase.cpp HEADERS += ut_duiextensionhandleview.h \ - $$DUISRCDIR/applicationextension/duiextensionhandleview.h \ - $$DUISRCDIR/applicationextension/duiextensionhandle.h \ - $$DUISRCDIR/applicationextension/duiextensionhandlemodel.h \ - $$DUISRCDIR/widgets/duiwidgetmodel_p.h \ - $$DUISRCDIR/widgets/core/duiwidgetview_p.h \ - $$DUISRCDIR/style/duiextensionhandlestyle.h + $$DUISRCDIR/extensions/applicationextension/duiextensionhandleview.h \ + $$DUISRCDIR/extensions/applicationextension/duiextensionhandle.h \ + $$DUISRCDIR/extensions/applicationextension/duiextensionhandlemodel.h \ + $$DUISRCDIR/corelib/widgets/duiwidgetmodel_p.h \ + $$DUISRCDIR/corelib/widgets/core/duiwidgetview_p.h \ + $$DUISRCDIR/extensions/style/duiextensionhandlestyle.h include(../common_bot.pri) diff --git a/tests/ut_duiextensionrunner/ut_duiextensionrunner.pro b/tests/ut_duiextensionrunner/ut_duiextensionrunner.pro index 92892a439..0d7682dd8 100644 --- a/tests/ut_duiextensionrunner/ut_duiextensionrunner.pro +++ b/tests/ut_duiextensionrunner/ut_duiextensionrunner.pro @@ -1,18 +1,13 @@ include(../common_top.pri) - -TARGET = ut_duiextensionrunner - -INCLUDEPATH += $$DUISRCDIR/applicationextension \ - $$DUISRCDIR/mashup/appletcommunication \ - $$DUISRCDIR/mashup/mashup +include(../common_duiextensions.pri) QT += network xml SOURCES += ut_duiextensionrunner.cpp \ - $$DUISRCDIR/applicationextension/duiextensionrunner.cpp \ + $$DUISRCDIR/extensions/applicationextension/duiextensionrunner.cpp \ ../stubs/stubbase.cpp HEADERS += ut_duiextensionrunner.h \ - $$DUISRCDIR/applicationextension/duiextensionrunner.h + $$DUISRCDIR/extensions/applicationextension/duiextensionrunner.h include(../common_bot.pri) diff --git a/tests/ut_duifeedback/ut_duifeedback.pro b/tests/ut_duifeedback/ut_duifeedback.pro index 09f246231..cc5fdc998 100644 --- a/tests/ut_duifeedback/ut_duifeedback.pro +++ b/tests/ut_duifeedback/ut_duifeedback.pro @@ -1,56 +1,16 @@ -#include(../common_top.pri) +include(../common_top.pri) -# **************************************************************************** -# This is the contents of "../common_top.pri" modified so that libdui library -# is not included. (It's not needed with this test) -# **************************************************************************** -include(../check.pri) +# FIXME holger check -# for defines -include(../../mkspecs/common.pri) - -DUISRCDIR = ../../src -#STUBSDIR = ../stubs -#INCLUDEPATH += . $$DUISRCDIR/include -#DEPENDPATH = $$INCLUDEPATH -#QMAKE_LIBDIR += ../../lib /usr/local/lib -CONFIG += debug -QT += testlib -TEMPLATE = app -# DEFINES += QT_NO_DEBUG_OUTPUT -DEFINES += UNIT_TEST -target.path = $$[QT_INSTALL_LIBS]/libdui-tests -INSTALLS += target - -#win32|macx { -# macx { -# QMAKE_LFLAGS += -F../../lib -# LIBS += -framework dui -# } -# win32:LIBS += -L../../lib -ldui0 -#} else { -# LIBS += ../../lib/libdui.so -#} - -QMAKE_CXXFLAGS += -Werror - -support_files.files = -support_files.path = $$[QT_INSTALL_LIBS]/libdui-tests -INSTALLS += support_files - -# **************************************************************************** -# "../common_top.pri" ends. -# **************************************************************************** - -INCLUDEPATH += $$DUISRCDIR/feedback +INCLUDEPATH += $$DUISRCDIR/corelib/feedback TARGET = ut_duifeedback -TESTED_SOURCES = $$DUISRCDIR/feedback/duifeedback.cpp \ - $$DUISRCDIR/feedback/duifeedback_p.cpp +TESTED_SOURCES = $$DUISRCDIR/corelib/feedback/duifeedback.cpp \ + $$DUISRCDIR/corelib/feedback/duifeedback_p.cpp -TESTED_HEADERS = $$DUISRCDIR/feedback/duifeedback.h \ - $$DUISRCDIR/feedback/duifeedback_p.h +TESTED_HEADERS = $$DUISRCDIR/corelib/feedback/duifeedback.h \ + $$DUISRCDIR/corelib/feedback/duifeedback_p.h copysourcefiles.input = TESTED_SOURCES copysourcefiles.output = ${QMAKE_FILE_BASE}.cpp diff --git a/tests/ut_duifeedbackplayer/ut_duifeedbackplayer.pro b/tests/ut_duifeedbackplayer/ut_duifeedbackplayer.pro index 8c63d1a05..3fb211cf8 100644 --- a/tests/ut_duifeedbackplayer/ut_duifeedbackplayer.pro +++ b/tests/ut_duifeedbackplayer/ut_duifeedbackplayer.pro @@ -1,56 +1,16 @@ -#include(../common_top.pri) +include(../common_top.pri) -# **************************************************************************** -# This is the contents of "../common_top.pri" modified so that libdui library -# is not included. (It's not needed with this test) -# **************************************************************************** -include(../check.pri) +#FIXME holger check -# for defines -include(../../mkspecs/common.pri) - -DUISRCDIR = ../../src -#STUBSDIR = ../stubs -INCLUDEPATH += . $$DUISRCDIR/include -#DEPENDPATH = $$INCLUDEPATH -#QMAKE_LIBDIR += ../../lib /usr/local/lib -CONFIG += debug -QT += testlib -TEMPLATE = app -# DEFINES += QT_NO_DEBUG_OUTPUT -DEFINES += UNIT_TEST -target.path = $$[QT_INSTALL_LIBS]/libdui-tests -INSTALLS += target - -#win32|macx { -# macx { -# QMAKE_LFLAGS += -F../../lib -# LIBS += -framework dui -# } -# win32:LIBS += -L../../lib -ldui0 -#} else { -# LIBS += ../../lib/libdui.so -#} - -QMAKE_CXXFLAGS += -Werror - -support_files.files = -support_files.path = $$[QT_INSTALL_LIBS]/libdui-tests -INSTALLS += support_files - -# **************************************************************************** -# "../common_top.pri" ends. -# **************************************************************************** - -INCLUDEPATH += $$DUISRCDIR/feedback +INCLUDEPATH += $$DUISRCDIR/corelib/feedback TARGET = ut_duifeedbackplayer -TESTED_SOURCES = $$DUISRCDIR/feedback/duifeedbackplayer.cpp \ - $$DUISRCDIR/feedback/duifeedbackplayer_p.cpp +TESTED_SOURCES = $$DUISRCDIR/corelib/feedback/duifeedbackplayer.cpp \ + $$DUISRCDIR/corelib/feedback/duifeedbackplayer_p.cpp -TESTED_HEADERS = $$DUISRCDIR/feedback/duifeedbackplayer.h \ - $$DUISRCDIR/feedback/duifeedbackplayer_p.h +TESTED_HEADERS = $$DUISRCDIR/corelib/feedback/duifeedbackplayer.h \ + $$DUISRCDIR/corelib/feedback/duifeedbackplayer_p.h copysourcefiles.input = TESTED_SOURCES copysourcefiles.output = ${QMAKE_FILE_BASE}.cpp diff --git a/tests/ut_duigconfdatastore/ut_duigconfdatastore.pro b/tests/ut_duigconfdatastore/ut_duigconfdatastore.pro index e08b4dad8..08bd68928 100644 --- a/tests/ut_duigconfdatastore/ut_duigconfdatastore.pro +++ b/tests/ut_duigconfdatastore/ut_duigconfdatastore.pro @@ -1,14 +1,14 @@ include(../common_top.pri) TARGET = ut_duigconfdatastore -INCLUDEPATH += $$DUISRCDIR/mashup/mashup +INCLUDEPATH += $$DUISRCDIR/extensions/mashup/mashup SOURCES += \ ut_duigconfdatastore.cpp \ - $$DUISRCDIR/mashup/mashup/duigconfdatastore.cpp + $$DUISRCDIR/extensions/mashup/mashup/duigconfdatastore.cpp HEADERS += \ ut_duigconfdatastore.h \ - $$DUISRCDIR/mashup/mashup/duigconfdatastore.h + $$DUISRCDIR/extensions/mashup/mashup/duigconfdatastore.h include(../common_bot.pri) diff --git a/tests/ut_duiinfobanner/ut_duiinfobanner.pro b/tests/ut_duiinfobanner/ut_duiinfobanner.pro index b80cc1237..a1b3026be 100644 --- a/tests/ut_duiinfobanner/ut_duiinfobanner.pro +++ b/tests/ut_duiinfobanner/ut_duiinfobanner.pro @@ -1,5 +1,5 @@ include(../common_top.pri) -INCLUDEPATH += $$DUISRCDIR/style +INCLUDEPATH += $$DUISRCDIR/corelib/style TARGET = ut_duiinfobanner # unit diff --git a/tests/ut_duiinputmethodstate/ut_duiinputmethodstate.pro b/tests/ut_duiinputmethodstate/ut_duiinputmethodstate.pro index 911d78aef..b768d1576 100644 --- a/tests/ut_duiinputmethodstate/ut_duiinputmethodstate.pro +++ b/tests/ut_duiinputmethodstate/ut_duiinputmethodstate.pro @@ -4,12 +4,12 @@ TARGET = ut_duiinputmethodstate # unit test and unit classes SOURCES += \ ut_duiinputmethodstate.cpp \ - $$DUISRCDIR/core/duiinputmethodstate.cpp + $$DUISRCDIR/corelib/core/duiinputmethodstate.cpp # unit test and unit classes HEADERS += \ ut_duiinputmethodstate.h \ - $$DUISRCDIR/core/duiinputmethodstate.h \ - $$DUISRCDIR/core/duiinputmethodstate_p.h + $$DUISRCDIR/corelib/core/duiinputmethodstate.h \ + $$DUISRCDIR/corelib/core/duiinputmethodstate_p.h include(../common_bot.pri) diff --git a/tests/ut_duilayout/ut_duilayout.cpp b/tests/ut_duilayout/ut_duilayout.cpp index f608e45eb..75109ac2b 100644 --- a/tests/ut_duilayout/ut_duilayout.cpp +++ b/tests/ut_duilayout/ut_duilayout.cpp @@ -34,7 +34,7 @@ #include #include -#include "../src/layout/duilayout_p.h" +#include "../src/corelib/layout/duilayout_p.h" #include #include diff --git a/tests/ut_duilistviewgroupheader/ut_duilistviewgroupheader.cpp b/tests/ut_duilistviewgroupheader/ut_duilistviewgroupheader.cpp index 8c100c48c..392ff50e9 100644 --- a/tests/ut_duilistviewgroupheader/ut_duilistviewgroupheader.cpp +++ b/tests/ut_duilistviewgroupheader/ut_duilistviewgroupheader.cpp @@ -18,7 +18,7 @@ ****************************************************************************/ #include -#include "../../src/widgets/views/duilistview_p.h" +#include "../../src/views/duilistview_p.h" #include "duilistmodel.h" #include "myindexedmodel.h" #include "ut_duilistviewgroupheader.h" diff --git a/tests/ut_duilistviewgroupheader/ut_duilistviewgroupheader.pro b/tests/ut_duilistviewgroupheader/ut_duilistviewgroupheader.pro index 738568690..2c470fc8d 100644 --- a/tests/ut_duilistviewgroupheader/ut_duilistviewgroupheader.pro +++ b/tests/ut_duilistviewgroupheader/ut_duilistviewgroupheader.pro @@ -8,7 +8,7 @@ HEADERS += ut_duilistviewgroupheader.h \ SOURCES += ut_duilistviewgroupheader.cpp \ ../duilistviewcommon/myindexedmodel.cpp \ - ../../src/widgets/views/duilistview_p.cpp \ - ../../src/.moc/moc_duilistview_p.cpp + ../../src/views/duilistview_p.cpp \ + ../../src/views/.moc/moc_duilistview_p.cpp include(../common_bot.pri) diff --git a/tests/ut_duilistviewmulticolumn/ut_duilistviewmulticolumn.cpp b/tests/ut_duilistviewmulticolumn/ut_duilistviewmulticolumn.cpp index be85e4fea..3a815eb96 100644 --- a/tests/ut_duilistviewmulticolumn/ut_duilistviewmulticolumn.cpp +++ b/tests/ut_duilistviewmulticolumn/ut_duilistviewmulticolumn.cpp @@ -18,7 +18,7 @@ ****************************************************************************/ #include -#include "../../src/widgets/views/duilistview_p.h" +#include "../../src/views/duilistview_p.h" #include "duilistmodel.h" #include "myindexedmodel.h" #include "ut_duilistviewmulticolumn.h" diff --git a/tests/ut_duilistviewmulticolumn/ut_duilistviewmulticolumn.pro b/tests/ut_duilistviewmulticolumn/ut_duilistviewmulticolumn.pro index 7ed13d280..0282fe6de 100644 --- a/tests/ut_duilistviewmulticolumn/ut_duilistviewmulticolumn.pro +++ b/tests/ut_duilistviewmulticolumn/ut_duilistviewmulticolumn.pro @@ -8,7 +8,7 @@ HEADERS += ut_duilistviewmulticolumn.h \ SOURCES += ut_duilistviewmulticolumn.cpp \ ../duilistviewcommon/myindexedmodel.cpp \ - ../../src/widgets/views/duilistview_p.cpp \ - ../../src/.moc/moc_duilistview_p.cpp + ../../src/views/duilistview_p.cpp \ + ../../src/views/.moc/moc_duilistview_p.cpp include(../common_bot.pri) diff --git a/tests/ut_duilistviewplain/ut_duilistviewplain.cpp b/tests/ut_duilistviewplain/ut_duilistviewplain.cpp index 27a1c7a1f..fcad57122 100644 --- a/tests/ut_duilistviewplain/ut_duilistviewplain.cpp +++ b/tests/ut_duilistviewplain/ut_duilistviewplain.cpp @@ -18,7 +18,7 @@ ****************************************************************************/ #include -#include "../../src/widgets/views/duilistview_p.h" +#include "../../src/corelib/widgets/views/duilistview_p.h" #include "duilistmodel.h" #include "ut_duilistview.h" diff --git a/tests/ut_duilistviewplain/ut_duilistviewplain.pro b/tests/ut_duilistviewplain/ut_duilistviewplain.pro index e67bb3664..bd4eab76e 100644 --- a/tests/ut_duilistviewplain/ut_duilistviewplain.pro +++ b/tests/ut_duilistviewplain/ut_duilistviewplain.pro @@ -6,8 +6,8 @@ INCLUDEPATH += ../ut_duilistviewcommon HEADERS += ut_duilistviewplain.h SOURCES += ut_duilistviewplain.cpp \ - ../../src/widgets/views/duilistview_p.cpp \ - ../../src/widgets/duicell.cpp \ - ../../src/.moc/moc_duilistview_p.cpp + ../../src/corelib/widgets/views/duilistview_p.cpp \ + ../../src/corelib/widgets/duicell.cpp \ + ../../src/corelib/.moc/moc_duilistview_p.cpp include(../common_bot.pri) diff --git a/tests/ut_duilistviewseparators/ut_duilistviewseparators.cpp b/tests/ut_duilistviewseparators/ut_duilistviewseparators.cpp index f63af0480..c448d57ec 100644 --- a/tests/ut_duilistviewseparators/ut_duilistviewseparators.cpp +++ b/tests/ut_duilistviewseparators/ut_duilistviewseparators.cpp @@ -18,7 +18,7 @@ ****************************************************************************/ #include -#include "../../src/widgets/views/duilistview_p.h" +#include "../../src/views/duilistview_p.h" #include "duilistmodel.h" #include "duiseparator.h" #include "myindexedmodel.h" diff --git a/tests/ut_duilistviewseparators/ut_duilistviewseparators.pro b/tests/ut_duilistviewseparators/ut_duilistviewseparators.pro index d788234db..3826fabfb 100644 --- a/tests/ut_duilistviewseparators/ut_duilistviewseparators.pro +++ b/tests/ut_duilistviewseparators/ut_duilistviewseparators.pro @@ -9,7 +9,7 @@ HEADERS += ut_duilistviewseparators.h \ SOURCES += ut_duilistviewseparators.cpp \ ../duilistviewcommon/myindexedmodel.cpp \ - ../../src/widgets/views/duilistview_p.cpp \ - ../../src/.moc/moc_duilistview_p.cpp + ../../src/views/duilistview_p.cpp \ + ../../src/views/.moc/moc_duilistview_p.cpp include(../common_bot.pri) diff --git a/tests/ut_duilogicalvalues/ut_duilogicalvalues.h b/tests/ut_duilogicalvalues/ut_duilogicalvalues.h index 5312cebe9..e9f7b9725 100644 --- a/tests/ut_duilogicalvalues/ut_duilogicalvalues.h +++ b/tests/ut_duilogicalvalues/ut_duilogicalvalues.h @@ -21,7 +21,7 @@ #define UT_DUILOGICALVALUES_H #include -#include "../../src/theme/duilogicalvalues.h" +#include "../../src/corelib/theme/duilogicalvalues.h" class Ut_DuiLogicalValues : public QObject { diff --git a/tests/ut_duilogicalvalues/ut_duilogicalvalues.pro b/tests/ut_duilogicalvalues/ut_duilogicalvalues.pro index 65bb81d57..2e9fc0006 100644 --- a/tests/ut_duilogicalvalues/ut_duilogicalvalues.pro +++ b/tests/ut_duilogicalvalues/ut_duilogicalvalues.pro @@ -5,14 +5,14 @@ LIBRARYPATH += $$DUISRCDIR SOURCES += \ ut_duilogicalvalues.cpp \ - ../../src/theme/duilogicalvalues.cpp \ - ../../src/style/duistylesheetattribute.cpp + ../../src/corelib/theme/duilogicalvalues.cpp \ + ../../src/corelib/style/duistylesheetattribute.cpp HEADERS += \ ut_duilogicalvalues.h \ - ../../src/theme/duilogicalvalues.h \ - ../../src/theme/duilogicalvalues_p.h \ - ../../src/style/duistylesheetattribute.h + ../../src/corelib/theme/duilogicalvalues.h \ + ../../src/corelib/theme/duilogicalvalues_p.h \ + ../../src/corelib/style/duistylesheetattribute.h support_files.files += *.ini diff --git a/tests/ut_duimashupcanvas/ut_duimashupcanvas.pro b/tests/ut_duimashupcanvas/ut_duimashupcanvas.pro index 1cf020b2d..e7e3ac1a5 100644 --- a/tests/ut_duimashupcanvas/ut_duimashupcanvas.pro +++ b/tests/ut_duimashupcanvas/ut_duimashupcanvas.pro @@ -1,17 +1,17 @@ include(../common_top.pri) -TARGET = ut_duimashupcanvas +include(../common_duiextensions.pri) + INCLUDEPATH += \ - $$DUISRCDIR/mashup/mashup \ - $$DUISRCDIR/widgets \ - $$DUISRCDIR/style + $$DUISRCDIR/corelib/widgets \ + $$DUISRCDIR/corelib/style # unit test and unit classes SOURCES += \ ut_duimashupcanvas.cpp \ - $$DUISRCDIR/mashup/mashup/duimashupcanvas.cpp \ - $$DUISRCDIR/widgets/core/duiwidgetcontroller.cpp \ - $$DUISRCDIR/widgets/core/duiwidget.cpp \ - $$DUISRCDIR/applicationextension/duiextensionarea.cpp + $$DUISRCDIR/extensions/mashup/mashup/duimashupcanvas.cpp \ + $$DUISRCDIR/corelib/widgets/core/duiwidgetcontroller.cpp \ + $$DUISRCDIR/corelib/widgets/core/duiwidget.cpp \ + $$DUISRCDIR/extensions/applicationextension/duiextensionarea.cpp # service classes SOURCES += \ @@ -20,12 +20,12 @@ SOURCES += \ # unit test and unit classes HEADERS += \ ut_duimashupcanvas.h \ - $$DUISRCDIR/mashup/mashup/duimashupcanvas.h \ - $$DUISRCDIR/mashup/mashup/duiappletinstancemanager.h \ - $$DUISRCDIR/mashup/mashup/duiappletid.h \ - $$DUISRCDIR/widgets/core/duiwidgetcontroller_p.h \ - $$DUISRCDIR/widgets/core/duiwidget_p.h \ - $$DUISRCDIR/widgets/duiscenewindow_p.h \ - $$DUISRCDIR/widgets/duiobjectmenu.h + $$DUISRCDIR/extensions/mashup/mashup/duimashupcanvas.h \ + $$DUISRCDIR/extensions/mashup/mashup/duiappletinstancemanager.h \ + $$DUISRCDIR/extensions/mashup/mashup/duiappletid.h \ + $$DUISRCDIR/corelib/widgets/core/duiwidgetcontroller_p.h \ + $$DUISRCDIR/corelib/widgets/core/duiwidget_p.h \ + $$DUISRCDIR/corelib/widgets/duiscenewindow_p.h \ + $$DUISRCDIR/corelib/widgets/duiobjectmenu.h include(../common_bot.pri) diff --git a/tests/ut_duimashupcanvasview/ut_duimashupcanvasview.pro b/tests/ut_duimashupcanvasview/ut_duimashupcanvasview.pro index b12e57ba3..21ccad0cb 100644 --- a/tests/ut_duimashupcanvasview/ut_duimashupcanvasview.pro +++ b/tests/ut_duimashupcanvasview/ut_duimashupcanvasview.pro @@ -1,6 +1,5 @@ include(../common_top.pri) -TARGET = ut_duimashupcanvasview -INCLUDEPATH += $$DUISRCDIR/mashup/appletcommunication $$DUISRCDIR/mashup/appletinterface $$DUISRCDIR/mashup/mashup $$DUISRCDIR/layout $$DUISRCDIR/style +include(../common_duiextensions.pri) QT += core network gui svg dbus diff --git a/tests/ut_duimulticolumnlistview/ut_duimulticolumnlistview.cpp b/tests/ut_duimulticolumnlistview/ut_duimulticolumnlistview.cpp index c6e8103fb..4ebb112c5 100644 --- a/tests/ut_duimulticolumnlistview/ut_duimulticolumnlistview.cpp +++ b/tests/ut_duimulticolumnlistview/ut_duimulticolumnlistview.cpp @@ -18,7 +18,7 @@ ****************************************************************************/ #include -#include "../../src/widgets/views/duilistview_p.h" +#include "../../src/corelib/widgets/views/duilistview_p.h" #include "duilistmodel.h" #include "myindexedmodel.h" #include "ut_duilistview.h" diff --git a/tests/ut_duimulticolumnlistview/ut_duimulticolumnlistview.pro b/tests/ut_duimulticolumnlistview/ut_duimulticolumnlistview.pro index efd23cfef..33ab14205 100644 --- a/tests/ut_duimulticolumnlistview/ut_duimulticolumnlistview.pro +++ b/tests/ut_duimulticolumnlistview/ut_duimulticolumnlistview.pro @@ -3,6 +3,6 @@ include(../common_top.pri) TARGET = ut_duimulticolumnlistview HEADERS += ut_duimulticolumnlistview.h myindexedmodel.h -SOURCES += ut_duimulticolumnlistview.cpp myindexedmodel.cpp ../../src/widgets/views/duilistview_p.cpp ../../src/.moc/moc_duilistview_p.cpp +SOURCES += ut_duimulticolumnlistview.cpp myindexedmodel.cpp ../../src/corelib/widgets/views/duilistview_p.cpp ../../src/corelib/.moc/moc_duilistview_p.cpp include(../common_bot.pri) diff --git a/tests/ut_duinavigationbar/ut_duinavigationbar.pro b/tests/ut_duinavigationbar/ut_duinavigationbar.pro index cc0d46453..9242d7908 100644 --- a/tests/ut_duinavigationbar/ut_duinavigationbar.pro +++ b/tests/ut_duinavigationbar/ut_duinavigationbar.pro @@ -2,7 +2,7 @@ include(../common_top.pri) TARGET = ut_duinavigationbar -INCLUDEPATH += $$DUISRCDIR/widgets $$DUISRCDIR/style $$DUISRCDIR/scene +INCLUDEPATH += $$DUISRCDIR/corelib/widgets $$DUISRCDIR/corelib/style $$DUISRCDIR/scene SOURCES += \ ut_duinavigationbar.cpp \ diff --git a/tests/ut_duinotification/ut_duinotification.pro b/tests/ut_duinotification/ut_duinotification.pro index 1665112e7..0dfbbd482 100644 --- a/tests/ut_duinotification/ut_duinotification.pro +++ b/tests/ut_duinotification/ut_duinotification.pro @@ -1,11 +1,11 @@ include(../common_top.pri) TARGET = ut_duinotification -INCLUDEPATH += $$DUISRCDIR/notification +INCLUDEPATH += $$DUISRCDIR/corelib/notification # unit test and unit SOURCES += \ ut_duinotification.cpp \ - $$DUISRCDIR/notification/duinotification.cpp + $$DUISRCDIR/corelib/notification/duinotification.cpp # service classes SOURCES += \ @@ -14,10 +14,10 @@ SOURCES += \ # unit test and unit HEADERS += \ ut_duinotification.h \ - $$DUISRCDIR/notification/duinotification.h \ - $$DUISRCDIR/notification/duinotificationmanager.h \ - $$DUISRCDIR/notification/duinotificationmanagerproxy.h \ - $$DUISRCDIR/core/duiremoteaction.h \ - $$DUISRCDIR/core/duiaction.h + $$DUISRCDIR/corelib/notification/duinotification.h \ + $$DUISRCDIR/corelib/notification/duinotificationmanager.h \ + $$DUISRCDIR/corelib/notification/duinotificationmanagerproxy.h \ + $$DUISRCDIR/corelib/core/duiremoteaction.h \ + $$DUISRCDIR/corelib/core/duiaction.h include(../common_bot.pri) diff --git a/tests/ut_duinotificationmanager/ut_duinotificationmanager.pro b/tests/ut_duinotificationmanager/ut_duinotificationmanager.pro index 0d669fce3..1c40d6e85 100644 --- a/tests/ut_duinotificationmanager/ut_duinotificationmanager.pro +++ b/tests/ut_duinotificationmanager/ut_duinotificationmanager.pro @@ -1,24 +1,23 @@ include(../common_top.pri) TARGET = ut_duinotificationmanager -INCLUDEPATH += $$DUISRCDIR/notification \ - $$DUISRCDIR/mashup/mashup +INCLUDEPATH += $$DUISRCDIR/corelib/notification # unit test and unit SOURCES += \ ut_duinotificationmanager.cpp \ - $$DUISRCDIR/notification/duinotificationmanager.cpp \ - $$DUISRCDIR/notification/duinotification.cpp \ - $$DUISRCDIR/notification/duinotificationgroup.cpp + $$DUISRCDIR/corelib/notification/duinotificationmanager.cpp \ + $$DUISRCDIR/corelib/notification/duinotification.cpp \ + $$DUISRCDIR/corelib/notification/duinotificationgroup.cpp # unit test and unit HEADERS += \ ut_duinotificationmanager.h \ - $$DUISRCDIR/notification/duinotificationmanager.h \ - $$DUISRCDIR/notification/duinotification.h \ - $$DUISRCDIR/notification/duinotificationgroup.h + $$DUISRCDIR/corelib/notification/duinotificationmanager.h \ + $$DUISRCDIR/corelib/notification/duinotification.h \ + $$DUISRCDIR/corelib/notification/duinotificationgroup.h # service classes HEADERS += \ - $$DUISRCDIR/notification/duinotificationmanagerproxy.h + $$DUISRCDIR/corelib/notification/duinotificationmanagerproxy.h include(../common_bot.pri) diff --git a/tests/ut_duiobjectmenu/ut_duiobjectmenu.pro b/tests/ut_duiobjectmenu/ut_duiobjectmenu.pro index 9c1737999..d62ad8df2 100644 --- a/tests/ut_duiobjectmenu/ut_duiobjectmenu.pro +++ b/tests/ut_duiobjectmenu/ut_duiobjectmenu.pro @@ -1,5 +1,5 @@ include(../common_top.pri) -INCLUDEPATH += $$DUISRCDIR/widgets $$DUISRCDIR/style +INCLUDEPATH += $$DUISRCDIR/corelib/widgets $$DUISRCDIR/corelib/style TARGET = ut_duiobjectmenu diff --git a/tests/ut_duioverlay/ut_duioverlay.pro b/tests/ut_duioverlay/ut_duioverlay.pro index e588c2ca0..9532eafdf 100644 --- a/tests/ut_duioverlay/ut_duioverlay.pro +++ b/tests/ut_duioverlay/ut_duioverlay.pro @@ -1,5 +1,5 @@ include(../common_top.pri) -INCLUDEPATH += $$DUISRCDIR/widgets $$DUISRCDIR/style +INCLUDEPATH += $$DUISRCDIR/corelib/widgets $$DUISRCDIR/corelib/style TARGET = ut_duioverlay diff --git a/tests/ut_duipannableviewport/ut_duipannableviewport.cpp b/tests/ut_duipannableviewport/ut_duipannableviewport.cpp index cdab29008..8ab4ed5bf 100644 --- a/tests/ut_duipannableviewport/ut_duipannableviewport.cpp +++ b/tests/ut_duipannableviewport/ut_duipannableviewport.cpp @@ -21,7 +21,7 @@ #include #include #include -#include "../../src/widgets/duipannableviewport_p.h" +#include "../../src/corelib/widgets/duipannableviewport_p.h" #include #include #include diff --git a/tests/ut_duipannablewidget/ut_duipannablewidget.cpp b/tests/ut_duipannablewidget/ut_duipannablewidget.cpp index 8ee066f57..f1407f39f 100644 --- a/tests/ut_duipannablewidget/ut_duipannablewidget.cpp +++ b/tests/ut_duipannablewidget/ut_duipannablewidget.cpp @@ -21,8 +21,8 @@ #include "duiapplication.h" #include #include -#include "../../src/widgets/duipannablewidget_p.h" -#include "../../src/widgets/duiphysics2dpanning_p.h" +#include "../../src/corelib/widgets/duipannablewidget_p.h" +#include "../../src/corelib/widgets/duiphysics2dpanning_p.h" #include #include diff --git a/tests/ut_duiphysics2dpanning/ut_duiphysics2dpanning.cpp b/tests/ut_duiphysics2dpanning/ut_duiphysics2dpanning.cpp index bfd445c1f..290323248 100644 --- a/tests/ut_duiphysics2dpanning/ut_duiphysics2dpanning.cpp +++ b/tests/ut_duiphysics2dpanning/ut_duiphysics2dpanning.cpp @@ -23,7 +23,7 @@ #include #include #include -#include "../../src/widgets/duiphysics2dpanning_p.h" +#include "../../src/corelib/widgets/duiphysics2dpanning_p.h" #include #include diff --git a/tests/ut_duiphysics2dpanning/ut_duiphysics2dpanning.pro b/tests/ut_duiphysics2dpanning/ut_duiphysics2dpanning.pro index 394ee9b17..61765eaf3 100644 --- a/tests/ut_duiphysics2dpanning/ut_duiphysics2dpanning.pro +++ b/tests/ut_duiphysics2dpanning/ut_duiphysics2dpanning.pro @@ -1,13 +1,13 @@ include(../common_top.pri) -INCLUDEPATH += $$DUISRCDIR/.moc +INCLUDEPATH += $$DUISRCDIR/corelib/.moc TARGET = ut_duiphysics2dpanning # unit test and unit SOURCES += \ ut_duiphysics2dpanning.cpp \ - ../../src/widgets/duiphysics2dpanning.cpp \ + ../../src/corelib/widgets/duiphysics2dpanning.cpp \ # unit test and unit HEADERS += \ diff --git a/tests/ut_duipopuplist/ut_duipopuplist.pro b/tests/ut_duipopuplist/ut_duipopuplist.pro index 9c9e45db0..15a883422 100644 --- a/tests/ut_duipopuplist/ut_duipopuplist.pro +++ b/tests/ut_duipopuplist/ut_duipopuplist.pro @@ -6,27 +6,30 @@ TARGET = ut_duipopuplist # unit test and unit SOURCES += \ ut_duipopuplist.cpp \ - ../../src/widgets/views/duidialogview.cpp \ - ../../src/widgets/views/duibuttongrouplayoutpolicy_p.cpp \ - ../../src/widgets/views/duiscenewindowview.cpp \ - ../../src/widgets/core/duiwidgetview.cpp \ - ../../src/animation/widget/core/duiabstractwidgetanimation.cpp \ - ../../src/.moc/moc_duiabstractwidgetanimation.cpp \ - ../../src/widgets/duicontentitemmodel.cpp \ - ../../src/.moc/moc_duicontentitemmodel.cpp \ - ../../src/.gen/gen_duicontentitemmodeldata.cpp \ + ../../src/views/duidialogview.cpp \ + ../../src/views/duibuttongrouplayoutpolicy_p.cpp \ + ../../src/views/duiscenewindowview.cpp \ + ../../src/corelib/widgets/core/duiwidgetview.cpp \ + ../../src/corelib/animation/widget/core/duiabstractwidgetanimation.cpp \ + ../../src/corelib/.moc/moc_duiabstractwidgetanimation.cpp \ + ../../src/corelib/widgets/duicontentitemmodel.cpp \ + ../../src/corelib/.moc/moc_duicontentitemmodel.cpp \ + ../../src/corelib/.gen/gen_duicontentitemmodeldata.cpp \ # unit test and unit HEADERS += \ ut_duipopuplist.h INCLUDEPATH += \ - ../../src/style \ - ../../src/widgets \ - ../../src/.moc \ - ../../src/animation/widget/core \ - ../../src/animation/core \ - ../../src/core \ - ../../src/widgets/views \ + ../../src/corelib \ + ../../src/corelib/style \ + ../../src/corelib/widgets \ + ../../src/corelib/.moc \ + ../../src/views/.moc \ + ../../src/corelib/animation/widget/core \ + ../../src/corelib/animation/core \ + ../../src/corelib/core \ + ../../src/corelib/widgets/views \ + ../../src/views \ include(../common_bot.pri) diff --git a/tests/ut_duipositionindicator/ut_duipositionindicator.cpp b/tests/ut_duipositionindicator/ut_duipositionindicator.cpp index aebf05e31..5178cc722 100644 --- a/tests/ut_duipositionindicator/ut_duipositionindicator.cpp +++ b/tests/ut_duipositionindicator/ut_duipositionindicator.cpp @@ -19,7 +19,7 @@ #include "ut_duipositionindicator.h" #include -#include "../../src/widgets/duipositionindicator_p.h" +#include "../../src/corelib/widgets/duipositionindicator_p.h" #include #include diff --git a/tests/ut_duipositionindicatorview/ut_duipositionindicatorview.pro b/tests/ut_duipositionindicatorview/ut_duipositionindicatorview.pro index 2f7d7b857..f438fead6 100644 --- a/tests/ut_duipositionindicatorview/ut_duipositionindicatorview.pro +++ b/tests/ut_duipositionindicatorview/ut_duipositionindicatorview.pro @@ -1,6 +1,6 @@ include(../common_top.pri) -INCLUDEPATH += $$DUISRCDIR/widgets $$DUISRCDIR/style +INCLUDEPATH += $$DUISRCDIR/corelib/widgets $$DUISRCDIR/corelib/style TARGET = ut_duipositionindicatorview CONFIG += DEBUG diff --git a/tests/ut_duiremoteaction/ut_duiremoteaction.pro b/tests/ut_duiremoteaction/ut_duiremoteaction.pro index ff4e76d0a..3cb572e9d 100644 --- a/tests/ut_duiremoteaction/ut_duiremoteaction.pro +++ b/tests/ut_duiremoteaction/ut_duiremoteaction.pro @@ -1,9 +1,9 @@ include(../common_top.pri) TARGET = ut_duiremoteaction -INCLUDEPATH += $$DUISRCDIR/core +INCLUDEPATH += $$DUISRCDIR/corelib/core TEST_SOURCES = \ - $$DUISRCDIR/core/duiremoteaction.cpp \ + $$DUISRCDIR/corelib/core/duiremoteaction.cpp \ # unit test and unit SOURCES += \ @@ -17,7 +17,7 @@ SOURCES += \ # unit test and unit HEADERS += \ ut_duiremoteaction.h \ - $$DUISRCDIR/core/duiaction.h \ - $$DUISRCDIR/core/duiremoteaction.h + $$DUISRCDIR/corelib/core/duiaction.h \ + $$DUISRCDIR/corelib/core/duiremoteaction.h include(../common_bot.pri) diff --git a/tests/ut_duiscenemanager/ut_duiscenemanager.pro b/tests/ut_duiscenemanager/ut_duiscenemanager.pro index b043076fb..82e7b14dd 100644 --- a/tests/ut_duiscenemanager/ut_duiscenemanager.pro +++ b/tests/ut_duiscenemanager/ut_duiscenemanager.pro @@ -1,5 +1,9 @@ include(../common_top.pri) -INCLUDEPATH += $$DUISRCDIR/scene $$DUISRCDIR/widgets $$DUISRCDIR/style $$DUISRCDIR/events +INCLUDEPATH += \ + $$DUISRCDIR/corelib/scene \ + $$DUISRCDIR/corelib/widgets \ + $$DUISRCDIR/corelib/style \ + $$DUISRCDIR/corelib/events TARGET = ut_duiscenemanager diff --git a/tests/ut_duiserviceaction/ut_duiserviceaction.pro b/tests/ut_duiserviceaction/ut_duiserviceaction.pro index 40b0d049b..1761eecc1 100644 --- a/tests/ut_duiserviceaction/ut_duiserviceaction.pro +++ b/tests/ut_duiserviceaction/ut_duiserviceaction.pro @@ -1,11 +1,11 @@ include(../common_top.pri) TARGET = ut_duiserviceaction -INCLUDEPATH += $$DUISRCDIR/service -INCLUDEPATH += $$DUISRCDIR/core +INCLUDEPATH += $$DUISRCDIR/corelib/service +INCLUDEPATH += $$DUISRCDIR/corelib/core TEST_SOURCES = \ - $$DUISRCDIR/service/duiserviceaction.cpp + $$DUISRCDIR/corelib/service/duiserviceaction.cpp # unit test and unit SOURCES += \ @@ -19,8 +19,8 @@ SOURCES += \ # unit test and unit HEADERS += \ ut_duiserviceaction.h \ - $$DUISRCDIR/core/duiaction.h \ - $$DUISRCDIR/service/duiserviceaction.h \ - $$DUISRCDIR/service/duiserviceinvoker.h + $$DUISRCDIR/corelib/core/duiaction.h \ + $$DUISRCDIR/corelib/service/duiserviceaction.h \ + $$DUISRCDIR/corelib/service/duiserviceinvoker.h include(../common_bot.pri) diff --git a/tests/ut_duiservicefwbaseif/ut_duiservicefwbaseif.pro b/tests/ut_duiservicefwbaseif/ut_duiservicefwbaseif.pro index cf9fbadfc..3c14e52ee 100644 --- a/tests/ut_duiservicefwbaseif/ut_duiservicefwbaseif.pro +++ b/tests/ut_duiservicefwbaseif/ut_duiservicefwbaseif.pro @@ -3,7 +3,7 @@ include(../common_top.pri) # need to copy the units here in order to avoid force the inclusion of the local duiservicefwproxy.h # which contains the stubbed proxy that does not rely on qdbus # see further down for a failed attempt to get this to work some other way -SFWDIR = $$DUISRCDIR/servicefwif +SFWDIR = $$DUISRCDIR/corelib/servicefwif TEST_SOURCE = duiservicefwbaseif.cpp TEST_SRC_FROM = $$SFWDIR/$$TEST_SOURCE TEST_HEADER = duiservicefwbaseif.h diff --git a/tests/ut_duiserviceinvoker/ut_duiserviceinvoker.pro b/tests/ut_duiserviceinvoker/ut_duiserviceinvoker.pro index 9c12d798b..f88fb67f1 100644 --- a/tests/ut_duiserviceinvoker/ut_duiserviceinvoker.pro +++ b/tests/ut_duiserviceinvoker/ut_duiserviceinvoker.pro @@ -1,10 +1,10 @@ include(../common_top.pri) TARGET = ut_duiserviceinvoker -INCLUDEPATH += $$DUISRCDIR/service +INCLUDEPATH += $$DUISRCDIR/corelib/service TEST_SOURCES = \ - $$DUISRCDIR/service/duiserviceinvoker.cpp + $$DUISRCDIR/corelib/service/duiserviceinvoker.cpp # unit test and unit SOURCES += \ @@ -14,7 +14,7 @@ SOURCES += \ # unit test and unit HEADERS += \ ut_duiserviceinvoker.h \ - $$DUISRCDIR/service/duiserviceinvoker.h \ - $$DUISRCDIR/service/duiserviceaction.h + $$DUISRCDIR/corelib/service/duiserviceinvoker.h \ + $$DUISRCDIR/corelib/service/duiserviceaction.h include(../common_bot.pri) diff --git a/tests/ut_duisettings/ut_duisettings.pro b/tests/ut_duisettings/ut_duisettings.pro index f6da9e92a..7090786f5 100644 --- a/tests/ut_duisettings/ut_duisettings.pro +++ b/tests/ut_duisettings/ut_duisettings.pro @@ -3,7 +3,7 @@ include(../common_top.pri) TARGET = ut_duisettings TEST_SOURCES = \ -# $$DUISRCDIR/duisettings.cpp \ +# $$DUISRCDIR/settings.cpp \ # unit test and unit SOURCES += \ @@ -20,7 +20,7 @@ SOURCES += \ # unit test and unit HEADERS += \ ut_duisettings.h \ -# $$DUISRCDIR/duisettings.h \ +# $$DUISRCDIR/settings.h \ # base classes HEADERS += \ diff --git a/tests/ut_duisettingslanguagebinary/ut_duisettingslanguagebinary.pro b/tests/ut_duisettingslanguagebinary/ut_duisettingslanguagebinary.pro index e4926629d..6c580c89f 100644 --- a/tests/ut_duisettingslanguagebinary/ut_duisettingslanguagebinary.pro +++ b/tests/ut_duisettingslanguagebinary/ut_duisettingslanguagebinary.pro @@ -1,15 +1,13 @@ include(../common_top.pri) -INCLUDEPATH += $$DUISRCDIR/settingslanguage - -TARGET = ut_duisettingslanguagebinary +INCLUDEPATH += $$DUISRCDIR/settings/settingslanguage # unit test and unit SOURCES += \ ut_duisettingslanguagebinary.cpp \ - $$DUISRCDIR/settingslanguage/duisettingslanguagebinary.cpp \ - $$DUISRCDIR/settingslanguage/duisettingslanguagenode.cpp \ - $$DUISRCDIR/settingslanguage/duisettingslanguagesettings.cpp + $$DUISRCDIR/settings/settingslanguage/duisettingslanguagebinary.cpp \ + $$DUISRCDIR/settings/settingslanguage/duisettingslanguagenode.cpp \ + $$DUISRCDIR/settings/settingslanguage/duisettingslanguagesettings.cpp # service classes SOURCES += \ @@ -18,8 +16,8 @@ SOURCES += \ # unit test and unit HEADERS += \ ut_duisettingslanguagebinary.h \ - $$DUISRCDIR/settingslanguage/duisettingslanguagebinary.h \ - $$DUISRCDIR/settingslanguage/duisettingslanguagenode.h \ - $$DUISRCDIR/settingslanguage/duisettingslanguagesettings.h + $$DUISRCDIR/settings/settingslanguage/duisettingslanguagebinary.h \ + $$DUISRCDIR/settings/settingslanguage/duisettingslanguagenode.h \ + $$DUISRCDIR/settings/settingslanguage/duisettingslanguagesettings.h include(../common_bot.pri) diff --git a/tests/ut_duisettingslanguageboolean/ut_duisettingslanguageboolean.pro b/tests/ut_duisettingslanguageboolean/ut_duisettingslanguageboolean.pro index 85658c8fa..9c774f304 100644 --- a/tests/ut_duisettingslanguageboolean/ut_duisettingslanguageboolean.pro +++ b/tests/ut_duisettingslanguageboolean/ut_duisettingslanguageboolean.pro @@ -1,14 +1,11 @@ include(../common_top.pri) - -INCLUDEPATH += $$DUISRCDIR/settingslanguage - -TARGET = ut_duisettingslanguageboolean +include(../common_duisettings.pri) # unit test and unit SOURCES += \ ut_duisettingslanguageboolean.cpp \ - $$DUISRCDIR/settingslanguage/duisettingslanguageboolean.cpp \ - $$DUISRCDIR/settingslanguage/duisettingslanguagenode.cpp + $$DUISRCDIR/settings/settingslanguage/duisettingslanguageboolean.cpp \ + $$DUISRCDIR/settings/settingslanguage/duisettingslanguagenode.cpp # service classes SOURCES += \ @@ -17,7 +14,7 @@ SOURCES += \ # unit test and unit HEADERS += \ ut_duisettingslanguageboolean.h \ - $$DUISRCDIR/settingslanguage/duisettingslanguageboolean.h \ - $$DUISRCDIR/settingslanguage/duisettingslanguagenode.h + $$DUISRCDIR/settings/settingslanguage/duisettingslanguageboolean.h \ + $$DUISRCDIR/settings/settingslanguage/duisettingslanguagenode.h include(../common_bot.pri) diff --git a/tests/ut_duisettingslanguagebooleancontroller/ut_duisettingslanguagebooleancontroller.pro b/tests/ut_duisettingslanguagebooleancontroller/ut_duisettingslanguagebooleancontroller.pro index 715d23849..c0d256dd9 100644 --- a/tests/ut_duisettingslanguagebooleancontroller/ut_duisettingslanguagebooleancontroller.pro +++ b/tests/ut_duisettingslanguagebooleancontroller/ut_duisettingslanguagebooleancontroller.pro @@ -1,24 +1,21 @@ include(../common_top.pri) - -INCLUDEPATH += $$DUISRCDIR/settingslanguage - -TARGET = ut_duisettingslanguagebooleancontroller +include(../common_duisettings.pri) # unit test and unit SOURCES += \ ut_duisettingslanguagebooleancontroller.cpp \ - $$DUISRCDIR/settingslanguage/duisettingslanguageboolean.cpp \ - $$DUISRCDIR/settingslanguage/duisettingslanguagebooleancontroller.cpp \ - $$DUISRCDIR/settingslanguage/duisettingslanguagebooleanfactory.cpp \ - $$DUISRCDIR/settingslanguage/duisettingslanguagenode.cpp + $$DUISRCDIR/settings/settingslanguage/duisettingslanguageboolean.cpp \ + $$DUISRCDIR/settings/settingslanguage/duisettingslanguagebooleancontroller.cpp \ + $$DUISRCDIR/settings/settingslanguage/duisettingslanguagebooleanfactory.cpp \ + $$DUISRCDIR/settings/settingslanguage/duisettingslanguagenode.cpp # unit test and unit HEADERS += \ ut_duisettingslanguagebooleancontroller.h \ - $$DUISRCDIR/settingslanguage/duisettingslanguageboolean.h \ - $$DUISRCDIR/settingslanguage/duisettingslanguagebooleancontroller.h \ - $$DUISRCDIR/settingslanguage/duisettingslanguagebooleanfactory.h \ - $$DUISRCDIR/settingslanguage/duisettingslanguagenode.h + $$DUISRCDIR/settings/settingslanguage/duisettingslanguageboolean.h \ + $$DUISRCDIR/settings/settingslanguage/duisettingslanguagebooleancontroller.h \ + $$DUISRCDIR/settings/settingslanguage/duisettingslanguagebooleanfactory.h \ + $$DUISRCDIR/settings/settingslanguage/duisettingslanguagenode.h include(../common_bot.pri) diff --git a/tests/ut_duisettingslanguagebooleanfactory/ut_duisettingslanguagebooleanfactory.pro b/tests/ut_duisettingslanguagebooleanfactory/ut_duisettingslanguagebooleanfactory.pro index 6b0f31271..25e039378 100644 --- a/tests/ut_duisettingslanguagebooleanfactory/ut_duisettingslanguagebooleanfactory.pro +++ b/tests/ut_duisettingslanguagebooleanfactory/ut_duisettingslanguagebooleanfactory.pro @@ -1,12 +1,11 @@ include(../common_top.pri) -TARGET = ut_duisettingslanguagebooleanfactory -INCLUDEPATH += $$DUISRCDIR/settingslanguage +include(../common_duisettings.pri) # unit test and unit classes SOURCES += \ ut_duisettingslanguagebooleanfactory.cpp \ - $$DUISRCDIR/settingslanguage/duisettingslanguagebooleanfactory.cpp \ - $$DUISRCDIR/settingslanguage/duisettingslanguagenode.cpp + $$DUISRCDIR/settings/settingslanguage/duisettingslanguagebooleanfactory.cpp \ + $$DUISRCDIR/settings/settingslanguage/duisettingslanguagenode.cpp # service classes SOURCES += \ @@ -15,8 +14,8 @@ SOURCES += \ # unit test and unit classes HEADERS += \ ut_duisettingslanguagebooleanfactory.h \ - $$DUISRCDIR/settingslanguage/duisettingslanguagebooleanfactory.h \ - $$DUISRCDIR/settingslanguage/duisettingslanguagebooleancontroller.h \ - $$DUISRCDIR/settingslanguage/duisettingslanguagenode.h + $$DUISRCDIR/settings/settingslanguage/duisettingslanguagebooleanfactory.h \ + $$DUISRCDIR/settings/settingslanguage/duisettingslanguagebooleancontroller.h \ + $$DUISRCDIR/settings/settingslanguage/duisettingslanguagenode.h include(../common_bot.pri) diff --git a/tests/ut_duisettingslanguageinteger/ut_duisettingslanguageinteger.pro b/tests/ut_duisettingslanguageinteger/ut_duisettingslanguageinteger.pro index aa52f8ed6..e426d9609 100644 --- a/tests/ut_duisettingslanguageinteger/ut_duisettingslanguageinteger.pro +++ b/tests/ut_duisettingslanguageinteger/ut_duisettingslanguageinteger.pro @@ -1,12 +1,11 @@ include(../common_top.pri) -TARGET = ut_duisettingslanguageinteger -INCLUDEPATH += $$DUISRCDIR/settingslanguage +include(../common_duisettings.pri) # unit test and unit classes SOURCES += \ ut_duisettingslanguageinteger.cpp \ - $$DUISRCDIR/settingslanguage/duisettingslanguageinteger.cpp \ - $$DUISRCDIR/settingslanguage/duisettingslanguagenode.cpp + $$DUISRCDIR/settings/settingslanguage/duisettingslanguageinteger.cpp \ + $$DUISRCDIR/settings/settingslanguage/duisettingslanguagenode.cpp # service classes SOURCES += \ @@ -15,7 +14,7 @@ SOURCES += \ # unit test and unit classes HEADERS += \ ut_duisettingslanguageinteger.h \ - $$DUISRCDIR/settingslanguage/duisettingslanguageinteger.h \ - $$DUISRCDIR/settingslanguage/duisettingslanguagenode.h + $$DUISRCDIR/settings/settingslanguage/duisettingslanguageinteger.h \ + $$DUISRCDIR/settings/settingslanguage/duisettingslanguagenode.h include(../common_bot.pri) diff --git a/tests/ut_duisettingslanguageintegercontroller/ut_duisettingslanguageintegercontroller.pro b/tests/ut_duisettingslanguageintegercontroller/ut_duisettingslanguageintegercontroller.pro index 550d0d1f1..ef9da1554 100644 --- a/tests/ut_duisettingslanguageintegercontroller/ut_duisettingslanguageintegercontroller.pro +++ b/tests/ut_duisettingslanguageintegercontroller/ut_duisettingslanguageintegercontroller.pro @@ -1,18 +1,15 @@ include(../common_top.pri) - -INCLUDEPATH += $$DUISRCDIR/settingslanguage - -TARGET = ut_duisettingslanguageintegercontroller +include(../common_duisettings.pri) # unit test and unit SOURCES += \ ut_duisettingslanguageintegercontroller.cpp \ - $$DUISRCDIR/settingslanguage/duisettingslanguageintegercontroller.cpp + $$DUISRCDIR/settings/settingslanguage/duisettingslanguageintegercontroller.cpp # unit test and unit HEADERS += \ ut_duisettingslanguageintegercontroller.h \ - $$DUISRCDIR/settingslanguage/duisettingslanguageintegercontroller.h + $$DUISRCDIR/settings/settingslanguage/duisettingslanguageintegercontroller.h include(../common_bot.pri) diff --git a/tests/ut_duisettingslanguageintegerfactory/ut_duisettingslanguageintegerfactory.pro b/tests/ut_duisettingslanguageintegerfactory/ut_duisettingslanguageintegerfactory.pro index 895363855..71be76395 100644 --- a/tests/ut_duisettingslanguageintegerfactory/ut_duisettingslanguageintegerfactory.pro +++ b/tests/ut_duisettingslanguageintegerfactory/ut_duisettingslanguageintegerfactory.pro @@ -1,14 +1,13 @@ include(../common_top.pri) -TARGET = ut_duisettingslanguageintegerfactory -INCLUDEPATH += $$DUISRCDIR/settingslanguage +include(../common_duisettings.pri) TEST_SOURCES = \ - $$DUISRCDIR/settingslanguage/duisettingslanguageintegerfactory.cpp \ + $$DUISRCDIR/settings/settingslanguage/duisettingslanguageintegerfactory.cpp \ # unit test and unit SOURCES += \ ut_duisettingslanguageintegerfactory.cpp \ - $$DUISRCDIR/settingslanguage/duisettingslanguagenode.cpp \ + $$DUISRCDIR/settings/settingslanguage/duisettingslanguagenode.cpp \ $$TEST_SOURCES \ # service classes @@ -18,8 +17,8 @@ SOURCES += \ # unit test and unit HEADERS += \ ut_duisettingslanguageintegerfactory.h \ - $$DUISRCDIR/settingslanguage/duisettingslanguageintegerfactory.h \ - $$DUISRCDIR/settingslanguage/duisettingslanguageintegercontroller.h \ - $$DUISRCDIR/settingslanguage/duisettingslanguagenode.h \ + $$DUISRCDIR/settings/settingslanguage/duisettingslanguageintegerfactory.h \ + $$DUISRCDIR/settings/settingslanguage/duisettingslanguageintegercontroller.h \ + $$DUISRCDIR/settings/settingslanguage/duisettingslanguagenode.h \ include(../common_bot.pri) diff --git a/tests/ut_duisettingslanguageoption/ut_duisettingslanguageoption.pro b/tests/ut_duisettingslanguageoption/ut_duisettingslanguageoption.pro index 3559f7ad2..bee678982 100644 --- a/tests/ut_duisettingslanguageoption/ut_duisettingslanguageoption.pro +++ b/tests/ut_duisettingslanguageoption/ut_duisettingslanguageoption.pro @@ -1,14 +1,11 @@ include(../common_top.pri) - -INCLUDEPATH += $$DUISRCDIR/settingslanguage - -TARGET = ut_duisettingslanguageoption +include(../common_duisettings.pri) # unit test and unit SOURCES += \ ut_duisettingslanguageoption.cpp \ - $$DUISRCDIR/settingslanguage/duisettingslanguageoption.cpp \ - $$DUISRCDIR/settingslanguage/duisettingslanguagenode.cpp + $$DUISRCDIR/settings/settingslanguage/duisettingslanguageoption.cpp \ + $$DUISRCDIR/settings/settingslanguage/duisettingslanguagenode.cpp # service classes SOURCES += \ @@ -17,7 +14,7 @@ SOURCES += \ # unit test and unit HEADERS += \ ut_duisettingslanguageoption.h \ - $$DUISRCDIR/settingslanguage/duisettingslanguageoption.h \ - $$DUISRCDIR/settingslanguage/duisettingslanguagenode.h + $$DUISRCDIR/settings/settingslanguage/duisettingslanguageoption.h \ + $$DUISRCDIR/settings/settingslanguage/duisettingslanguagenode.h include(../common_bot.pri) diff --git a/tests/ut_duisettingslanguageparser/ut_duisettingslanguageparser.pro b/tests/ut_duisettingslanguageparser/ut_duisettingslanguageparser.pro index babf68301..100c4ad37 100644 --- a/tests/ut_duisettingslanguageparser/ut_duisettingslanguageparser.pro +++ b/tests/ut_duisettingslanguageparser/ut_duisettingslanguageparser.pro @@ -1,16 +1,14 @@ include(../common_top.pri) -QT += xml - -INCLUDEPATH += $$DUISRCDIR/settingslanguage +include(../common_duisettings.pri) -TARGET = ut_duisettingslanguageparser +QT += xml # unit test and unit SOURCES += \ ut_duisettingslanguageparser.cpp \ - $$DUISRCDIR/settingslanguage/duisettingslanguageparser.cpp \ - $$DUISRCDIR/settingslanguage/duisettingslanguagebinary.cpp \ - $$DUISRCDIR/settingslanguage/duisettingslanguagenode.cpp + $$DUISRCDIR/settings/settingslanguage/duisettingslanguageparser.cpp \ + $$DUISRCDIR/settings/settingslanguage/duisettingslanguagebinary.cpp \ + $$DUISRCDIR/settings/settingslanguage/duisettingslanguagenode.cpp # service classes SOURCES += \ @@ -19,8 +17,8 @@ SOURCES += \ # unit test and unit HEADERS += \ ut_duisettingslanguageparser.h \ - $$DUISRCDIR/settingslanguage/duisettingslanguageparser.h \ - $$DUISRCDIR/settingslanguage/duisettingslanguagebinary.h \ - $$DUISRCDIR/settingslanguage/duisettingslanguagenode.h + $$DUISRCDIR/settings/settingslanguage/duisettingslanguageparser.h \ + $$DUISRCDIR/settings/settingslanguage/duisettingslanguagebinary.h \ + $$DUISRCDIR/settings/settingslanguage/duisettingslanguagenode.h include(../common_bot.pri) diff --git a/tests/ut_duisettingslanguageselection/ut_duisettingslanguageselection.pro b/tests/ut_duisettingslanguageselection/ut_duisettingslanguageselection.pro index 5d9eda6fc..42fe97243 100644 --- a/tests/ut_duisettingslanguageselection/ut_duisettingslanguageselection.pro +++ b/tests/ut_duisettingslanguageselection/ut_duisettingslanguageselection.pro @@ -1,14 +1,11 @@ include(../common_top.pri) - -INCLUDEPATH += $$DUISRCDIR/settingslanguage - -TARGET = ut_duisettingslanguageselection +include(../common_duisettings.pri) # unit test and unit SOURCES += \ ut_duisettingslanguageselection.cpp \ - $$DUISRCDIR/settingslanguage/duisettingslanguageselection.cpp \ - $$DUISRCDIR/settingslanguage/duisettingslanguagenode.cpp + $$DUISRCDIR/settings/settingslanguage/duisettingslanguageselection.cpp \ + $$DUISRCDIR/settings/settingslanguage/duisettingslanguagenode.cpp # service classes SOURCES += \ @@ -17,8 +14,8 @@ SOURCES += \ # unit test and unit HEADERS += \ ut_duisettingslanguageselection.h \ - $$DUISRCDIR/settingslanguage/duisettingslanguageselection.h \ - $$DUISRCDIR/settingslanguage/duisettingslanguagenode.h \ - $$DUISRCDIR/settingslanguage/duisettingslanguageoption.h + $$DUISRCDIR/settings/settingslanguage/duisettingslanguageselection.h \ + $$DUISRCDIR/settings/settingslanguage/duisettingslanguagenode.h \ + $$DUISRCDIR/settings/settingslanguage/duisettingslanguageoption.h include(../common_bot.pri) diff --git a/tests/ut_duisettingslanguageselectioncontroller/ut_duisettingslanguageselectioncontroller.pro b/tests/ut_duisettingslanguageselectioncontroller/ut_duisettingslanguageselectioncontroller.pro index b1e5dd596..949e22e2a 100644 --- a/tests/ut_duisettingslanguageselectioncontroller/ut_duisettingslanguageselectioncontroller.pro +++ b/tests/ut_duisettingslanguageselectioncontroller/ut_duisettingslanguageselectioncontroller.pro @@ -1,18 +1,15 @@ include(../common_top.pri) - -INCLUDEPATH += $$DUISRCDIR/settingslanguage - -TARGET = ut_duisettingslanguageselectioncontroller +include(../common_duisettings.pri) # unit test and unit SOURCES += \ ut_duisettingslanguageselectioncontroller.cpp \ - $$DUISRCDIR/settingslanguage/duisettingslanguageselectioncontroller.cpp + $$DUISRCDIR/settings/settingslanguage/duisettingslanguageselectioncontroller.cpp # unit test and unit HEADERS += \ ut_duisettingslanguageselectioncontroller.h \ - $$DUISRCDIR/settingslanguage/duisettingslanguageselectioncontroller.h + $$DUISRCDIR/settings/settingslanguage/duisettingslanguageselectioncontroller.h include(../common_bot.pri) diff --git a/tests/ut_duisettingslanguageselectionfactory/ut_duisettingslanguageselectionfactory.pro b/tests/ut_duisettingslanguageselectionfactory/ut_duisettingslanguageselectionfactory.pro index 4a47a5007..b7cbba58b 100644 --- a/tests/ut_duisettingslanguageselectionfactory/ut_duisettingslanguageselectionfactory.pro +++ b/tests/ut_duisettingslanguageselectionfactory/ut_duisettingslanguageselectionfactory.pro @@ -1,12 +1,11 @@ include(../common_top.pri) -TARGET = ut_duisettingslanguageselectionfactory -INCLUDEPATH += $$DUISRCDIR/settingslanguage +include(../common_duisettings.pri) # unit test and unit classes SOURCES += \ ut_duisettingslanguageselectionfactory.cpp \ - $$DUISRCDIR/settingslanguage/duisettingslanguageselectionfactory.cpp \ - $$DUISRCDIR/settingslanguage/duisettingslanguagenode.cpp + $$DUISRCDIR/settings/settingslanguage/duisettingslanguageselectionfactory.cpp \ + $$DUISRCDIR/settings/settingslanguage/duisettingslanguagenode.cpp # service classes SOURCES += \ @@ -15,8 +14,8 @@ SOURCES += \ # unit test and unit classes HEADERS += \ ut_duisettingslanguageselectionfactory.h \ - $$DUISRCDIR/settingslanguage/duisettingslanguageselectionfactory.h \ - $$DUISRCDIR/settingslanguage/duisettingslanguageselectioncontroller.h \ - $$DUISRCDIR/settingslanguage/duisettingslanguagenode.h + $$DUISRCDIR/settings/settingslanguage/duisettingslanguageselectionfactory.h \ + $$DUISRCDIR/settings/settingslanguage/duisettingslanguageselectioncontroller.h \ + $$DUISRCDIR/settings/settingslanguage/duisettingslanguagenode.h include(../common_bot.pri) diff --git a/tests/ut_duisettingslanguagesettings/ut_duisettingslanguagesettings.pro b/tests/ut_duisettingslanguagesettings/ut_duisettingslanguagesettings.pro index 6c205d8ff..044be0c44 100644 --- a/tests/ut_duisettingslanguagesettings/ut_duisettingslanguagesettings.pro +++ b/tests/ut_duisettingslanguagesettings/ut_duisettingslanguagesettings.pro @@ -1,12 +1,11 @@ include(../common_top.pri) -TARGET = ut_duisettingslanguagesettings -INCLUDEPATH += $$DUISRCDIR/settingslanguage +include(../common_duisettings.pri) # unit test and unit classes SOURCES += \ ut_duisettingslanguagesettings.cpp \ - $$DUISRCDIR/settingslanguage/duisettingslanguagesettings.cpp \ - $$DUISRCDIR/settingslanguage/duisettingslanguagenode.cpp + $$DUISRCDIR/settings/settingslanguage/duisettingslanguagesettings.cpp \ + $$DUISRCDIR/settings/settingslanguage/duisettingslanguagenode.cpp # service classes SOURCES += \ @@ -15,7 +14,7 @@ SOURCES += \ # unit test and unit classes HEADERS += \ ut_duisettingslanguagesettings.h \ - $$DUISRCDIR/settingslanguage/duisettingslanguagesettings.h \ - $$DUISRCDIR/settingslanguage/duisettingslanguagenode.h + $$DUISRCDIR/settings/settingslanguage/duisettingslanguagesettings.h \ + $$DUISRCDIR/settings/settingslanguage/duisettingslanguagenode.h include(../common_bot.pri) diff --git a/tests/ut_duisettingslanguagesettingsfactory/ut_duisettingslanguagesettingsfactory.pro b/tests/ut_duisettingslanguagesettingsfactory/ut_duisettingslanguagesettingsfactory.pro index e3c916832..94ebd618d 100644 --- a/tests/ut_duisettingslanguagesettingsfactory/ut_duisettingslanguagesettingsfactory.pro +++ b/tests/ut_duisettingslanguagesettingsfactory/ut_duisettingslanguagesettingsfactory.pro @@ -1,12 +1,13 @@ include(../common_top.pri) -TARGET = ut_duisettingslanguagesettingsfactory -INCLUDEPATH += $$DUISRCDIR/settingslanguage $$DUISRCDIR/style +include(../common_duisettings.pri) + +INCLUDEPATH += $$DUISRCDIR/corelib/style # unit test and unit classes SOURCES += \ ut_duisettingslanguagesettingsfactory.cpp \ - $$DUISRCDIR/settingslanguage/duisettingslanguagesettingsfactory.cpp \ - $$DUISRCDIR/settingslanguage/duisettingslanguagenode.cpp + $$DUISRCDIR/settings/settingslanguage/duisettingslanguagesettingsfactory.cpp \ + $$DUISRCDIR/settings/settingslanguage/duisettingslanguagenode.cpp # service classes SOURCES += \ @@ -15,7 +16,7 @@ SOURCES += \ # unit test and unit classes HEADERS += \ ut_duisettingslanguagesettingsfactory.h \ - $$DUISRCDIR/settingslanguage/duisettingslanguagesettingsfactory.h \ - $$DUISRCDIR/settingslanguage/duisettingslanguagenode.h + $$DUISRCDIR/settings/settingslanguage/duisettingslanguagesettingsfactory.h \ + $$DUISRCDIR/settings/settingslanguage/duisettingslanguagenode.h include(../common_bot.pri) diff --git a/tests/ut_duisettingslanguagetext/ut_duisettingslanguagetext.pro b/tests/ut_duisettingslanguagetext/ut_duisettingslanguagetext.pro index 3a19bbf0a..9ccb98e9a 100644 --- a/tests/ut_duisettingslanguagetext/ut_duisettingslanguagetext.pro +++ b/tests/ut_duisettingslanguagetext/ut_duisettingslanguagetext.pro @@ -1,12 +1,11 @@ include(../common_top.pri) -TARGET = ut_duisettingslanguagetext -INCLUDEPATH += $$DUISRCDIR/settingslanguage +include(../common_duisettings.pri) # unit test and unit classes SOURCES += \ ut_duisettingslanguagetext.cpp \ - $$DUISRCDIR/settingslanguage/duisettingslanguagetext.cpp \ - $$DUISRCDIR/settingslanguage/duisettingslanguagenode.cpp + $$DUISRCDIR/settings/settingslanguage/duisettingslanguagetext.cpp \ + $$DUISRCDIR/settings/settingslanguage/duisettingslanguagenode.cpp # service classes SOURCES += \ @@ -15,7 +14,7 @@ SOURCES += \ # unit test and unit classes HEADERS += \ ut_duisettingslanguagetext.h \ - $$DUISRCDIR/settingslanguage/duisettingslanguagetext.h \ - $$DUISRCDIR/settingslanguage/duisettingslanguagenode.h + $$DUISRCDIR/settings/settingslanguage/duisettingslanguagetext.h \ + $$DUISRCDIR/settings/settingslanguage/duisettingslanguagenode.h include(../common_bot.pri) diff --git a/tests/ut_duisettingslanguagetextcontroller/ut_duisettingslanguagetextcontroller.pro b/tests/ut_duisettingslanguagetextcontroller/ut_duisettingslanguagetextcontroller.pro index 74f0d5171..28b58de9b 100644 --- a/tests/ut_duisettingslanguagetextcontroller/ut_duisettingslanguagetextcontroller.pro +++ b/tests/ut_duisettingslanguagetextcontroller/ut_duisettingslanguagetextcontroller.pro @@ -1,18 +1,15 @@ include(../common_top.pri) - -INCLUDEPATH += $$DUISRCDIR/settingslanguage - -TARGET = ut_duisettingslanguagetextcontroller +include(../common_duisettings.pri) # unit test and unit SOURCES += \ ut_duisettingslanguagetextcontroller.cpp \ - $$DUISRCDIR/settingslanguage/duisettingslanguagetextcontroller.cpp + $$DUISRCDIR/settings/settingslanguage/duisettingslanguagetextcontroller.cpp # unit test and unit HEADERS += \ ut_duisettingslanguagetextcontroller.h \ - $$DUISRCDIR/settingslanguage/duisettingslanguagetextcontroller.h + $$DUISRCDIR/settings/settingslanguage/duisettingslanguagetextcontroller.h include(../common_bot.pri) diff --git a/tests/ut_duisettingslanguagetextfactory/ut_duisettingslanguagetextfactory.pro b/tests/ut_duisettingslanguagetextfactory/ut_duisettingslanguagetextfactory.pro index a9418e456..1fce45487 100644 --- a/tests/ut_duisettingslanguagetextfactory/ut_duisettingslanguagetextfactory.pro +++ b/tests/ut_duisettingslanguagetextfactory/ut_duisettingslanguagetextfactory.pro @@ -1,14 +1,13 @@ include(../common_top.pri) -TARGET = ut_duisettingslanguagetextfactory -INCLUDEPATH += $$DUISRCDIR/settingslanguage +include(../common_duisettings.pri) TEST_SOURCES = \ - $$DUISRCDIR/settingslanguage/duisettingslanguagetextfactory.cpp \ + $$DUISRCDIR/settings/settingslanguage/duisettingslanguagetextfactory.cpp \ # unit test and unit SOURCES += \ ut_duisettingslanguagetextfactory.cpp \ - $$DUISRCDIR/settingslanguage/duisettingslanguagenode.cpp \ + $$DUISRCDIR/settings/settingslanguage/duisettingslanguagenode.cpp \ $$TEST_SOURCES \ # service classes @@ -18,8 +17,8 @@ SOURCES += \ # unit test and unit HEADERS += \ ut_duisettingslanguagetextfactory.h \ - $$DUISRCDIR/settingslanguage/duisettingslanguagetextfactory.h \ - $$DUISRCDIR/settingslanguage/duisettingslanguagetextcontroller.h \ - $$DUISRCDIR/settingslanguage/duisettingslanguagenode.h + $$DUISRCDIR/settings/settingslanguage/duisettingslanguagetextfactory.h \ + $$DUISRCDIR/settings/settingslanguage/duisettingslanguagetextcontroller.h \ + $$DUISRCDIR/settings/settingslanguage/duisettingslanguagenode.h include(../common_bot.pri) diff --git a/tests/ut_duisettingslanguagewidget/ut_duisettingslanguagewidget.pro b/tests/ut_duisettingslanguagewidget/ut_duisettingslanguagewidget.pro index 4826d124a..ab105d497 100644 --- a/tests/ut_duisettingslanguagewidget/ut_duisettingslanguagewidget.pro +++ b/tests/ut_duisettingslanguagewidget/ut_duisettingslanguagewidget.pro @@ -2,17 +2,16 @@ include(../common_top.pri) QT += xml -TARGET = ut_duisettingslanguagewidget -INCLUDEPATH += $$DUISRCDIR/settingslanguage +INCLUDEPATH += $$DUISRCDIR/settings/settingslanguage # unit test and unit classes SOURCES += \ ut_duisettingslanguagewidget.cpp \ - $$DUISRCDIR/settingslanguage/duisettingslanguagewidget.cpp + $$DUISRCDIR/settings/settingslanguage/duisettingslanguagewidget.cpp # unit test and unit classes HEADERS += \ ut_duisettingslanguagewidget.h \ - $$DUISRCDIR/settingslanguage/duisettingslanguagewidget.h + $$DUISRCDIR/settings/settingslanguage/duisettingslanguagewidget.h include(../common_bot.pri) diff --git a/tests/ut_duisettingslanguagewidgetfactory/ut_duisettingslanguagewidgetfactory.pro b/tests/ut_duisettingslanguagewidgetfactory/ut_duisettingslanguagewidgetfactory.pro index c27014e59..5e7f6e94c 100644 --- a/tests/ut_duisettingslanguagewidgetfactory/ut_duisettingslanguagewidgetfactory.pro +++ b/tests/ut_duisettingslanguagewidgetfactory/ut_duisettingslanguagewidgetfactory.pro @@ -1,12 +1,11 @@ include(../common_top.pri) -TARGET = ut_duisettingslanguagewidgetfactory -INCLUDEPATH += $$DUISRCDIR/settingslanguage +include(../common_duisettings.pri) # unit test and unit classes SOURCES += \ ut_duisettingslanguagewidgetfactory.cpp \ - $$DUISRCDIR/settingslanguage/duisettingslanguagewidgetfactory.cpp \ - $$DUISRCDIR/settingslanguage/duisettingslanguagenode.cpp + $$DUISRCDIR/settings/settingslanguage/duisettingslanguagewidgetfactory.cpp \ + $$DUISRCDIR/settings/settingslanguage/duisettingslanguagenode.cpp # service classes SOURCES += \ @@ -15,7 +14,7 @@ SOURCES += \ # unit test and unit classes HEADERS += \ ut_duisettingslanguagewidgetfactory.h \ - $$DUISRCDIR/settingslanguage/duisettingslanguagewidgetfactory.h \ - $$DUISRCDIR/settingslanguage/duisettingslanguagenode.h + $$DUISRCDIR/settings/settingslanguage/duisettingslanguagewidgetfactory.h \ + $$DUISRCDIR/settings/settingslanguage/duisettingslanguagenode.h include(../common_bot.pri) diff --git a/tests/ut_duishareddata/ut_duishareddata.cpp b/tests/ut_duishareddata/ut_duishareddata.cpp index 9ef90d1f5..986ac7bd1 100644 --- a/tests/ut_duishareddata/ut_duishareddata.cpp +++ b/tests/ut_duishareddata/ut_duishareddata.cpp @@ -20,7 +20,6 @@ #include #include #include -#include "core/duishareddata.h" #include "ut_duishareddata.h" void Ut_DuiSharedData::init() diff --git a/tests/ut_duishareddata/ut_duishareddata.h b/tests/ut_duishareddata/ut_duishareddata.h index 0d4728ee1..f18c51d25 100644 --- a/tests/ut_duishareddata/ut_duishareddata.h +++ b/tests/ut_duishareddata/ut_duishareddata.h @@ -23,7 +23,7 @@ #include #include -#include +#include Q_DECLARE_METATYPE(DuiSharedData *); diff --git a/tests/ut_duishareddata/ut_duishareddata.pro b/tests/ut_duishareddata/ut_duishareddata.pro index 4b6da4f1e..8339be1cf 100644 --- a/tests/ut_duishareddata/ut_duishareddata.pro +++ b/tests/ut_duishareddata/ut_duishareddata.pro @@ -1,5 +1,5 @@ include(../common_top.pri) -INCLUDEPATH += $$DUISRCDIR/theme +INCLUDEPATH += $$DUISRCDIR/corelib/theme TARGET = ut_duishareddata diff --git a/tests/ut_duisliderview/ut_duisliderview.pro b/tests/ut_duisliderview/ut_duisliderview.pro index bcc1636e6..eb6484fc8 100644 --- a/tests/ut_duisliderview/ut_duisliderview.pro +++ b/tests/ut_duisliderview/ut_duisliderview.pro @@ -1,6 +1,6 @@ include(../common_top.pri) -INCLUDEPATH += $$DUISRCDIR/widgets $$DUISRCDIR/style +INCLUDEPATH += $$DUISRCDIR/corelib/widgets $$DUISRCDIR/corelib/style TARGET = ut_duisliderview diff --git a/tests/ut_duisubdatastore/ut_duisubdatastore.pro b/tests/ut_duisubdatastore/ut_duisubdatastore.pro index 3f2c3b453..7484b9be0 100644 --- a/tests/ut_duisubdatastore/ut_duisubdatastore.pro +++ b/tests/ut_duisubdatastore/ut_duisubdatastore.pro @@ -1,6 +1,5 @@ include(../common_top.pri) -TARGET = ut_duisubdatastore -INCLUDEPATH += $$DUISRCDIR/mashup/appletcommunication $$DUISRCDIR/mashup/appletinterface $$DUISRCDIR/mashup/mashup +include(../common_duiextensions.pri) SOURCES += \ ut_duisubdatastore.cpp \ diff --git a/tests/ut_duitapandholdrecognizer/ut_duitapandholdrecognizer.pro b/tests/ut_duitapandholdrecognizer/ut_duitapandholdrecognizer.pro index 9c7bd6e03..f247b7508 100644 --- a/tests/ut_duitapandholdrecognizer/ut_duitapandholdrecognizer.pro +++ b/tests/ut_duitapandholdrecognizer/ut_duitapandholdrecognizer.pro @@ -1,16 +1,16 @@ include(../common_top.pri) -INCLUDEPATH += $$DUISRCDIR/events +INCLUDEPATH += $$DUISRCDIR/corelib/events TARGET = ut_duitapandholdrecognizer # unit test and unit classes SOURCES += \ ut_duitapandholdrecognizer.cpp \ - ../../src/events/duitapandholdrecognizer.cpp \ - ../../src/events/duitapandholdgesture.cpp \ + ../../src/corelib/events/duitapandholdrecognizer.cpp \ + ../../src/corelib/events/duitapandholdgesture.cpp \ # unit test and unit classes HEADERS += \ ut_duitapandholdrecognizer.h \ - ../../src/events/duitapandholdgesture_p.h \ + ../../src/corelib/events/duitapandholdgesture_p.h \ include(../common_bot.pri) diff --git a/tests/ut_duitextedit/ut_duitextedit.cpp b/tests/ut_duitextedit/ut_duitextedit.cpp index f2146c8f2..ed1e1fbb9 100644 --- a/tests/ut_duitextedit/ut_duitextedit.cpp +++ b/tests/ut_duitextedit/ut_duitextedit.cpp @@ -45,7 +45,7 @@ #include //TODO:using other way instead of using relative paths -#include "../../src/widgets/duitextedit_p.h" +#include "../../src/corelib/widgets/duitextedit_p.h" Q_DECLARE_METATYPE(Dui::TextContentType); diff --git a/tests/ut_duitextedit/ut_duitextedit.pro b/tests/ut_duitextedit/ut_duitextedit.pro index 70a207868..b144090cc 100644 --- a/tests/ut_duitextedit/ut_duitextedit.pro +++ b/tests/ut_duitextedit/ut_duitextedit.pro @@ -14,6 +14,6 @@ HEADERS += \ $$STUBSDIR/duiwidgetview_stub.h \ ut_duitextedit.h \ -INCLUDEPATH += $$DUISRCDIR/widgets/ +INCLUDEPATH += $$DUISRCDIR/corelib/widgets/ include(../common_bot.pri) diff --git a/tests/ut_duitexteditview/ut_duitexteditview.cpp b/tests/ut_duitexteditview/ut_duitexteditview.cpp index 456c5d153..d312722ca 100644 --- a/tests/ut_duitexteditview/ut_duitexteditview.cpp +++ b/tests/ut_duitexteditview/ut_duitexteditview.cpp @@ -33,8 +33,8 @@ #include #include -#include "../../src/widgets/duitextedit_p.h" -#include "../../src/widgets/views/duitexteditview_p.h" +#include "../../src/corelib/widgets/duitextedit_p.h" +#include "../../src/views/duitexteditview_p.h" void Ut_DuiTextEditView::initTestCase() { diff --git a/tests/ut_duitoolbar/ut_duitoolbar.pro b/tests/ut_duitoolbar/ut_duitoolbar.pro index 3cc0a13a7..c9aa94e58 100644 --- a/tests/ut_duitoolbar/ut_duitoolbar.pro +++ b/tests/ut_duitoolbar/ut_duitoolbar.pro @@ -2,7 +2,7 @@ include(../common_top.pri) TARGET = ut_duitoolbar -INCLUDEPATH += $$DUISRCDIR/widgets $$DUISRCDIR/style +INCLUDEPATH += $$DUISRCDIR/corelib/widgets $$DUISRCDIR/corelib/style SOURCES += \ ut_duitoolbar.cpp \ diff --git a/tests/ut_duitoolbarview/ut_duitoolbarview.pro b/tests/ut_duitoolbarview/ut_duitoolbarview.pro index 67775a65f..ba1e44e65 100644 --- a/tests/ut_duitoolbarview/ut_duitoolbarview.pro +++ b/tests/ut_duitoolbarview/ut_duitoolbarview.pro @@ -2,7 +2,7 @@ include(../common_top.pri) TARGET = ut_duitoolbarview -INCLUDEPATH += $$DUISRCDIR/widgets $$DUISRCDIR/style +INCLUDEPATH += $$DUISRCDIR/corelib/widgets $$DUISRCDIR/corelib/style SOURCES += \ ut_duitoolbarview.cpp \ diff --git a/tests/ut_duiwidget/ut_duiwidget.pro b/tests/ut_duiwidget/ut_duiwidget.pro index 4f1addda8..9336c4df1 100644 --- a/tests/ut_duiwidget/ut_duiwidget.pro +++ b/tests/ut_duiwidget/ut_duiwidget.pro @@ -1,6 +1,6 @@ include(../common_top.pri) -INCLUDEPATH += $$DUISRCDIR/widgets +INCLUDEPATH += $$DUISRCDIR/corelib/widgets TEST_SOURCES += \ # $$DUISRCDIR/duiwidget.cpp \ diff --git a/tests/ut_duiwidgetview/ut_duiwidgetview.pro b/tests/ut_duiwidgetview/ut_duiwidgetview.pro index 796419752..a9b2fdd7c 100644 --- a/tests/ut_duiwidgetview/ut_duiwidgetview.pro +++ b/tests/ut_duiwidgetview/ut_duiwidgetview.pro @@ -1,6 +1,6 @@ include(../common_top.pri) -INCLUDEPATH += $$DUISRCDIR/widgets $$DUISRCDIR/style +INCLUDEPATH += $$DUISRCDIR/corelib/widgets $$DUISRCDIR/corelib/style TARGET = ut_duiwidgetview diff --git a/tests/ut_duiwindow/ut_duiwindow.cpp b/tests/ut_duiwindow/ut_duiwindow.cpp index d63698f5b..f68fb8a7d 100644 --- a/tests/ut_duiwindow/ut_duiwindow.cpp +++ b/tests/ut_duiwindow/ut_duiwindow.cpp @@ -22,7 +22,7 @@ #include #include #include "duiondisplaychangeevent.h" -#include "widgets/duiwindow_p.h" +#include "corelib/widgets/duiwindow_p.h" #include "ut_duiwindow.h" diff --git a/tests/ut_duiwindow/ut_duiwindow.pro b/tests/ut_duiwindow/ut_duiwindow.pro index 9fab40edf..2711984c3 100644 --- a/tests/ut_duiwindow/ut_duiwindow.pro +++ b/tests/ut_duiwindow/ut_duiwindow.pro @@ -2,7 +2,7 @@ include(../common_top.pri) TARGET = ut_duiwindow -INCLUDEPATH += $$DUISRCDIR/events +INCLUDEPATH += $$DUISRCDIR/corelib/events # Input HEADERS += \ diff --git a/tests/ut_qtmaemo6style/ut_qtmaemo6style.pro b/tests/ut_qtmaemo6style/ut_qtmaemo6style.pro index 3c657c567..4f2a67acd 100644 --- a/tests/ut_qtmaemo6style/ut_qtmaemo6style.pro +++ b/tests/ut_qtmaemo6style/ut_qtmaemo6style.pro @@ -1,6 +1,6 @@ include(../common_top.pri) TARGET = ut_qtmaemo6style -INCLUDEPATH += $$DUISRCDIR/widgets $$DUISRCDIR/style $$DUISRCDIR/../plainqt/style +INCLUDEPATH += $$DUISRCDIR/corelib/widgets $$DUISRCDIR/corelib/style $$DUISRCDIR/../plainqt/style TEST_SOURCES = \ $$DUISRCDIR/../plainqt/style/qtmaemo6style.cpp \ diff --git a/tools/duiapplettester/duiapplettester.pro b/tools/duiapplettester/duiapplettester.pro index 99790dbc8..2bd58f10b 100644 --- a/tools/duiapplettester/duiapplettester.pro +++ b/tools/duiapplettester/duiapplettester.pro @@ -2,31 +2,28 @@ include(../../mkspecs/common.pri) INCLUDEPATH += . \ ../../src/include \ - ../../src/mashup/mashup + ../../src/extensions/mashup/mashup + DEPENDPATH += $$INCLUDEPATH TEMPLATE = app TARGET = duiapplettester QT += xml -win32|macx { - macx { - QMAKE_LFLAGS += -F../../lib - LIBS += -framework dui - } - win32:LIBS += -L../../lib -ldui0 -} else { - LIBS += ../../lib/libdui.so -} +LIBS += \ + -lduicore \ + -lduiviews \ + -lduisettings \ + -lduiextensions \ # Input HEADERS += duiapplettester.h \ duiapplettesterwindow.h \ - ../../src/mashup/mashup/duiappletid.h + ../../src/extensions/mashup/mashup/duiappletid.h SOURCES += main.cpp \ duiapplettester.cpp \ duiapplettesterwindow.cpp \ - ../../src/mashup/mashup/duiappletid.cpp + ../../src/extensions/mashup/mashup/duiappletid.cpp target.path = $$DUI_INSTALL_BIN INSTALLS += target CONFIG -= app_bundle diff --git a/tools/duiapplicationextensiontester/duiapplicationextensiontester.pro b/tools/duiapplicationextensiontester/duiapplicationextensiontester.pro index ac9feebda..529796bb7 100644 --- a/tools/duiapplicationextensiontester/duiapplicationextensiontester.pro +++ b/tools/duiapplicationextensiontester/duiapplicationextensiontester.pro @@ -6,15 +6,11 @@ DEPENDPATH += $$INCLUDEPATH TEMPLATE = app TARGET = duiapplicationextensiontester -win32|macx { - macx { - QMAKE_LFLAGS += -F../../lib - LIBS += -framework dui - } - win32:LIBS += -L../../lib -ldui0 -} else { - LIBS += ../../lib/libdui.so -} +LIBS += \ + -lduicore \ + -lduiviews \ + -lduisettings \ + -lduiextensions \ # Input HEADERS += duiapplicationextensiontester.h diff --git a/tools/duinotificationtool/duinotificationtool.pro b/tools/duinotificationtool/duinotificationtool.pro index ba20f3f37..a458ec32c 100644 --- a/tools/duinotificationtool/duinotificationtool.pro +++ b/tools/duinotificationtool/duinotificationtool.pro @@ -4,17 +4,20 @@ TEMPLATE = app TARGET = duinotificationtool INCLUDEPATH += . \ ../../src/include \ - ../../src/notification + ../../src/corelib/notification + + DEPENDPATH += $$INCLUDEPATH win32|macx { macx { QMAKE_LFLAGS += -F../../lib LIBS += -framework dui } - win32:LIBS += -L../../lib -ldui0 + win32:LIBS += -lduicore0 } else { - LIBS += ../../lib/libdui.so + LIBS += -lduicore } + SOURCES += duinotificationtool.cpp target.path = $$DUI_INSTALL_BIN INSTALLS += target