diff options
| author | Igor Nazarov <i.nazarov@samsung.com> | 2017-08-02 17:21:14 +0300 |
|---|---|---|
| committer | Igor Nazarov <i.nazarov@samsung.com> | 2017-08-03 13:36:48 +0300 |
| commit | bebbaa9cb40aabcb313f89e5e481e6fdc0ea046a (patch) | |
| tree | d6c3d92d602f6eb4ccb7366e48ecda0eadd8a654 | |
| parent | ec0e8d53a3d267f067e0f89748663ba7c397e10f (diff) | |
| download | gallery-bebbaa9cb40aabcb313f89e5e481e6fdc0ea046a.tar.gz gallery-bebbaa9cb40aabcb313f89e5e481e6fdc0ea046a.tar.bz2 gallery-bebbaa9cb40aabcb313f89e5e481e6fdc0ea046a.zip | |
TizenRefApp-9010 [Gallery] Refactor project directory structure
- Directory structure refactoring;
- Fixed bug in delRotaryEventHandler() function;
- Fixed build warning in UCL.
Change-Id: Iea1960b83a3ccd25527529898bd154b69167ea23
| -rw-r--r-- | .cproject | 61 | ||||
| -rw-r--r-- | edc/includes.h (renamed from inc/gallery/presenters/types.h) | 14 | ||||
| -rw-r--r-- | gallery/common.h (renamed from src/common.h) | 0 | ||||
| -rw-r--r-- | gallery/config.h (renamed from inc/gallery/config.h) | 0 | ||||
| -rw-r--r-- | gallery/helpers.h (renamed from src/helpers.h) | 2 | ||||
| -rw-r--r-- | gallery/helpers.hpp (renamed from src/helpers.hpp) | 0 | ||||
| -rw-r--r-- | gallery/main.cpp (renamed from src/main.cpp) | 2 | ||||
| -rw-r--r-- | gallery/model/Gallery.cpp (renamed from src/model/Gallery.cpp) | 4 | ||||
| -rw-r--r-- | gallery/model/Gallery.h (renamed from inc/gallery/model/Gallery.h) | 0 | ||||
| -rw-r--r-- | gallery/model/IJob.h (renamed from inc/gallery/model/IJob.h) | 0 | ||||
| -rw-r--r-- | gallery/model/IMediaAlbum.h (renamed from inc/gallery/model/IMediaAlbum.h) | 0 | ||||
| -rw-r--r-- | gallery/model/IMediaAlbum.hpp (renamed from inc/gallery/model/IMediaAlbum.hpp) | 0 | ||||
| -rw-r--r-- | gallery/model/MediaItem.cpp (renamed from src/model/MediaItem.cpp) | 4 | ||||
| -rw-r--r-- | gallery/model/MediaItem.h (renamed from inc/gallery/model/MediaItem.h) | 0 | ||||
| -rw-r--r-- | gallery/model/SoundManager.cpp (renamed from src/model/SoundManager.cpp) | 2 | ||||
| -rw-r--r-- | gallery/model/SoundManager.h (renamed from inc/gallery/model/SoundManager.h) | 0 | ||||
| -rw-r--r-- | gallery/model/common.h (renamed from src/model/common.h) | 4 | ||||
| -rw-r--r-- | gallery/model/impl/BaseJob.cpp (renamed from src/model/BaseJob.cpp) | 0 | ||||
| -rw-r--r-- | gallery/model/impl/BaseJob.h (renamed from src/model/BaseJob.h) | 6 | ||||
| -rw-r--r-- | gallery/model/impl/GalleryAlbum.cpp (renamed from src/model/GalleryAlbum.cpp) | 0 | ||||
| -rw-r--r-- | gallery/model/impl/GalleryAlbum.h (renamed from src/model/GalleryAlbum.h) | 6 | ||||
| -rw-r--r-- | gallery/model/impl/common.h | 22 | ||||
| -rw-r--r-- | gallery/model/impl/helpers.cpp (renamed from src/model/helpers.cpp) | 0 | ||||
| -rw-r--r-- | gallery/model/impl/helpers.h (renamed from src/model/helpers.h) | 6 | ||||
| -rw-r--r-- | gallery/model/impl/helpers.hpp (renamed from src/model/helpers.hpp) | 0 | ||||
| -rw-r--r-- | gallery/model/types.h (renamed from inc/gallery/model/types.h) | 0 | ||||
| -rw-r--r-- | gallery/presenters/Instance.cpp (renamed from src/presenters/Instance.cpp) | 10 | ||||
| -rw-r--r-- | gallery/presenters/Instance.h (renamed from inc/gallery/presenters/Instance.h) | 3 | ||||
| -rw-r--r-- | gallery/presenters/InstanceManager.cpp (renamed from src/presenters/InstanceManager.cpp) | 4 | ||||
| -rw-r--r-- | gallery/presenters/InstanceManager.h (renamed from inc/gallery/presenters/InstanceManager.h) | 2 | ||||
| -rw-r--r-- | gallery/presenters/base/Dialog.cpp (renamed from src/presenters/Dialog.cpp) | 2 | ||||
| -rw-r--r-- | gallery/presenters/base/Dialog.h (renamed from inc/gallery/presenters/Dialog.h) | 6 | ||||
| -rw-r--r-- | gallery/presenters/base/Dialog.hpp (renamed from inc/gallery/presenters/Dialog.hpp) | 0 | ||||
| -rw-r--r-- | gallery/presenters/base/Page.cpp (renamed from src/presenters/Page.cpp) | 2 | ||||
| -rw-r--r-- | gallery/presenters/base/Page.h (renamed from inc/gallery/presenters/Page.h) | 6 | ||||
| -rw-r--r-- | gallery/presenters/base/Page.hpp (renamed from inc/gallery/presenters/Page.hpp) | 0 | ||||
| -rw-r--r-- | gallery/presenters/base/common.h | 22 | ||||
| -rw-r--r-- | gallery/presenters/common.h (renamed from src/presenters/common.h) | 4 | ||||
| -rw-r--r-- | gallery/presenters/dialogs/AlertDialog.cpp (renamed from src/presenters/AlertDialog.cpp) | 2 | ||||
| -rw-r--r-- | gallery/presenters/dialogs/AlertDialog.h (renamed from inc/gallery/presenters/AlertDialog.h) | 8 | ||||
| -rw-r--r-- | gallery/presenters/dialogs/common.h | 22 | ||||
| -rw-r--r-- | gallery/presenters/misc/AtspiHighlightHelper.cpp (renamed from src/presenters/AtspiHighlightHelper.cpp) | 2 | ||||
| -rw-r--r-- | gallery/presenters/misc/AtspiHighlightHelper.h (renamed from inc/gallery/presenters/AtspiHighlightHelper.h) | 6 | ||||
| -rw-r--r-- | gallery/presenters/misc/MoreOptionsPresenter.cpp (renamed from src/presenters/MoreOptionsPresenter.cpp) | 2 | ||||
| -rw-r--r-- | gallery/presenters/misc/MoreOptionsPresenter.h (renamed from inc/gallery/presenters/MoreOptionsPresenter.h) | 6 | ||||
| -rw-r--r-- | gallery/presenters/misc/ProcessingPresenter.cpp (renamed from src/presenters/ProcessingPresenter.cpp) | 2 | ||||
| -rw-r--r-- | gallery/presenters/misc/ProcessingPresenter.h (renamed from inc/gallery/presenters/ProcessingPresenter.h) | 6 | ||||
| -rw-r--r-- | gallery/presenters/misc/SelectModePresenter.cpp (renamed from src/presenters/SelectModePresenter.cpp) | 2 | ||||
| -rw-r--r-- | gallery/presenters/misc/SelectModePresenter.h (renamed from inc/gallery/presenters/SelectModePresenter.h) | 6 | ||||
| -rw-r--r-- | gallery/presenters/misc/common.h | 22 | ||||
| -rw-r--r-- | gallery/presenters/misc/helpers.cpp (renamed from src/presenters/helpers.cpp) | 0 | ||||
| -rw-r--r-- | gallery/presenters/misc/helpers.h (renamed from src/presenters/helpers.h) | 6 | ||||
| -rw-r--r-- | gallery/presenters/pages/NoContentPage.cpp (renamed from src/presenters/NoContentPage.cpp) | 2 | ||||
| -rw-r--r-- | gallery/presenters/pages/NoContentPage.h (renamed from inc/gallery/presenters/NoContentPage.h) | 8 | ||||
| -rw-r--r-- | gallery/presenters/pages/PreviewPage.cpp (renamed from src/presenters/PreviewPage.cpp) | 4 | ||||
| -rw-r--r-- | gallery/presenters/pages/PreviewPage.h (renamed from inc/gallery/presenters/PreviewPage.h) | 21 | ||||
| -rw-r--r-- | gallery/presenters/pages/ThumbnailPage.cpp (renamed from src/presenters/ThumbnailPage.cpp) | 4 | ||||
| -rw-r--r-- | gallery/presenters/pages/ThumbnailPage.h (renamed from inc/gallery/presenters/ThumbnailPage.h) | 14 | ||||
| -rw-r--r-- | gallery/presenters/pages/VideoPlayerPage.cpp (renamed from src/presenters/VideoPlayerPage.cpp) | 2 | ||||
| -rw-r--r-- | gallery/presenters/pages/VideoPlayerPage.h (renamed from inc/gallery/presenters/VideoPlayerPage.h) | 12 | ||||
| -rw-r--r-- | gallery/presenters/pages/ViewerPage.cpp (renamed from src/presenters/ViewerPage.cpp) | 2 | ||||
| -rw-r--r-- | gallery/presenters/pages/ViewerPage.h (renamed from inc/gallery/presenters/ViewerPage.h) | 14 | ||||
| -rw-r--r-- | gallery/presenters/pages/common.h | 22 | ||||
| -rw-r--r-- | gallery/resources.cpp (renamed from src/resources.cpp) | 2 | ||||
| -rw-r--r-- | gallery/resources.h (renamed from inc/gallery/resources.h) | 0 | ||||
| -rw-r--r-- | gallery/types.h (renamed from inc/gallery/types.h) | 0 | ||||
| -rw-r--r-- | gallery/view/ImageGrid.cpp (renamed from src/view/ImageGrid.cpp) | 4 | ||||
| -rw-r--r-- | gallery/view/ImageGrid.h (renamed from inc/gallery/view/ImageGrid.h) | 2 | ||||
| -rw-r--r-- | gallery/view/ImageViewer.cpp (renamed from src/view/ImageViewer.cpp) | 0 | ||||
| -rw-r--r-- | gallery/view/ImageViewer.h (renamed from inc/gallery/view/ImageViewer.h) | 0 | ||||
| -rw-r--r-- | gallery/view/PageContent.cpp (renamed from src/view/PageContent.cpp) | 2 | ||||
| -rw-r--r-- | gallery/view/PageContent.h (renamed from inc/gallery/view/PageContent.h) | 0 | ||||
| -rw-r--r-- | gallery/view/TouchParser.cpp (renamed from src/view/TouchParser.cpp) | 2 | ||||
| -rw-r--r-- | gallery/view/TouchParser.h (renamed from inc/gallery/view/TouchParser.h) | 0 | ||||
| -rw-r--r-- | gallery/view/common.h (renamed from src/view/common.h) | 4 | ||||
| -rw-r--r-- | gallery/view/helpers.cpp (renamed from src/view/helpers.cpp) | 4 | ||||
| -rw-r--r-- | gallery/view/helpers.h (renamed from inc/gallery/view/helpers.h) | 0 | ||||
| -rw-r--r-- | gallery/view/types.h (renamed from inc/gallery/view/types.h) | 0 | ||||
| -rw-r--r-- | project_def.prop | 6 | ||||
| -rw-r--r-- | res/edje/theme.edc | 7 | ||||
| -rw-r--r-- | tizen-manifest.xml | 44 | ||||
| -rw-r--r-- | ucl/include/ucl/appfw/IInstance.h (renamed from ucl/inc/ucl/appfw/IInstance.h) | 0 | ||||
| -rw-r--r-- | ucl/include/ucl/appfw/IInstanceAppControlExt.h (renamed from ucl/inc/ucl/appfw/IInstanceAppControlExt.h) | 0 | ||||
| -rw-r--r-- | ucl/include/ucl/appfw/IInstanceContext.h (renamed from ucl/inc/ucl/appfw/IInstanceContext.h) | 0 | ||||
| -rw-r--r-- | ucl/include/ucl/appfw/InstanceManagerBase.h (renamed from ucl/inc/ucl/appfw/InstanceManagerBase.h) | 0 | ||||
| -rw-r--r-- | ucl/include/ucl/appfw/SysEventProvider.h (renamed from ucl/inc/ucl/appfw/SysEventProvider.h) | 0 | ||||
| -rw-r--r-- | ucl/include/ucl/appfw/SysEventProvider.hpp (renamed from ucl/inc/ucl/appfw/SysEventProvider.hpp) | 0 | ||||
| -rw-r--r-- | ucl/include/ucl/appfw/UIApp.h (renamed from ucl/inc/ucl/appfw/UIApp.h) | 0 | ||||
| -rw-r--r-- | ucl/include/ucl/appfw/helpers.h (renamed from ucl/inc/ucl/appfw/helpers.h) | 0 | ||||
| -rw-r--r-- | ucl/include/ucl/appfw/types.h (renamed from ucl/inc/ucl/appfw/types.h) | 0 | ||||
| -rw-r--r-- | ucl/include/ucl/config.h (renamed from ucl/inc/ucl/config.h) | 0 | ||||
| -rw-r--r-- | ucl/include/ucl/gui/EdjeWidget.h (renamed from ucl/inc/ucl/gui/EdjeWidget.h) | 0 | ||||
| -rw-r--r-- | ucl/include/ucl/gui/EdjeWidget.hpp (renamed from ucl/inc/ucl/gui/EdjeWidget.hpp) | 0 | ||||
| -rw-r--r-- | ucl/include/ucl/gui/ElmWidget.h (renamed from ucl/inc/ucl/gui/ElmWidget.h) | 0 | ||||
| -rw-r--r-- | ucl/include/ucl/gui/ElmWidget.hpp (renamed from ucl/inc/ucl/gui/ElmWidget.hpp) | 0 | ||||
| -rw-r--r-- | ucl/include/ucl/gui/Genlist.h (renamed from ucl/inc/ucl/gui/Genlist.h) | 0 | ||||
| -rw-r--r-- | ucl/include/ucl/gui/Genlist.hpp (renamed from ucl/inc/ucl/gui/Genlist.hpp) | 0 | ||||
| -rw-r--r-- | ucl/include/ucl/gui/GenlistItem.h (renamed from ucl/inc/ucl/gui/GenlistItem.h) | 0 | ||||
| -rw-r--r-- | ucl/include/ucl/gui/GenlistItem.hpp (renamed from ucl/inc/ucl/gui/GenlistItem.hpp) | 0 | ||||
| -rw-r--r-- | ucl/include/ucl/gui/Layout.h (renamed from ucl/inc/ucl/gui/Layout.h) | 0 | ||||
| -rw-r--r-- | ucl/include/ucl/gui/Layout.hpp (renamed from ucl/inc/ucl/gui/Layout.hpp) | 0 | ||||
| -rw-r--r-- | ucl/include/ucl/gui/NaviItem.h (renamed from ucl/inc/ucl/gui/NaviItem.h) | 0 | ||||
| -rw-r--r-- | ucl/include/ucl/gui/NaviItem.hpp (renamed from ucl/inc/ucl/gui/NaviItem.hpp) | 0 | ||||
| -rw-r--r-- | ucl/include/ucl/gui/Naviframe.h (renamed from ucl/inc/ucl/gui/Naviframe.h) | 0 | ||||
| -rw-r--r-- | ucl/include/ucl/gui/Naviframe.hpp (renamed from ucl/inc/ucl/gui/Naviframe.hpp) | 0 | ||||
| -rw-r--r-- | ucl/include/ucl/gui/StyledWidget.h (renamed from ucl/inc/ucl/gui/StyledWidget.h) | 0 | ||||
| -rw-r--r-- | ucl/include/ucl/gui/StyledWidget.hpp (renamed from ucl/inc/ucl/gui/StyledWidget.hpp) | 0 | ||||
| -rw-r--r-- | ucl/include/ucl/gui/Theme.h (renamed from ucl/inc/ucl/gui/Theme.h) | 0 | ||||
| -rw-r--r-- | ucl/include/ucl/gui/Theme.hpp (renamed from ucl/inc/ucl/gui/Theme.hpp) | 0 | ||||
| -rw-r--r-- | ucl/include/ucl/gui/Widget.h (renamed from ucl/inc/ucl/gui/Widget.h) | 0 | ||||
| -rw-r--r-- | ucl/include/ucl/gui/Widget.hpp (renamed from ucl/inc/ucl/gui/Widget.hpp) | 0 | ||||
| -rw-r--r-- | ucl/include/ucl/gui/WidgetItem.h (renamed from ucl/inc/ucl/gui/WidgetItem.h) | 0 | ||||
| -rw-r--r-- | ucl/include/ucl/gui/WidgetItem.hpp (renamed from ucl/inc/ucl/gui/WidgetItem.hpp) | 0 | ||||
| -rw-r--r-- | ucl/include/ucl/gui/Window.h (renamed from ucl/inc/ucl/gui/Window.h) | 0 | ||||
| -rw-r--r-- | ucl/include/ucl/gui/Window.hpp (renamed from ucl/inc/ucl/gui/Window.hpp) | 0 | ||||
| -rw-r--r-- | ucl/include/ucl/gui/helpers.h (renamed from ucl/inc/ucl/gui/helpers.h) | 0 | ||||
| -rw-r--r-- | ucl/include/ucl/gui/helpers.hpp (renamed from ucl/inc/ucl/gui/helpers.hpp) | 0 | ||||
| -rw-r--r-- | ucl/include/ucl/gui/stdTheme.h (renamed from ucl/inc/ucl/gui/stdTheme.h) | 0 | ||||
| -rw-r--r-- | ucl/include/ucl/gui/stdTheme/common.h (renamed from ucl/inc/ucl/gui/stdTheme/common.h) | 0 | ||||
| -rw-r--r-- | ucl/include/ucl/gui/stdTheme/layout.h (renamed from ucl/inc/ucl/gui/stdTheme/layout.h) | 0 | ||||
| -rw-r--r-- | ucl/include/ucl/gui/stdTheme/naviframe.h (renamed from ucl/inc/ucl/gui/stdTheme/naviframe.h) | 0 | ||||
| -rw-r--r-- | ucl/include/ucl/gui/types.h (renamed from ucl/inc/ucl/gui/types.h) | 0 | ||||
| -rw-r--r-- | ucl/include/ucl/gui/types.hpp (renamed from ucl/inc/ucl/gui/types.hpp) | 0 | ||||
| -rw-r--r-- | ucl/include/ucl/misc/Aspect.h (renamed from ucl/inc/ucl/misc/Aspect.h) | 0 | ||||
| -rw-r--r-- | ucl/include/ucl/misc/Aspect.hpp (renamed from ucl/inc/ucl/misc/Aspect.hpp) | 0 | ||||
| -rw-r--r-- | ucl/include/ucl/misc/AutoHandle.h (renamed from ucl/inc/ucl/misc/AutoHandle.h) | 0 | ||||
| -rw-r--r-- | ucl/include/ucl/misc/CString.h (renamed from ucl/inc/ucl/misc/CString.h) | 0 | ||||
| -rw-r--r-- | ucl/include/ucl/misc/CString.hpp (renamed from ucl/inc/ucl/misc/CString.hpp) | 0 | ||||
| -rw-r--r-- | ucl/include/ucl/misc/ConstCString.h (renamed from ucl/inc/ucl/misc/ConstCString.h) | 0 | ||||
| -rw-r--r-- | ucl/include/ucl/misc/ConstCString.hpp (renamed from ucl/inc/ucl/misc/ConstCString.hpp) | 0 | ||||
| -rw-r--r-- | ucl/include/ucl/misc/Event.h (renamed from ucl/inc/ucl/misc/Event.h) | 0 | ||||
| -rw-r--r-- | ucl/include/ucl/misc/Event.hpp (renamed from ucl/inc/ucl/misc/Event.hpp) | 0 | ||||
| -rw-r--r-- | ucl/include/ucl/misc/HashMap.h (renamed from ucl/inc/ucl/misc/HashMap.h) | 0 | ||||
| -rw-r--r-- | ucl/include/ucl/misc/HashMap.hpp (renamed from ucl/inc/ucl/misc/HashMap.hpp) | 0 | ||||
| -rw-r--r-- | ucl/include/ucl/misc/RefCountAware.h (renamed from ucl/inc/ucl/misc/RefCountAware.h) | 0 | ||||
| -rw-r--r-- | ucl/include/ucl/misc/RefCountAware.hpp (renamed from ucl/inc/ucl/misc/RefCountAware.hpp) | 0 | ||||
| -rw-r--r-- | ucl/include/ucl/misc/TString.h (renamed from ucl/inc/ucl/misc/TString.h) | 0 | ||||
| -rw-r--r-- | ucl/include/ucl/misc/TString.hpp (renamed from ucl/inc/ucl/misc/TString.hpp) | 0 | ||||
| -rw-r--r-- | ucl/include/ucl/misc/Timeout.h (renamed from ucl/inc/ucl/misc/Timeout.h) | 0 | ||||
| -rw-r--r-- | ucl/include/ucl/misc/Variant.h (renamed from ucl/inc/ucl/misc/Variant.h) | 0 | ||||
| -rw-r--r-- | ucl/include/ucl/misc/Variant.hpp (renamed from ucl/inc/ucl/misc/Variant.hpp) | 0 | ||||
| -rw-r--r-- | ucl/include/ucl/mvp/GuiPresenter.h (renamed from ucl/inc/ucl/mvp/GuiPresenter.h) | 0 | ||||
| -rw-r--r-- | ucl/include/ucl/mvp/ListItemPresenter.h (renamed from ucl/inc/ucl/mvp/ListItemPresenter.h) | 0 | ||||
| -rw-r--r-- | ucl/include/ucl/mvp/ListPresenter.h (renamed from ucl/inc/ucl/mvp/ListPresenter.h) | 0 | ||||
| -rw-r--r-- | ucl/include/ucl/mvp/types.h (renamed from ucl/inc/ucl/mvp/types.h) | 0 | ||||
| -rw-r--r-- | ucl/include/ucl/util/delegation.h (renamed from ucl/inc/ucl/util/delegation.h) | 0 | ||||
| -rw-r--r-- | ucl/include/ucl/util/delegation/BaseDelegate.h (renamed from ucl/inc/ucl/util/delegation/BaseDelegate.h) | 0 | ||||
| -rw-r--r-- | ucl/include/ucl/util/delegation/BaseDelegate.hpp (renamed from ucl/inc/ucl/util/delegation/BaseDelegate.hpp) | 0 | ||||
| -rw-r--r-- | ucl/include/ucl/util/delegation/BaseDelegate2.h (renamed from ucl/inc/ucl/util/delegation/BaseDelegate2.h) | 0 | ||||
| -rw-r--r-- | ucl/include/ucl/util/delegation/BaseDelegate2.hpp (renamed from ucl/inc/ucl/util/delegation/BaseDelegate2.hpp) | 0 | ||||
| -rw-r--r-- | ucl/include/ucl/util/delegation/Callback.h (renamed from ucl/inc/ucl/util/delegation/Callback.h) | 0 | ||||
| -rw-r--r-- | ucl/include/ucl/util/delegation/Callback.hpp (renamed from ucl/inc/ucl/util/delegation/Callback.hpp) | 0 | ||||
| -rw-r--r-- | ucl/include/ucl/util/delegation/Delegate.h (renamed from ucl/inc/ucl/util/delegation/Delegate.h) | 0 | ||||
| -rw-r--r-- | ucl/include/ucl/util/delegation/Delegate.hpp (renamed from ucl/inc/ucl/util/delegation/Delegate.hpp) | 0 | ||||
| -rw-r--r-- | ucl/include/ucl/util/delegation/Delegate2.h (renamed from ucl/inc/ucl/util/delegation/Delegate2.h) | 0 | ||||
| -rw-r--r-- | ucl/include/ucl/util/delegation/Delegate2.hpp (renamed from ucl/inc/ucl/util/delegation/Delegate2.hpp) | 0 | ||||
| -rw-r--r-- | ucl/include/ucl/util/delegation/helpers.h (renamed from ucl/inc/ucl/util/delegation/helpers.h) | 0 | ||||
| -rw-r--r-- | ucl/include/ucl/util/delegation/macro.h (renamed from ucl/inc/ucl/util/delegation/macro.h) | 0 | ||||
| -rw-r--r-- | ucl/include/ucl/util/delegation/shortMacro.h (renamed from ucl/inc/ucl/util/delegation/shortMacro.h) | 0 | ||||
| -rw-r--r-- | ucl/include/ucl/util/helpers.h (renamed from ucl/inc/ucl/util/helpers.h) | 0 | ||||
| -rw-r--r-- | ucl/include/ucl/util/helpers.hpp (renamed from ucl/inc/ucl/util/helpers.hpp) | 0 | ||||
| -rw-r--r-- | ucl/include/ucl/util/logging.h (renamed from ucl/inc/ucl/util/logging.h) | 0 | ||||
| -rw-r--r-- | ucl/include/ucl/util/memory.h (renamed from ucl/inc/ucl/util/memory.h) | 0 | ||||
| -rw-r--r-- | ucl/include/ucl/util/memory/BaseRef.h (renamed from ucl/inc/ucl/util/memory/BaseRef.h) | 0 | ||||
| -rw-r--r-- | ucl/include/ucl/util/memory/BaseRef.hpp (renamed from ucl/inc/ucl/util/memory/BaseRef.hpp) | 0 | ||||
| -rw-r--r-- | ucl/include/ucl/util/memory/IRefCountObj.h (renamed from ucl/inc/ucl/util/memory/IRefCountObj.h) | 0 | ||||
| -rw-r--r-- | ucl/include/ucl/util/memory/RefCountObj.h (renamed from ucl/inc/ucl/util/memory/RefCountObj.h) | 0 | ||||
| -rw-r--r-- | ucl/include/ucl/util/memory/RefCountObj.hpp (renamed from ucl/inc/ucl/util/memory/RefCountObj.hpp) | 0 | ||||
| -rw-r--r-- | ucl/include/ucl/util/memory/RefCounterMT.h (renamed from ucl/inc/ucl/util/memory/RefCounterMT.h) | 0 | ||||
| -rw-r--r-- | ucl/include/ucl/util/memory/RefCounterMT.hpp (renamed from ucl/inc/ucl/util/memory/RefCounterMT.hpp) | 0 | ||||
| -rw-r--r-- | ucl/include/ucl/util/memory/RefCounterST.h (renamed from ucl/inc/ucl/util/memory/RefCounterST.h) | 0 | ||||
| -rw-r--r-- | ucl/include/ucl/util/memory/RefCounterST.hpp (renamed from ucl/inc/ucl/util/memory/RefCounterST.hpp) | 0 | ||||
| -rw-r--r-- | ucl/include/ucl/util/memory/ReffedObj.h (renamed from ucl/inc/ucl/util/memory/ReffedObj.h) | 0 | ||||
| -rw-r--r-- | ucl/include/ucl/util/memory/ReffedObj.hpp (renamed from ucl/inc/ucl/util/memory/ReffedObj.hpp) | 0 | ||||
| -rw-r--r-- | ucl/include/ucl/util/memory/SharedRef.h (renamed from ucl/inc/ucl/util/memory/SharedRef.h) | 0 | ||||
| -rw-r--r-- | ucl/include/ucl/util/memory/SharedRef.hpp (renamed from ucl/inc/ucl/util/memory/SharedRef.hpp) | 0 | ||||
| -rw-r--r-- | ucl/include/ucl/util/memory/WeakRef.h (renamed from ucl/inc/ucl/util/memory/WeakRef.h) | 0 | ||||
| -rw-r--r-- | ucl/include/ucl/util/memory/WeakRef.hpp (renamed from ucl/inc/ucl/util/memory/WeakRef.hpp) | 0 | ||||
| -rw-r--r-- | ucl/include/ucl/util/memory/helpers.h (renamed from ucl/inc/ucl/util/memory/helpers.h) | 0 | ||||
| -rw-r--r-- | ucl/include/ucl/util/memory/macro.h (renamed from ucl/inc/ucl/util/memory/macro.h) | 0 | ||||
| -rw-r--r-- | ucl/include/ucl/util/shortLogs.h (renamed from ucl/inc/ucl/util/shortLogs.h) | 0 | ||||
| -rw-r--r-- | ucl/include/ucl/util/smartDelegation.h (renamed from ucl/inc/ucl/util/smartDelegation.h) | 0 | ||||
| -rw-r--r-- | ucl/include/ucl/util/smartDelegation/WeakDelegate.h (renamed from ucl/inc/ucl/util/smartDelegation/WeakDelegate.h) | 0 | ||||
| -rw-r--r-- | ucl/include/ucl/util/smartDelegation/WeakDelegate.hpp (renamed from ucl/inc/ucl/util/smartDelegation/WeakDelegate.hpp) | 0 | ||||
| -rw-r--r-- | ucl/include/ucl/util/smartDelegation/macro.h (renamed from ucl/inc/ucl/util/smartDelegation/macro.h) | 0 | ||||
| -rw-r--r-- | ucl/include/ucl/util/smartDelegation/shortMacro.h (renamed from ucl/inc/ucl/util/smartDelegation/shortMacro.h) | 0 | ||||
| -rw-r--r-- | ucl/include/ucl/util/threading.h (renamed from ucl/inc/ucl/util/threading.h) | 0 | ||||
| -rw-r--r-- | ucl/include/ucl/util/threading/CondVar.h (renamed from ucl/inc/ucl/util/threading/CondVar.h) | 0 | ||||
| -rw-r--r-- | ucl/include/ucl/util/threading/CondVar.hpp (renamed from ucl/inc/ucl/util/threading/CondVar.hpp) | 0 | ||||
| -rw-r--r-- | ucl/include/ucl/util/threading/Mutex.h (renamed from ucl/inc/ucl/util/threading/Mutex.h) | 0 | ||||
| -rw-r--r-- | ucl/include/ucl/util/threading/Mutex.hpp (renamed from ucl/inc/ucl/util/threading/Mutex.hpp) | 0 | ||||
| -rw-r--r-- | ucl/include/ucl/util/threading/MutexLock.h (renamed from ucl/inc/ucl/util/threading/MutexLock.h) | 0 | ||||
| -rw-r--r-- | ucl/include/ucl/util/threading/MutexLock.hpp (renamed from ucl/inc/ucl/util/threading/MutexLock.hpp) | 0 | ||||
| -rw-r--r-- | ucl/include/ucl/util/threading/Thread.h (renamed from ucl/inc/ucl/util/threading/Thread.h) | 0 | ||||
| -rw-r--r-- | ucl/include/ucl/util/threading/Thread.hpp (renamed from ucl/inc/ucl/util/threading/Thread.hpp) | 0 | ||||
| -rw-r--r-- | ucl/include/ucl/util/types.h (renamed from ucl/inc/ucl/util/types.h) | 0 | ||||
| -rw-r--r-- | ucl/include/ucl/util/types/Result.h (renamed from ucl/inc/ucl/util/types/Result.h) | 0 | ||||
| -rw-r--r-- | ucl/include/ucl/util/types/Result.hpp (renamed from ucl/inc/ucl/util/types/Result.hpp) | 0 | ||||
| -rw-r--r-- | ucl/include/ucl/util/types/baseTypes.h (renamed from ucl/inc/ucl/util/types/baseTypes.h) | 0 | ||||
| -rw-r--r-- | ucl/include/ucl/util/types/classTypes.h (renamed from ucl/inc/ucl/util/types/classTypes.h) | 0 | ||||
| -rw-r--r-- | ucl/source/appfw/InstanceManagerBase.cpp (renamed from ucl/src/appfw/InstanceManagerBase.cpp) | 0 | ||||
| -rw-r--r-- | ucl/source/appfw/SysEventProvider.cpp (renamed from ucl/src/appfw/SysEventProvider.cpp) | 0 | ||||
| -rw-r--r-- | ucl/source/appfw/UIApp.cpp (renamed from ucl/src/appfw/UIApp.cpp) | 0 | ||||
| -rw-r--r-- | ucl/source/appfw/common.h (renamed from ucl/src/misc/common.h) | 8 | ||||
| -rw-r--r-- | ucl/source/appfw/helpers.cpp (renamed from ucl/src/appfw/helpers.cpp) | 0 | ||||
| -rw-r--r-- | ucl/source/common.h (renamed from ucl/src/common.h) | 6 | ||||
| -rw-r--r-- | ucl/source/gui/EdjeWidget.cpp (renamed from ucl/src/gui/EdjeWidget.cpp) | 0 | ||||
| -rw-r--r-- | ucl/source/gui/ElmWidget.cpp (renamed from ucl/src/gui/ElmWidget.cpp) | 0 | ||||
| -rw-r--r-- | ucl/source/gui/Genlist.cpp (renamed from ucl/src/gui/Genlist.cpp) | 0 | ||||
| -rw-r--r-- | ucl/source/gui/Layout.cpp (renamed from ucl/src/gui/Layout.cpp) | 0 | ||||
| -rw-r--r-- | ucl/source/gui/NaviItem.cpp (renamed from ucl/src/gui/NaviItem.cpp) | 0 | ||||
| -rw-r--r-- | ucl/source/gui/Naviframe.cpp (renamed from ucl/src/gui/Naviframe.cpp) | 0 | ||||
| -rw-r--r-- | ucl/source/gui/Widget.cpp (renamed from ucl/src/gui/Widget.cpp) | 0 | ||||
| -rw-r--r-- | ucl/source/gui/WidgetItem.cpp (renamed from ucl/src/gui/WidgetItem.cpp) | 0 | ||||
| -rw-r--r-- | ucl/source/gui/Window.cpp (renamed from ucl/src/gui/Window.cpp) | 0 | ||||
| -rw-r--r-- | ucl/source/gui/common.h (renamed from ucl/src/mvp/common.h) | 8 | ||||
| -rw-r--r-- | ucl/source/misc/Timeout.cpp (renamed from ucl/src/misc/Timeout.cpp) | 0 | ||||
| -rw-r--r-- | ucl/source/misc/Variant.cpp (renamed from ucl/src/misc/Variant.cpp) | 2 | ||||
| -rw-r--r-- | ucl/source/misc/common.h (renamed from ucl/src/appfw/common.h) | 8 | ||||
| -rw-r--r-- | ucl/source/mvp/GuiPresenter.cpp (renamed from ucl/src/mvp/GuiPresenter.cpp) | 0 | ||||
| -rw-r--r-- | ucl/source/mvp/ListItemPresenter.cpp (renamed from ucl/src/mvp/ListItemPresenter.cpp) | 0 | ||||
| -rw-r--r-- | ucl/source/mvp/ListPresenter.cpp (renamed from ucl/src/mvp/ListPresenter.cpp) | 0 | ||||
| -rw-r--r-- | ucl/source/mvp/common.h (renamed from ucl/src/gui/common.h) | 8 | ||||
| -rw-r--r-- | ucl/source/util/logging.cpp (renamed from ucl/src/util/logging.cpp) | 0 | ||||
| -rw-r--r-- | ucl/source/util/types/Result.cpp (renamed from ucl/src/util/types/Result.cpp) | 0 |
225 files changed, 311 insertions, 197 deletions
@@ -16,18 +16,18 @@ </extensions> </storageModule> <storageModule moduleId="cdtBuildSystem" version="4.0.0"> - <configuration artifactName="gallery" buildArtefactType="org.tizen.nativecore.buildArtefactType.app" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.tizen.nativecore.buildArtefactType.app,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug" description="" errorParsers="org.eclipse.cdt.core.MakeErrorParser;org.eclipse.cdt.core.GCCErrorParser;" id="org.tizen.nativecore.config.sbi.gcc45.app.debug.1049602791" name="Debug" parent="org.tizen.nativecore.config.sbi.gcc45.app.debug"> + <configuration artifactName="w-gallery" buildArtefactType="org.tizen.nativecore.buildArtefactType.app" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.tizen.nativecore.buildArtefactType.app,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug" description="" errorParsers="org.eclipse.cdt.core.MakeErrorParser;org.eclipse.cdt.core.GCCErrorParser;" id="org.tizen.nativecore.config.sbi.gcc45.app.debug.1049602791" name="Debug" parent="org.tizen.nativecore.config.sbi.gcc45.app.debug"> <folderInfo id="org.tizen.nativecore.config.sbi.gcc45.app.debug.1049602791." name="/" resourcePath=""> <toolChain id="org.tizen.nativecore.toolchain.sbi.gcc45.app.debug.531160032" name="Tizen Native Toolchain" superClass="org.tizen.nativecore.toolchain.sbi.gcc45.app.debug"> <targetPlatform binaryParser="org.eclipse.cdt.core.ELF" id="org.tizen.nativeide.target.sbi.gnu.platform.base.728531842" osList="linux,win32" superClass="org.tizen.nativeide.target.sbi.gnu.platform.base"/> <builder autoBuildTarget="all" buildPath="${workspace_loc:/gallery}/Debug" enableAutoBuild="true" id="org.tizen.nativecore.target.sbi.gnu.builder.1903374037" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Tizen Application Builder" superClass="org.tizen.nativecore.target.sbi.gnu.builder"/> <tool id="org.tizen.nativecore.tool.sbi.gnu.archiver.683429809" name="Archiver" superClass="org.tizen.nativecore.tool.sbi.gnu.archiver"/> - <tool command="clang++" id="org.tizen.nativecore.tool.sbi.gnu.cpp.compiler.1060076319" name="C++ Compiler" superClass="org.tizen.nativecore.tool.sbi.gnu.cpp.compiler"> + <tool command="arm-linux-gnueabi-g++" id="org.tizen.nativecore.tool.sbi.gnu.cpp.compiler.1060076319" name="C++ Compiler" superClass="org.tizen.nativecore.tool.sbi.gnu.cpp.compiler"> <option id="gnu.cpp.compiler.option.optimization.level.1602641110" name="Optimization Level" superClass="gnu.cpp.compiler.option.optimization.level" value="gnu.cpp.compiler.optimization.level.none" valueType="enumerated"/> <option defaultValue="gnu.cpp.compiler.debugging.level.max" id="sbi.gnu.cpp.compiler.option.debugging.level.core.1369151974" name="Debug level" superClass="sbi.gnu.cpp.compiler.option.debugging.level.core" valueType="enumerated"/> <option defaultValue="false" id="sbi.gnu.cpp.compiler.option.misc.pic.core.1996885248" name="-fPIC option" superClass="sbi.gnu.cpp.compiler.option.misc.pic.core" valueType="boolean"/> <option id="sbi.gnu.cpp.compiler.option.1964350537" name="Tizen-Target" superClass="sbi.gnu.cpp.compiler.option" valueType="userObjs"> - <listOptionValue builtIn="false" value="wearable-4.0-device.core_llvm37.armel.core.app"/> + <listOptionValue builtIn="false" value="wearable-4.0-device.core_gcc62.armel.core.app"/> </option> <option id="sbi.gnu.cpp.compiler.option.frameworks_inc.core.1290986068" name="Tizen-Frameworks-Include-Path" superClass="sbi.gnu.cpp.compiler.option.frameworks_inc.core" valueType="includePath"> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/libxml2""/> @@ -122,8 +122,8 @@ <listOptionValue builtIn="false" value="-mthumb"/> </option> <option id="gnu.cpp.compiler.option.include.paths.831915180" name="Include paths (-I)" superClass="gnu.cpp.compiler.option.include.paths" valueType="includePath"> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/inc}""/> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/ucl/inc}""/> + <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}}""/> + <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/ucl/include}""/> </option> <option id="sbi.gnu.cpp.compiler.option.frameworks.core.1738122246" name="Tizen-Frameworks" superClass="sbi.gnu.cpp.compiler.option.frameworks.core" valueType="userObjs"> <listOptionValue builtIn="false" value="Native_API"/> @@ -136,12 +136,12 @@ <option id="gnu.cpp.compiler.option.dialect.std.220245897" name="Language standard" superClass="gnu.cpp.compiler.option.dialect.std" value="gnu.cpp.compiler.dialect.c++11" valueType="enumerated"/> <inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.592894666" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/> </tool> - <tool command="clang" id="org.tizen.nativecore.tool.sbi.gnu.c.compiler.1433876771" name="C Compiler" superClass="org.tizen.nativecore.tool.sbi.gnu.c.compiler"> + <tool command="arm-linux-gnueabi-gcc" id="org.tizen.nativecore.tool.sbi.gnu.c.compiler.1433876771" name="C Compiler" superClass="org.tizen.nativecore.tool.sbi.gnu.c.compiler"> <option defaultValue="gnu.c.optimization.level.none" id="gnu.c.compiler.option.optimization.level.982057263" name="Optimization Level" superClass="gnu.c.compiler.option.optimization.level" valueType="enumerated"/> <option defaultValue="gnu.c.debugging.level.max" id="sbi.gnu.c.compiler.option.debugging.level.core.1672854934" name="Debug level" superClass="sbi.gnu.c.compiler.option.debugging.level.core" valueType="enumerated"/> <option defaultValue="false" id="sbi.gnu.c.compiler.option.misc.pic.core.1117960579" name="-fPIC option" superClass="sbi.gnu.c.compiler.option.misc.pic.core" valueType="boolean"/> <option id="sbi.gnu.c.compiler.option.2144981321" name="Tizen-Target" superClass="sbi.gnu.c.compiler.option" valueType="userObjs"> - <listOptionValue builtIn="false" value="wearable-4.0-device.core_llvm37.armel.core.app"/> + <listOptionValue builtIn="false" value="wearable-4.0-device.core_gcc62.armel.core.app"/> </option> <option id="sbi.gnu.c.compiler.option.frameworks_inc.core.625351371" name="Tizen-Frameworks-Include-Path" superClass="sbi.gnu.c.compiler.option.frameworks_inc.core" valueType="includePath"> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/libxml2""/> @@ -236,8 +236,8 @@ <listOptionValue builtIn="false" value="-mthumb"/> </option> <option id="gnu.c.compiler.option.include.paths.2123823065" name="Include paths (-I)" superClass="gnu.c.compiler.option.include.paths" valueType="includePath"> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/inc}""/> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/ucl/inc}""/> + <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}}""/> + <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/ucl/include}""/> </option> <option id="sbi.gnu.c.compiler.option.frameworks.core.1669459306" name="Tizen-Frameworks" superClass="sbi.gnu.c.compiler.option.frameworks.core" valueType="userObjs"> <listOptionValue builtIn="false" value="Native_API"/> @@ -250,7 +250,7 @@ <inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.1564318540" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/> </tool> <tool id="org.tizen.nativeide.tool.sbi.gnu.c.linker.base.1520359031" name="C Linker" superClass="org.tizen.nativeide.tool.sbi.gnu.c.linker.base"/> - <tool command="clang++" id="org.tizen.nativecore.tool.sbi.gnu.cpp.linker.1597861570" name="C++ Linker" superClass="org.tizen.nativecore.tool.sbi.gnu.cpp.linker"> + <tool command="arm-linux-gnueabi-g++" id="org.tizen.nativecore.tool.sbi.gnu.cpp.linker.1597861570" name="C++ Linker" superClass="org.tizen.nativecore.tool.sbi.gnu.cpp.linker"> <option defaultValue="false" id="sbi.gnu.cpp.linker.option.shared_flag.core.1262973541" name="Linker.Shared" superClass="sbi.gnu.cpp.linker.option.shared_flag.core" valueType="boolean"/> <option defaultValue="false" id="sbi.gnu.cpp.linker.option.noundefined.core.1726486558" name="Report unresolved symbol references (-Wl,--no-undefined)" superClass="sbi.gnu.cpp.linker.option.noundefined.core" valueType="boolean"/> <option id="sbi.gnu.cpp.linker.option.frameworks_lflags.core.1232921885" name="Tizen-Frameworks-Other-Lflags" superClass="sbi.gnu.cpp.linker.option.frameworks_lflags.core" valueType="stringList"> @@ -292,11 +292,9 @@ </toolChain> </folderInfo> <sourceEntries> - <entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="inc"/> - <entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="res"/> - <entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="src"/> - <entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="ucl/inc"/> - <entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="ucl/src"/> + <entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="gallery"/> + <entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="res"/> + <entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="ucl/source"/> </sourceEntries> </configuration> </storageModule> @@ -323,12 +321,12 @@ <targetPlatform binaryParser="org.eclipse.cdt.core.ELF" id="org.tizen.nativeide.target.sbi.gnu.platform.base.1905316156" osList="linux,win32" superClass="org.tizen.nativeide.target.sbi.gnu.platform.base"/> <builder buildPath="${workspace_loc:/gallery}/Release" id="org.tizen.nativecore.target.sbi.gnu.builder.2018439737" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Tizen Application Builder" superClass="org.tizen.nativecore.target.sbi.gnu.builder"/> <tool id="org.tizen.nativecore.tool.sbi.gnu.archiver.1278616718" name="Archiver" superClass="org.tizen.nativecore.tool.sbi.gnu.archiver"/> - <tool command="clang++" id="org.tizen.nativecore.tool.sbi.gnu.cpp.compiler.1877650577" name="C++ Compiler" superClass="org.tizen.nativecore.tool.sbi.gnu.cpp.compiler"> + <tool command="arm-linux-gnueabi-g++" id="org.tizen.nativecore.tool.sbi.gnu.cpp.compiler.1877650577" name="C++ Compiler" superClass="org.tizen.nativecore.tool.sbi.gnu.cpp.compiler"> <option id="gnu.cpp.compiler.option.optimization.level.1349943786" name="Optimization Level" superClass="gnu.cpp.compiler.option.optimization.level" value="gnu.cpp.compiler.optimization.level.most" valueType="enumerated"/> <option defaultValue="gnu.cpp.compiler.debugging.level.none" id="sbi.gnu.cpp.compiler.option.debugging.level.core.2118322735" name="Debug level" superClass="sbi.gnu.cpp.compiler.option.debugging.level.core" valueType="enumerated"/> <option defaultValue="false" id="sbi.gnu.cpp.compiler.option.misc.pic.core.350374090" name="-fPIC option" superClass="sbi.gnu.cpp.compiler.option.misc.pic.core" valueType="boolean"/> <option id="sbi.gnu.cpp.compiler.option.205445558" name="Tizen-Target" superClass="sbi.gnu.cpp.compiler.option" valueType="userObjs"> - <listOptionValue builtIn="false" value="wearable-4.0-device.core_llvm37.armel.core.app"/> + <listOptionValue builtIn="false" value="wearable-4.0-device.core_gcc62.armel.core.app"/> </option> <option id="sbi.gnu.cpp.compiler.option.frameworks_inc.core.2129264981" name="Tizen-Frameworks-Include-Path" superClass="sbi.gnu.cpp.compiler.option.frameworks_inc.core" valueType="includePath"> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/libxml2""/> @@ -423,8 +421,8 @@ <listOptionValue builtIn="false" value="-mthumb"/> </option> <option id="gnu.cpp.compiler.option.include.paths.2064434934" name="Include paths (-I)" superClass="gnu.cpp.compiler.option.include.paths" valueType="includePath"> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/inc}""/> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/ucl/inc}""/> + <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}}""/> + <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/ucl/include}""/> </option> <option id="sbi.gnu.cpp.compiler.option.frameworks.core.1300541916" name="Tizen-Frameworks" superClass="sbi.gnu.cpp.compiler.option.frameworks.core" valueType="userObjs"> <listOptionValue builtIn="false" value="Native_API"/> @@ -432,12 +430,12 @@ <option id="gnu.cpp.compiler.option.dialect.std.1157770444" name="Language standard" superClass="gnu.cpp.compiler.option.dialect.std" value="gnu.cpp.compiler.dialect.c++11" valueType="enumerated"/> <inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.67986536" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/> </tool> - <tool command="clang" id="org.tizen.nativecore.tool.sbi.gnu.c.compiler.904054681" name="C Compiler" superClass="org.tizen.nativecore.tool.sbi.gnu.c.compiler"> + <tool command="arm-linux-gnueabi-gcc" id="org.tizen.nativecore.tool.sbi.gnu.c.compiler.904054681" name="C Compiler" superClass="org.tizen.nativecore.tool.sbi.gnu.c.compiler"> <option defaultValue="gnu.c.optimization.level.most" id="gnu.c.compiler.option.optimization.level.877653241" name="Optimization Level" superClass="gnu.c.compiler.option.optimization.level" valueType="enumerated"/> <option defaultValue="gnu.c.debugging.level.default" id="sbi.gnu.c.compiler.option.debugging.level.core.530526098" name="Debug level" superClass="sbi.gnu.c.compiler.option.debugging.level.core" valueType="enumerated"/> <option defaultValue="false" id="sbi.gnu.c.compiler.option.misc.pic.core.658919778" name="-fPIC option" superClass="sbi.gnu.c.compiler.option.misc.pic.core" valueType="boolean"/> <option id="sbi.gnu.c.compiler.option.1532282184" name="Tizen-Target" superClass="sbi.gnu.c.compiler.option" valueType="userObjs"> - <listOptionValue builtIn="false" value="wearable-4.0-device.core_llvm37.armel.core.app"/> + <listOptionValue builtIn="false" value="wearable-4.0-device.core_gcc62.armel.core.app"/> </option> <option id="sbi.gnu.c.compiler.option.frameworks_inc.core.1707321532" name="Tizen-Frameworks-Include-Path" superClass="sbi.gnu.c.compiler.option.frameworks_inc.core" valueType="includePath"> <listOptionValue builtIn="false" value=""${SBI_SYSROOT}/usr/include/libxml2""/> @@ -532,8 +530,8 @@ <listOptionValue builtIn="false" value="-mthumb"/> </option> <option id="gnu.c.compiler.option.include.paths.1214715962" name="Include paths (-I)" superClass="gnu.c.compiler.option.include.paths" valueType="includePath"> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/inc}""/> - <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/ucl/inc}""/> + <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}}""/> + <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/ucl/include}""/> </option> <option id="sbi.gnu.c.compiler.option.frameworks.core.775372915" name="Tizen-Frameworks" superClass="sbi.gnu.c.compiler.option.frameworks.core" valueType="userObjs"> <listOptionValue builtIn="false" value="Native_API"/> @@ -541,7 +539,7 @@ <inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.1964837320" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/> </tool> <tool id="org.tizen.nativeide.tool.sbi.gnu.c.linker.base.499300439" name="C Linker" superClass="org.tizen.nativeide.tool.sbi.gnu.c.linker.base"/> - <tool command="clang++" id="org.tizen.nativecore.tool.sbi.gnu.cpp.linker.1838325853" name="C++ Linker" superClass="org.tizen.nativecore.tool.sbi.gnu.cpp.linker"> + <tool command="arm-linux-gnueabi-g++" id="org.tizen.nativecore.tool.sbi.gnu.cpp.linker.1838325853" name="C++ Linker" superClass="org.tizen.nativecore.tool.sbi.gnu.cpp.linker"> <option defaultValue="false" id="sbi.gnu.cpp.linker.option.shared_flag.core.1256173694" name="Linker.Shared" superClass="sbi.gnu.cpp.linker.option.shared_flag.core" valueType="boolean"/> <option defaultValue="false" id="sbi.gnu.cpp.linker.option.noundefined.core.642735052" name="Report unresolved symbol references (-Wl,--no-undefined)" superClass="sbi.gnu.cpp.linker.option.noundefined.core" valueType="boolean"/> <option id="sbi.gnu.cpp.linker.option.frameworks_lflags.core.1632577677" name="Tizen-Frameworks-Other-Lflags" superClass="sbi.gnu.cpp.linker.option.frameworks_lflags.core" valueType="stringList"> @@ -583,11 +581,9 @@ </toolChain> </folderInfo> <sourceEntries> - <entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="inc"/> + <entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="gallery"/> <entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="res"/> - <entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="src"/> - <entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="ucl/inc"/> - <entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="ucl/src"/> + <entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="ucl/source"/> </sourceEntries> </configuration> </storageModule> @@ -607,5 +603,12 @@ </scannerConfigBuildInfo> </storageModule> <storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/> - <storageModule moduleId="refreshScope"/> + <storageModule moduleId="refreshScope" versionNumber="2"> + <configuration configurationName="Debug"> + <resource resourceType="PROJECT" workspacePath="/gallery"/> + </configuration> + <configuration configurationName="Release"> + <resource resourceType="PROJECT" workspacePath="/gallery"/> + </configuration> + </storageModule> </cproject> diff --git a/inc/gallery/presenters/types.h b/edc/includes.h index 2d862ff..46b53be 100644 --- a/inc/gallery/presenters/types.h +++ b/edc/includes.h @@ -14,10 +14,14 @@ * limitations under the License. */ -#ifndef __GALLERY_PRESENTERS_TYPES_H__ -#define __GALLERY_PRESENTERS_TYPES_H__ +#ifndef __GALLERY_EDC_INCLUDES_H__ +#define __GALLERY_EDC_INCLUDES_H__ -#include "gallery/view/types.h" -#include "gallery/model/types.h" +#include "colors.h" +#include "images.edc" +#include "image-grid.edc" +#include "button.edc" +#include "layouts.edc" +#include "naviframe.edc" -#endif // __GALLERY_PRESENTERS_TYPES_H__ +#endif // __GALLERY_EDC_INCLUDES_H__ diff --git a/src/common.h b/gallery/common.h index 659c330..659c330 100644 --- a/src/common.h +++ b/gallery/common.h diff --git a/inc/gallery/config.h b/gallery/config.h index debdc9a..debdc9a 100644 --- a/inc/gallery/config.h +++ b/gallery/config.h diff --git a/src/helpers.h b/gallery/helpers.h index 5dd0d63..fb79812 100644 --- a/src/helpers.h +++ b/gallery/helpers.h @@ -17,7 +17,7 @@ #ifndef __GALLERY_HELPERS_H__ #define __GALLERY_HELPERS_H__ -#include "gallery/types.h" +#include "types.h" namespace gallery { namespace util { diff --git a/src/helpers.hpp b/gallery/helpers.hpp index 5bca4c7..5bca4c7 100644 --- a/src/helpers.hpp +++ b/gallery/helpers.hpp diff --git a/src/main.cpp b/gallery/main.cpp index 826f6c3..0165f6f 100644 --- a/src/main.cpp +++ b/gallery/main.cpp @@ -16,7 +16,7 @@ #include "ucl/appfw/UIApp.h" -#include "gallery/presenters/InstanceManager.h" +#include "presenters/InstanceManager.h" #include "common.h" diff --git a/src/model/Gallery.cpp b/gallery/model/Gallery.cpp index ad7c1c1..a254c36 100644 --- a/src/model/Gallery.cpp +++ b/gallery/model/Gallery.cpp @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "gallery/model/Gallery.h" +#include "Gallery.h" -#include "GalleryAlbum.h" +#include "impl/GalleryAlbum.h" #include "common.h" diff --git a/inc/gallery/model/Gallery.h b/gallery/model/Gallery.h index e17b1f5..e17b1f5 100644 --- a/inc/gallery/model/Gallery.h +++ b/gallery/model/Gallery.h diff --git a/inc/gallery/model/IJob.h b/gallery/model/IJob.h index 8c7d56e..8c7d56e 100644 --- a/inc/gallery/model/IJob.h +++ b/gallery/model/IJob.h diff --git a/inc/gallery/model/IMediaAlbum.h b/gallery/model/IMediaAlbum.h index 80eb222..80eb222 100644 --- a/inc/gallery/model/IMediaAlbum.h +++ b/gallery/model/IMediaAlbum.h diff --git a/inc/gallery/model/IMediaAlbum.hpp b/gallery/model/IMediaAlbum.hpp index 5793dfc..5793dfc 100644 --- a/inc/gallery/model/IMediaAlbum.hpp +++ b/gallery/model/IMediaAlbum.hpp diff --git a/src/model/MediaItem.cpp b/gallery/model/MediaItem.cpp index c20148a..4e1c034 100644 --- a/src/model/MediaItem.cpp +++ b/gallery/model/MediaItem.cpp @@ -14,13 +14,13 @@ * limitations under the License. */ -#include "gallery/model/MediaItem.h" +#include "MediaItem.h" #include <Ecore_File.h> #include <storage.h> #include <mime_type.h> -#include "BaseJob.h" +#include "impl/BaseJob.h" #include "common.h" diff --git a/inc/gallery/model/MediaItem.h b/gallery/model/MediaItem.h index 98491b1..98491b1 100644 --- a/inc/gallery/model/MediaItem.h +++ b/gallery/model/MediaItem.h diff --git a/src/model/SoundManager.cpp b/gallery/model/SoundManager.cpp index 0d83a73..b56c0d4 100644 --- a/src/model/SoundManager.cpp +++ b/gallery/model/SoundManager.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "gallery/model/SoundManager.h" +#include "SoundManager.h" #include "common.h" diff --git a/inc/gallery/model/SoundManager.h b/gallery/model/SoundManager.h index e5adddb..e5adddb 100644 --- a/inc/gallery/model/SoundManager.h +++ b/gallery/model/SoundManager.h diff --git a/src/model/common.h b/gallery/model/common.h index 7581a14..a46e1ff 100644 --- a/src/model/common.h +++ b/gallery/model/common.h @@ -17,8 +17,8 @@ #ifndef __GALLERY_MODEL_COMMON_H__ #define __GALLERY_MODEL_COMMON_H__ -#include "helpers.h" +#include "impl/helpers.h" -#include "../common.h" +#include "gallery/common.h" #endif // __GALLERY_MODEL_COMMON_H__ diff --git a/src/model/BaseJob.cpp b/gallery/model/impl/BaseJob.cpp index 1a358fb..1a358fb 100644 --- a/src/model/BaseJob.cpp +++ b/gallery/model/impl/BaseJob.cpp diff --git a/src/model/BaseJob.h b/gallery/model/impl/BaseJob.h index 5b12d54..42c6374 100644 --- a/src/model/BaseJob.h +++ b/gallery/model/impl/BaseJob.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef __GALLERY_MODEL_BASE_JOB_H__ -#define __GALLERY_MODEL_BASE_JOB_H__ +#ifndef __GALLERY_MODEL_IMPL_BASE_JOB_H__ +#define __GALLERY_MODEL_IMPL_BASE_JOB_H__ #include <atomic> @@ -58,4 +58,4 @@ namespace gallery { }; } -#endif // __GALLERY_MODEL_BASE_JOB_H__ +#endif // __GALLERY_MODEL_IMPL_BASE_JOB_H__ diff --git a/src/model/GalleryAlbum.cpp b/gallery/model/impl/GalleryAlbum.cpp index fbe2ad6..fbe2ad6 100644 --- a/src/model/GalleryAlbum.cpp +++ b/gallery/model/impl/GalleryAlbum.cpp diff --git a/src/model/GalleryAlbum.h b/gallery/model/impl/GalleryAlbum.h index 715b708..358e5b5 100644 --- a/src/model/GalleryAlbum.h +++ b/gallery/model/impl/GalleryAlbum.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef __GALLERY_MODEL_GALLERY_ALBUM_H__ -#define __GALLERY_MODEL_GALLERY_ALBUM_H__ +#ifndef __GALLERY_MODEL_IMPL_GALLERY_ALBUM_H__ +#define __GALLERY_MODEL_IMPL_GALLERY_ALBUM_H__ #include <vector> @@ -77,4 +77,4 @@ namespace gallery { }; } -#endif // __GALLERY_MODEL_GALLERY_ALBUM_H__ +#endif // __GALLERY_MODEL_IMPL_GALLERY_ALBUM_H__ diff --git a/gallery/model/impl/common.h b/gallery/model/impl/common.h new file mode 100644 index 0000000..1b000dc --- /dev/null +++ b/gallery/model/impl/common.h @@ -0,0 +1,22 @@ +/* + * Copyright 2017 Samsung Electronics Co., Ltd + * + * Licensed under the Flora License, Version 1.1 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://floralicense.org/license/ + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef __GALLERY_MODEL_IMPL_COMMON_H__ +#define __GALLERY_MODEL_IMPL_COMMON_H__ + +#include "gallery/model/common.h" + +#endif // __GALLERY_MODEL_IMPL_COMMON_H__ diff --git a/src/model/helpers.cpp b/gallery/model/impl/helpers.cpp index 9bf5042..9bf5042 100644 --- a/src/model/helpers.cpp +++ b/gallery/model/impl/helpers.cpp diff --git a/src/model/helpers.h b/gallery/model/impl/helpers.h index 2c956c4..5411c42 100644 --- a/src/model/helpers.h +++ b/gallery/model/impl/helpers.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef __GALLERY_MODEL_HELPERS_H__ -#define __GALLERY_MODEL_HELPERS_H__ +#ifndef __GALLERY_MODEL_IMPL_HELPERS_H__ +#define __GALLERY_MODEL_IMPL_HELPERS_H__ #include <media_content.h> @@ -58,4 +58,4 @@ namespace gallery { namespace util { #include "helpers.hpp" -#endif // __GALLERY_MODEL_HELPERS_H__ +#endif // __GALLERY_MODEL_IMPL_HELPERS_H__ diff --git a/src/model/helpers.hpp b/gallery/model/impl/helpers.hpp index 56efe64..56efe64 100644 --- a/src/model/helpers.hpp +++ b/gallery/model/impl/helpers.hpp diff --git a/inc/gallery/model/types.h b/gallery/model/types.h index 38feee5..38feee5 100644 --- a/inc/gallery/model/types.h +++ b/gallery/model/types.h diff --git a/src/presenters/Instance.cpp b/gallery/presenters/Instance.cpp index 392ce50..e9b37b3 100644 --- a/src/presenters/Instance.cpp +++ b/gallery/presenters/Instance.cpp @@ -14,16 +14,16 @@ * limitations under the License. */ -#include "gallery/presenters/Instance.h" +#include "Instance.h" #include <system_settings.h> #include "ucl/appfw/helpers.h" -#include "gallery/presenters/NoContentPage.h" -#include "gallery/presenters/ThumbnailPage.h" -#include "gallery/presenters/ViewerPage.h" -#include "gallery/presenters/VideoPlayerPage.h" +#include "pages/NoContentPage.h" +#include "pages/ThumbnailPage.h" +#include "pages/ViewerPage.h" +#include "pages/VideoPlayerPage.h" #include "gallery/resources.h" diff --git a/inc/gallery/presenters/Instance.h b/gallery/presenters/Instance.h index bdc4fa6..d1de739 100644 --- a/inc/gallery/presenters/Instance.h +++ b/gallery/presenters/Instance.h @@ -25,7 +25,8 @@ #include "ucl/gui/Naviframe.h" #include "gallery/model/Gallery.h" -#include "Page.h" + +#include "base/Page.h" namespace gallery { diff --git a/src/presenters/InstanceManager.cpp b/gallery/presenters/InstanceManager.cpp index dd187d7..459eede 100644 --- a/src/presenters/InstanceManager.cpp +++ b/gallery/presenters/InstanceManager.cpp @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "gallery/presenters/InstanceManager.h" +#include "InstanceManager.h" -#include "gallery/presenters/Instance.h" +#include "Instance.h" #include "common.h" diff --git a/inc/gallery/presenters/InstanceManager.h b/gallery/presenters/InstanceManager.h index 66710ae..f45dc0a 100644 --- a/inc/gallery/presenters/InstanceManager.h +++ b/gallery/presenters/InstanceManager.h @@ -19,8 +19,6 @@ #include "ucl/appfw/InstanceManagerBase.h" -#include "types.h" - namespace gallery { class InstanceManager final : public ucl::InstanceManagerBase { diff --git a/src/presenters/Dialog.cpp b/gallery/presenters/base/Dialog.cpp index 0c15e9f..07a91b4 100644 --- a/src/presenters/Dialog.cpp +++ b/gallery/presenters/base/Dialog.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "gallery/presenters/Dialog.h" +#include "Dialog.h" #include "common.h" diff --git a/inc/gallery/presenters/Dialog.h b/gallery/presenters/base/Dialog.h index 7c26010..3092f68 100644 --- a/inc/gallery/presenters/Dialog.h +++ b/gallery/presenters/base/Dialog.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef __GALLERY_PRESENTERS_DIALOG_H__ -#define __GALLERY_PRESENTERS_DIALOG_H__ +#ifndef __GALLERY_PRESENTERS_BASE_DIALOG_H__ +#define __GALLERY_PRESENTERS_BASE_DIALOG_H__ #include "ucl/gui/StyledWidget.h" @@ -68,4 +68,4 @@ namespace gallery { #include "Dialog.hpp" -#endif // __GALLERY_PRESENTERS_DIALOG_H__ +#endif // __GALLERY_PRESENTERS_BASE_DIALOG_H__ diff --git a/inc/gallery/presenters/Dialog.hpp b/gallery/presenters/base/Dialog.hpp index 5bd8ecb..5bd8ecb 100644 --- a/inc/gallery/presenters/Dialog.hpp +++ b/gallery/presenters/base/Dialog.hpp diff --git a/src/presenters/Page.cpp b/gallery/presenters/base/Page.cpp index 3ba8919..0aeb96d 100644 --- a/src/presenters/Page.cpp +++ b/gallery/presenters/base/Page.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "gallery/presenters/Page.h" +#include "Page.h" #include "common.h" diff --git a/inc/gallery/presenters/Page.h b/gallery/presenters/base/Page.h index d4de6f0..357a36e 100644 --- a/inc/gallery/presenters/Page.h +++ b/gallery/presenters/base/Page.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef __GALLERY_PRESENTERS_PAGE_H__ -#define __GALLERY_PRESENTERS_PAGE_H__ +#ifndef __GALLERY_PRESENTERS_BASE_PAGE_H__ +#define __GALLERY_PRESENTERS_BASE_PAGE_H__ #include "ucl/gui/Naviframe.h" @@ -95,4 +95,4 @@ namespace gallery { #include "Page.hpp" -#endif // __GALLERY_PRESENTERS_PAGE_H__ +#endif // __GALLERY_PRESENTERS_BASE_PAGE_H__ diff --git a/inc/gallery/presenters/Page.hpp b/gallery/presenters/base/Page.hpp index 426445a..426445a 100644 --- a/inc/gallery/presenters/Page.hpp +++ b/gallery/presenters/base/Page.hpp diff --git a/gallery/presenters/base/common.h b/gallery/presenters/base/common.h new file mode 100644 index 0000000..2444b53 --- /dev/null +++ b/gallery/presenters/base/common.h @@ -0,0 +1,22 @@ +/* + * Copyright 2017 Samsung Electronics Co., Ltd + * + * Licensed under the Flora License, Version 1.1 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://floralicense.org/license/ + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef __GALLERY_PRESENTERS_BASE_COMMON_H__ +#define __GALLERY_PRESENTERS_BASE_COMMON_H__ + +#include "gallery/presenters/common.h" + +#endif // __GALLERY_PRESENTERS_BASE_COMMON_H__ diff --git a/src/presenters/common.h b/gallery/presenters/common.h index a769b95..6961b7f 100644 --- a/src/presenters/common.h +++ b/gallery/presenters/common.h @@ -17,8 +17,8 @@ #ifndef __GALLERY_PRESENTERS_COMMON_H__ #define __GALLERY_PRESENTERS_COMMON_H__ -#include "helpers.h" +#include "misc/helpers.h" -#include "../view/common.h" +#include "gallery/view/common.h" #endif // __GALLERY_PRESENTERS_COMMON_H__ diff --git a/src/presenters/AlertDialog.cpp b/gallery/presenters/dialogs/AlertDialog.cpp index e8e7c9a..016fb31 100644 --- a/src/presenters/AlertDialog.cpp +++ b/gallery/presenters/dialogs/AlertDialog.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "gallery/presenters/AlertDialog.h" +#include "AlertDialog.h" #include "gallery/resources.h" diff --git a/inc/gallery/presenters/AlertDialog.h b/gallery/presenters/dialogs/AlertDialog.h index 641c536..76ae6ec 100644 --- a/inc/gallery/presenters/AlertDialog.h +++ b/gallery/presenters/dialogs/AlertDialog.h @@ -14,12 +14,12 @@ * limitations under the License. */ -#ifndef __GALLERY_PRESENTERS_ALERT_DIALOG_H__ -#define __GALLERY_PRESENTERS_ALERT_DIALOG_H__ +#ifndef __GALLERY_PRESENTERS_DIALOGS_ALERT_DIALOG_H__ +#define __GALLERY_PRESENTERS_DIALOGS_ALERT_DIALOG_H__ #include "ucl/gui/Layout.h" -#include "Dialog.h" +#include "gallery/presenters/base/Dialog.h" namespace gallery { @@ -90,4 +90,4 @@ namespace gallery { }; } -#endif // __GALLERY_PRESENTERS_ALERT_DIALOG_H__ +#endif // __GALLERY_PRESENTERS_DIALOGS_ALERT_DIALOG_H__ diff --git a/gallery/presenters/dialogs/common.h b/gallery/presenters/dialogs/common.h new file mode 100644 index 0000000..6820d90 --- /dev/null +++ b/gallery/presenters/dialogs/common.h @@ -0,0 +1,22 @@ +/* + * Copyright 2017 Samsung Electronics Co., Ltd + * + * Licensed under the Flora License, Version 1.1 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://floralicense.org/license/ + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef __GALLERY_PRESENTERS_DIALOGS_COMMON_H__ +#define __GALLERY_PRESENTERS_DIALOGS_COMMON_H__ + +#include "gallery/presenters/common.h" + +#endif // __GALLERY_PRESENTERS_DIALOGS_COMMON_H__ diff --git a/src/presenters/AtspiHighlightHelper.cpp b/gallery/presenters/misc/AtspiHighlightHelper.cpp index d960cb0..bdd0ead 100644 --- a/src/presenters/AtspiHighlightHelper.cpp +++ b/gallery/presenters/misc/AtspiHighlightHelper.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "gallery/presenters/AtspiHighlightHelper.h" +#include "AtspiHighlightHelper.h" #include "common.h" diff --git a/inc/gallery/presenters/AtspiHighlightHelper.h b/gallery/presenters/misc/AtspiHighlightHelper.h index 650860e..0404786 100644 --- a/inc/gallery/presenters/AtspiHighlightHelper.h +++ b/gallery/presenters/misc/AtspiHighlightHelper.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef __GALLERY_PRESENTERS_ATSPI_HIGHLIGH_HELPER_H__ -#define __GALLERY_PRESENTERS_ATSPI_HIGHLIGH_HELPER_H__ +#ifndef __GALLERY_PRESENTERS_MISC_ATSPI_HIGHLIGH_HELPER_H__ +#define __GALLERY_PRESENTERS_MISC_ATSPI_HIGHLIGH_HELPER_H__ #include "ucl/mvp/GuiPresenter.h" @@ -50,4 +50,4 @@ namespace gallery { }; } -#endif // __GALLERY_PRESENTERS_ATSPI_HIGHLIGH_HELPER_H__ +#endif // __GALLERY_PRESENTERS_MISC_ATSPI_HIGHLIGH_HELPER_H__ diff --git a/src/presenters/MoreOptionsPresenter.cpp b/gallery/presenters/misc/MoreOptionsPresenter.cpp index bae6640..f2fa2c9 100644 --- a/src/presenters/MoreOptionsPresenter.cpp +++ b/gallery/presenters/misc/MoreOptionsPresenter.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "gallery/presenters/MoreOptionsPresenter.h" +#include "MoreOptionsPresenter.h" #include "ucl/gui/Layout.h" diff --git a/inc/gallery/presenters/MoreOptionsPresenter.h b/gallery/presenters/misc/MoreOptionsPresenter.h index 461bc7e..95b432b 100644 --- a/inc/gallery/presenters/MoreOptionsPresenter.h +++ b/gallery/presenters/misc/MoreOptionsPresenter.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef __GALLERY_PRESENTERS_MORE_OPTIONS_PRESENTER_H__ -#define __GALLERY_PRESENTERS_MORE_OPTIONS_PRESENTER_H__ +#ifndef __GALLERY_PRESENTERS_MISC_MORE_OPTIONS_PRESENTER_H__ +#define __GALLERY_PRESENTERS_MISC_MORE_OPTIONS_PRESENTER_H__ #include <list> @@ -106,4 +106,4 @@ namespace gallery { }; } -#endif // __GALLERY_PRESENTERS_MORE_OPTIONS_PRESENTER_H__ +#endif // __GALLERY_PRESENTERS_MISC_MORE_OPTIONS_PRESENTER_H__ diff --git a/src/presenters/ProcessingPresenter.cpp b/gallery/presenters/misc/ProcessingPresenter.cpp index b8f1b05..6307961 100644 --- a/src/presenters/ProcessingPresenter.cpp +++ b/gallery/presenters/misc/ProcessingPresenter.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "gallery/presenters/ProcessingPresenter.h" +#include "ProcessingPresenter.h" #include "common.h" diff --git a/inc/gallery/presenters/ProcessingPresenter.h b/gallery/presenters/misc/ProcessingPresenter.h index ff0477a..56b1e9f 100644 --- a/inc/gallery/presenters/ProcessingPresenter.h +++ b/gallery/presenters/misc/ProcessingPresenter.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef __GALLERY_PRESENTERS_PROCESSING_PRESENTER_H__ -#define __GALLERY_PRESENTERS_PROCESSING_PRESENTER_H__ +#ifndef __GALLERY_PRESENTERS_MISC_PROCESSING_PRESENTER_H__ +#define __GALLERY_PRESENTERS_MISC_PROCESSING_PRESENTER_H__ #include "ucl/gui/Layout.h" #include "ucl/gui/StyledWidget.h" @@ -107,4 +107,4 @@ namespace gallery { }; } -#endif // __GALLERY_PRESENTERS_PROCESSING_PRESENTER_H__ +#endif // __GALLERY_PRESENTERS_MISC_PROCESSING_PRESENTER_H__ diff --git a/src/presenters/SelectModePresenter.cpp b/gallery/presenters/misc/SelectModePresenter.cpp index 385a2d5..ea83e76 100644 --- a/src/presenters/SelectModePresenter.cpp +++ b/gallery/presenters/misc/SelectModePresenter.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "gallery/presenters/SelectModePresenter.h" +#include "SelectModePresenter.h" #include "ucl/gui/WidgetItem.h" diff --git a/inc/gallery/presenters/SelectModePresenter.h b/gallery/presenters/misc/SelectModePresenter.h index b7b78f1..f52722f 100644 --- a/inc/gallery/presenters/SelectModePresenter.h +++ b/gallery/presenters/misc/SelectModePresenter.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef __GALLERY_PRESENTERS_SELECT_MODE_PRESENTER_H__ -#define __GALLERY_PRESENTERS_SELECT_MODE_PRESENTER_H__ +#ifndef __GALLERY_PRESENTERS_MISC_SELECT_MODE_PRESENTER_H__ +#define __GALLERY_PRESENTERS_MISC_SELECT_MODE_PRESENTER_H__ #include "ucl/gui/StyledWidget.h" @@ -117,4 +117,4 @@ namespace gallery { }; } -#endif // __GALLERY_PRESENTERS_SELECT_MODE_PRESENTER_H__ +#endif // __GALLERY_PRESENTERS_MISC_SELECT_MODE_PRESENTER_H__ diff --git a/gallery/presenters/misc/common.h b/gallery/presenters/misc/common.h new file mode 100644 index 0000000..67dfea8 --- /dev/null +++ b/gallery/presenters/misc/common.h @@ -0,0 +1,22 @@ +/* + * Copyright 2017 Samsung Electronics Co., Ltd + * + * Licensed under the Flora License, Version 1.1 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://floralicense.org/license/ + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef __GALLERY_PRESENTERS_MISC_COMMON_H__ +#define __GALLERY_PRESENTERS_MISC_COMMON_H__ + +#include "gallery/presenters/common.h" + +#endif // __GALLERY_PRESENTERS_MISC_COMMON_H__ diff --git a/src/presenters/helpers.cpp b/gallery/presenters/misc/helpers.cpp index c325932..c325932 100644 --- a/src/presenters/helpers.cpp +++ b/gallery/presenters/misc/helpers.cpp diff --git a/src/presenters/helpers.h b/gallery/presenters/misc/helpers.h index 0540406..8892553 100644 --- a/src/presenters/helpers.h +++ b/gallery/presenters/misc/helpers.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef __GALLERY_PRESENTERS_HELPERS_H__ -#define __GALLERY_PRESENTERS_HELPERS_H__ +#ifndef __GALLERY_PRESENTERS_MISC_HELPERS_H__ +#define __GALLERY_PRESENTERS_MISC_HELPERS_H__ #include "ucl/gui/Window.h" @@ -28,4 +28,4 @@ namespace gallery { bool isInstancePaused(const ucl::Window &win); } -#endif // __GALLERY_PRESENTERS_HELPERS_H__ +#endif // __GALLERY_PRESENTERS_MISC_HELPERS_H__ diff --git a/src/presenters/NoContentPage.cpp b/gallery/presenters/pages/NoContentPage.cpp index b7a96db..fb00b83 100644 --- a/src/presenters/NoContentPage.cpp +++ b/gallery/presenters/pages/NoContentPage.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "gallery/presenters/NoContentPage.h" +#include "NoContentPage.h" #include "ucl/gui/Layout.h" diff --git a/inc/gallery/presenters/NoContentPage.h b/gallery/presenters/pages/NoContentPage.h index aeb1ff8..26e64dd 100644 --- a/inc/gallery/presenters/NoContentPage.h +++ b/gallery/presenters/pages/NoContentPage.h @@ -14,10 +14,10 @@ * limitations under the License. */ -#ifndef __GALLERY_PRESENTERS_NO_CONTENT_PAGE_H__ -#define __GALLERY_PRESENTERS_NO_CONTENT_PAGE_H__ +#ifndef __GALLERY_PRESENTERS_PAGES_NO_CONTENT_PAGE_H__ +#define __GALLERY_PRESENTERS_PAGES_NO_CONTENT_PAGE_H__ -#include "Page.h" +#include "gallery/presenters/base/Page.h" namespace gallery { @@ -46,4 +46,4 @@ namespace gallery { }; } -#endif // __GALLERY_PRESENTERS_NO_CONTENT_PAGE_H__ +#endif // __GALLERY_PRESENTERS_PAGES_NO_CONTENT_PAGE_H__ diff --git a/src/presenters/PreviewPage.cpp b/gallery/presenters/pages/PreviewPage.cpp index cfb0412..7b70dc5 100644 --- a/src/presenters/PreviewPage.cpp +++ b/gallery/presenters/pages/PreviewPage.cpp @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "gallery/presenters/PreviewPage.h" +#include "PreviewPage.h" -#include "gallery/presenters/ViewerPage.h" +#include "ViewerPage.h" #include "gallery/resources.h" diff --git a/inc/gallery/presenters/PreviewPage.h b/gallery/presenters/pages/PreviewPage.h index 2f41752..0df248d 100644 --- a/inc/gallery/presenters/PreviewPage.h +++ b/gallery/presenters/pages/PreviewPage.h @@ -14,21 +14,22 @@ * limitations under the License. */ -#ifndef __GALLERY_PRESENTERS_PREVIEW_PAGE_H__ -#define __GALLERY_PRESENTERS_PREVIEW_PAGE_H__ - -#include "Page.h" +#ifndef __GALLERY_PRESENTERS_PAGES_PREVIEW_PAGE_H__ +#define __GALLERY_PRESENTERS_PAGES_PREVIEW_PAGE_H__ #include "gallery/model/IMediaAlbum.h" #include "gallery/view/PageContent.h" #include "gallery/view/ImageGrid.h" -#include "MoreOptionsPresenter.h" -#include "SelectModePresenter.h" -#include "AlertDialog.h" -#include "ProcessingPresenter.h" -#include "AtspiHighlightHelper.h" +#include "gallery/presenters/base/Page.h" + +#include "gallery/presenters/misc/MoreOptionsPresenter.h" +#include "gallery/presenters/misc/SelectModePresenter.h" +#include "gallery/presenters/misc/ProcessingPresenter.h" +#include "gallery/presenters/misc/AtspiHighlightHelper.h" + +#include "gallery/presenters/dialogs/AlertDialog.h" namespace gallery { @@ -148,4 +149,4 @@ namespace gallery { }; } -#endif // __GALLERY_PRESENTERS_PREVIEW_PAGE_H__ +#endif // __GALLERY_PRESENTERS_PAGES_PREVIEW_PAGE_H__ diff --git a/src/presenters/ThumbnailPage.cpp b/gallery/presenters/pages/ThumbnailPage.cpp index abd1ce2..13ffdc5 100644 --- a/src/presenters/ThumbnailPage.cpp +++ b/gallery/presenters/pages/ThumbnailPage.cpp @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "gallery/presenters/ThumbnailPage.h" +#include "ThumbnailPage.h" -#include "gallery/presenters/PreviewPage.h" +#include "PreviewPage.h" #include "gallery/resources.h" diff --git a/inc/gallery/presenters/ThumbnailPage.h b/gallery/presenters/pages/ThumbnailPage.h index 5222e86..f808c8a 100644 --- a/inc/gallery/presenters/ThumbnailPage.h +++ b/gallery/presenters/pages/ThumbnailPage.h @@ -14,18 +14,18 @@ * limitations under the License. */ -#ifndef __GALLERY_PRESENTERS_THUMBNAIL_PAGE_H__ -#define __GALLERY_PRESENTERS_THUMBNAIL_PAGE_H__ - -#include "Page.h" +#ifndef __GALLERY_PRESENTERS_PAGES_THUMBNAIL_PAGE_H__ +#define __GALLERY_PRESENTERS_PAGES_THUMBNAIL_PAGE_H__ #include "gallery/model/IMediaAlbum.h" #include "gallery/view/PageContent.h" #include "gallery/view/ImageGrid.h" -#include "MoreOptionsPresenter.h" -#include "AtspiHighlightHelper.h" +#include "gallery/presenters/base/Page.h" + +#include "gallery/presenters/misc/MoreOptionsPresenter.h" +#include "gallery/presenters/misc/AtspiHighlightHelper.h" namespace gallery { @@ -105,4 +105,4 @@ namespace gallery { }; } -#endif // __GALLERY_PRESENTERS_THUMBNAIL_PAGE_H__ +#endif // __GALLERY_PRESENTERS_PAGES_THUMBNAIL_PAGE_H__ diff --git a/src/presenters/VideoPlayerPage.cpp b/gallery/presenters/pages/VideoPlayerPage.cpp index ebeb3f7..b2f695d 100644 --- a/src/presenters/VideoPlayerPage.cpp +++ b/gallery/presenters/pages/VideoPlayerPage.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "gallery/presenters/VideoPlayerPage.h" +#include "VideoPlayerPage.h" #include <efl_util.h> diff --git a/inc/gallery/presenters/VideoPlayerPage.h b/gallery/presenters/pages/VideoPlayerPage.h index 36d3262..d8e3db5 100644 --- a/inc/gallery/presenters/VideoPlayerPage.h +++ b/gallery/presenters/pages/VideoPlayerPage.h @@ -14,21 +14,21 @@ * limitations under the License. */ -#ifndef __GALLERY_PRESENTERS_VIDEO_PLAYER_PAGE_H__ -#define __GALLERY_PRESENTERS_VIDEO_PLAYER_PAGE_H__ +#ifndef __GALLERY_PRESENTERS_PAGES_VIDEO_PLAYER_PAGE_H__ +#define __GALLERY_PRESENTERS_PAGES_VIDEO_PLAYER_PAGE_H__ #include <player.h> #include "ucl/gui/Layout.h" -#include "Page.h" - #include "gallery/model/SoundManager.h" #include "gallery/model/MediaItem.h" #include "gallery/view/TouchParser.h" -#include "AlertDialog.h" +#include "gallery/presenters/base/Page.h" + +#include "gallery/presenters/dialogs/AlertDialog.h" namespace gallery { @@ -141,4 +141,4 @@ namespace gallery { }; } -#endif // __GALLERY_PRESENTERS_VIDEO_PLAYER_PAGE_H__ +#endif // __GALLERY_PRESENTERS_PAGES_VIDEO_PLAYER_PAGE_H__ diff --git a/src/presenters/ViewerPage.cpp b/gallery/presenters/pages/ViewerPage.cpp index 87135b8..ce51c00 100644 --- a/src/presenters/ViewerPage.cpp +++ b/gallery/presenters/pages/ViewerPage.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "gallery/presenters/ViewerPage.h" +#include "ViewerPage.h" #include "gallery/resources.h" diff --git a/inc/gallery/presenters/ViewerPage.h b/gallery/presenters/pages/ViewerPage.h index 30a8fe4..44380fa 100644 --- a/inc/gallery/presenters/ViewerPage.h +++ b/gallery/presenters/pages/ViewerPage.h @@ -14,10 +14,8 @@ * limitations under the License. */ -#ifndef __GALLERY_PRESENTERS_VIEWER_PAGE_H__ -#define __GALLERY_PRESENTERS_VIEWER_PAGE_H__ - -#include "Page.h" +#ifndef __GALLERY_PRESENTERS_PAGES_VIEWER_PAGE_H__ +#define __GALLERY_PRESENTERS_PAGES_VIEWER_PAGE_H__ #include "gallery/model/MediaItem.h" @@ -25,8 +23,10 @@ #include "gallery/view/ImageViewer.h" #include "gallery/view/TouchParser.h" -#include "MoreOptionsPresenter.h" -#include "ProcessingPresenter.h" +#include "gallery/presenters/base/Page.h" + +#include "gallery/presenters/misc/MoreOptionsPresenter.h" +#include "gallery/presenters/misc/ProcessingPresenter.h" namespace gallery { @@ -98,4 +98,4 @@ namespace gallery { }; } -#endif // __GALLERY_PRESENTERS_VIEWER_PAGE_H__ +#endif // __GALLERY_PRESENTERS_PAGES_VIEWER_PAGE_H__ diff --git a/gallery/presenters/pages/common.h b/gallery/presenters/pages/common.h new file mode 100644 index 0000000..8396561 --- /dev/null +++ b/gallery/presenters/pages/common.h @@ -0,0 +1,22 @@ +/* + * Copyright 2017 Samsung Electronics Co., Ltd + * + * Licensed under the Flora License, Version 1.1 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://floralicense.org/license/ + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef __GALLERY_PRESENTERS_PAGES_COMMON_H__ +#define __GALLERY_PRESENTERS_PAGES_COMMON_H__ + +#include "gallery/presenters/common.h" + +#endif // __GALLERY_PRESENTERS_PAGES_COMMON_H__ diff --git a/src/resources.cpp b/gallery/resources.cpp index 256ccef..ba4247e 100644 --- a/src/resources.cpp +++ b/gallery/resources.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "gallery/resources.h" +#include "resources.h" namespace gallery { diff --git a/inc/gallery/resources.h b/gallery/resources.h index 6a6f372..6a6f372 100644 --- a/inc/gallery/resources.h +++ b/gallery/resources.h diff --git a/inc/gallery/types.h b/gallery/types.h index 9a1476e..9a1476e 100644 --- a/inc/gallery/types.h +++ b/gallery/types.h diff --git a/src/view/ImageGrid.cpp b/gallery/view/ImageGrid.cpp index 4d7c10c..7cae9b2 100644 --- a/src/view/ImageGrid.cpp +++ b/gallery/view/ImageGrid.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "gallery/view/ImageGrid.h" +#include "ImageGrid.h" #include <array> #include <vector> @@ -22,7 +22,7 @@ #include "ucl/gui/Layout.h" #include "ucl/gui/Window.h" -#include "gallery/view/TouchParser.h" +#include "TouchParser.h" #include "common.h" diff --git a/inc/gallery/view/ImageGrid.h b/gallery/view/ImageGrid.h index ddcae7a..2eff5f5 100644 --- a/inc/gallery/view/ImageGrid.h +++ b/gallery/view/ImageGrid.h @@ -23,6 +23,8 @@ #include "ucl/misc/Timeout.h" +#include "types.h" + namespace gallery { UCL_DECLARE_REF_ALIASES(ImageGrid); diff --git a/src/view/ImageViewer.cpp b/gallery/view/ImageViewer.cpp index da3a0c2..da3a0c2 100644 --- a/src/view/ImageViewer.cpp +++ b/gallery/view/ImageViewer.cpp diff --git a/inc/gallery/view/ImageViewer.h b/gallery/view/ImageViewer.h index 409b010..409b010 100644 --- a/inc/gallery/view/ImageViewer.h +++ b/gallery/view/ImageViewer.h diff --git a/src/view/PageContent.cpp b/gallery/view/PageContent.cpp index 1ef0005..40966ba 100644 --- a/src/view/PageContent.cpp +++ b/gallery/view/PageContent.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "gallery/view/PageContent.h" +#include "PageContent.h" #include "common.h" diff --git a/inc/gallery/view/PageContent.h b/gallery/view/PageContent.h index 85a6c59..85a6c59 100644 --- a/inc/gallery/view/PageContent.h +++ b/gallery/view/PageContent.h diff --git a/src/view/TouchParser.cpp b/gallery/view/TouchParser.cpp index 8678bdb..ef8a153 100644 --- a/src/view/TouchParser.cpp +++ b/gallery/view/TouchParser.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "gallery/view/TouchParser.h" +#include "TouchParser.h" #include "common.h" diff --git a/inc/gallery/view/TouchParser.h b/gallery/view/TouchParser.h index be391a3..be391a3 100644 --- a/inc/gallery/view/TouchParser.h +++ b/gallery/view/TouchParser.h diff --git a/src/view/common.h b/gallery/view/common.h index e72c13b..1cc35a3 100644 --- a/src/view/common.h +++ b/gallery/view/common.h @@ -21,9 +21,9 @@ #include "ucl/gui/stdTheme.h" #include "ucl/gui/helpers.h" -#include "gallery/view/helpers.h" +#include "helpers.h" -#include "../common.h" +#include "gallery/common.h" namespace gallery { diff --git a/src/view/helpers.cpp b/gallery/view/helpers.cpp index 393e3de..6388200 100644 --- a/src/view/helpers.cpp +++ b/gallery/view/helpers.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "gallery/view/helpers.h" +#include "helpers.h" #include <vector> @@ -115,7 +115,7 @@ namespace gallery { while (true) { void *const oldData = eext_rotary_event_handler_del(func); if (!oldData || (oldData == data)) { - return; + break; } backup.push_back(oldData); } diff --git a/inc/gallery/view/helpers.h b/gallery/view/helpers.h index 5a13ab4..5a13ab4 100644 --- a/inc/gallery/view/helpers.h +++ b/gallery/view/helpers.h diff --git a/inc/gallery/view/types.h b/gallery/view/types.h index 35b0594..35b0594 100644 --- a/inc/gallery/view/types.h +++ b/gallery/view/types.h diff --git a/project_def.prop b/project_def.prop index 405f2c5..d779955 100644 --- a/project_def.prop +++ b/project_def.prop @@ -1,6 +1,6 @@ # Project Name
-APPNAME = gallery
+APPNAME = w-gallery
# Project Type
type = app
@@ -9,7 +9,7 @@ type = app profile = wearable-4.0
# C/CPP Sources
-USER_SRCS = ucl/src/gui/NaviItem.cpp src/resources.cpp ucl/src/gui/Layout.cpp src/model/Gallery.cpp src/presenters/ThumbnailPage.cpp ucl/src/misc/Timeout.cpp src/view/PageContent.cpp src/presenters/ViewerPage.cpp ucl/src/appfw/UIApp.cpp src/model/MediaItem.cpp ucl/src/gui/ElmWidget.cpp ucl/src/appfw/helpers.cpp src/presenters/SelectModePresenter.cpp ucl/src/gui/EdjeWidget.cpp src/model/helpers.cpp src/view/ImageViewer.cpp src/presenters/AtspiHighlightHelper.cpp src/view/TouchParser.cpp ucl/src/gui/Window.cpp ucl/src/gui/Widget.cpp ucl/src/util/types/Result.cpp src/model/SoundManager.cpp ucl/src/mvp/ListItemPresenter.cpp src/model/GalleryAlbum.cpp ucl/src/mvp/ListPresenter.cpp src/presenters/Instance.cpp ucl/src/misc/Variant.cpp src/main.cpp src/presenters/InstanceManager.cpp src/presenters/AlertDialog.cpp src/model/BaseJob.cpp ucl/src/appfw/InstanceManagerBase.cpp src/presenters/VideoPlayerPage.cpp ucl/src/util/logging.cpp ucl/src/appfw/SysEventProvider.cpp src/view/helpers.cpp src/presenters/MoreOptionsPresenter.cpp src/presenters/PreviewPage.cpp ucl/src/mvp/GuiPresenter.cpp src/presenters/NoContentPage.cpp ucl/src/gui/Genlist.cpp src/presenters/ProcessingPresenter.cpp ucl/src/gui/Naviframe.cpp src/presenters/Dialog.cpp src/presenters/Page.cpp src/view/ImageGrid.cpp src/presenters/helpers.cpp ucl/src/gui/WidgetItem.cpp
+USER_SRCS = gallery/presenters/Instance.cpp ucl/source/mvp/GuiPresenter.cpp gallery/presenters/pages/ThumbnailPage.cpp ucl/source/appfw/InstanceManagerBase.cpp gallery/presenters/InstanceManager.cpp gallery/presenters/misc/SelectModePresenter.cpp ucl/source/util/logging.cpp gallery/resources.cpp gallery/presenters/pages/ViewerPage.cpp gallery/presenters/misc/MoreOptionsPresenter.cpp gallery/presenters/misc/AtspiHighlightHelper.cpp ucl/source/mvp/ListPresenter.cpp gallery/model/SoundManager.cpp ucl/source/misc/Variant.cpp gallery/presenters/base/Dialog.cpp ucl/source/misc/Timeout.cpp gallery/presenters/misc/ProcessingPresenter.cpp ucl/source/util/types/Result.cpp gallery/model/impl/GalleryAlbum.cpp gallery/presenters/misc/helpers.cpp ucl/source/gui/Genlist.cpp gallery/presenters/pages/NoContentPage.cpp gallery/view/ImageViewer.cpp gallery/presenters/pages/PreviewPage.cpp gallery/view/PageContent.cpp gallery/view/TouchParser.cpp ucl/source/gui/WidgetItem.cpp gallery/presenters/dialogs/AlertDialog.cpp gallery/model/Gallery.cpp gallery/model/impl/helpers.cpp ucl/source/gui/Naviframe.cpp ucl/source/appfw/UIApp.cpp ucl/source/appfw/SysEventProvider.cpp gallery/presenters/pages/VideoPlayerPage.cpp gallery/main.cpp ucl/source/gui/Layout.cpp gallery/presenters/base/Page.cpp gallery/model/MediaItem.cpp gallery/view/helpers.cpp ucl/source/gui/Window.cpp ucl/source/gui/Widget.cpp gallery/model/impl/BaseJob.cpp ucl/source/mvp/ListItemPresenter.cpp ucl/source/gui/NaviItem.cpp ucl/source/gui/ElmWidget.cpp gallery/view/ImageGrid.cpp ucl/source/appfw/helpers.cpp ucl/source/gui/EdjeWidget.cpp
# EDC Sources
USER_EDCS =
@@ -36,7 +36,7 @@ USER_OBJS = USER_C_INC_DIRS =
USER_INC_FILES =
## C++ Compiler
-USER_CPP_INC_DIRS = inc ucl/inc
+USER_CPP_INC_DIRS = . ucl/include
USER_CPP_INC_FILES =
USER_INC_DIRS = $(USER_C_INC_DIRS) $(USER_CPP_INC_DIRS)
diff --git a/res/edje/theme.edc b/res/edje/theme.edc index ceb51c9..6aa29e9 100644 --- a/res/edje/theme.edc +++ b/res/edje/theme.edc @@ -34,10 +34,5 @@ collections { } } - #include "../../edc/colors.h" - #include "../../edc/images.edc" - #include "../../edc/image-grid.edc" - #include "../../edc/button.edc" - #include "../../edc/layouts.edc" - #include "../../edc/naviframe.edc" + #include "../../edc/includes.h" } diff --git a/tizen-manifest.xml b/tizen-manifest.xml index e80b6c8..78ed1c9 100644 --- a/tizen-manifest.xml +++ b/tizen-manifest.xml @@ -1,22 +1,22 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<manifest xmlns="http://tizen.org/ns/packages" api-version="4.0" package="org.tizen.w-gallery" version="1.0.0"> - <profile name="wearable"/> - <ui-application appid="org.tizen.w-gallery" exec="gallery" hw-acceleration="on" launch_mode="caller" multiple="false" nodisplay="false" taskmanage="true" type="capp"> - <label>Gallery</label> - <icon>org.tizen.gallery.png</icon> - <app-control> - <operation name="http://tizen.org/appcontrol/operation/view"/> - <mime name="image/*"/> - </app-control> - <app-control> - <operation name="http://tizen.org/appcontrol/operation/view"/> - <mime name="video/*"/> - </app-control> - </ui-application> - <privileges> - <privilege>http://tizen.org/privilege/mediastorage</privilege> - <privilege>http://tizen.org/privilege/appmanager.launch</privilege> - <privilege>http://tizen.org/privilege/externalstorage</privilege> - <privilege>http://tizen.org/privilege/content.write</privilege> - </privileges> -</manifest> +<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<manifest xmlns="http://tizen.org/ns/packages" api-version="4.0" package="org.tizen.w-gallery" version="1.0.0">
+ <profile name="wearable"/>
+ <ui-application appid="org.tizen.w-gallery" exec="w-gallery" hw-acceleration="on" launch_mode="caller" multiple="false" nodisplay="false" taskmanage="true" type="capp">
+ <label>Gallery</label>
+ <icon>org.tizen.gallery.png</icon>
+ <app-control>
+ <operation name="http://tizen.org/appcontrol/operation/view"/>
+ <mime name="image/*"/>
+ </app-control>
+ <app-control>
+ <operation name="http://tizen.org/appcontrol/operation/view"/>
+ <mime name="video/*"/>
+ </app-control>
+ </ui-application>
+ <privileges>
+ <privilege>http://tizen.org/privilege/mediastorage</privilege>
+ <privilege>http://tizen.org/privilege/appmanager.launch</privilege>
+ <privilege>http://tizen.org/privilege/externalstorage</privilege>
+ <privilege>http://tizen.org/privilege/content.write</privilege>
+ </privileges>
+</manifest>
diff --git a/ucl/inc/ucl/appfw/IInstance.h b/ucl/include/ucl/appfw/IInstance.h index bf09205..bf09205 100644 --- a/ucl/inc/ucl/appfw/IInstance.h +++ b/ucl/include/ucl/appfw/IInstance.h diff --git a/ucl/inc/ucl/appfw/IInstanceAppControlExt.h b/ucl/include/ucl/appfw/IInstanceAppControlExt.h index 6799a84..6799a84 100644 --- a/ucl/inc/ucl/appfw/IInstanceAppControlExt.h +++ b/ucl/include/ucl/appfw/IInstanceAppControlExt.h diff --git a/ucl/inc/ucl/appfw/IInstanceContext.h b/ucl/include/ucl/appfw/IInstanceContext.h index b06c177..b06c177 100644 --- a/ucl/inc/ucl/appfw/IInstanceContext.h +++ b/ucl/include/ucl/appfw/IInstanceContext.h diff --git a/ucl/inc/ucl/appfw/InstanceManagerBase.h b/ucl/include/ucl/appfw/InstanceManagerBase.h index 0fdde8c..0fdde8c 100644 --- a/ucl/inc/ucl/appfw/InstanceManagerBase.h +++ b/ucl/include/ucl/appfw/InstanceManagerBase.h diff --git a/ucl/inc/ucl/appfw/SysEventProvider.h b/ucl/include/ucl/appfw/SysEventProvider.h index 8a72758..8a72758 100644 --- a/ucl/inc/ucl/appfw/SysEventProvider.h +++ b/ucl/include/ucl/appfw/SysEventProvider.h diff --git a/ucl/inc/ucl/appfw/SysEventProvider.hpp b/ucl/include/ucl/appfw/SysEventProvider.hpp index 1d52394..1d52394 100644 --- a/ucl/inc/ucl/appfw/SysEventProvider.hpp +++ b/ucl/include/ucl/appfw/SysEventProvider.hpp diff --git a/ucl/inc/ucl/appfw/UIApp.h b/ucl/include/ucl/appfw/UIApp.h index a8b4dbc..a8b4dbc 100644 --- a/ucl/inc/ucl/appfw/UIApp.h +++ b/ucl/include/ucl/appfw/UIApp.h diff --git a/ucl/inc/ucl/appfw/helpers.h b/ucl/include/ucl/appfw/helpers.h index fe598d9..fe598d9 100644 --- a/ucl/inc/ucl/appfw/helpers.h +++ b/ucl/include/ucl/appfw/helpers.h diff --git a/ucl/inc/ucl/appfw/types.h b/ucl/include/ucl/appfw/types.h index 48f8adc..48f8adc 100644 --- a/ucl/inc/ucl/appfw/types.h +++ b/ucl/include/ucl/appfw/types.h diff --git a/ucl/inc/ucl/config.h b/ucl/include/ucl/config.h index 584596c..584596c 100644 --- a/ucl/inc/ucl/config.h +++ b/ucl/include/ucl/config.h diff --git a/ucl/inc/ucl/gui/EdjeWidget.h b/ucl/include/ucl/gui/EdjeWidget.h index 8d045c4..8d045c4 100644 --- a/ucl/inc/ucl/gui/EdjeWidget.h +++ b/ucl/include/ucl/gui/EdjeWidget.h diff --git a/ucl/inc/ucl/gui/EdjeWidget.hpp b/ucl/include/ucl/gui/EdjeWidget.hpp index 3f989c7..3f989c7 100644 --- a/ucl/inc/ucl/gui/EdjeWidget.hpp +++ b/ucl/include/ucl/gui/EdjeWidget.hpp diff --git a/ucl/inc/ucl/gui/ElmWidget.h b/ucl/include/ucl/gui/ElmWidget.h index f967cc3..f967cc3 100644 --- a/ucl/inc/ucl/gui/ElmWidget.h +++ b/ucl/include/ucl/gui/ElmWidget.h diff --git a/ucl/inc/ucl/gui/ElmWidget.hpp b/ucl/include/ucl/gui/ElmWidget.hpp index 0673a57..0673a57 100644 --- a/ucl/inc/ucl/gui/ElmWidget.hpp +++ b/ucl/include/ucl/gui/ElmWidget.hpp diff --git a/ucl/inc/ucl/gui/Genlist.h b/ucl/include/ucl/gui/Genlist.h index 366eccf..366eccf 100644 --- a/ucl/inc/ucl/gui/Genlist.h +++ b/ucl/include/ucl/gui/Genlist.h diff --git a/ucl/inc/ucl/gui/Genlist.hpp b/ucl/include/ucl/gui/Genlist.hpp index 3c93031..3c93031 100644 --- a/ucl/inc/ucl/gui/Genlist.hpp +++ b/ucl/include/ucl/gui/Genlist.hpp diff --git a/ucl/inc/ucl/gui/GenlistItem.h b/ucl/include/ucl/gui/GenlistItem.h index 2c96b9c..2c96b9c 100644 --- a/ucl/inc/ucl/gui/GenlistItem.h +++ b/ucl/include/ucl/gui/GenlistItem.h diff --git a/ucl/inc/ucl/gui/GenlistItem.hpp b/ucl/include/ucl/gui/GenlistItem.hpp index 6920a88..6920a88 100644 --- a/ucl/inc/ucl/gui/GenlistItem.hpp +++ b/ucl/include/ucl/gui/GenlistItem.hpp diff --git a/ucl/inc/ucl/gui/Layout.h b/ucl/include/ucl/gui/Layout.h index d349f92..d349f92 100644 --- a/ucl/inc/ucl/gui/Layout.h +++ b/ucl/include/ucl/gui/Layout.h diff --git a/ucl/inc/ucl/gui/Layout.hpp b/ucl/include/ucl/gui/Layout.hpp index d6d18a3..d6d18a3 100644 --- a/ucl/inc/ucl/gui/Layout.hpp +++ b/ucl/include/ucl/gui/Layout.hpp diff --git a/ucl/inc/ucl/gui/NaviItem.h b/ucl/include/ucl/gui/NaviItem.h index 1161847..1161847 100644 --- a/ucl/inc/ucl/gui/NaviItem.h +++ b/ucl/include/ucl/gui/NaviItem.h diff --git a/ucl/inc/ucl/gui/NaviItem.hpp b/ucl/include/ucl/gui/NaviItem.hpp index 6b33fe4..6b33fe4 100644 --- a/ucl/inc/ucl/gui/NaviItem.hpp +++ b/ucl/include/ucl/gui/NaviItem.hpp diff --git a/ucl/inc/ucl/gui/Naviframe.h b/ucl/include/ucl/gui/Naviframe.h index 66693f2..66693f2 100644 --- a/ucl/inc/ucl/gui/Naviframe.h +++ b/ucl/include/ucl/gui/Naviframe.h diff --git a/ucl/inc/ucl/gui/Naviframe.hpp b/ucl/include/ucl/gui/Naviframe.hpp index e8fdc19..e8fdc19 100644 --- a/ucl/inc/ucl/gui/Naviframe.hpp +++ b/ucl/include/ucl/gui/Naviframe.hpp diff --git a/ucl/inc/ucl/gui/StyledWidget.h b/ucl/include/ucl/gui/StyledWidget.h index 223a293..223a293 100644 --- a/ucl/inc/ucl/gui/StyledWidget.h +++ b/ucl/include/ucl/gui/StyledWidget.h diff --git a/ucl/inc/ucl/gui/StyledWidget.hpp b/ucl/include/ucl/gui/StyledWidget.hpp index cb32329..cb32329 100644 --- a/ucl/inc/ucl/gui/StyledWidget.hpp +++ b/ucl/include/ucl/gui/StyledWidget.hpp diff --git a/ucl/inc/ucl/gui/Theme.h b/ucl/include/ucl/gui/Theme.h index d8b5b31..d8b5b31 100644 --- a/ucl/inc/ucl/gui/Theme.h +++ b/ucl/include/ucl/gui/Theme.h diff --git a/ucl/inc/ucl/gui/Theme.hpp b/ucl/include/ucl/gui/Theme.hpp index 65910df..65910df 100644 --- a/ucl/inc/ucl/gui/Theme.hpp +++ b/ucl/include/ucl/gui/Theme.hpp diff --git a/ucl/inc/ucl/gui/Widget.h b/ucl/include/ucl/gui/Widget.h index ac47866..ac47866 100644 --- a/ucl/inc/ucl/gui/Widget.h +++ b/ucl/include/ucl/gui/Widget.h diff --git a/ucl/inc/ucl/gui/Widget.hpp b/ucl/include/ucl/gui/Widget.hpp index 95da66a..95da66a 100644 --- a/ucl/inc/ucl/gui/Widget.hpp +++ b/ucl/include/ucl/gui/Widget.hpp diff --git a/ucl/inc/ucl/gui/WidgetItem.h b/ucl/include/ucl/gui/WidgetItem.h index 7794444..7794444 100644 --- a/ucl/inc/ucl/gui/WidgetItem.h +++ b/ucl/include/ucl/gui/WidgetItem.h diff --git a/ucl/inc/ucl/gui/WidgetItem.hpp b/ucl/include/ucl/gui/WidgetItem.hpp index 26b6cbd..26b6cbd 100644 --- a/ucl/inc/ucl/gui/WidgetItem.hpp +++ b/ucl/include/ucl/gui/WidgetItem.hpp diff --git a/ucl/inc/ucl/gui/Window.h b/ucl/include/ucl/gui/Window.h index 9aa598d..9aa598d 100644 --- a/ucl/inc/ucl/gui/Window.h +++ b/ucl/include/ucl/gui/Window.h diff --git a/ucl/inc/ucl/gui/Window.hpp b/ucl/include/ucl/gui/Window.hpp index d5b1828..d5b1828 100644 --- a/ucl/inc/ucl/gui/Window.hpp +++ b/ucl/include/ucl/gui/Window.hpp diff --git a/ucl/inc/ucl/gui/helpers.h b/ucl/include/ucl/gui/helpers.h index d42eccb..d42eccb 100644 --- a/ucl/inc/ucl/gui/helpers.h +++ b/ucl/include/ucl/gui/helpers.h diff --git a/ucl/inc/ucl/gui/helpers.hpp b/ucl/include/ucl/gui/helpers.hpp index 29df283..29df283 100644 --- a/ucl/inc/ucl/gui/helpers.hpp +++ b/ucl/include/ucl/gui/helpers.hpp diff --git a/ucl/inc/ucl/gui/stdTheme.h b/ucl/include/ucl/gui/stdTheme.h index 13202cc..13202cc 100644 --- a/ucl/inc/ucl/gui/stdTheme.h +++ b/ucl/include/ucl/gui/stdTheme.h diff --git a/ucl/inc/ucl/gui/stdTheme/common.h b/ucl/include/ucl/gui/stdTheme/common.h index 7ec81b9..7ec81b9 100644 --- a/ucl/inc/ucl/gui/stdTheme/common.h +++ b/ucl/include/ucl/gui/stdTheme/common.h diff --git a/ucl/inc/ucl/gui/stdTheme/layout.h b/ucl/include/ucl/gui/stdTheme/layout.h index 79ff426..79ff426 100644 --- a/ucl/inc/ucl/gui/stdTheme/layout.h +++ b/ucl/include/ucl/gui/stdTheme/layout.h diff --git a/ucl/inc/ucl/gui/stdTheme/naviframe.h b/ucl/include/ucl/gui/stdTheme/naviframe.h index fd99fdc..fd99fdc 100644 --- a/ucl/inc/ucl/gui/stdTheme/naviframe.h +++ b/ucl/include/ucl/gui/stdTheme/naviframe.h diff --git a/ucl/inc/ucl/gui/types.h b/ucl/include/ucl/gui/types.h index 6d43d76..6d43d76 100644 --- a/ucl/inc/ucl/gui/types.h +++ b/ucl/include/ucl/gui/types.h diff --git a/ucl/inc/ucl/gui/types.hpp b/ucl/include/ucl/gui/types.hpp index 7f128c8..7f128c8 100644 --- a/ucl/inc/ucl/gui/types.hpp +++ b/ucl/include/ucl/gui/types.hpp diff --git a/ucl/inc/ucl/misc/Aspect.h b/ucl/include/ucl/misc/Aspect.h index 0c55bf6..0c55bf6 100644 --- a/ucl/inc/ucl/misc/Aspect.h +++ b/ucl/include/ucl/misc/Aspect.h diff --git a/ucl/inc/ucl/misc/Aspect.hpp b/ucl/include/ucl/misc/Aspect.hpp index 9894681..9894681 100644 --- a/ucl/inc/ucl/misc/Aspect.hpp +++ b/ucl/include/ucl/misc/Aspect.hpp diff --git a/ucl/inc/ucl/misc/AutoHandle.h b/ucl/include/ucl/misc/AutoHandle.h index 27c19f4..27c19f4 100644 --- a/ucl/inc/ucl/misc/AutoHandle.h +++ b/ucl/include/ucl/misc/AutoHandle.h diff --git a/ucl/inc/ucl/misc/CString.h b/ucl/include/ucl/misc/CString.h index 396f37d..396f37d 100644 --- a/ucl/inc/ucl/misc/CString.h +++ b/ucl/include/ucl/misc/CString.h diff --git a/ucl/inc/ucl/misc/CString.hpp b/ucl/include/ucl/misc/CString.hpp index 086b3c2..086b3c2 100644 --- a/ucl/inc/ucl/misc/CString.hpp +++ b/ucl/include/ucl/misc/CString.hpp diff --git a/ucl/inc/ucl/misc/ConstCString.h b/ucl/include/ucl/misc/ConstCString.h index 7f600f0..7f600f0 100644 --- a/ucl/inc/ucl/misc/ConstCString.h +++ b/ucl/include/ucl/misc/ConstCString.h diff --git a/ucl/inc/ucl/misc/ConstCString.hpp b/ucl/include/ucl/misc/ConstCString.hpp index 50df605..50df605 100644 --- a/ucl/inc/ucl/misc/ConstCString.hpp +++ b/ucl/include/ucl/misc/ConstCString.hpp diff --git a/ucl/inc/ucl/misc/Event.h b/ucl/include/ucl/misc/Event.h index cd27f29..cd27f29 100644 --- a/ucl/inc/ucl/misc/Event.h +++ b/ucl/include/ucl/misc/Event.h diff --git a/ucl/inc/ucl/misc/Event.hpp b/ucl/include/ucl/misc/Event.hpp index ed4e402..ed4e402 100644 --- a/ucl/inc/ucl/misc/Event.hpp +++ b/ucl/include/ucl/misc/Event.hpp diff --git a/ucl/inc/ucl/misc/HashMap.h b/ucl/include/ucl/misc/HashMap.h index 8470fed..8470fed 100644 --- a/ucl/inc/ucl/misc/HashMap.h +++ b/ucl/include/ucl/misc/HashMap.h diff --git a/ucl/inc/ucl/misc/HashMap.hpp b/ucl/include/ucl/misc/HashMap.hpp index 2ba4ffd..2ba4ffd 100644 --- a/ucl/inc/ucl/misc/HashMap.hpp +++ b/ucl/include/ucl/misc/HashMap.hpp diff --git a/ucl/inc/ucl/misc/RefCountAware.h b/ucl/include/ucl/misc/RefCountAware.h index 6ea5ee9..6ea5ee9 100644 --- a/ucl/inc/ucl/misc/RefCountAware.h +++ b/ucl/include/ucl/misc/RefCountAware.h diff --git a/ucl/inc/ucl/misc/RefCountAware.hpp b/ucl/include/ucl/misc/RefCountAware.hpp index 8fb3812..8fb3812 100644 --- a/ucl/inc/ucl/misc/RefCountAware.hpp +++ b/ucl/include/ucl/misc/RefCountAware.hpp diff --git a/ucl/inc/ucl/misc/TString.h b/ucl/include/ucl/misc/TString.h index 71ca2d9..71ca2d9 100644 --- a/ucl/inc/ucl/misc/TString.h +++ b/ucl/include/ucl/misc/TString.h diff --git a/ucl/inc/ucl/misc/TString.hpp b/ucl/include/ucl/misc/TString.hpp index 01c1327..01c1327 100644 --- a/ucl/inc/ucl/misc/TString.hpp +++ b/ucl/include/ucl/misc/TString.hpp diff --git a/ucl/inc/ucl/misc/Timeout.h b/ucl/include/ucl/misc/Timeout.h index 165265c..165265c 100644 --- a/ucl/inc/ucl/misc/Timeout.h +++ b/ucl/include/ucl/misc/Timeout.h diff --git a/ucl/inc/ucl/misc/Variant.h b/ucl/include/ucl/misc/Variant.h index 6542358..6542358 100644 --- a/ucl/inc/ucl/misc/Variant.h +++ b/ucl/include/ucl/misc/Variant.h diff --git a/ucl/inc/ucl/misc/Variant.hpp b/ucl/include/ucl/misc/Variant.hpp index fe6d977..fe6d977 100644 --- a/ucl/inc/ucl/misc/Variant.hpp +++ b/ucl/include/ucl/misc/Variant.hpp diff --git a/ucl/inc/ucl/mvp/GuiPresenter.h b/ucl/include/ucl/mvp/GuiPresenter.h index 5a94af4..5a94af4 100644 --- a/ucl/inc/ucl/mvp/GuiPresenter.h +++ b/ucl/include/ucl/mvp/GuiPresenter.h diff --git a/ucl/inc/ucl/mvp/ListItemPresenter.h b/ucl/include/ucl/mvp/ListItemPresenter.h index 46d2fb4..46d2fb4 100644 --- a/ucl/inc/ucl/mvp/ListItemPresenter.h +++ b/ucl/include/ucl/mvp/ListItemPresenter.h diff --git a/ucl/inc/ucl/mvp/ListPresenter.h b/ucl/include/ucl/mvp/ListPresenter.h index 1d62e41..1d62e41 100644 --- a/ucl/inc/ucl/mvp/ListPresenter.h +++ b/ucl/include/ucl/mvp/ListPresenter.h diff --git a/ucl/inc/ucl/mvp/types.h b/ucl/include/ucl/mvp/types.h index 6c263e2..6c263e2 100644 --- a/ucl/inc/ucl/mvp/types.h +++ b/ucl/include/ucl/mvp/types.h diff --git a/ucl/inc/ucl/util/delegation.h b/ucl/include/ucl/util/delegation.h index a624c08..a624c08 100644 --- a/ucl/inc/ucl/util/delegation.h +++ b/ucl/include/ucl/util/delegation.h diff --git a/ucl/inc/ucl/util/delegation/BaseDelegate.h b/ucl/include/ucl/util/delegation/BaseDelegate.h index 62b92ff..62b92ff 100644 --- a/ucl/inc/ucl/util/delegation/BaseDelegate.h +++ b/ucl/include/ucl/util/delegation/BaseDelegate.h diff --git a/ucl/inc/ucl/util/delegation/BaseDelegate.hpp b/ucl/include/ucl/util/delegation/BaseDelegate.hpp index f25c0a7..f25c0a7 100644 --- a/ucl/inc/ucl/util/delegation/BaseDelegate.hpp +++ b/ucl/include/ucl/util/delegation/BaseDelegate.hpp diff --git a/ucl/inc/ucl/util/delegation/BaseDelegate2.h b/ucl/include/ucl/util/delegation/BaseDelegate2.h index ff3b635..ff3b635 100644 --- a/ucl/inc/ucl/util/delegation/BaseDelegate2.h +++ b/ucl/include/ucl/util/delegation/BaseDelegate2.h diff --git a/ucl/inc/ucl/util/delegation/BaseDelegate2.hpp b/ucl/include/ucl/util/delegation/BaseDelegate2.hpp index 6d8efa7..6d8efa7 100644 --- a/ucl/inc/ucl/util/delegation/BaseDelegate2.hpp +++ b/ucl/include/ucl/util/delegation/BaseDelegate2.hpp diff --git a/ucl/inc/ucl/util/delegation/Callback.h b/ucl/include/ucl/util/delegation/Callback.h index 69724be..69724be 100644 --- a/ucl/inc/ucl/util/delegation/Callback.h +++ b/ucl/include/ucl/util/delegation/Callback.h diff --git a/ucl/inc/ucl/util/delegation/Callback.hpp b/ucl/include/ucl/util/delegation/Callback.hpp index 28d2145..28d2145 100644 --- a/ucl/inc/ucl/util/delegation/Callback.hpp +++ b/ucl/include/ucl/util/delegation/Callback.hpp diff --git a/ucl/inc/ucl/util/delegation/Delegate.h b/ucl/include/ucl/util/delegation/Delegate.h index e1e7416..e1e7416 100644 --- a/ucl/inc/ucl/util/delegation/Delegate.h +++ b/ucl/include/ucl/util/delegation/Delegate.h diff --git a/ucl/inc/ucl/util/delegation/Delegate.hpp b/ucl/include/ucl/util/delegation/Delegate.hpp index 632ec24..632ec24 100644 --- a/ucl/inc/ucl/util/delegation/Delegate.hpp +++ b/ucl/include/ucl/util/delegation/Delegate.hpp diff --git a/ucl/inc/ucl/util/delegation/Delegate2.h b/ucl/include/ucl/util/delegation/Delegate2.h index 56ff3fb..56ff3fb 100644 --- a/ucl/inc/ucl/util/delegation/Delegate2.h +++ b/ucl/include/ucl/util/delegation/Delegate2.h diff --git a/ucl/inc/ucl/util/delegation/Delegate2.hpp b/ucl/include/ucl/util/delegation/Delegate2.hpp index 085ba46..085ba46 100644 --- a/ucl/inc/ucl/util/delegation/Delegate2.hpp +++ b/ucl/include/ucl/util/delegation/Delegate2.hpp diff --git a/ucl/inc/ucl/util/delegation/helpers.h b/ucl/include/ucl/util/delegation/helpers.h index 54ebb99..54ebb99 100644 --- a/ucl/inc/ucl/util/delegation/helpers.h +++ b/ucl/include/ucl/util/delegation/helpers.h diff --git a/ucl/inc/ucl/util/delegation/macro.h b/ucl/include/ucl/util/delegation/macro.h index 62bf88f..62bf88f 100644 --- a/ucl/inc/ucl/util/delegation/macro.h +++ b/ucl/include/ucl/util/delegation/macro.h diff --git a/ucl/inc/ucl/util/delegation/shortMacro.h b/ucl/include/ucl/util/delegation/shortMacro.h index 3837977..3837977 100644 --- a/ucl/inc/ucl/util/delegation/shortMacro.h +++ b/ucl/include/ucl/util/delegation/shortMacro.h diff --git a/ucl/inc/ucl/util/helpers.h b/ucl/include/ucl/util/helpers.h index 117d3de..117d3de 100644 --- a/ucl/inc/ucl/util/helpers.h +++ b/ucl/include/ucl/util/helpers.h diff --git a/ucl/inc/ucl/util/helpers.hpp b/ucl/include/ucl/util/helpers.hpp index a7606f8..a7606f8 100644 --- a/ucl/inc/ucl/util/helpers.hpp +++ b/ucl/include/ucl/util/helpers.hpp diff --git a/ucl/inc/ucl/util/logging.h b/ucl/include/ucl/util/logging.h index 804a513..804a513 100644 --- a/ucl/inc/ucl/util/logging.h +++ b/ucl/include/ucl/util/logging.h diff --git a/ucl/inc/ucl/util/memory.h b/ucl/include/ucl/util/memory.h index cc33960..cc33960 100644 --- a/ucl/inc/ucl/util/memory.h +++ b/ucl/include/ucl/util/memory.h diff --git a/ucl/inc/ucl/util/memory/BaseRef.h b/ucl/include/ucl/util/memory/BaseRef.h index 8146eae..8146eae 100644 --- a/ucl/inc/ucl/util/memory/BaseRef.h +++ b/ucl/include/ucl/util/memory/BaseRef.h diff --git a/ucl/inc/ucl/util/memory/BaseRef.hpp b/ucl/include/ucl/util/memory/BaseRef.hpp index 312c38e..312c38e 100644 --- a/ucl/inc/ucl/util/memory/BaseRef.hpp +++ b/ucl/include/ucl/util/memory/BaseRef.hpp diff --git a/ucl/inc/ucl/util/memory/IRefCountObj.h b/ucl/include/ucl/util/memory/IRefCountObj.h index 69d6a1c..69d6a1c 100644 --- a/ucl/inc/ucl/util/memory/IRefCountObj.h +++ b/ucl/include/ucl/util/memory/IRefCountObj.h diff --git a/ucl/inc/ucl/util/memory/RefCountObj.h b/ucl/include/ucl/util/memory/RefCountObj.h index 7237aa4..7237aa4 100644 --- a/ucl/inc/ucl/util/memory/RefCountObj.h +++ b/ucl/include/ucl/util/memory/RefCountObj.h diff --git a/ucl/inc/ucl/util/memory/RefCountObj.hpp b/ucl/include/ucl/util/memory/RefCountObj.hpp index 8a2c065..8a2c065 100644 --- a/ucl/inc/ucl/util/memory/RefCountObj.hpp +++ b/ucl/include/ucl/util/memory/RefCountObj.hpp diff --git a/ucl/inc/ucl/util/memory/RefCounterMT.h b/ucl/include/ucl/util/memory/RefCounterMT.h index 1d2fb95..1d2fb95 100644 --- a/ucl/inc/ucl/util/memory/RefCounterMT.h +++ b/ucl/include/ucl/util/memory/RefCounterMT.h diff --git a/ucl/inc/ucl/util/memory/RefCounterMT.hpp b/ucl/include/ucl/util/memory/RefCounterMT.hpp index 1ff459b..1ff459b 100644 --- a/ucl/inc/ucl/util/memory/RefCounterMT.hpp +++ b/ucl/include/ucl/util/memory/RefCounterMT.hpp diff --git a/ucl/inc/ucl/util/memory/RefCounterST.h b/ucl/include/ucl/util/memory/RefCounterST.h index 30e5e35..30e5e35 100644 --- a/ucl/inc/ucl/util/memory/RefCounterST.h +++ b/ucl/include/ucl/util/memory/RefCounterST.h diff --git a/ucl/inc/ucl/util/memory/RefCounterST.hpp b/ucl/include/ucl/util/memory/RefCounterST.hpp index 45781c7..45781c7 100644 --- a/ucl/inc/ucl/util/memory/RefCounterST.hpp +++ b/ucl/include/ucl/util/memory/RefCounterST.hpp diff --git a/ucl/inc/ucl/util/memory/ReffedObj.h b/ucl/include/ucl/util/memory/ReffedObj.h index c521544..c521544 100644 --- a/ucl/inc/ucl/util/memory/ReffedObj.h +++ b/ucl/include/ucl/util/memory/ReffedObj.h diff --git a/ucl/inc/ucl/util/memory/ReffedObj.hpp b/ucl/include/ucl/util/memory/ReffedObj.hpp index cfc1e84..cfc1e84 100644 --- a/ucl/inc/ucl/util/memory/ReffedObj.hpp +++ b/ucl/include/ucl/util/memory/ReffedObj.hpp diff --git a/ucl/inc/ucl/util/memory/SharedRef.h b/ucl/include/ucl/util/memory/SharedRef.h index 396d176..396d176 100644 --- a/ucl/inc/ucl/util/memory/SharedRef.h +++ b/ucl/include/ucl/util/memory/SharedRef.h diff --git a/ucl/inc/ucl/util/memory/SharedRef.hpp b/ucl/include/ucl/util/memory/SharedRef.hpp index f085b9c..f085b9c 100644 --- a/ucl/inc/ucl/util/memory/SharedRef.hpp +++ b/ucl/include/ucl/util/memory/SharedRef.hpp diff --git a/ucl/inc/ucl/util/memory/WeakRef.h b/ucl/include/ucl/util/memory/WeakRef.h index 4cccbe6..4cccbe6 100644 --- a/ucl/inc/ucl/util/memory/WeakRef.h +++ b/ucl/include/ucl/util/memory/WeakRef.h diff --git a/ucl/inc/ucl/util/memory/WeakRef.hpp b/ucl/include/ucl/util/memory/WeakRef.hpp index 6634f3c..6634f3c 100644 --- a/ucl/inc/ucl/util/memory/WeakRef.hpp +++ b/ucl/include/ucl/util/memory/WeakRef.hpp diff --git a/ucl/inc/ucl/util/memory/helpers.h b/ucl/include/ucl/util/memory/helpers.h index 5ce25a3..5ce25a3 100644 --- a/ucl/inc/ucl/util/memory/helpers.h +++ b/ucl/include/ucl/util/memory/helpers.h diff --git a/ucl/inc/ucl/util/memory/macro.h b/ucl/include/ucl/util/memory/macro.h index b97175a..b97175a 100644 --- a/ucl/inc/ucl/util/memory/macro.h +++ b/ucl/include/ucl/util/memory/macro.h diff --git a/ucl/inc/ucl/util/shortLogs.h b/ucl/include/ucl/util/shortLogs.h index 02f8bbf..02f8bbf 100644 --- a/ucl/inc/ucl/util/shortLogs.h +++ b/ucl/include/ucl/util/shortLogs.h diff --git a/ucl/inc/ucl/util/smartDelegation.h b/ucl/include/ucl/util/smartDelegation.h index 6714411..6714411 100644 --- a/ucl/inc/ucl/util/smartDelegation.h +++ b/ucl/include/ucl/util/smartDelegation.h diff --git a/ucl/inc/ucl/util/smartDelegation/WeakDelegate.h b/ucl/include/ucl/util/smartDelegation/WeakDelegate.h index 97e1ae8..97e1ae8 100644 --- a/ucl/inc/ucl/util/smartDelegation/WeakDelegate.h +++ b/ucl/include/ucl/util/smartDelegation/WeakDelegate.h diff --git a/ucl/inc/ucl/util/smartDelegation/WeakDelegate.hpp b/ucl/include/ucl/util/smartDelegation/WeakDelegate.hpp index fa7b3f8..fa7b3f8 100644 --- a/ucl/inc/ucl/util/smartDelegation/WeakDelegate.hpp +++ b/ucl/include/ucl/util/smartDelegation/WeakDelegate.hpp diff --git a/ucl/inc/ucl/util/smartDelegation/macro.h b/ucl/include/ucl/util/smartDelegation/macro.h index b117820..b117820 100644 --- a/ucl/inc/ucl/util/smartDelegation/macro.h +++ b/ucl/include/ucl/util/smartDelegation/macro.h diff --git a/ucl/inc/ucl/util/smartDelegation/shortMacro.h b/ucl/include/ucl/util/smartDelegation/shortMacro.h index ddf5e35..ddf5e35 100644 --- a/ucl/inc/ucl/util/smartDelegation/shortMacro.h +++ b/ucl/include/ucl/util/smartDelegation/shortMacro.h diff --git a/ucl/inc/ucl/util/threading.h b/ucl/include/ucl/util/threading.h index 4595b1b..4595b1b 100644 --- a/ucl/inc/ucl/util/threading.h +++ b/ucl/include/ucl/util/threading.h diff --git a/ucl/inc/ucl/util/threading/CondVar.h b/ucl/include/ucl/util/threading/CondVar.h index e73a763..e73a763 100644 --- a/ucl/inc/ucl/util/threading/CondVar.h +++ b/ucl/include/ucl/util/threading/CondVar.h diff --git a/ucl/inc/ucl/util/threading/CondVar.hpp b/ucl/include/ucl/util/threading/CondVar.hpp index 09b0ae0..09b0ae0 100644 --- a/ucl/inc/ucl/util/threading/CondVar.hpp +++ b/ucl/include/ucl/util/threading/CondVar.hpp diff --git a/ucl/inc/ucl/util/threading/Mutex.h b/ucl/include/ucl/util/threading/Mutex.h index eda90ff..eda90ff 100644 --- a/ucl/inc/ucl/util/threading/Mutex.h +++ b/ucl/include/ucl/util/threading/Mutex.h diff --git a/ucl/inc/ucl/util/threading/Mutex.hpp b/ucl/include/ucl/util/threading/Mutex.hpp index c3b75be..c3b75be 100644 --- a/ucl/inc/ucl/util/threading/Mutex.hpp +++ b/ucl/include/ucl/util/threading/Mutex.hpp diff --git a/ucl/inc/ucl/util/threading/MutexLock.h b/ucl/include/ucl/util/threading/MutexLock.h index 062837f..062837f 100644 --- a/ucl/inc/ucl/util/threading/MutexLock.h +++ b/ucl/include/ucl/util/threading/MutexLock.h diff --git a/ucl/inc/ucl/util/threading/MutexLock.hpp b/ucl/include/ucl/util/threading/MutexLock.hpp index a30d995..a30d995 100644 --- a/ucl/inc/ucl/util/threading/MutexLock.hpp +++ b/ucl/include/ucl/util/threading/MutexLock.hpp diff --git a/ucl/inc/ucl/util/threading/Thread.h b/ucl/include/ucl/util/threading/Thread.h index 0839921..0839921 100644 --- a/ucl/inc/ucl/util/threading/Thread.h +++ b/ucl/include/ucl/util/threading/Thread.h diff --git a/ucl/inc/ucl/util/threading/Thread.hpp b/ucl/include/ucl/util/threading/Thread.hpp index 74259c1..74259c1 100644 --- a/ucl/inc/ucl/util/threading/Thread.hpp +++ b/ucl/include/ucl/util/threading/Thread.hpp diff --git a/ucl/inc/ucl/util/types.h b/ucl/include/ucl/util/types.h index 70a33d3..70a33d3 100644 --- a/ucl/inc/ucl/util/types.h +++ b/ucl/include/ucl/util/types.h diff --git a/ucl/inc/ucl/util/types/Result.h b/ucl/include/ucl/util/types/Result.h index 099223f..099223f 100644 --- a/ucl/inc/ucl/util/types/Result.h +++ b/ucl/include/ucl/util/types/Result.h diff --git a/ucl/inc/ucl/util/types/Result.hpp b/ucl/include/ucl/util/types/Result.hpp index c83db4c..c83db4c 100644 --- a/ucl/inc/ucl/util/types/Result.hpp +++ b/ucl/include/ucl/util/types/Result.hpp diff --git a/ucl/inc/ucl/util/types/baseTypes.h b/ucl/include/ucl/util/types/baseTypes.h index c5062db..c5062db 100644 --- a/ucl/inc/ucl/util/types/baseTypes.h +++ b/ucl/include/ucl/util/types/baseTypes.h diff --git a/ucl/inc/ucl/util/types/classTypes.h b/ucl/include/ucl/util/types/classTypes.h index 5c708d2..5c708d2 100644 --- a/ucl/inc/ucl/util/types/classTypes.h +++ b/ucl/include/ucl/util/types/classTypes.h diff --git a/ucl/src/appfw/InstanceManagerBase.cpp b/ucl/source/appfw/InstanceManagerBase.cpp index 2e90b24..2e90b24 100644 --- a/ucl/src/appfw/InstanceManagerBase.cpp +++ b/ucl/source/appfw/InstanceManagerBase.cpp diff --git a/ucl/src/appfw/SysEventProvider.cpp b/ucl/source/appfw/SysEventProvider.cpp index 8958aaf..8958aaf 100644 --- a/ucl/src/appfw/SysEventProvider.cpp +++ b/ucl/source/appfw/SysEventProvider.cpp diff --git a/ucl/src/appfw/UIApp.cpp b/ucl/source/appfw/UIApp.cpp index 6f49c2b..6f49c2b 100644 --- a/ucl/src/appfw/UIApp.cpp +++ b/ucl/source/appfw/UIApp.cpp diff --git a/ucl/src/misc/common.h b/ucl/source/appfw/common.h index 372ad4d..402bb6e 100644 --- a/ucl/src/misc/common.h +++ b/ucl/source/appfw/common.h @@ -14,9 +14,9 @@ * limitations under the License. */ -#ifndef __UCL_MISC_COMMON_H__ -#define __UCL_MISC_COMMON_H__ +#ifndef __UCL_SOURCE_APPFW_COMMON_H__ +#define __UCL_SOURCE_APPFW_COMMON_H__ -#include "../common.h" +#include "ucl/source/common.h" -#endif // __UCL_MISC_COMMON_H__ +#endif // __UCL_SOURCE_APPFW_COMMON_H__ diff --git a/ucl/src/appfw/helpers.cpp b/ucl/source/appfw/helpers.cpp index c547dce..c547dce 100644 --- a/ucl/src/appfw/helpers.cpp +++ b/ucl/source/appfw/helpers.cpp diff --git a/ucl/src/common.h b/ucl/source/common.h index f358669..3312380 100644 --- a/ucl/src/common.h +++ b/ucl/source/common.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef __UCL_COMMON_H__ -#define __UCL_COMMON_H__ +#ifndef __UCL_SOURCE_COMMON_H__ +#define __UCL_SOURCE_COMMON_H__ #include <cmath> #include <cstring> @@ -32,4 +32,4 @@ #include "ucl/util/delegation/shortMacro.h" #include "ucl/util/smartDelegation/shortMacro.h" -#endif // __UCL_COMMON_H__ +#endif // __UCL_SOURCE_COMMON_H__ diff --git a/ucl/src/gui/EdjeWidget.cpp b/ucl/source/gui/EdjeWidget.cpp index 8d67596..8d67596 100644 --- a/ucl/src/gui/EdjeWidget.cpp +++ b/ucl/source/gui/EdjeWidget.cpp diff --git a/ucl/src/gui/ElmWidget.cpp b/ucl/source/gui/ElmWidget.cpp index b7d227e..b7d227e 100644 --- a/ucl/src/gui/ElmWidget.cpp +++ b/ucl/source/gui/ElmWidget.cpp diff --git a/ucl/src/gui/Genlist.cpp b/ucl/source/gui/Genlist.cpp index b0e31a5..b0e31a5 100644 --- a/ucl/src/gui/Genlist.cpp +++ b/ucl/source/gui/Genlist.cpp diff --git a/ucl/src/gui/Layout.cpp b/ucl/source/gui/Layout.cpp index 1509fc5..1509fc5 100644 --- a/ucl/src/gui/Layout.cpp +++ b/ucl/source/gui/Layout.cpp diff --git a/ucl/src/gui/NaviItem.cpp b/ucl/source/gui/NaviItem.cpp index 02f5da2..02f5da2 100644 --- a/ucl/src/gui/NaviItem.cpp +++ b/ucl/source/gui/NaviItem.cpp diff --git a/ucl/src/gui/Naviframe.cpp b/ucl/source/gui/Naviframe.cpp index 717940b..717940b 100644 --- a/ucl/src/gui/Naviframe.cpp +++ b/ucl/source/gui/Naviframe.cpp diff --git a/ucl/src/gui/Widget.cpp b/ucl/source/gui/Widget.cpp index 096c6e1..096c6e1 100644 --- a/ucl/src/gui/Widget.cpp +++ b/ucl/source/gui/Widget.cpp diff --git a/ucl/src/gui/WidgetItem.cpp b/ucl/source/gui/WidgetItem.cpp index 04d1fca..04d1fca 100644 --- a/ucl/src/gui/WidgetItem.cpp +++ b/ucl/source/gui/WidgetItem.cpp diff --git a/ucl/src/gui/Window.cpp b/ucl/source/gui/Window.cpp index 3f74e9e..3f74e9e 100644 --- a/ucl/src/gui/Window.cpp +++ b/ucl/source/gui/Window.cpp diff --git a/ucl/src/mvp/common.h b/ucl/source/gui/common.h index 2894a14..b8a0028 100644 --- a/ucl/src/mvp/common.h +++ b/ucl/source/gui/common.h @@ -14,9 +14,9 @@ * limitations under the License. */ -#ifndef __UCL_MVP_COMMON_H__ -#define __UCL_MVP_COMMON_H__ +#ifndef __UCL_SOURCE_GUI_COMMON_H__ +#define __UCL_SOURCE_GUI_COMMON_H__ -#include "../common.h" +#include "ucl/source/common.h" -#endif // __UCL_MVP_COMMON_H__ +#endif // __UCL_SOURCE_GUI_COMMON_H__ diff --git a/ucl/src/misc/Timeout.cpp b/ucl/source/misc/Timeout.cpp index 41a3d3f..41a3d3f 100644 --- a/ucl/src/misc/Timeout.cpp +++ b/ucl/source/misc/Timeout.cpp diff --git a/ucl/src/misc/Variant.cpp b/ucl/source/misc/Variant.cpp index f723f34..8be8708 100644 --- a/ucl/src/misc/Variant.cpp +++ b/ucl/source/misc/Variant.cpp @@ -26,7 +26,7 @@ namespace ucl { m_type(aString ? TYPE_STRING : TYPE_NIL) { if (aString) { - const int realLength = ((length < 0) ? strlen(aString) : length); + const size_t realLength = ((length < 0) ? strlen(aString) : length); if (realLength < sizeof(m_aSmallStr.buffer)) { strncpy(m_aSmallStr.buffer, aString, realLength); m_aSmallStr.buffer[realLength] = '\0'; diff --git a/ucl/src/appfw/common.h b/ucl/source/misc/common.h index b612dfb..fd9d17e 100644 --- a/ucl/src/appfw/common.h +++ b/ucl/source/misc/common.h @@ -14,9 +14,9 @@ * limitations under the License. */ -#ifndef __UCL_APPFW_COMMON_H__ -#define __UCL_APPFW_COMMON_H__ +#ifndef __UCL_SOURCE_MISC_COMMON_H__ +#define __UCL_SOURCE_MISC_COMMON_H__ -#include "../common.h" +#include "ucl/source/common.h" -#endif // __UCL_APPFW_COMMON_H__ +#endif // __UCL_SOURCE_MISC_COMMON_H__ diff --git a/ucl/src/mvp/GuiPresenter.cpp b/ucl/source/mvp/GuiPresenter.cpp index e23bc02..e23bc02 100644 --- a/ucl/src/mvp/GuiPresenter.cpp +++ b/ucl/source/mvp/GuiPresenter.cpp diff --git a/ucl/src/mvp/ListItemPresenter.cpp b/ucl/source/mvp/ListItemPresenter.cpp index d27568b..d27568b 100644 --- a/ucl/src/mvp/ListItemPresenter.cpp +++ b/ucl/source/mvp/ListItemPresenter.cpp diff --git a/ucl/src/mvp/ListPresenter.cpp b/ucl/source/mvp/ListPresenter.cpp index 2835697..2835697 100644 --- a/ucl/src/mvp/ListPresenter.cpp +++ b/ucl/source/mvp/ListPresenter.cpp diff --git a/ucl/src/gui/common.h b/ucl/source/mvp/common.h index 6b543d3..11a4d84 100644 --- a/ucl/src/gui/common.h +++ b/ucl/source/mvp/common.h @@ -14,9 +14,9 @@ * limitations under the License. */ -#ifndef __UCL_GUI_COMMON_H__ -#define __UCL_GUI_COMMON_H__ +#ifndef __UCL_SOURCE_MVP_COMMON_H__ +#define __UCL_SOURCE_MVP_COMMON_H__ -#include "../common.h" +#include "ucl/source/common.h" -#endif // __UCL_GUI_COMMON_H__ +#endif // __UCL_SOURCE_MVP_COMMON_H__ diff --git a/ucl/src/util/logging.cpp b/ucl/source/util/logging.cpp index 311f25b..311f25b 100644 --- a/ucl/src/util/logging.cpp +++ b/ucl/source/util/logging.cpp diff --git a/ucl/src/util/types/Result.cpp b/ucl/source/util/types/Result.cpp index b42875e..b42875e 100644 --- a/ucl/src/util/types/Result.cpp +++ b/ucl/source/util/types/Result.cpp |