gallery-app

Merge lp:~schwann/gallery-app/gallery-remove-directory-includes into lp:gallery-app

  1. gallery-remove-directory-includes
  2. Merge into trunk
Proposed by Günter Schwann
Status: Merged
Approved by: Olivier Tilloy
Approved revision: 688
Merged at revision: 688
Proposed branch: lp:~schwann/gallery-app/gallery-remove-directory-includes
Merge into: lp:gallery-app
Diff against target: 1610 lines (+402/-227)
74 files modified
src/CMakeLists.txt (+10/-2)
src/album/CMakeLists.txt (+14/-0)
src/album/album-collection.cpp (+9/-3)
src/album/album-collection.h (+6/-4)
src/album/album-default-template.h (+2/-2)
src/album/album-page.cpp (+7/-4)
src/album/album-page.h (+8/-4)
src/album/album-template.h (+2/-2)
src/album/album.cpp (+18/-7)
src/album/album.h (+9/-5)
src/core/CMakeLists.txt (+2/-1)
src/core/container-source-collection.h (+2/-2)
src/core/container-source.h (+3/-3)
src/core/data-collection.cpp (+2/-2)
src/core/data-collection.h (+4/-3)
src/core/data-object.cpp (+2/-2)
src/core/selectable-view-collection.h (+2/-2)
src/database/CMakeLists.txt (+12/-0)
src/database/album-table.cpp (+6/-2)
src/database/album-table.h (+1/-1)
src/database/database.cpp (+1/-1)
src/database/database.h (+2/-2)
src/database/media-table.cpp (+3/-3)
src/database/media-table.h (+2/-2)
src/database/photo-edit-table.cpp (+6/-4)
src/event/CMakeLists.txt (+10/-0)
src/event/event-collection.cpp (+9/-3)
src/event/event-collection.h (+2/-2)
src/event/event.cpp (+5/-3)
src/event/event.h (+7/-4)
src/gallery-application.cpp (+28/-16)
src/gallery-application.h (+1/-1)
src/gallery-manager.cpp (+22/-11)
src/gallery-manager.h (+2/-1)
src/media/CMakeLists.txt (+14/-0)
src/media/media-collection.cpp (+13/-7)
src/media/media-collection.h (+2/-1)
src/media/media-monitor.h (+1/-1)
src/media/media-source.cpp (+17/-7)
src/media/media-source.h (+6/-3)
src/media/preview-manager.cpp (+8/-4)
src/photo/CMakeLists.txt (+12/-0)
src/photo/photo-caches.h (+2/-2)
src/photo/photo-edit-state.h (+2/-2)
src/photo/photo-metadata.cpp (+2/-2)
src/photo/photo-metadata.h (+1/-1)
src/photo/photo.cpp (+20/-10)
src/photo/photo.h (+6/-4)
src/qml/CMakeLists.txt (+15/-0)
src/qml/gallery-standard-image-provider.cpp (+7/-5)
src/qml/gallery-standard-image-provider.h (+4/-4)
src/qml/gallery-thumbnail-image-provider.cpp (+3/-1)
src/qml/qml-album-collection-model.cpp (+5/-5)
src/qml/qml-event-collection-model.cpp (+3/-3)
src/qml/qml-event-overview-model.cpp (+5/-5)
src/qml/qml-media-collection-model.cpp (+8/-8)
src/qml/qml-view-collection-model.cpp (+3/-3)
src/qml/qml-view-collection-model.h (+1/-1)
src/util/CMakeLists.txt (+1/-1)
src/util/collections.h (+1/-0)
tests/unittests/command-line-parser/CMakeLists.txt (+1/-1)
tests/unittests/command-line-parser/tst_commandlineparser.cpp (+1/-1)
tests/unittests/gallerystandardimageprovider/CMakeLists.txt (+3/-0)
tests/unittests/gallerystandardimageprovider/photometa-data.cpp (+1/-1)
tests/unittests/gallerystandardimageprovider/preview-manager.cpp (+2/-2)
tests/unittests/gallerystandardimageprovider/tst_gallerystandardimageprovidertest.cpp (+3/-3)
tests/unittests/gallerythumbnailimageprovider/CMakeLists.txt (+2/-1)
tests/unittests/gallerythumbnailimageprovider/media/media-collection.h (+0/-28)
tests/unittests/gallerythumbnailimageprovider/preview-manager.cpp (+1/-1)
tests/unittests/gallerythumbnailimageprovider/tst_gallerythumbnailimageprovider.cpp (+1/-1)
tests/unittests/imaging/CMakeLists.txt (+1/-1)
tests/unittests/imaging/tst_imaging.cpp (+1/-1)
tests/unittests/resource/CMakeLists.txt (+1/-1)
tests/unittests/resource/tst_resource.cpp (+1/-1)
To merge this branch: bzr merge lp:~schwann/gallery-app/gallery-remove-directory-includes
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Olivier Tilloy Approve
Review via email: mp+167702@code.launchpad.net

Commit message

Remove directories from includes, but set them in the include paths

Description of the change

Remove the directories in the includes.
Set the include paths in the cmake files instead. As well as the target_library dependencies.
This nicely hightlights the dependencies (lots of circular dependencies).

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:685
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/202/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-amd64-ci/12/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-armhf-ci/12/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-i386-ci/12/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/gallery-app-ci/202/rebuild

review: Needs Fixing (continuous-integration)
lp:~schwann/gallery-app/gallery-remove-directory-includes updated
686. By Günter Schwann

Work around cmake issues with circular dependencies

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:686
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/203/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-amd64-ci/13
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-armhf-ci/13
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-armhf-ci/13/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-i386-ci/13
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1920

Click here to trigger a rebuild:
http://s-jenkins:8080/job/gallery-app-ci/203/rebuild

review: Approve (continuous-integration)
Revision history for this message
Olivier Tilloy (osomon) wrote :

44 + ${gallery_src_SOURCE_DIR}/database
45 + ${gallery_src_SOURCE_DIR}/media
46 + ${gallery_src_SOURCE_DIR}/photo
47 + ${gallery_src_SOURCE_DIR}/qml

Shouldn’t this be:

    ${gallery_database_src_SOURCE_DIR}
    ${gallery_media_src_SOURCE_DIR}
    ${gallery_photo_src_SOURCE_DIR}
    ${gallery_qml_src_SOURCE_DIR}

review: Needs Information
Revision history for this message
Olivier Tilloy (osomon) wrote :

A suggestion: since #include statements are not prefixed with the subproject directory anymore, I would group them by subproject and separate each group with a blank line, and prefix it with a comment with the name of the subproject, e.g.:

    // core
    #include "container-source.h"
    #include "selectable-view-collection.h"

    // media
    #include "media-collection.h"

    // util
    #include "collections.h"
    #include "resource.h"

Revision history for this message
Günter Schwann (schwann) wrote :

> 44 + ${gallery_src_SOURCE_DIR}/database
> 45 + ${gallery_src_SOURCE_DIR}/media
> 46 + ${gallery_src_SOURCE_DIR}/photo
> 47 + ${gallery_src_SOURCE_DIR}/qml
>
> Shouldn’t this be:
>
> ${gallery_database_src_SOURCE_DIR}
> ${gallery_media_src_SOURCE_DIR}
> ${gallery_photo_src_SOURCE_DIR}
> ${gallery_qml_src_SOURCE_DIR}

I had this before. But I had to do this because of the cmake issues with circular dependencies

Revision history for this message
Günter Schwann (schwann) wrote :

> A suggestion: since #include statements are not prefixed with the subproject
> directory anymore, I would group them by subproject and separate each group
> with a blank line, and prefix it with a comment with the name of the
> subproject, e.g.:

Ok - I will do this

Revision history for this message
Olivier Tilloy (osomon) wrote :

> > 44 + ${gallery_src_SOURCE_DIR}/database
> > 45 + ${gallery_src_SOURCE_DIR}/media
> > 46 + ${gallery_src_SOURCE_DIR}/photo
> > 47 + ${gallery_src_SOURCE_DIR}/qml
> >
> > Shouldn’t this be:
> >
> > ${gallery_database_src_SOURCE_DIR}
> > ${gallery_media_src_SOURCE_DIR}
> > ${gallery_photo_src_SOURCE_DIR}
> > ${gallery_qml_src_SOURCE_DIR}
>
> I had this before. But I had to do this because of the cmake issues with
> circular dependencies

Ouch :(
Can you please add a comment there to explain?

lp:~schwann/gallery-app/gallery-remove-directory-includes updated
687. By Günter Schwann

Comment the workaround in the cmake files

688. By Günter Schwann

Group and sort includes

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:687
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/208/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-amd64-ci/18
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-armhf-ci/18
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-armhf-ci/18/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-i386-ci/18
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1933

Click here to trigger a rebuild:
http://s-jenkins:8080/job/gallery-app-ci/208/rebuild

review: Approve (continuous-integration)
Revision history for this message
Olivier Tilloy (osomon) wrote :

Looks good now.

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:688
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/211/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-amd64-ci/21
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-armhf-ci/21
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-armhf-ci/21/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-i386-ci/21
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1936

Click here to trigger a rebuild:
http://s-jenkins:8080/job/gallery-app-ci/211/rebuild

review: Approve (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:688
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/211/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-amd64-ci/21
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-armhf-ci/21
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-armhf-ci/21/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-i386-ci/21
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1936

Click here to trigger a rebuild:
http://s-jenkins:8080/job/gallery-app-ci/211/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/CMakeLists.txt'
2--- src/CMakeLists.txt 2013-06-03 07:06:50 +0000
3+++ src/CMakeLists.txt 2013-06-06 16:04:27 +0000
4@@ -1,13 +1,13 @@
5 project(gallery_src)
6
7+add_subdirectory(util)
8+add_subdirectory(core)
9 add_subdirectory(album)
10-add_subdirectory(core)
11 add_subdirectory(database)
12 add_subdirectory(event)
13 add_subdirectory(media)
14 add_subdirectory(photo)
15 add_subdirectory(qml)
16-add_subdirectory(util)
17
18 configure_file(
19 config.h.in
20@@ -18,6 +18,14 @@
21 set(GALLERY gallery-app)
22
23 include_directories(
24+ ${gallery_album_src_SOURCE_DIR}
25+ ${gallery_core_src_SOURCE_DIR}
26+ ${gallery_database_src_SOURCE_DIR}
27+ ${gallery_event_src_SOURCE_DIR}
28+ ${gallery_media_src_SOURCE_DIR}
29+ ${gallery_photo_src_SOURCE_DIR}
30+ ${gallery_qml_src_SOURCE_DIR}
31+ ${gallery_util_src_SOURCE_DIR}
32 ${CMAKE_BINARY_DIR}
33 ${GSTLIB_INCLUDE_DIRS}
34 )
35
36=== modified file 'src/album/CMakeLists.txt'
37--- src/album/CMakeLists.txt 2013-06-03 07:06:50 +0000
38+++ src/album/CMakeLists.txt 2013-06-06 16:04:27 +0000
39@@ -4,6 +4,14 @@
40
41 include_directories(
42 ${gallery_src_SOURCE_DIR}
43+ ${gallery_core_src_SOURCE_DIR}
44+ # because of circulate dependencies the sub project can't be used directly
45+ # FIXME resolve the circulate dependencies
46+ ${gallery_src_SOURCE_DIR}/database
47+ ${gallery_src_SOURCE_DIR}/media
48+ ${gallery_src_SOURCE_DIR}/photo
49+ ${gallery_src_SOURCE_DIR}/qml
50+ ${gallery_util_src_SOURCE_DIR}
51 ${CMAKE_BINARY_DIR}
52 ${GSTLIB_INCLUDE_DIRS}
53 )
54@@ -33,5 +41,11 @@
55 qt5_use_modules(${GALLERY_ALBUM_LIB} Widgets Core Qml)
56
57 target_link_libraries( ${GALLERY_ALBUM_LIB}
58+ gallery-core
59+ gallery-database
60+ gallery-media
61+ gallery-photo
62+ gallery-qml
63+ gallery-util
64 ${GSTLIB_LDFLAGS}
65 )
66
67=== modified file 'src/album/album-collection.cpp'
68--- src/album/album-collection.cpp 2013-05-28 13:50:03 +0000
69+++ src/album/album-collection.cpp 2013-06-06 16:04:27 +0000
70@@ -18,9 +18,15 @@
71 */
72
73 #include "album-collection.h"
74-#include "media/media-collection.h"
75-#include "database/database.h"
76-#include "database/album-table.h"
77+
78+// database
79+#include "album-table.h"
80+#include "database.h"
81+
82+// media
83+#include "media-collection.h"
84+
85+// src
86 #include "gallery-manager.h"
87
88 /*!
89
90=== modified file 'src/album/album-collection.h'
91--- src/album/album-collection.h 2013-05-28 13:50:03 +0000
92+++ src/album/album-collection.h 2013-06-06 16:04:27 +0000
93@@ -20,12 +20,14 @@
94 #ifndef GALLERY_ALBUM_COLLECTION_H_
95 #define GALLERY_ALBUM_COLLECTION_H_
96
97+#include "album.h"
98+
99+// core
100+#include "container-source-collection.h"
101+#include "data-object.h"
102+
103 #include <QObject>
104
105-#include "album.h"
106-#include "core/container-source-collection.h"
107-#include "core/data-object.h"
108-
109 /*!
110 * \brief The AlbumCollection class
111 */
112
113=== modified file 'src/album/album-default-template.h'
114--- src/album/album-default-template.h 2013-05-28 13:50:03 +0000
115+++ src/album/album-default-template.h 2013-06-06 16:04:27 +0000
116@@ -21,10 +21,10 @@
117 #ifndef GALLERY_ALBUM_DEFAULT_TEMPLATE_H_
118 #define GALLERY_ALBUM_DEFAULT_TEMPLATE_H_
119
120+#include "album-template.h"
121+
122 #include <QObject>
123
124-#include "album-template.h"
125-
126 /*!
127 * \brief The AlbumDefaultTemplate class
128 */
129
130=== modified file 'src/album/album-page.cpp'
131--- src/album/album-page.cpp 2013-05-28 13:50:03 +0000
132+++ src/album/album-page.cpp 2013-06-06 16:04:27 +0000
133@@ -19,10 +19,13 @@
134
135 #include "album-page.h"
136 #include "album.h"
137-#include "media/media-collection.h"
138-#include "util/collections.h"
139-#include "util/resource.h"
140-#include "gallery-manager.h"
141+
142+// media
143+#include "media-collection.h"
144+
145+// util
146+#include "collections.h"
147+#include "resource.h"
148
149 /*!
150 * \brief AlbumPage::AlbumPage
151
152=== modified file 'src/album/album-page.h'
153--- src/album/album-page.h 2013-05-28 13:50:03 +0000
154+++ src/album/album-page.h 2013-06-06 16:04:27 +0000
155@@ -20,13 +20,17 @@
156 #ifndef GALLERY_ALBUM_PAGE_H_
157 #define GALLERY_ALBUM_PAGE_H_
158
159+#include "album-template-page.h"
160+
161+// core
162+#include "container-source.h"
163+
164+// media
165+#include "media-source.h"
166+
167 #include <QObject>
168 #include <QUrl>
169
170-#include "album-template-page.h"
171-#include "core/container-source.h"
172-#include "media/media-source.h"
173-
174 class Album;
175
176 /*!
177
178=== modified file 'src/album/album-template.h'
179--- src/album/album-template.h 2013-05-28 13:50:03 +0000
180+++ src/album/album-template.h 2013-06-06 16:04:27 +0000
181@@ -20,12 +20,12 @@
182 #ifndef GALLERY_ALBUM_TEMPLATE_H_
183 #define GALLERY_ALBUM_TEMPLATE_H_
184
185+#include "album-template-page.h"
186+
187 #include <QObject>
188 #include <QList>
189 #include <QString>
190
191-#include "album-template-page.h"
192-
193 /*!
194 * \brief The AlbumTemplate class
195 */
196
197=== modified file 'src/album/album.cpp'
198--- src/album/album.cpp 2013-05-28 13:50:03 +0000
199+++ src/album/album.cpp 2013-06-06 16:04:27 +0000
200@@ -18,17 +18,28 @@
201 * Charles Lindsay <chaz@yorba.org>
202 */
203
204-
205 #include "album.h"
206 #include "album-collection.h"
207 #include "album-default-template.h"
208-#include "core/selectable-view-collection.h"
209-#include "database/album-table.h"
210-#include "database/database.h"
211+
212+// core
213+#include "selectable-view-collection.h"
214+
215+// database
216+#include "album-table.h"
217+#include "database.h"
218+
219+// media
220+#include "media-collection.h"
221+
222+// qml
223+#include "qml-media-collection-model.h"
224+
225+// util
226+#include "variants.h"
227+
228+// src
229 #include "gallery-manager.h"
230-#include "media/media-collection.h"
231-#include "qml/qml-media-collection-model.h"
232-#include "util/variants.h"
233
234 const char *Album::DEFAULT_TITLE = "New Photo Album";
235 const char *Album::DEFAULT_SUBTITLE = "Subtitle";
236
237=== modified file 'src/album/album.h'
238--- src/album/album.h 2013-05-28 13:50:03 +0000
239+++ src/album/album.h 2013-06-06 16:04:27 +0000
240@@ -21,16 +21,20 @@
241 #ifndef GALLERY_ALBUM_H_
242 #define GALLERY_ALBUM_H_
243
244+#include "album-page.h"
245+#include "album-template.h"
246+
247+// core
248+#include "container-source.h"
249+
250+// media
251+#include "media-source.h"
252+
253 #include <QDateTime>
254 #include <QQmlListProperty>
255 #include <QString>
256 #include <QVariant>
257
258-#include "album-page.h"
259-#include "album-template.h"
260-#include "core/container-source.h"
261-#include "media/media-source.h"
262-
263 /*!
264 * \brief The AlbumTemplate class
265
266
267=== modified file 'src/core/CMakeLists.txt'
268--- src/core/CMakeLists.txt 2013-06-03 07:06:50 +0000
269+++ src/core/CMakeLists.txt 2013-06-06 16:04:27 +0000
270@@ -3,7 +3,7 @@
271 set(GALLERY_CORE_LIB gallery-core)
272
273 include_directories(
274- ${gallery_src_SOURCE_DIR}
275+ ${gallery_util_src_SOURCE_DIR}
276 ${CMAKE_BINARY_DIR}
277 ${GSTLIB_INCLUDE_DIRS}
278 )
279@@ -37,5 +37,6 @@
280 qt5_use_modules(${GALLERY_CORE_LIB} Core Quick)
281
282 target_link_libraries( ${GALLERY_CORE_LIB}
283+ gallery-util
284 ${GSTLIB_LDFLAGS}
285 )
286
287=== modified file 'src/core/container-source-collection.h'
288--- src/core/container-source-collection.h 2013-05-28 13:50:03 +0000
289+++ src/core/container-source-collection.h 2013-06-06 16:04:27 +0000
290@@ -20,11 +20,11 @@
291 #ifndef GALLERY_CONTAINER_SOURCE_COLLECTION_H_
292 #define GALLERY_CONTAINER_SOURCE_COLLECTION_H_
293
294-#include <QString>
295-
296 #include "data-object.h"
297 #include "source-collection.h"
298
299+#include <QString>
300+
301 /**
302 * ContainerSourceCollection is a SourceCollection that holds ContainerSources.
303 * That is, it represents all active ContainerSources of a particular finalized
304
305=== modified file 'src/core/container-source.h'
306--- src/core/container-source.h 2013-05-28 13:50:03 +0000
307+++ src/core/container-source.h 2013-06-06 16:04:27 +0000
308@@ -20,13 +20,13 @@
309 #ifndef GALLERY_CONTAINER_SOURCE_H_
310 #define GALLERY_CONTAINER_SOURCE_H_
311
312-#include <QObject>
313-#include <QSet>
314-
315 #include "data-object.h"
316 #include "data-source.h"
317 #include "view-collection.h"
318
319+#include <QObject>
320+#include <QSet>
321+
322 /**
323 * A ContainerSource is a DataSource that holds other DataSources. Generally
324 * these are used for organizational features.
325
326=== modified file 'src/core/data-collection.cpp'
327--- src/core/data-collection.cpp 2013-05-28 13:50:03 +0000
328+++ src/core/data-collection.cpp 2013-06-06 16:04:27 +0000
329@@ -17,11 +17,11 @@
330 * Jim Nelson <jim@yorba.org>
331 */
332
333-#include <QQmlEngine>
334-
335 #include "data-collection.h"
336 #include "data-object.h"
337
338+#include <QQmlEngine>
339+
340 /*!
341 * \brief DataCollection::DataCollection
342 * \param name
343
344=== modified file 'src/core/data-collection.h'
345--- src/core/data-collection.h 2013-05-29 15:02:27 +0000
346+++ src/core/data-collection.h 2013-06-06 16:04:27 +0000
347@@ -20,14 +20,15 @@
348 #ifndef GALLERY_DATA_COLLECTION_H_
349 #define GALLERY_DATA_COLLECTION_H_
350
351-#include <QObject>
352+// core
353+#include "collections.h"
354+
355 #include <QByteArray>
356 #include <QList>
357+#include <QObject>
358 #include <QSet>
359 #include <QString>
360
361-#include "util/collections.h"
362-
363 class DataObject;
364
365 // Defined as a LessThan comparator (return true if a is less than b)
366
367=== modified file 'src/core/data-object.cpp'
368--- src/core/data-object.cpp 2013-05-28 13:50:03 +0000
369+++ src/core/data-object.cpp 2013-06-06 16:04:27 +0000
370@@ -17,10 +17,10 @@
371 * Jim Nelson <jim@yorba.org>
372 */
373
374+#include "data-object.h"
375+
376 #include <QQmlEngine>
377
378-#include "data-object.h"
379-
380 DataObjectNumber DataObject::next_number_ = 0;
381
382 /*!
383
384=== modified file 'src/core/selectable-view-collection.h'
385--- src/core/selectable-view-collection.h 2013-05-28 13:50:03 +0000
386+++ src/core/selectable-view-collection.h 2013-06-06 16:04:27 +0000
387@@ -20,11 +20,11 @@
388 #ifndef GALLERY_SELECTABLE_VIEW_COLLECTION_H_
389 #define GALLERY_SELECTABLE_VIEW_COLLECTION_H_
390
391-#include <QSet>
392-
393 #include "data-object.h"
394 #include "view-collection.h"
395
396+#include <QSet>
397+
398 /**
399 * SelectableViewCollection adds the notion of selection to a ViewCollection.
400 * It's primarily of use in grid or checkerboard views when the user may want
401
402=== modified file 'src/database/CMakeLists.txt'
403--- src/database/CMakeLists.txt 2013-06-03 07:06:50 +0000
404+++ src/database/CMakeLists.txt 2013-06-06 16:04:27 +0000
405@@ -4,6 +4,13 @@
406
407 include_directories(
408 ${gallery_src_SOURCE_DIR}
409+ # because of circulate dependencies the sub project can't be used directly
410+ # FIXME resolve the circulate dependencies
411+ ${gallery_src_SOURCE_DIR}/album
412+ ${gallery_core_src_SOURCE_DIR}
413+ ${gallery_src_SOURCE_DIR}/media
414+ ${gallery_src_SOURCE_DIR}/photo
415+ ${gallery_util_src_SOURCE_DIR}
416 ${CMAKE_BINARY_DIR}
417 ${GSTLIB_INCLUDE_DIRS}
418 )
419@@ -29,5 +36,10 @@
420 qt5_use_modules(${GALLERY_DATABASE_LIB} Widgets Core Qml Quick Sql)
421
422 target_link_libraries( ${GALLERY_DATABASE_LIB}
423+ gallery-album
424+ gallery-core
425+ gallery-media
426+ gallery-photo
427+ gallery-util
428 ${GSTLIB_LDFLAGS}
429 )
430
431=== modified file 'src/database/album-table.cpp'
432--- src/database/album-table.cpp 2013-05-28 13:50:03 +0000
433+++ src/database/album-table.cpp 2013-06-06 16:04:27 +0000
434@@ -19,8 +19,12 @@
435
436 #include "album-table.h"
437 #include "database.h"
438-#include "album/album.h"
439-#include "album/album-default-template.h"
440+
441+// album
442+#include "album.h"
443+#include "album-default-template.h"
444+
445+// src
446 #include "gallery-manager.h"
447
448 #include <QtSql>
449
450=== modified file 'src/database/album-table.h'
451--- src/database/album-table.h 2013-04-18 13:42:50 +0000
452+++ src/database/album-table.h 2013-06-06 16:04:27 +0000
453@@ -20,8 +20,8 @@
454 #ifndef ALBUMTABLE_H
455 #define ALBUMTABLE_H
456
457+#include <QList>
458 #include <QObject>
459-#include <QList>
460
461 class Album;
462 class Database;
463
464=== modified file 'src/database/database.cpp'
465--- src/database/database.cpp 2013-06-05 08:52:51 +0000
466+++ src/database/database.cpp 2013-06-06 16:04:27 +0000
467@@ -24,8 +24,8 @@
468 #include "photo-edit-table.h"
469
470 #include <QFile>
471+#include <QSqlTableModel>
472 #include <QtSql>
473-#include <QSqlTableModel>
474
475 /*!
476 * \brief Database::Database
477
478=== modified file 'src/database/database.h'
479--- src/database/database.h 2013-06-03 15:18:06 +0000
480+++ src/database/database.h 2013-06-06 16:04:27 +0000
481@@ -20,16 +20,16 @@
482 #ifndef DATABASE_H
483 #define DATABASE_H
484
485+#include <QFile>
486 #include <QObject>
487-#include <QFile>
488 #include <QString>
489
490 class AlbumTable;
491 class MediaTable;
492 class PhotoEditTable;
493
494+class QSqlDatabase;
495 class QSqlQuery;
496-class QSqlDatabase;
497
498 const qint64 INVALID_ID = -1;
499
500
501=== modified file 'src/database/media-table.cpp'
502--- src/database/media-table.cpp 2013-05-28 13:50:03 +0000
503+++ src/database/media-table.cpp 2013-06-06 16:04:27 +0000
504@@ -17,12 +17,12 @@
505 * Eric Gregory <eric@yorba.org>
506 */
507
508+#include "media-table.h"
509+#include "database.h"
510+
511 #include <QApplication>
512 #include <QtSql>
513
514-#include "media-table.h"
515-#include "database.h"
516-
517 /*!
518 * \brief MediaTable::MediaTable
519 * \param db
520
521=== modified file 'src/database/media-table.h'
522--- src/database/media-table.h 2013-02-25 10:16:29 +0000
523+++ src/database/media-table.h 2013-06-06 16:04:27 +0000
524@@ -20,10 +20,10 @@
525 #ifndef MEDIATABLE_H
526 #define MEDIATABLE_H
527
528+#include "photo-metadata.h"
529+
530 #include <QObject>
531
532-#include "photo/photo-metadata.h"
533-
534 class Database;
535
536 /*!
537
538=== modified file 'src/database/photo-edit-table.cpp'
539--- src/database/photo-edit-table.cpp 2013-06-03 15:46:21 +0000
540+++ src/database/photo-edit-table.cpp 2013-06-06 16:04:27 +0000
541@@ -17,14 +17,16 @@
542 * Charles Lindsay <chaz@yorba.org>
543 */
544
545+#include "photo-edit-table.h"
546+#include "database.h"
547+
548+// photo
549+#include "photo-edit-state.h"
550+
551 #include <QSqlQuery>
552 #include <QStringList>
553 #include <QVariant>
554
555-#include "photo-edit-table.h"
556-#include "database.h"
557-#include "photo/photo-edit-state.h"
558-
559 /*!
560 * \brief PhotoEditTable::PhotoEditTable
561 * \param db
562
563=== modified file 'src/event/CMakeLists.txt'
564--- src/event/CMakeLists.txt 2013-06-03 07:06:50 +0000
565+++ src/event/CMakeLists.txt 2013-06-06 16:04:27 +0000
566@@ -4,6 +4,12 @@
567
568 include_directories(
569 ${gallery_src_SOURCE_DIR}
570+ ${gallery_core_src_SOURCE_DIR}
571+ # because of circulate dependencies the sub project can't be used directly
572+ # FIXME resolve the circulate dependencies
573+ ${gallery_src_SOURCE_DIR}/media
574+ ${gallery_src_SOURCE_DIR}/photo
575+ ${gallery_util_src_SOURCE_DIR}
576 ${CMAKE_BINARY_DIR}
577 ${GSTLIB_INCLUDE_DIRS}
578 )
579@@ -25,5 +31,9 @@
580 qt5_use_modules(${GALLERY_EVENT_LIB} Widgets Core Qml)
581
582 target_link_libraries( ${GALLERY_EVENT_LIB}
583+ gallery-core
584+ gallery-media
585+ gallery-photo
586+ gallery-util
587 ${GSTLIB_LDFLAGS}
588 )
589
590=== modified file 'src/event/event-collection.cpp'
591--- src/event/event-collection.cpp 2013-05-28 13:50:03 +0000
592+++ src/event/event-collection.cpp 2013-06-06 16:04:27 +0000
593@@ -19,9 +19,15 @@
594
595 #include "event-collection.h"
596 #include "event.h"
597-#include "core/data-object.h"
598-#include "media/media-collection.h"
599-#include "media/media-source.h"
600+
601+// core
602+#include "data-object.h"
603+
604+// media
605+#include "media-collection.h"
606+#include "media-source.h"
607+
608+// src
609 #include "gallery-manager.h"
610
611 /*!
612
613=== modified file 'src/event/event-collection.h'
614--- src/event/event-collection.h 2013-02-25 10:16:29 +0000
615+++ src/event/event-collection.h 2013-06-06 16:04:27 +0000
616@@ -20,12 +20,12 @@
617 #ifndef GALLERY_EVENT_COLLECTION_H_
618 #define GALLERY_EVENT_COLLECTION_H_
619
620+#include "source-collection.h"
621+
622 #include <QDate>
623 #include <QHash>
624 #include <QSet>
625
626-#include "core/source-collection.h"
627-
628 class DataObject;
629 class Event;
630 class MediaSource;
631
632=== modified file 'src/event/event.cpp'
633--- src/event/event.cpp 2013-02-25 10:16:29 +0000
634+++ src/event/event.cpp 2013-06-06 16:04:27 +0000
635@@ -17,11 +17,13 @@
636 * Jim Nelson <jim@yorba.org>
637 */
638
639+#include "event.h"
640+
641+// media
642+#include "media-collection.h"
643+
644 #include <QString>
645
646-#include "event.h"
647-#include "media/media-collection.h"
648-
649 /*!
650 * \brief Event::Event
651 * \param parent
652
653=== modified file 'src/event/event.h'
654--- src/event/event.h 2013-02-25 10:16:29 +0000
655+++ src/event/event.h 2013-06-06 16:04:27 +0000
656@@ -20,12 +20,15 @@
657 #ifndef GALLERY_EVENT_H_
658 #define GALLERY_EVENT_H_
659
660-#include <QObject>
661+// core
662+#include "container-source.h"
663+
664+// media
665+#include "media-source.h"
666+
667 #include <QDate>
668 #include <QDateTime>
669-
670-#include "core/container-source.h"
671-#include "media/media-source.h"
672+#include <QObject>
673
674 /*!
675 * \brief The Event class
676
677=== modified file 'src/gallery-application.cpp'
678--- src/gallery-application.cpp 2013-05-28 13:50:03 +0000
679+++ src/gallery-application.cpp 2013-06-06 16:04:27 +0000
680@@ -23,22 +23,34 @@
681
682 #include "gallery-application.h"
683 #include "gallery-manager.h"
684-#include "album/album.h"
685-#include "album/album-page.h"
686-#include "event/event.h"
687-#include "media/media-collection.h"
688-#include "media/media-monitor.h"
689-#include "media/media-source.h"
690-#include "photo/photo.h"
691-#include "qml/gallery-standard-image-provider.h"
692-#include "qml/gallery-thumbnail-image-provider.h"
693-#include "qml/qml-album-collection-model.h"
694-#include "qml/qml-event-collection-model.h"
695-#include "qml/qml-event-overview-model.h"
696-#include "qml/qml-media-collection-model.h"
697-#include "util/command-line-parser.h"
698-#include "util/resource.h"
699-#include "util/sharefile.h"
700+
701+// album
702+#include "album.h"
703+#include "album-page.h"
704+
705+// event
706+#include "event.h"
707+
708+// media
709+#include "media-collection.h"
710+#include "media-monitor.h"
711+#include "media-source.h"
712+
713+// photo
714+#include "photo.h"
715+
716+// qml
717+#include "gallery-standard-image-provider.h"
718+#include "gallery-thumbnail-image-provider.h"
719+#include "qml-album-collection-model.h"
720+#include "qml-event-collection-model.h"
721+#include "qml-event-overview-model.h"
722+#include "qml-media-collection-model.h"
723+
724+// util
725+#include "command-line-parser.h"
726+#include "resource.h"
727+#include "sharefile.h"
728
729 /*!
730 * \brief GalleryApplication::GalleryApplication
731
732=== modified file 'src/gallery-application.h'
733--- src/gallery-application.h 2013-05-28 13:50:03 +0000
734+++ src/gallery-application.h 2013-06-06 16:04:27 +0000
735@@ -21,9 +21,9 @@
736 #define GALLERYAPPLICATION_H
737
738 #include <QApplication>
739-#include <QQuickView>
740 #include <QElapsedTimer>
741 #include <QFileInfo>
742+#include <QQuickView>
743
744 class CommandLineParser;
745 class GalleryManager;
746
747=== modified file 'src/gallery-manager.cpp'
748--- src/gallery-manager.cpp 2013-06-04 10:21:17 +0000
749+++ src/gallery-manager.cpp 2013-06-06 16:04:27 +0000
750@@ -19,17 +19,28 @@
751 */
752
753 #include "gallery-manager.h"
754-#include "album/album-collection.h"
755-#include "album/album-default-template.h"
756-#include "database/database.h"
757-#include "database/media-table.h"
758-#include "event/event-collection.h"
759-#include "media/media-collection.h"
760-#include "media/preview-manager.h"
761-#include "qml/gallery-standard-image-provider.h"
762-#include "qml/gallery-thumbnail-image-provider.h"
763-#include "util/command-line-parser.h"
764-#include "util/resource.h"
765+
766+// album
767+#include "album-collection.h"
768+#include "album-default-template.h"
769+
770+// database
771+#include "database.h"
772+#include "media-table.h"
773+
774+// event
775+#include "event-collection.h"
776+
777+// media
778+#include "media-collection.h"
779+#include "preview-manager.h"
780+
781+// qml
782+#include "gallery-standard-image-provider.h"
783+#include "gallery-thumbnail-image-provider.h"
784+
785+// util
786+#include "resource.h"
787
788 GalleryManager* GalleryManager::gallery_mgr_ = NULL;
789
790
791=== modified file 'src/gallery-manager.h'
792--- src/gallery-manager.h 2013-06-04 10:21:17 +0000
793+++ src/gallery-manager.h 2013-06-06 16:04:27 +0000
794@@ -20,8 +20,9 @@
795 #ifndef GALLERYMANAGER_H
796 #define GALLERYMANAGER_H
797
798+#include <QDir>
799+
800 #include <cstddef>
801-#include <QDir>
802
803 class QQuickView;
804
805
806=== modified file 'src/media/CMakeLists.txt'
807--- src/media/CMakeLists.txt 2013-06-03 07:06:50 +0000
808+++ src/media/CMakeLists.txt 2013-06-06 16:04:27 +0000
809@@ -4,6 +4,14 @@
810
811 include_directories(
812 ${gallery_src_SOURCE_DIR}
813+ ${gallery_core_src_SOURCE_DIR}
814+ # because of circulate dependencies the sub project can't be used directly
815+ # FIXME resolve the circulate dependencies
816+ ${gallery_src_SOURCE_DIR}/database
817+ ${gallery_src_SOURCE_DIR}/event
818+ ${gallery_src_SOURCE_DIR}/photo
819+ ${gallery_src_SOURCE_DIR}/qml
820+ ${gallery_util_src_SOURCE_DIR}
821 ${CMAKE_BINARY_DIR}
822 ${GSTLIB_INCLUDE_DIRS}
823 )
824@@ -29,5 +37,11 @@
825 qt5_use_modules(${GALLERY_MEDIA_LIB} Core Quick)
826
827 target_link_libraries( ${GALLERY_MEDIA_LIB}
828+ gallery-core
829+ gallery-database
830+ gallery-event
831+ gallery-photo
832+ gallery-qml
833+ gallery-util
834 ${GSTLIB_LDFLAGS}
835 )
836
837=== modified file 'src/media/media-collection.cpp'
838--- src/media/media-collection.cpp 2013-05-28 13:50:03 +0000
839+++ src/media/media-collection.cpp 2013-06-06 16:04:27 +0000
840@@ -17,15 +17,21 @@
841 * Jim Nelson <jim@yorba.org>
842 */
843
844+#include "media-collection.h"
845+
846+// database
847+#include "database.h"
848+#include "media-table.h"
849+
850+// photo
851+#include "photo.h"
852+
853+// src
854+#include "gallery-manager.h"
855+
856 #include <QFileInfo>
857+#include <QString>
858 #include <QStringList>
859-#include <QString>
860-
861-#include "media-collection.h"
862-#include "photo/photo.h"
863-#include "database/database.h"
864-#include "database/media-table.h"
865-#include "gallery-manager.h"
866
867 /*!
868 * \brief MediaCollection::MediaCollection
869
870=== modified file 'src/media/media-collection.h'
871--- src/media/media-collection.h 2013-02-25 10:16:29 +0000
872+++ src/media/media-collection.h 2013-06-06 16:04:27 +0000
873@@ -24,7 +24,8 @@
874 #include <QHash>
875 #include <QSet>
876
877-#include "core/source-collection.h"
878+// core
879+#include "source-collection.h"
880
881 class DataObject;
882 class MediaSource;
883
884=== modified file 'src/media/media-monitor.h'
885--- src/media/media-monitor.h 2013-02-25 10:16:29 +0000
886+++ src/media/media-monitor.h 2013-06-06 16:04:27 +0000
887@@ -20,9 +20,9 @@
888 #ifndef GALLERY_MEDIA_MONITOR_H_
889 #define GALLERY_MEDIA_MONITOR_H_
890
891-#include <QObject>
892 #include <QDir>
893 #include <QFileSystemWatcher>
894+#include <QObject>
895 #include <QStringList>
896 #include <QTimer>
897
898
899=== modified file 'src/media/media-source.cpp'
900--- src/media/media-source.cpp 2013-06-04 09:24:50 +0000
901+++ src/media/media-source.cpp 2013-06-06 16:04:27 +0000
902@@ -19,13 +19,23 @@
903
904 #include "media-source.h"
905 #include "preview-manager.h"
906-#include "database/database.h"
907-#include "database/media-table.h"
908-#include "event/event.h"
909-#include "event/event-collection.h"
910-#include "qml/gallery-standard-image-provider.h"
911-#include "qml/gallery-thumbnail-image-provider.h"
912-#include "util/resource.h"
913+
914+// database
915+#include "database.h"
916+#include "media-table.h"
917+
918+// event
919+#include "event.h"
920+#include "event-collection.h"
921+
922+// qml
923+#include "gallery-standard-image-provider.h"
924+#include "gallery-thumbnail-image-provider.h"
925+
926+// util
927+#include "resource.h"
928+
929+// src
930 #include "gallery-manager.h"
931
932 /*!
933
934=== modified file 'src/media/media-source.h'
935--- src/media/media-source.h 2013-06-04 09:24:50 +0000
936+++ src/media/media-source.h 2013-06-06 16:04:27 +0000
937@@ -20,6 +20,12 @@
938 #ifndef GALLERY_MEDIA_SOURCE_H_
939 #define GALLERY_MEDIA_SOURCE_H_
940
941+// core
942+#include "data-source.h"
943+
944+// photo
945+#include "photo-metadata.h"
946+
947 #include <QDate>
948 #include <QDateTime>
949 #include <QFileInfo>
950@@ -29,9 +35,6 @@
951 #include <QVariant>
952 #include <QtQml>
953
954-#include "core/data-source.h"
955-#include "photo/photo-metadata.h"
956-
957 class Event;
958 class GalleryManager;
959
960
961=== modified file 'src/media/preview-manager.cpp'
962--- src/media/preview-manager.cpp 2013-06-05 08:52:51 +0000
963+++ src/media/preview-manager.cpp 2013-06-06 16:04:27 +0000
964@@ -17,14 +17,18 @@
965 * Jim Nelson <jim@yorba.org>
966 */
967
968+#include "preview-manager.h"
969+
970+// media
971+#include "media-collection.h"
972+
973+// photo
974+#include "photo.h"
975+
976 #include <QCryptographicHash>
977 #include <QDir>
978 #include <QMutexLocker>
979
980-#include "preview-manager.h"
981-#include "media-collection.h"
982-#include "photo/photo.h"
983-
984 // FIXME adapt to different sizes. This is fixed size for the demo device
985 const int PreviewManager::PREVIEW_SIZE = 360; // in pixel
986 const int PreviewManager::THUMBNAIL_SIZE = 216; // in pixel
987
988=== modified file 'src/photo/CMakeLists.txt'
989--- src/photo/CMakeLists.txt 2013-06-03 07:06:50 +0000
990+++ src/photo/CMakeLists.txt 2013-06-06 16:04:27 +0000
991@@ -4,6 +4,13 @@
992
993 include_directories(
994 ${gallery_src_SOURCE_DIR}
995+ ${gallery_core_src_SOURCE_DIR}
996+ # because of circulate dependencies the sub project can't be used directly
997+ # FIXME resolve the circulate dependencies
998+ ${gallery_src_SOURCE_DIR}/media
999+ ${gallery_src_SOURCE_DIR}/database
1000+ ${gallery_src_SOURCE_DIR}/qml
1001+ ${gallery_util_src_SOURCE_DIR}
1002 ${CMAKE_BINARY_DIR}
1003 ${EXIV2_INCLUDEDIR}
1004 ${GSTLIB_INCLUDE_DIRS}
1005@@ -30,6 +37,11 @@
1006 qt5_use_modules(${GALLERY_PHOTO_LIB} Widgets Core Quick)
1007
1008 target_link_libraries( ${GALLERY_PHOTO_LIB}
1009+ gallery-core
1010+ gallery-media
1011+ gallery-database
1012+ gallery-qml
1013+ gallery-util
1014 ${EXIV2_LIBRARIES}
1015 ${GSTLIB_LDFLAGS}
1016 )
1017
1018=== modified file 'src/photo/photo-caches.h'
1019--- src/photo/photo-caches.h 2013-02-25 10:16:29 +0000
1020+++ src/photo/photo-caches.h 2013-06-06 16:04:27 +0000
1021@@ -20,9 +20,9 @@
1022 #ifndef GALLERY_PHOTO_CACHES_H_
1023 #define GALLERY_PHOTO_CACHES_H_
1024
1025+#include <QFile>
1026+#include <QFileInfo>
1027 #include <QString>
1028-#include <QFileInfo>
1029-#include <QFile>
1030
1031 /*!
1032 * \brief The PhotoCaches class
1033
1034=== modified file 'src/photo/photo-edit-state.h'
1035--- src/photo/photo-edit-state.h 2013-05-28 13:50:03 +0000
1036+++ src/photo/photo-edit-state.h 2013-06-06 16:04:27 +0000
1037@@ -20,11 +20,11 @@
1038 #ifndef GALLERY_PHOTO_EDIT_STATE_H_
1039 #define GALLERY_PHOTO_EDIT_STATE_H_
1040
1041+#include "photo-metadata.h"
1042+
1043 #include <QRect>
1044 #include <QVector4D>
1045
1046-#include "photo-metadata.h"
1047-
1048 /*!
1049 * \brief The PhotoEditState class
1050 *
1051
1052=== modified file 'src/photo/photo-metadata.cpp'
1053--- src/photo/photo-metadata.cpp 2013-02-25 10:16:29 +0000
1054+++ src/photo/photo-metadata.cpp 2013-06-06 16:04:27 +0000
1055@@ -17,10 +17,10 @@
1056 * Lucas Beeler <lucas@yorba.org>
1057 */
1058
1059+#include "photo-metadata.h"
1060+
1061 #include <cstdio>
1062
1063-#include "photo-metadata.h"
1064-
1065 namespace {
1066 const Orientation DEFAULT_ORIENTATION = TOP_LEFT_ORIGIN;
1067 const char* EXIF_ORIENTATION_KEY = "Exif.Image.Orientation";
1068
1069=== modified file 'src/photo/photo-metadata.h'
1070--- src/photo/photo-metadata.h 2013-02-25 10:16:29 +0000
1071+++ src/photo/photo-metadata.h 2013-06-06 16:04:27 +0000
1072@@ -20,9 +20,9 @@
1073 #ifndef GALLERY_PHOTO_METADATA_H_
1074 #define GALLERY_PHOTO_METADATA_H_
1075
1076-#include <QObject>
1077 #include <QDateTime>
1078 #include <QFileInfo>
1079+#include <QObject>
1080 #include <QString>
1081 #include <QSet>
1082 #include <QTransform>
1083
1084=== modified file 'src/photo/photo.cpp'
1085--- src/photo/photo.cpp 2013-05-28 13:50:03 +0000
1086+++ src/photo/photo.cpp 2013-06-06 16:04:27 +0000
1087@@ -21,22 +21,32 @@
1088 * Clint Rogers <clinton@yorba.org>
1089 */
1090
1091+#include "photo.h"
1092+
1093+// database
1094+#include "database.h"
1095+#include "media-table.h"
1096+#include "photo-edit-table.h"
1097+
1098+// media
1099+#include "media-collection.h"
1100+
1101+// qml
1102+#include "gallery-standard-image-provider.h"
1103+#include "gallery-thumbnail-image-provider.h"
1104+
1105+// util
1106+#include "imaging.h"
1107+
1108+// src
1109+#include "gallery-manager.h"
1110+
1111 #include <QApplication>
1112 #include <QFileInfo>
1113 #include <QImage>
1114 #include <QImageReader>
1115 #include <QImageWriter>
1116
1117-#include "photo.h"
1118-#include "database/database.h"
1119-#include "database/media-table.h"
1120-#include "database/photo-edit-table.h"
1121-#include "media/media-collection.h"
1122-#include "qml/gallery-standard-image-provider.h"
1123-#include "qml/gallery-thumbnail-image-provider.h"
1124-#include "util/imaging.h"
1125-#include "gallery-manager.h"
1126-
1127 // A simple class for dealing with an undo-/redo-able stack of applied edits.
1128 class EditStack {
1129 public:
1130
1131=== modified file 'src/photo/photo.h'
1132--- src/photo/photo.h 2013-05-28 13:50:03 +0000
1133+++ src/photo/photo.h 2013-06-06 16:04:27 +0000
1134@@ -22,13 +22,15 @@
1135 #ifndef GALLERY_PHOTO_H_
1136 #define GALLERY_PHOTO_H_
1137
1138-#include <QDateTime>
1139-#include <QStack>
1140-
1141 #include "photo-caches.h"
1142 #include "photo-edit-state.h"
1143 #include "photo-metadata.h"
1144-#include "media/media-source.h"
1145+
1146+// media
1147+#include "media-source.h"
1148+
1149+#include <QDateTime>
1150+#include <QStack>
1151
1152 class PhotoPrivate;
1153
1154
1155=== modified file 'src/qml/CMakeLists.txt'
1156--- src/qml/CMakeLists.txt 2013-06-03 07:06:50 +0000
1157+++ src/qml/CMakeLists.txt 2013-06-06 16:04:27 +0000
1158@@ -4,6 +4,14 @@
1159
1160 include_directories(
1161 ${gallery_src_SOURCE_DIR}
1162+ # because of circulate dependencies the sub project can't be used directly
1163+ # FIXME resolve the circulate dependencies
1164+ ${gallery_src_SOURCE_DIR}/album
1165+ ${gallery_core_src_SOURCE_DIR}
1166+ ${gallery_src_SOURCE_DIR}/event
1167+ ${gallery_src_SOURCE_DIR}/media
1168+ ${gallery_src_SOURCE_DIR}/photo
1169+ ${gallery_util_src_SOURCE_DIR}
1170 ${CMAKE_BINARY_DIR}
1171 ${GSTLIB_INCLUDE_DIRS}
1172 )
1173@@ -35,5 +43,12 @@
1174 qt5_use_modules(${GALLERY_QML_LIB} Core Quick)
1175
1176 target_link_libraries( ${GALLERY_QML_LIB}
1177+ gallery-album
1178+ gallery-core
1179+ gallery-event
1180+ gallery-media
1181+ gallery-photo
1182+ gallery-qml
1183+ gallery-util
1184 ${GSTLIB_LDFLAGS}
1185 )
1186
1187=== modified file 'src/qml/gallery-standard-image-provider.cpp'
1188--- src/qml/gallery-standard-image-provider.cpp 2013-06-04 09:24:50 +0000
1189+++ src/qml/gallery-standard-image-provider.cpp 2013-06-06 16:04:27 +0000
1190@@ -18,14 +18,16 @@
1191 * Jim Nelson <jim@yorba.org>
1192 */
1193
1194+#include "gallery-standard-image-provider.h"
1195+
1196+// media
1197+#include "preview-manager.h"
1198+
1199+#include <QDebug>
1200+#include <QElapsedTimer>
1201 #include <QImageReader>
1202 #include <QSize>
1203-#include <QElapsedTimer>
1204 #include <QUrlQuery>
1205-#include <QDebug>
1206-
1207-#include "gallery-standard-image-provider.h"
1208-#include "media/preview-manager.h"
1209
1210 const char* GalleryStandardImageProvider::PROVIDER_ID = "gallery-standard";
1211 const char* GalleryStandardImageProvider::PROVIDER_ID_SCHEME = "image://gallery-standard/";
1212
1213=== modified file 'src/qml/gallery-standard-image-provider.h'
1214--- src/qml/gallery-standard-image-provider.h 2013-06-04 09:24:50 +0000
1215+++ src/qml/gallery-standard-image-provider.h 2013-06-06 16:04:27 +0000
1216@@ -21,18 +21,18 @@
1217 #ifndef GALLERY_GALLERY_STANDARD_IMAGE_PROVIDER_H_
1218 #define GALLERY_GALLERY_STANDARD_IMAGE_PROVIDER_H_
1219
1220-#include <QObject>
1221-#include <QQuickImageProvider>
1222+#include "photo-metadata.h"
1223+
1224 #include <QFileInfo>
1225 #include <QImage>
1226 #include <QMap>
1227 #include <QMutex>
1228+#include <QObject>
1229+#include <QQuickImageProvider>
1230 #include <QSize>
1231 #include <QString>
1232 #include <QUrl>
1233
1234-#include "photo/photo-metadata.h"
1235-
1236 class PreviewManager;
1237
1238 /*!
1239
1240=== modified file 'src/qml/gallery-thumbnail-image-provider.cpp'
1241--- src/qml/gallery-thumbnail-image-provider.cpp 2013-06-04 09:24:50 +0000
1242+++ src/qml/gallery-thumbnail-image-provider.cpp 2013-06-06 16:04:27 +0000
1243@@ -18,7 +18,9 @@
1244 */
1245
1246 #include "gallery-thumbnail-image-provider.h"
1247-#include "media/preview-manager.h"
1248+
1249+// media
1250+#include "preview-manager.h"
1251
1252 #include <QDebug>
1253 #include <QElapsedTimer>
1254
1255=== modified file 'src/qml/qml-album-collection-model.cpp'
1256--- src/qml/qml-album-collection-model.cpp 2013-05-28 13:50:03 +0000
1257+++ src/qml/qml-album-collection-model.cpp 2013-06-06 16:04:27 +0000
1258@@ -18,11 +18,11 @@
1259 */
1260
1261 #include "qml-album-collection-model.h"
1262-#include "album/album.h"
1263-#include "album/album-collection.h"
1264-#include "album/album-default-template.h"
1265-#include "core/selectable-view-collection.h"
1266-#include "util/variants.h"
1267+#include "album.h"
1268+#include "album-collection.h"
1269+#include "album-default-template.h"
1270+#include "selectable-view-collection.h"
1271+#include "variants.h"
1272 #include "gallery-manager.h"
1273
1274 /*!
1275
1276=== modified file 'src/qml/qml-event-collection-model.cpp'
1277--- src/qml/qml-event-collection-model.cpp 2013-05-28 13:50:03 +0000
1278+++ src/qml/qml-event-collection-model.cpp 2013-06-06 16:04:27 +0000
1279@@ -18,9 +18,9 @@
1280 */
1281
1282 #include "qml-event-collection-model.h"
1283-#include "event/event.h"
1284-#include "event/event-collection.h"
1285-#include "util/variants.h"
1286+#include "event.h"
1287+#include "event-collection.h"
1288+#include "variants.h"
1289 #include "gallery-manager.h"
1290
1291 /*!
1292
1293=== modified file 'src/qml/qml-event-overview-model.cpp'
1294--- src/qml/qml-event-overview-model.cpp 2013-05-28 13:50:03 +0000
1295+++ src/qml/qml-event-overview-model.cpp 2013-06-06 16:04:27 +0000
1296@@ -18,11 +18,11 @@
1297 */
1298
1299 #include "qml-event-overview-model.h"
1300-#include "core/data-object.h"
1301-#include "core/selectable-view-collection.h"
1302-#include "event/event.h"
1303-#include "event/event-collection.h"
1304-#include "util/variants.h"
1305+#include "data-object.h"
1306+#include "selectable-view-collection.h"
1307+#include "event.h"
1308+#include "event-collection.h"
1309+#include "variants.h"
1310 #include "gallery-manager.h"
1311
1312 /*!
1313
1314=== modified file 'src/qml/qml-media-collection-model.cpp'
1315--- src/qml/qml-media-collection-model.cpp 2013-05-28 13:50:03 +0000
1316+++ src/qml/qml-media-collection-model.cpp 2013-06-06 16:04:27 +0000
1317@@ -20,14 +20,14 @@
1318
1319 #include "qml-media-collection-model.h"
1320
1321-#include "album/album.h"
1322-#include "album/album-collection.h"
1323-#include "album/album-default-template.h"
1324-#include "core/data-object.h"
1325-#include "core/selectable-view-collection.h"
1326-#include "media/media-source.h"
1327-#include "media/media-collection.h"
1328-#include "util/variants.h"
1329+#include "album.h"
1330+#include "album-collection.h"
1331+#include "album-default-template.h"
1332+#include "data-object.h"
1333+#include "selectable-view-collection.h"
1334+#include "media-source.h"
1335+#include "media-collection.h"
1336+#include "variants.h"
1337 #include "gallery-manager.h"
1338
1339 /*!
1340
1341=== modified file 'src/qml/qml-view-collection-model.cpp'
1342--- src/qml/qml-view-collection-model.cpp 2013-02-25 10:16:29 +0000
1343+++ src/qml/qml-view-collection-model.cpp 2013-06-06 16:04:27 +0000
1344@@ -18,9 +18,9 @@
1345 */
1346
1347 #include "qml-view-collection-model.h"
1348-#include "core/container-source.h"
1349-#include "core/data-object.h"
1350-#include "core/selectable-view-collection.h"
1351+#include "container-source.h"
1352+#include "data-object.h"
1353+#include "selectable-view-collection.h"
1354 #include "util/variants.h"
1355
1356 /*!
1357
1358=== modified file 'src/qml/qml-view-collection-model.h'
1359--- src/qml/qml-view-collection-model.h 2013-02-25 10:16:29 +0000
1360+++ src/qml/qml-view-collection-model.h 2013-06-06 16:04:27 +0000
1361@@ -27,7 +27,7 @@
1362 #include <QModelIndex>
1363 #include <QVariant>
1364
1365-#include <core/data-collection.h>
1366+#include <data-collection.h>
1367
1368 class DataObject;
1369 class ContainerSource;
1370
1371=== modified file 'src/util/CMakeLists.txt'
1372--- src/util/CMakeLists.txt 2013-06-03 07:06:50 +0000
1373+++ src/util/CMakeLists.txt 2013-06-06 16:04:27 +0000
1374@@ -4,7 +4,7 @@
1375
1376 include_directories(
1377 ${gallery_src_SOURCE_DIR}
1378- ${CMAKE_CURRENT_BINARY_DIR}/..
1379+ ${gallery_src_BINARY_DIR}
1380 ${CMAKE_BINARY_DIR}
1381 ${GSTLIB_INCLUDE_DIRS}
1382 )
1383
1384=== modified file 'src/util/collections.h'
1385--- src/util/collections.h 2013-02-25 10:16:29 +0000
1386+++ src/util/collections.h 2013-06-06 16:04:27 +0000
1387@@ -21,6 +21,7 @@
1388 #define GALLERY_UTIL_COLLECTIONS_H_
1389
1390 #include <QList>
1391+#include <QObject>
1392 #include <QSet>
1393
1394 template <class F, class T>
1395
1396=== modified file 'tests/unittests/command-line-parser/CMakeLists.txt'
1397--- tests/unittests/command-line-parser/CMakeLists.txt 2013-05-28 13:50:03 +0000
1398+++ tests/unittests/command-line-parser/CMakeLists.txt 2013-06-06 16:04:27 +0000
1399@@ -5,8 +5,8 @@
1400 endif()
1401
1402 include_directories(
1403+ ${gallery_util_src_SOURCE_DIR}
1404 ${CMAKE_BINARY_DIR}
1405- ${gallery_src_SOURCE_DIR}
1406 )
1407
1408 add_executable(command-line-parser
1409
1410=== modified file 'tests/unittests/command-line-parser/tst_commandlineparser.cpp'
1411--- tests/unittests/command-line-parser/tst_commandlineparser.cpp 2013-05-28 13:50:03 +0000
1412+++ tests/unittests/command-line-parser/tst_commandlineparser.cpp 2013-06-06 16:04:27 +0000
1413@@ -21,7 +21,7 @@
1414 #include <QStringList>
1415 #include <QtTest>
1416
1417-#include "util/command-line-parser.h"
1418+#include "command-line-parser.h"
1419
1420 class tst_CommandLineParser : public QObject
1421 {
1422
1423=== modified file 'tests/unittests/gallerystandardimageprovider/CMakeLists.txt'
1424--- tests/unittests/gallerystandardimageprovider/CMakeLists.txt 2013-06-04 09:24:50 +0000
1425+++ tests/unittests/gallerystandardimageprovider/CMakeLists.txt 2013-06-06 16:04:27 +0000
1426@@ -7,6 +7,9 @@
1427 include_directories(
1428 ${CMAKE_BINARY_DIR}
1429 ${gallery_src_SOURCE_DIR}
1430+ ${gallery_media_src_SOURCE_DIR}
1431+ ${gallery_photo_src_SOURCE_DIR}
1432+ ${gallery_qml_src_SOURCE_DIR}
1433 ${GSTLIB_INCLUDE_DIRS}
1434 )
1435
1436
1437=== removed directory 'tests/unittests/gallerystandardimageprovider/media'
1438=== renamed file 'tests/unittests/gallerystandardimageprovider/media/media-collection.h' => 'tests/unittests/gallerystandardimageprovider/media-collection.h'
1439=== modified file 'tests/unittests/gallerystandardimageprovider/photometa-data.cpp'
1440--- tests/unittests/gallerystandardimageprovider/photometa-data.cpp 2013-01-16 11:01:23 +0000
1441+++ tests/unittests/gallerystandardimageprovider/photometa-data.cpp 2013-06-06 16:04:27 +0000
1442@@ -18,7 +18,7 @@
1443 *
1444 */
1445
1446-#include "photo/photo-metadata.h"
1447+#include "photo-metadata.h"
1448
1449 Orientation PhotoMetadata::orientation() const
1450 {
1451
1452=== modified file 'tests/unittests/gallerystandardimageprovider/preview-manager.cpp'
1453--- tests/unittests/gallerystandardimageprovider/preview-manager.cpp 2013-06-05 08:52:51 +0000
1454+++ tests/unittests/gallerystandardimageprovider/preview-manager.cpp 2013-06-06 16:04:27 +0000
1455@@ -20,8 +20,8 @@
1456
1457 #include <QDir>
1458
1459-#include "media/preview-manager.h"
1460-#include "media/media-collection.h"
1461+#include "preview-manager.h"
1462+#include "media-collection.h"
1463
1464 const int PreviewManager::PREVIEW_SIZE = 360;
1465 const QString PreviewManager::PREVIEW_DIR = ".thumbs";
1466
1467=== modified file 'tests/unittests/gallerystandardimageprovider/tst_gallerystandardimageprovidertest.cpp'
1468--- tests/unittests/gallerystandardimageprovider/tst_gallerystandardimageprovidertest.cpp 2013-06-04 11:32:12 +0000
1469+++ tests/unittests/gallerystandardimageprovider/tst_gallerystandardimageprovidertest.cpp 2013-06-06 16:04:27 +0000
1470@@ -23,9 +23,9 @@
1471 #include <QFileInfo>
1472 #include <QUrl>
1473
1474-#include "qml/gallery-standard-image-provider.h"
1475-#include "media/preview-manager.h"
1476-#include "media/media-collection.h"
1477+#include "gallery-standard-image-provider.h"
1478+#include "preview-manager.h"
1479+#include "media-collection.h"
1480 #include "gallery-manager.h"
1481
1482 class tst_GalleryStandardImageProvider : public QObject
1483
1484=== modified file 'tests/unittests/gallerythumbnailimageprovider/CMakeLists.txt'
1485--- tests/unittests/gallerythumbnailimageprovider/CMakeLists.txt 2013-06-04 09:24:50 +0000
1486+++ tests/unittests/gallerythumbnailimageprovider/CMakeLists.txt 2013-06-06 16:04:27 +0000
1487@@ -5,8 +5,9 @@
1488 endif()
1489
1490 include_directories(
1491+ ${gallery_media_src_SOURCE_DIR}
1492+ ${gallery_qml_src_SOURCE_DIR}
1493 ${CMAKE_BINARY_DIR}
1494- ${gallery_src_SOURCE_DIR}
1495 ${GSTLIB_INCLUDE_DIRS}
1496 )
1497
1498
1499=== removed directory 'tests/unittests/gallerythumbnailimageprovider/media'
1500=== removed file 'tests/unittests/gallerythumbnailimageprovider/media/media-collection.h'
1501--- tests/unittests/gallerythumbnailimageprovider/media/media-collection.h 2013-06-04 11:32:12 +0000
1502+++ tests/unittests/gallerythumbnailimageprovider/media/media-collection.h 1970-01-01 00:00:00 +0000
1503@@ -1,28 +0,0 @@
1504-/*
1505- * Copyright (C) 2013 Canonical Ltd
1506- *
1507- * This program is free software: you can redistribute it and/or modify
1508- * it under the terms of the GNU General Public License version 3 as
1509- * published by the Free Software Foundation.
1510- *
1511- * This program is distributed in the hope that it will be useful,
1512- * but WITHOUT ANY WARRANTY; without even the implied warranty of
1513- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1514- * GNU General Public License for more details.
1515- *
1516- * You should have received a copy of the GNU General Public License
1517- * along with this program. If not, see <http://www.gnu.org/licenses/>.
1518- */
1519-
1520-#ifndef GALLERY_MEDIA_COLLECTION_H_
1521-#define GALLERY_MEDIA_COLLECTION_H_
1522-
1523-#include <QDir>
1524-
1525-class MediaCollection
1526-{
1527-public:
1528- MediaCollection(const QDir& directory) {Q_UNUSED(directory);}
1529-};
1530-
1531-#endif
1532
1533=== modified file 'tests/unittests/gallerythumbnailimageprovider/preview-manager.cpp'
1534--- tests/unittests/gallerythumbnailimageprovider/preview-manager.cpp 2013-06-05 08:52:51 +0000
1535+++ tests/unittests/gallerythumbnailimageprovider/preview-manager.cpp 2013-06-06 16:04:27 +0000
1536@@ -20,7 +20,7 @@
1537
1538 #include <QDir>
1539
1540-#include "media/preview-manager.h"
1541+#include "preview-manager.h"
1542
1543 const QString PreviewManager::PREVIEW_DIR = ".thumbs";
1544 const char* PreviewManager::PREVIEW_FILE_EXT = "JPG";
1545
1546=== modified file 'tests/unittests/gallerythumbnailimageprovider/tst_gallerythumbnailimageprovider.cpp'
1547--- tests/unittests/gallerythumbnailimageprovider/tst_gallerythumbnailimageprovider.cpp 2013-05-28 13:50:03 +0000
1548+++ tests/unittests/gallerythumbnailimageprovider/tst_gallerythumbnailimageprovider.cpp 2013-06-06 16:04:27 +0000
1549@@ -21,7 +21,7 @@
1550 #include <QFileInfo>
1551 #include <QUrl>
1552
1553-#include "qml/gallery-thumbnail-image-provider.h"
1554+#include "gallery-thumbnail-image-provider.h"
1555
1556 class tst_GalleryThumbnailImageProvider : public QObject
1557 {
1558
1559=== modified file 'tests/unittests/imaging/CMakeLists.txt'
1560--- tests/unittests/imaging/CMakeLists.txt 2013-05-28 13:50:03 +0000
1561+++ tests/unittests/imaging/CMakeLists.txt 2013-06-06 16:04:27 +0000
1562@@ -5,8 +5,8 @@
1563 endif()
1564
1565 include_directories(
1566+ ${gallery_util_src_SOURCE_DIR}
1567 ${CMAKE_BINARY_DIR}
1568- ${gallery_src_SOURCE_DIR}
1569 )
1570
1571 add_executable(imaging
1572
1573=== modified file 'tests/unittests/imaging/tst_imaging.cpp'
1574--- tests/unittests/imaging/tst_imaging.cpp 2013-02-19 12:50:54 +0000
1575+++ tests/unittests/imaging/tst_imaging.cpp 2013-06-06 16:04:27 +0000
1576@@ -17,7 +17,7 @@
1577 #include <QtTest/QtTest>
1578 #include <QString>
1579
1580-#include "util/imaging.h"
1581+#include "imaging.h"
1582
1583 class tst_Imaging : public QObject
1584 {
1585
1586=== modified file 'tests/unittests/resource/CMakeLists.txt'
1587--- tests/unittests/resource/CMakeLists.txt 2013-05-28 13:50:03 +0000
1588+++ tests/unittests/resource/CMakeLists.txt 2013-06-06 16:04:27 +0000
1589@@ -6,7 +6,7 @@
1590
1591 include_directories(
1592 ${CMAKE_BINARY_DIR}
1593- ${gallery_src_SOURCE_DIR}
1594+ ${gallery_util_src_SOURCE_DIR}
1595 )
1596
1597 add_executable(resource
1598
1599=== modified file 'tests/unittests/resource/tst_resource.cpp'
1600--- tests/unittests/resource/tst_resource.cpp 2013-06-05 08:52:51 +0000
1601+++ tests/unittests/resource/tst_resource.cpp 2013-06-06 16:04:27 +0000
1602@@ -21,7 +21,7 @@
1603 #include <QStandardPaths>
1604 #include <QString>
1605
1606-#include "util/resource.h"
1607+#include "resource.h"
1608
1609 class tst_Resource : public QObject
1610 {

Subscribers

People subscribed via source and target branches