unity-scope-click

Merge lp:~stolowski/unity-scope-click/split-more into lp:unity-scope-click/devel

  1. split-more
  2. Merge into devel
Proposed by Paweł Stołowski
Status: Merged
Approved by: dobey
Approved revision: 276
Merged at revision: 279
Proposed branch: lp:~stolowski/unity-scope-click/split-more
Merge into: lp:unity-scope-click/devel
Diff against target: 257 lines (+36/-38)
12 files modified
libclickscope/click/CMakeLists.txt (+8/-0)
libclickscope/click/download-manager.cpp (+1/-1)
libclickscope/click/index.cpp (+1/-1)
libclickscope/click/package.cpp (+2/-2)
libclickscope/click/preview.cpp (+4/-5)
libclickscope/click/preview.h (+3/-3)
libclickscope/tests/CMakeLists.txt (+8/-0)
scope/click/CMakeLists.txt (+0/-9)
scope/click/query.cpp (+3/-3)
scope/click/scope.cpp (+4/-4)
scope/click/scope.h (+1/-1)
scope/tests/CMakeLists.txt (+1/-9)
To merge this branch: bzr merge lp:~stolowski/unity-scope-click/split-more
Reviewer Review Type Date Requested Status
dobey (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+220975@code.launchpad.net

Commit message

Moved remaining classes into the library.

Description of the change

Moved remaining classes into the library.

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

PASSED: Continuous integration, rev:276
http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-ci/88/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-amd64-ci/63
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-armhf-ci/62
        deb: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-armhf-ci/62/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-i386-ci/62

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-team-unity-scope-click-devel-ci/88/rebuild

review: Approve (continuous-integration)
Revision history for this message
dobey (dobey) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'libclickscope/click/CMakeLists.txt'
2--- libclickscope/click/CMakeLists.txt 2014-05-23 18:45:01 +0000
3+++ libclickscope/click/CMakeLists.txt 2014-05-26 15:05:28 +0000
4@@ -10,8 +10,16 @@
5
6 add_library(${SCOPE_LIB_NAME} STATIC
7 configuration.cpp
8+ download-manager.cpp
9+ index.cpp
10+ interface.cpp
11 key_file_locator.cpp
12 network_access_manager.cpp
13+ package.cpp
14+ preview.cpp
15+ reviews.cpp
16+ qtbridge.cpp
17+ scope_activation.cpp
18 smartconnect.cpp
19 ubuntuone_credentials.cpp
20 webclient.cpp
21
22=== renamed file 'scope/click/application.h' => 'libclickscope/click/application.h'
23=== renamed file 'scope/click/download-manager.cpp' => 'libclickscope/click/download-manager.cpp'
24--- scope/click/download-manager.cpp 2014-05-23 17:44:41 +0000
25+++ libclickscope/click/download-manager.cpp 2014-05-26 15:05:28 +0000
26@@ -35,7 +35,7 @@
27 #include <QStringBuilder>
28 #include <QTimer>
29
30-#include "qtbridge.h"
31+#include <click/qtbridge.h>
32
33 namespace u1 = UbuntuOne;
34 #include <click/ubuntuone_credentials.h>
35
36=== renamed file 'scope/click/download-manager.h' => 'libclickscope/click/download-manager.h'
37=== renamed file 'scope/click/index.cpp' => 'libclickscope/click/index.cpp'
38--- scope/click/index.cpp 2014-05-20 18:32:45 +0000
39+++ libclickscope/click/index.cpp 2014-05-26 15:05:28 +0000
40@@ -36,7 +36,7 @@
41
42 #include <click/smartconnect.h>
43
44-#include "download-manager.h"
45+#include <click/download-manager.h>
46 #include "index.h"
47 #include "interface.h"
48 #include "application.h"
49
50=== renamed file 'scope/click/index.h' => 'libclickscope/click/index.h'
51=== renamed file 'scope/click/interface.cpp' => 'libclickscope/click/interface.cpp'
52=== renamed file 'scope/click/interface.h' => 'libclickscope/click/interface.h'
53=== renamed file 'scope/click/package.cpp' => 'libclickscope/click/package.cpp'
54--- scope/click/package.cpp 2014-05-23 14:20:41 +0000
55+++ libclickscope/click/package.cpp 2014-05-26 15:05:28 +0000
56@@ -29,8 +29,8 @@
57
58 #include <sstream>
59
60-#include "application.h"
61-#include "package.h"
62+#include <click/application.h>
63+#include <click/package.h>
64
65 namespace click
66 {
67
68=== renamed file 'scope/click/package.h' => 'libclickscope/click/package.h'
69=== renamed file 'scope/click/preview.cpp' => 'libclickscope/click/preview.cpp'
70--- scope/click/preview.cpp 2014-05-13 19:32:29 +0000
71+++ libclickscope/click/preview.cpp 2014-05-26 15:05:28 +0000
72@@ -27,11 +27,11 @@
73 * files in the program, then also delete it here.
74 */
75
76-#include "application.h"
77-#include "interface.h"
78+#include <click/application.h>
79+#include <click/interface.h>
80 #include "preview.h"
81-#include "qtbridge.h"
82-#include "download-manager.h"
83+#include <click/qtbridge.h>
84+#include <click/download-manager.h>
85
86 #include <boost/algorithm/string/replace.hpp>
87
88@@ -46,7 +46,6 @@
89 #include <iostream>
90 #include <sstream>
91
92-#include "interface.h"
93 #include <click/click-i18n.h>
94
95 namespace click {
96
97=== renamed file 'scope/click/preview.h' => 'libclickscope/click/preview.h'
98--- scope/click/preview.h 2014-05-20 19:33:41 +0000
99+++ libclickscope/click/preview.h 2014-05-26 15:05:28 +0000
100@@ -30,9 +30,9 @@
101 #ifndef CLICKPREVIEW_H
102 #define CLICKPREVIEW_H
103
104-#include "index.h"
105-#include "download-manager.h"
106-#include "qtbridge.h"
107+#include <click/index.h>
108+#include <click/download-manager.h>
109+#include <click/qtbridge.h>
110 #include "reviews.h"
111
112 #include <click/network_access_manager.h>
113
114=== renamed file 'scope/click/qtbridge.cpp' => 'libclickscope/click/qtbridge.cpp'
115=== renamed file 'scope/click/qtbridge.h' => 'libclickscope/click/qtbridge.h'
116=== renamed file 'scope/click/reviews.cpp' => 'libclickscope/click/reviews.cpp'
117=== renamed file 'scope/click/reviews.h' => 'libclickscope/click/reviews.h'
118=== renamed file 'scope/click/scope_activation.cpp' => 'libclickscope/click/scope_activation.cpp'
119=== renamed file 'scope/click/scope_activation.h' => 'libclickscope/click/scope_activation.h'
120=== modified file 'libclickscope/tests/CMakeLists.txt'
121--- libclickscope/tests/CMakeLists.txt 2014-05-23 18:45:01 +0000
122+++ libclickscope/tests/CMakeLists.txt 2014-05-26 15:05:28 +0000
123@@ -14,14 +14,22 @@
124 ${GMOCK_INCLUDE_DIR}
125 )
126
127+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/test_data.cpp.in ${CMAKE_CURRENT_BINARY_DIR}/test_data.cpp)
128+
129 add_executable (${LIBCLICKSCOPE_TESTS_TARGET}
130 mock_network_access_manager.h
131 mock_ubuntuone_credentials.h
132 mock_webclient.h
133
134+ test_download_manager.cpp
135+ test_index.cpp
136+ test_interface.cpp
137 test_configuration.cpp
138+ test_reviews.cpp
139 test_smartconnect.cpp
140 test_webclient.cpp
141+
142+ ${CMAKE_CURRENT_BINARY_DIR}/test_data.cpp
143 )
144
145 qt5_use_modules(${LIBCLICKSCOPE_TESTS_TARGET} Core)
146
147=== renamed directory 'scope/tests/applications' => 'libclickscope/tests/applications'
148=== renamed file 'scope/tests/fake_json.h' => 'libclickscope/tests/fake_json.h'
149=== renamed file 'scope/tests/mock_ubuntu_download_manager.h' => 'libclickscope/tests/mock_ubuntu_download_manager.h'
150=== renamed file 'scope/tests/test_data.cpp' => 'libclickscope/tests/test_data.cpp'
151=== renamed file 'scope/tests/test_data.cpp.in' => 'libclickscope/tests/test_data.cpp.in'
152=== renamed file 'scope/tests/test_data.h' => 'libclickscope/tests/test_data.h'
153=== renamed file 'scope/tests/test_download_manager.cpp' => 'libclickscope/tests/test_download_manager.cpp'
154=== renamed file 'scope/tests/test_index.cpp' => 'libclickscope/tests/test_index.cpp'
155=== renamed file 'scope/tests/test_interface.cpp' => 'libclickscope/tests/test_interface.cpp'
156=== renamed file 'scope/tests/test_reviews.cpp' => 'libclickscope/tests/test_reviews.cpp'
157=== modified file 'scope/click/CMakeLists.txt'
158--- scope/click/CMakeLists.txt 2014-05-23 18:45:01 +0000
159+++ scope/click/CMakeLists.txt 2014-05-26 15:05:28 +0000
160@@ -9,17 +9,8 @@
161 )
162
163 add_library(${SCOPE_LIB_UNVERSIONED} SHARED
164- download-manager.cpp
165- index.cpp
166- interface.cpp
167 query.cpp
168- reviews.cpp
169 scope.cpp
170- scope_activation.cpp
171- package.cpp
172- preview.cpp
173-
174- qtbridge.cpp
175 )
176
177 include_directories(
178
179=== modified file 'scope/click/query.cpp'
180--- scope/click/query.cpp 2014-05-14 18:34:20 +0000
181+++ scope/click/query.cpp 2014-05-26 15:05:28 +0000
182@@ -27,10 +27,10 @@
183 * files in the program, then also delete it here.
184 */
185
186-#include "application.h"
187+#include <click/application.h>
188 #include "query.h"
189-#include "qtbridge.h"
190-#include "interface.h"
191+#include <click/qtbridge.h>
192+#include <click/interface.h>
193
194 #include <click/key_file_locator.h>
195
196
197=== modified file 'scope/click/scope.cpp'
198--- scope/click/scope.cpp 2014-05-20 19:33:41 +0000
199+++ scope/click/scope.cpp 2014-05-26 15:05:28 +0000
200@@ -27,12 +27,12 @@
201 * files in the program, then also delete it here.
202 */
203
204-#include "qtbridge.h"
205+#include <click/qtbridge.h>
206 #include "scope.h"
207 #include "query.h"
208-#include "preview.h"
209-#include "interface.h"
210-#include "scope_activation.h"
211+#include <click/preview.h>
212+#include <click/interface.h>
213+#include <click/scope_activation.h>
214
215 #include <QSharedPointer>
216
217
218=== modified file 'scope/click/scope.h'
219--- scope/click/scope.h 2014-05-23 18:45:01 +0000
220+++ scope/click/scope.h 2014-05-26 15:05:28 +0000
221@@ -37,7 +37,7 @@
222 #include <unity/scopes/QueryBase.h>
223 #include <unity/scopes/ActivationQueryBase.h>
224
225-#include "index.h"
226+#include <click/index.h>
227
228 namespace scopes = unity::scopes;
229
230
231=== modified file 'scope/tests/CMakeLists.txt'
232--- scope/tests/CMakeLists.txt 2014-05-23 18:45:01 +0000
233+++ scope/tests/CMakeLists.txt 2014-05-26 15:05:28 +0000
234@@ -15,16 +15,8 @@
235 ${GMOCK_INCLUDE_DIR}
236 )
237
238-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/test_data.cpp.in ${CMAKE_CURRENT_BINARY_DIR}/test_data.cpp)
239-
240 add_executable (${CLICKSCOPE_TESTS_TARGET}
241- test_download_manager.cpp
242- test_index.cpp
243- test_interface.cpp
244 test_query.cpp
245- test_reviews.cpp
246-
247- ${CMAKE_CURRENT_BINARY_DIR}/test_data.cpp
248 )
249
250 qt5_use_modules(${CLICKSCOPE_TESTS_TARGET} Core DBus Network Test)
251@@ -66,4 +58,4 @@
252
253 add_subdirectory(integration)
254 add_subdirectory(download_manager_tool)
255-add_subdirectory(click_interface_tool)
256\ No newline at end of file
257+add_subdirectory(click_interface_tool)

Subscribers

People subscribed via source and target branches

to all changes: