From a24da6d71857940e3088f149a71b4d8ede71322f Mon Sep 17 00:00:00 2001 From: Igor Nazarov Date: Tue, 13 Jun 2017 10:49:38 +0300 Subject: [PATCH] TizenRefApp-8669 [Gallery] Refactor directory structure Change-Id: I82d1a4e2c01c05ad823f74c1ce4c161f3a97374b --- inc/{ => gallery}/config.h | 0 inc/{ => gallery}/model/Gallery.h | 0 inc/{ => gallery}/model/IJob.h | 0 inc/{ => gallery}/model/IMediaAlbum.h | 0 inc/{ => gallery}/model/IMediaAlbum.hpp | 0 inc/{ => gallery}/model/MediaItem.h | 0 inc/{ => gallery}/model/SoundManager.h | 0 inc/{ => gallery}/model/types.h | 2 +- inc/{ => gallery}/presenters/AlertDialog.h | 0 inc/{ => gallery}/presenters/AtspiHighlightHelper.h | 0 inc/{ => gallery}/presenters/Instance.h | 2 +- inc/{ => gallery}/presenters/InstanceManager.h | 0 inc/{ => gallery}/presenters/MoreOptionsPresenter.h | 0 inc/{ => gallery}/presenters/NoContentPage.h | 0 inc/{ => gallery}/presenters/Page.h | 0 inc/{ => gallery}/presenters/Page.hpp | 0 inc/{ => gallery}/presenters/Presenter.h | 0 inc/{ => gallery}/presenters/PreviewPage.h | 6 +++--- inc/{ => gallery}/presenters/ProcessingPresenter.h | 0 inc/{ => gallery}/presenters/SelectModePresenter.h | 2 +- inc/{ => gallery}/presenters/ThumbnailPage.h | 6 +++--- inc/{ => gallery}/presenters/VideoPlayerPage.h | 6 +++--- inc/{ => gallery}/presenters/ViewerPage.h | 8 ++++---- inc/{ => gallery}/presenters/types.h | 4 ++-- inc/{ => gallery}/resources.h | 0 inc/{ => gallery}/types.h | 0 inc/{ => gallery}/view/ImageGrid.h | 0 inc/{ => gallery}/view/ImageViewer.h | 0 inc/{ => gallery}/view/PageContent.h | 0 inc/{ => gallery}/view/TouchParser.h | 0 inc/{ => gallery}/view/helpers.h | 0 inc/{ => gallery}/view/types.h | 2 +- src/common.h | 2 +- src/{internal.h => helpers.h} | 10 +++++----- src/{internal.hpp => helpers.hpp} | 0 src/main.cpp | 2 +- src/model/BaseJob.h | 2 +- src/model/Gallery.cpp | 2 +- src/model/GalleryAlbum.h | 2 +- src/model/MediaItem.cpp | 2 +- src/model/SoundManager.cpp | 2 +- src/model/common.h | 2 +- src/model/{internal.cpp => helpers.cpp} | 2 +- src/model/{internal.h => helpers.h} | 10 +++++----- src/model/{internal.hpp => helpers.hpp} | 0 src/presenters/AlertDialog.cpp | 5 +++-- src/presenters/AtspiHighlightHelper.cpp | 2 +- src/presenters/Instance.cpp | 13 +++++++------ src/presenters/InstanceManager.cpp | 4 ++-- src/presenters/MoreOptionsPresenter.cpp | 2 +- src/presenters/NoContentPage.cpp | 5 +++-- src/presenters/Page.cpp | 2 +- src/presenters/Presenter.cpp | 2 +- src/presenters/PreviewPage.cpp | 7 ++++--- src/presenters/ProcessingPresenter.cpp | 2 +- src/presenters/SelectModePresenter.cpp | 5 +++-- src/presenters/ThumbnailPage.cpp | 7 ++++--- src/presenters/VideoPlayerPage.cpp | 5 +++-- src/presenters/ViewerPage.cpp | 5 +++-- src/presenters/common.h | 2 +- src/presenters/{internal.cpp => helpers.cpp} | 2 +- src/presenters/{internal.h => helpers.h} | 6 +++--- src/resources.cpp | 2 +- src/view/ImageGrid.cpp | 4 ++-- src/view/ImageViewer.cpp | 2 +- src/view/PageContent.cpp | 2 +- src/view/TouchParser.cpp | 2 +- src/view/common.h | 2 +- src/view/helpers.cpp | 2 +- 69 files changed, 88 insertions(+), 80 deletions(-) rename inc/{ => gallery}/config.h (100%) rename inc/{ => gallery}/model/Gallery.h (100%) rename inc/{ => gallery}/model/IJob.h (100%) rename inc/{ => gallery}/model/IMediaAlbum.h (100%) rename inc/{ => gallery}/model/IMediaAlbum.hpp (100%) rename inc/{ => gallery}/model/MediaItem.h (100%) rename inc/{ => gallery}/model/SoundManager.h (100%) rename inc/{ => gallery}/model/types.h (96%) rename inc/{ => gallery}/presenters/AlertDialog.h (100%) rename inc/{ => gallery}/presenters/AtspiHighlightHelper.h (100%) rename inc/{ => gallery}/presenters/Instance.h (98%) rename inc/{ => gallery}/presenters/InstanceManager.h (100%) rename inc/{ => gallery}/presenters/MoreOptionsPresenter.h (100%) rename inc/{ => gallery}/presenters/NoContentPage.h (100%) rename inc/{ => gallery}/presenters/Page.h (100%) rename inc/{ => gallery}/presenters/Page.hpp (100%) rename inc/{ => gallery}/presenters/Presenter.h (100%) rename inc/{ => gallery}/presenters/PreviewPage.h (97%) rename inc/{ => gallery}/presenters/ProcessingPresenter.h (100%) rename inc/{ => gallery}/presenters/SelectModePresenter.h (98%) rename inc/{ => gallery}/presenters/ThumbnailPage.h (96%) rename inc/{ => gallery}/presenters/VideoPlayerPage.h (96%) rename inc/{ => gallery}/presenters/ViewerPage.h (94%) rename inc/{ => gallery}/presenters/types.h (91%) rename inc/{ => gallery}/resources.h (100%) rename inc/{ => gallery}/types.h (100%) rename inc/{ => gallery}/view/ImageGrid.h (100%) rename inc/{ => gallery}/view/ImageViewer.h (100%) rename inc/{ => gallery}/view/PageContent.h (100%) rename inc/{ => gallery}/view/TouchParser.h (100%) rename inc/{ => gallery}/view/helpers.h (100%) rename inc/{ => gallery}/view/types.h (96%) rename src/{internal.h => helpers.h} (87%) rename src/{internal.hpp => helpers.hpp} (100%) rename src/model/{internal.cpp => helpers.cpp} (99%) rename src/model/{internal.h => helpers.h} (89%) rename src/model/{internal.hpp => helpers.hpp} (100%) rename src/presenters/{internal.cpp => helpers.cpp} (98%) rename src/presenters/{internal.h => helpers.h} (87%) diff --git a/inc/config.h b/inc/gallery/config.h similarity index 100% rename from inc/config.h rename to inc/gallery/config.h diff --git a/inc/model/Gallery.h b/inc/gallery/model/Gallery.h similarity index 100% rename from inc/model/Gallery.h rename to inc/gallery/model/Gallery.h diff --git a/inc/model/IJob.h b/inc/gallery/model/IJob.h similarity index 100% rename from inc/model/IJob.h rename to inc/gallery/model/IJob.h diff --git a/inc/model/IMediaAlbum.h b/inc/gallery/model/IMediaAlbum.h similarity index 100% rename from inc/model/IMediaAlbum.h rename to inc/gallery/model/IMediaAlbum.h diff --git a/inc/model/IMediaAlbum.hpp b/inc/gallery/model/IMediaAlbum.hpp similarity index 100% rename from inc/model/IMediaAlbum.hpp rename to inc/gallery/model/IMediaAlbum.hpp diff --git a/inc/model/MediaItem.h b/inc/gallery/model/MediaItem.h similarity index 100% rename from inc/model/MediaItem.h rename to inc/gallery/model/MediaItem.h diff --git a/inc/model/SoundManager.h b/inc/gallery/model/SoundManager.h similarity index 100% rename from inc/model/SoundManager.h rename to inc/gallery/model/SoundManager.h diff --git a/inc/model/types.h b/inc/gallery/model/types.h similarity index 96% rename from inc/model/types.h rename to inc/gallery/model/types.h index 87beb8f..38feee5 100644 --- a/inc/model/types.h +++ b/inc/gallery/model/types.h @@ -17,7 +17,7 @@ #ifndef __GALLERY_MODEL_TYPES_H__ #define __GALLERY_MODEL_TYPES_H__ -#include "../types.h" +#include "gallery/types.h" namespace gallery { diff --git a/inc/presenters/AlertDialog.h b/inc/gallery/presenters/AlertDialog.h similarity index 100% rename from inc/presenters/AlertDialog.h rename to inc/gallery/presenters/AlertDialog.h diff --git a/inc/presenters/AtspiHighlightHelper.h b/inc/gallery/presenters/AtspiHighlightHelper.h similarity index 100% rename from inc/presenters/AtspiHighlightHelper.h rename to inc/gallery/presenters/AtspiHighlightHelper.h diff --git a/inc/presenters/Instance.h b/inc/gallery/presenters/Instance.h similarity index 98% rename from inc/presenters/Instance.h rename to inc/gallery/presenters/Instance.h index bdd20f6..2fee458 100644 --- a/inc/presenters/Instance.h +++ b/inc/gallery/presenters/Instance.h @@ -24,7 +24,7 @@ #include "ucl/gui/Theme.h" #include "ucl/gui/Naviframe.h" -#include "model/Gallery.h" +#include "gallery/model/Gallery.h" #include "Page.h" namespace gallery { diff --git a/inc/presenters/InstanceManager.h b/inc/gallery/presenters/InstanceManager.h similarity index 100% rename from inc/presenters/InstanceManager.h rename to inc/gallery/presenters/InstanceManager.h diff --git a/inc/presenters/MoreOptionsPresenter.h b/inc/gallery/presenters/MoreOptionsPresenter.h similarity index 100% rename from inc/presenters/MoreOptionsPresenter.h rename to inc/gallery/presenters/MoreOptionsPresenter.h diff --git a/inc/presenters/NoContentPage.h b/inc/gallery/presenters/NoContentPage.h similarity index 100% rename from inc/presenters/NoContentPage.h rename to inc/gallery/presenters/NoContentPage.h diff --git a/inc/presenters/Page.h b/inc/gallery/presenters/Page.h similarity index 100% rename from inc/presenters/Page.h rename to inc/gallery/presenters/Page.h diff --git a/inc/presenters/Page.hpp b/inc/gallery/presenters/Page.hpp similarity index 100% rename from inc/presenters/Page.hpp rename to inc/gallery/presenters/Page.hpp diff --git a/inc/presenters/Presenter.h b/inc/gallery/presenters/Presenter.h similarity index 100% rename from inc/presenters/Presenter.h rename to inc/gallery/presenters/Presenter.h diff --git a/inc/presenters/PreviewPage.h b/inc/gallery/presenters/PreviewPage.h similarity index 97% rename from inc/presenters/PreviewPage.h rename to inc/gallery/presenters/PreviewPage.h index aa0c70d..a93691b 100644 --- a/inc/presenters/PreviewPage.h +++ b/inc/gallery/presenters/PreviewPage.h @@ -19,10 +19,10 @@ #include "Page.h" -#include "model/IMediaAlbum.h" +#include "gallery/model/IMediaAlbum.h" -#include "view/PageContent.h" -#include "view/ImageGrid.h" +#include "gallery/view/PageContent.h" +#include "gallery/view/ImageGrid.h" #include "MoreOptionsPresenter.h" #include "SelectModePresenter.h" diff --git a/inc/presenters/ProcessingPresenter.h b/inc/gallery/presenters/ProcessingPresenter.h similarity index 100% rename from inc/presenters/ProcessingPresenter.h rename to inc/gallery/presenters/ProcessingPresenter.h diff --git a/inc/presenters/SelectModePresenter.h b/inc/gallery/presenters/SelectModePresenter.h similarity index 98% rename from inc/presenters/SelectModePresenter.h rename to inc/gallery/presenters/SelectModePresenter.h index b7de8bf..72c014f 100644 --- a/inc/presenters/SelectModePresenter.h +++ b/inc/gallery/presenters/SelectModePresenter.h @@ -21,7 +21,7 @@ #include "Presenter.h" -#include "view/PageContent.h" +#include "gallery/view/PageContent.h" namespace gallery { diff --git a/inc/presenters/ThumbnailPage.h b/inc/gallery/presenters/ThumbnailPage.h similarity index 96% rename from inc/presenters/ThumbnailPage.h rename to inc/gallery/presenters/ThumbnailPage.h index 066a017..ccfe14e 100644 --- a/inc/presenters/ThumbnailPage.h +++ b/inc/gallery/presenters/ThumbnailPage.h @@ -19,10 +19,10 @@ #include "Page.h" -#include "model/IMediaAlbum.h" +#include "gallery/model/IMediaAlbum.h" -#include "view/PageContent.h" -#include "view/ImageGrid.h" +#include "gallery/view/PageContent.h" +#include "gallery/view/ImageGrid.h" #include "MoreOptionsPresenter.h" #include "AtspiHighlightHelper.h" diff --git a/inc/presenters/VideoPlayerPage.h b/inc/gallery/presenters/VideoPlayerPage.h similarity index 96% rename from inc/presenters/VideoPlayerPage.h rename to inc/gallery/presenters/VideoPlayerPage.h index 440a336..64732fa 100644 --- a/inc/presenters/VideoPlayerPage.h +++ b/inc/gallery/presenters/VideoPlayerPage.h @@ -23,10 +23,10 @@ #include "Page.h" -#include "model/SoundManager.h" -#include "model/MediaItem.h" +#include "gallery/model/SoundManager.h" +#include "gallery/model/MediaItem.h" -#include "view/TouchParser.h" +#include "gallery/view/TouchParser.h" namespace gallery { diff --git a/inc/presenters/ViewerPage.h b/inc/gallery/presenters/ViewerPage.h similarity index 94% rename from inc/presenters/ViewerPage.h rename to inc/gallery/presenters/ViewerPage.h index 3e44887..6cb80ad 100644 --- a/inc/presenters/ViewerPage.h +++ b/inc/gallery/presenters/ViewerPage.h @@ -19,11 +19,11 @@ #include "Page.h" -#include "model/MediaItem.h" +#include "gallery/model/MediaItem.h" -#include "view/PageContent.h" -#include "view/ImageViewer.h" -#include "view/TouchParser.h" +#include "gallery/view/PageContent.h" +#include "gallery/view/ImageViewer.h" +#include "gallery/view/TouchParser.h" #include "MoreOptionsPresenter.h" #include "ProcessingPresenter.h" diff --git a/inc/presenters/types.h b/inc/gallery/presenters/types.h similarity index 91% rename from inc/presenters/types.h rename to inc/gallery/presenters/types.h index 86e3572..2d862ff 100644 --- a/inc/presenters/types.h +++ b/inc/gallery/presenters/types.h @@ -17,7 +17,7 @@ #ifndef __GALLERY_PRESENTERS_TYPES_H__ #define __GALLERY_PRESENTERS_TYPES_H__ -#include "view/types.h" -#include "model/types.h" +#include "gallery/view/types.h" +#include "gallery/model/types.h" #endif // __GALLERY_PRESENTERS_TYPES_H__ diff --git a/inc/resources.h b/inc/gallery/resources.h similarity index 100% rename from inc/resources.h rename to inc/gallery/resources.h diff --git a/inc/types.h b/inc/gallery/types.h similarity index 100% rename from inc/types.h rename to inc/gallery/types.h diff --git a/inc/view/ImageGrid.h b/inc/gallery/view/ImageGrid.h similarity index 100% rename from inc/view/ImageGrid.h rename to inc/gallery/view/ImageGrid.h diff --git a/inc/view/ImageViewer.h b/inc/gallery/view/ImageViewer.h similarity index 100% rename from inc/view/ImageViewer.h rename to inc/gallery/view/ImageViewer.h diff --git a/inc/view/PageContent.h b/inc/gallery/view/PageContent.h similarity index 100% rename from inc/view/PageContent.h rename to inc/gallery/view/PageContent.h diff --git a/inc/view/TouchParser.h b/inc/gallery/view/TouchParser.h similarity index 100% rename from inc/view/TouchParser.h rename to inc/gallery/view/TouchParser.h diff --git a/inc/view/helpers.h b/inc/gallery/view/helpers.h similarity index 100% rename from inc/view/helpers.h rename to inc/gallery/view/helpers.h diff --git a/inc/view/types.h b/inc/gallery/view/types.h similarity index 96% rename from inc/view/types.h rename to inc/gallery/view/types.h index d458dc3..35b0594 100644 --- a/inc/view/types.h +++ b/inc/gallery/view/types.h @@ -21,6 +21,6 @@ #include "ucl/gui/types.h" -#include "../types.h" +#include "gallery/types.h" #endif // __GALLERY_VIEW_TYPES_H__ diff --git a/src/common.h b/src/common.h index 57d60ad..d6d7bae 100644 --- a/src/common.h +++ b/src/common.h @@ -26,7 +26,7 @@ #undef UCL_LOG_TAG #define UCL_LOG_TAG GALLERY_LOG_TAG -#include "internal.h" +#include "helpers.h" namespace gallery { diff --git a/src/internal.h b/src/helpers.h similarity index 87% rename from src/internal.h rename to src/helpers.h index 504f985..666ebc6 100644 --- a/src/internal.h +++ b/src/helpers.h @@ -14,10 +14,10 @@ * limitations under the License. */ -#ifndef __GALLERY_INTERNAL_H__ -#define __GALLERY_INTERNAL_H__ +#ifndef __GALLERY_HELPERS_H__ +#define __GALLERY_HELPERS_H__ -#include "types.h" +#include "gallery/types.h" namespace gallery { namespace util { @@ -31,6 +31,6 @@ namespace gallery { namespace util { ucl::Result call(FUNC &&func, ARGS &&...args); }} -#include "internal.hpp" +#include "helpers.hpp" -#endif // __GALLERY_INTERNAL_H__ +#endif // __GALLERY_HELPERS_H__ diff --git a/src/internal.hpp b/src/helpers.hpp similarity index 100% rename from src/internal.hpp rename to src/helpers.hpp diff --git a/src/main.cpp b/src/main.cpp index 0165f6f..826f6c3 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -16,7 +16,7 @@ #include "ucl/appfw/UIApp.h" -#include "presenters/InstanceManager.h" +#include "gallery/presenters/InstanceManager.h" #include "common.h" diff --git a/src/model/BaseJob.h b/src/model/BaseJob.h index 33c28cd..5b12d54 100644 --- a/src/model/BaseJob.h +++ b/src/model/BaseJob.h @@ -21,7 +21,7 @@ #include "ucl/util/threading/Thread.h" -#include "model/IJob.h" +#include "gallery/model/IJob.h" namespace gallery { diff --git a/src/model/Gallery.cpp b/src/model/Gallery.cpp index 9e4fae8..a2c9acc 100644 --- a/src/model/Gallery.cpp +++ b/src/model/Gallery.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "model/Gallery.h" +#include "gallery/model/Gallery.h" #include "GalleryAlbum.h" diff --git a/src/model/GalleryAlbum.h b/src/model/GalleryAlbum.h index 9a03043..57f7e48 100644 --- a/src/model/GalleryAlbum.h +++ b/src/model/GalleryAlbum.h @@ -23,7 +23,7 @@ #include "ucl/misc/Event.h" -#include "model/IMediaAlbum.h" +#include "gallery/model/IMediaAlbum.h" namespace gallery { diff --git a/src/model/MediaItem.cpp b/src/model/MediaItem.cpp index 67f8212..ac8c3ef 100644 --- a/src/model/MediaItem.cpp +++ b/src/model/MediaItem.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "model/MediaItem.h" +#include "gallery/model/MediaItem.h" #include #include diff --git a/src/model/SoundManager.cpp b/src/model/SoundManager.cpp index efdf651..0d83a73 100644 --- a/src/model/SoundManager.cpp +++ b/src/model/SoundManager.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "model/SoundManager.h" +#include "gallery/model/SoundManager.h" #include "common.h" diff --git a/src/model/common.h b/src/model/common.h index c1e6306..7581a14 100644 --- a/src/model/common.h +++ b/src/model/common.h @@ -17,7 +17,7 @@ #ifndef __GALLERY_MODEL_COMMON_H__ #define __GALLERY_MODEL_COMMON_H__ -#include "internal.h" +#include "helpers.h" #include "../common.h" diff --git a/src/model/internal.cpp b/src/model/helpers.cpp similarity index 99% rename from src/model/internal.cpp rename to src/model/helpers.cpp index 9f0e5cf..452abb7 100644 --- a/src/model/internal.cpp +++ b/src/model/helpers.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "internal.h" +#include "helpers.h" #include #include diff --git a/src/model/internal.h b/src/model/helpers.h similarity index 89% rename from src/model/internal.h rename to src/model/helpers.h index 61a9176..4fa988f 100644 --- a/src/model/internal.h +++ b/src/model/helpers.h @@ -14,14 +14,14 @@ * limitations under the License. */ -#ifndef __GALLERY_MODEL_INTERNAL_H__ -#define __GALLERY_MODEL_INTERNAL_H__ +#ifndef __GALLERY_MODEL_HELPERS_H__ +#define __GALLERY_MODEL_HELPERS_H__ #include #include "ucl/util/threading.h" -#include "model/types.h" +#include "gallery/model/types.h" namespace gallery { @@ -53,6 +53,6 @@ namespace gallery { namespace util { bool caseSensitive = true); }} -#include "internal.hpp" +#include "helpers.hpp" -#endif // __GALLERY_MODEL_INTERNAL_H__ +#endif // __GALLERY_MODEL_HELPERS_H__ diff --git a/src/model/internal.hpp b/src/model/helpers.hpp similarity index 100% rename from src/model/internal.hpp rename to src/model/helpers.hpp diff --git a/src/presenters/AlertDialog.cpp b/src/presenters/AlertDialog.cpp index 85ec84b..57b06d6 100644 --- a/src/presenters/AlertDialog.cpp +++ b/src/presenters/AlertDialog.cpp @@ -14,9 +14,10 @@ * limitations under the License. */ -#include "presenters/AlertDialog.h" +#include "gallery/presenters/AlertDialog.h" + +#include "gallery/resources.h" -#include "resources.h" #include "common.h" namespace gallery { namespace { namespace impl { diff --git a/src/presenters/AtspiHighlightHelper.cpp b/src/presenters/AtspiHighlightHelper.cpp index 8e6ae07..08cd14e 100644 --- a/src/presenters/AtspiHighlightHelper.cpp +++ b/src/presenters/AtspiHighlightHelper.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "presenters/AtspiHighlightHelper.h" +#include "gallery/presenters/AtspiHighlightHelper.h" #include "common.h" diff --git a/src/presenters/Instance.cpp b/src/presenters/Instance.cpp index cceb718..fbefd8e 100644 --- a/src/presenters/Instance.cpp +++ b/src/presenters/Instance.cpp @@ -14,18 +14,19 @@ * limitations under the License. */ -#include "presenters/Instance.h" +#include "gallery/presenters/Instance.h" #include #include "ucl/appfw/helpers.h" -#include "presenters/NoContentPage.h" -#include "presenters/ThumbnailPage.h" -#include "presenters/ViewerPage.h" -#include "presenters/VideoPlayerPage.h" +#include "gallery/presenters/NoContentPage.h" +#include "gallery/presenters/ThumbnailPage.h" +#include "gallery/presenters/ViewerPage.h" +#include "gallery/presenters/VideoPlayerPage.h" + +#include "gallery/resources.h" -#include "resources.h" #include "common.h" namespace gallery { namespace { namespace impl { diff --git a/src/presenters/InstanceManager.cpp b/src/presenters/InstanceManager.cpp index 826362e..dd187d7 100644 --- a/src/presenters/InstanceManager.cpp +++ b/src/presenters/InstanceManager.cpp @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "presenters/InstanceManager.h" +#include "gallery/presenters/InstanceManager.h" -#include "presenters/Instance.h" +#include "gallery/presenters/Instance.h" #include "common.h" diff --git a/src/presenters/MoreOptionsPresenter.cpp b/src/presenters/MoreOptionsPresenter.cpp index c718ff9..f0d902f 100644 --- a/src/presenters/MoreOptionsPresenter.cpp +++ b/src/presenters/MoreOptionsPresenter.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "presenters/MoreOptionsPresenter.h" +#include "gallery/presenters/MoreOptionsPresenter.h" #include "ucl/gui/Layout.h" diff --git a/src/presenters/NoContentPage.cpp b/src/presenters/NoContentPage.cpp index f2537fe..db5c2d6 100644 --- a/src/presenters/NoContentPage.cpp +++ b/src/presenters/NoContentPage.cpp @@ -14,11 +14,12 @@ * limitations under the License. */ -#include "presenters/NoContentPage.h" +#include "gallery/presenters/NoContentPage.h" #include "ucl/gui/Layout.h" -#include "resources.h" +#include "gallery/resources.h" + #include "common.h" namespace gallery { diff --git a/src/presenters/Page.cpp b/src/presenters/Page.cpp index 2bc1870..39a6930 100644 --- a/src/presenters/Page.cpp +++ b/src/presenters/Page.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "presenters/Page.h" +#include "gallery/presenters/Page.h" #include "common.h" diff --git a/src/presenters/Presenter.cpp b/src/presenters/Presenter.cpp index 7d86b06..13f2856 100644 --- a/src/presenters/Presenter.cpp +++ b/src/presenters/Presenter.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "presenters/Presenter.h" +#include "gallery/presenters/Presenter.h" #include "common.h" diff --git a/src/presenters/PreviewPage.cpp b/src/presenters/PreviewPage.cpp index b741e74..05f3f12 100644 --- a/src/presenters/PreviewPage.cpp +++ b/src/presenters/PreviewPage.cpp @@ -14,11 +14,12 @@ * limitations under the License. */ -#include "presenters/PreviewPage.h" +#include "gallery/presenters/PreviewPage.h" -#include "presenters/ViewerPage.h" +#include "gallery/presenters/ViewerPage.h" + +#include "gallery/resources.h" -#include "resources.h" #include "common.h" namespace gallery { namespace { namespace impl { diff --git a/src/presenters/ProcessingPresenter.cpp b/src/presenters/ProcessingPresenter.cpp index 4eea1d4..90e679e 100644 --- a/src/presenters/ProcessingPresenter.cpp +++ b/src/presenters/ProcessingPresenter.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "presenters/ProcessingPresenter.h" +#include "gallery/presenters/ProcessingPresenter.h" #include "common.h" diff --git a/src/presenters/SelectModePresenter.cpp b/src/presenters/SelectModePresenter.cpp index 7b2e02f..d0fec2c 100644 --- a/src/presenters/SelectModePresenter.cpp +++ b/src/presenters/SelectModePresenter.cpp @@ -14,11 +14,12 @@ * limitations under the License. */ -#include "presenters/SelectModePresenter.h" +#include "gallery/presenters/SelectModePresenter.h" #include "ucl/gui/WidgetItem.h" -#include "resources.h" +#include "gallery/resources.h" + #include "common.h" namespace gallery { namespace { namespace impl { diff --git a/src/presenters/ThumbnailPage.cpp b/src/presenters/ThumbnailPage.cpp index d341a5b..4d96ab6 100644 --- a/src/presenters/ThumbnailPage.cpp +++ b/src/presenters/ThumbnailPage.cpp @@ -14,11 +14,12 @@ * limitations under the License. */ -#include "presenters/ThumbnailPage.h" +#include "gallery/presenters/ThumbnailPage.h" -#include "presenters/PreviewPage.h" +#include "gallery/presenters/PreviewPage.h" + +#include "gallery/resources.h" -#include "resources.h" #include "common.h" namespace gallery { namespace { namespace impl { diff --git a/src/presenters/VideoPlayerPage.cpp b/src/presenters/VideoPlayerPage.cpp index e9e1cdb..96c384d 100644 --- a/src/presenters/VideoPlayerPage.cpp +++ b/src/presenters/VideoPlayerPage.cpp @@ -14,13 +14,14 @@ * limitations under the License. */ -#include "presenters/VideoPlayerPage.h" +#include "gallery/presenters/VideoPlayerPage.h" #include #include "ucl/appfw/types.h" -#include "resources.h" +#include "gallery/resources.h" + #include "common.h" namespace gallery { namespace { namespace impl { diff --git a/src/presenters/ViewerPage.cpp b/src/presenters/ViewerPage.cpp index 2e2805c..e8a7d85 100644 --- a/src/presenters/ViewerPage.cpp +++ b/src/presenters/ViewerPage.cpp @@ -14,9 +14,10 @@ * limitations under the License. */ -#include "presenters/ViewerPage.h" +#include "gallery/presenters/ViewerPage.h" + +#include "gallery/resources.h" -#include "resources.h" #include "common.h" namespace gallery { namespace { namespace impl { diff --git a/src/presenters/common.h b/src/presenters/common.h index 8a5ab5c..a769b95 100644 --- a/src/presenters/common.h +++ b/src/presenters/common.h @@ -17,7 +17,7 @@ #ifndef __GALLERY_PRESENTERS_COMMON_H__ #define __GALLERY_PRESENTERS_COMMON_H__ -#include "internal.h" +#include "helpers.h" #include "../view/common.h" diff --git a/src/presenters/internal.cpp b/src/presenters/helpers.cpp similarity index 98% rename from src/presenters/internal.cpp rename to src/presenters/helpers.cpp index 207fdb1..c325932 100644 --- a/src/presenters/internal.cpp +++ b/src/presenters/helpers.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "internal.h" +#include "helpers.h" #include "common.h" diff --git a/src/presenters/internal.h b/src/presenters/helpers.h similarity index 87% rename from src/presenters/internal.h rename to src/presenters/helpers.h index a0f7ecb..0540406 100644 --- a/src/presenters/internal.h +++ b/src/presenters/helpers.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef __GALLERY_PRESENTERS_INTERNAL_H__ -#define __GALLERY_PRESENTERS_INTERNAL_H__ +#ifndef __GALLERY_PRESENTERS_HELPERS_H__ +#define __GALLERY_PRESENTERS_HELPERS_H__ #include "ucl/gui/Window.h" @@ -28,4 +28,4 @@ namespace gallery { bool isInstancePaused(const ucl::Window &win); } -#endif // __GALLERY_PRESENTERS_INTERNAL_H__ +#endif // __GALLERY_PRESENTERS_HELPERS_H__ diff --git a/src/resources.cpp b/src/resources.cpp index 83291cd..f685c91 100644 --- a/src/resources.cpp +++ b/src/resources.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "resources.h" +#include "gallery/resources.h" namespace gallery { diff --git a/src/view/ImageGrid.cpp b/src/view/ImageGrid.cpp index c3a2b7c..ece8828 100644 --- a/src/view/ImageGrid.cpp +++ b/src/view/ImageGrid.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "view/ImageGrid.h" +#include "gallery/view/ImageGrid.h" #include #include @@ -22,7 +22,7 @@ #include "ucl/gui/Layout.h" #include "ucl/gui/Window.h" -#include "view/TouchParser.h" +#include "gallery/view/TouchParser.h" #include "common.h" diff --git a/src/view/ImageViewer.cpp b/src/view/ImageViewer.cpp index 5e90e41..606e376 100644 --- a/src/view/ImageViewer.cpp +++ b/src/view/ImageViewer.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "view/ImageViewer.h" +#include "gallery/view/ImageViewer.h" #include "common.h" diff --git a/src/view/PageContent.cpp b/src/view/PageContent.cpp index 39c2505..21d601d 100644 --- a/src/view/PageContent.cpp +++ b/src/view/PageContent.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "view/PageContent.h" +#include "gallery/view/PageContent.h" #include "common.h" diff --git a/src/view/TouchParser.cpp b/src/view/TouchParser.cpp index bed06bf..d06d2f1 100644 --- a/src/view/TouchParser.cpp +++ b/src/view/TouchParser.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "view/TouchParser.h" +#include "gallery/view/TouchParser.h" #include "common.h" diff --git a/src/view/common.h b/src/view/common.h index d56f144..e72c13b 100644 --- a/src/view/common.h +++ b/src/view/common.h @@ -21,7 +21,7 @@ #include "ucl/gui/stdTheme.h" #include "ucl/gui/helpers.h" -#include "view/helpers.h" +#include "gallery/view/helpers.h" #include "../common.h" diff --git a/src/view/helpers.cpp b/src/view/helpers.cpp index 2a9fe7f..f9361da 100644 --- a/src/view/helpers.cpp +++ b/src/view/helpers.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "view/helpers.h" +#include "gallery/view/helpers.h" #include -- 2.34.1