Storage Framework

Merge lp:~michihenning/storage-framework/no-boost-with-remote-client into lp:storage-framework/devel

  1. no-boost-with-remote-client
  2. Merge into devel
Proposed by Michi Henning
Status: Merged
Approved by: James Henstridge
Approved revision: 39
Merged at revision: 39
Proposed branch: lp:~michihenning/storage-framework/no-boost-with-remote-client
Merge into: lp:storage-framework/devel
Diff against target: 129 lines (+14/-4)
10 files modified
include/unity/storage/qt/client/internal/ItemBase.h (+0/-1)
include/unity/storage/qt/client/internal/local_client/ItemImpl.h (+1/-1)
src/qt/client/CMakeLists.txt (+0/-1)
src/qt/client/internal/FolderBase.cpp (+2/-0)
src/qt/client/internal/RootBase.cpp (+2/-0)
src/qt/client/internal/remote_client/AccountImpl.cpp (+2/-0)
src/qt/client/internal/remote_client/FolderImpl.cpp (+2/-0)
src/qt/client/internal/remote_client/ItemImpl.cpp (+2/-0)
src/qt/client/internal/remote_client/RootImpl.cpp (+2/-0)
tests/local-client/local-client_test.cpp (+1/-1)
To merge this branch: bzr merge lp:~michihenning/storage-framework/no-boost-with-remote-client
Reviewer Review Type Date Requested Status
James Henstridge Approve
Review via email: mp+301236@code.launchpad.net

Commit message

Removed boost dependency from remote client lib.

Description of the change

Removed boost dependency from remote client lib.

To post a comment you must log in.
Revision history for this message
James Henstridge (jamesh) wrote :

Looks good.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'include/unity/storage/qt/client/internal/ItemBase.h'
2--- include/unity/storage/qt/client/internal/ItemBase.h 2016-07-22 02:35:12 +0000
3+++ include/unity/storage/qt/client/internal/ItemBase.h 2016-07-27 02:21:43 +0000
4@@ -19,7 +19,6 @@
5 #pragma once
6
7 #include <unity/storage/common.h>
8-#include <unity/storage/qt/client/internal/boost_filesystem.h>
9
10 #include <QDateTime>
11 #pragma GCC diagnostic push
12
13=== modified file 'include/unity/storage/qt/client/internal/local_client/ItemImpl.h'
14--- include/unity/storage/qt/client/internal/local_client/ItemImpl.h 2016-07-22 00:17:24 +0000
15+++ include/unity/storage/qt/client/internal/local_client/ItemImpl.h 2016-07-27 02:21:43 +0000
16@@ -20,8 +20,8 @@
17
18 #include <unity/storage/common.h>
19 #include <unity/storage/qt/client/Exceptions.h>
20-#include <unity/storage/qt/client/internal/boost_filesystem.h>
21 #include <unity/storage/qt/client/internal/ItemBase.h>
22+#include <unity/storage/qt/client/internal/local_client/boost_filesystem.h>
23
24 #include <mutex>
25
26
27=== renamed file 'include/unity/storage/qt/client/internal/boost_filesystem.h' => 'include/unity/storage/qt/client/internal/local_client/boost_filesystem.h'
28=== modified file 'src/qt/client/CMakeLists.txt'
29--- src/qt/client/CMakeLists.txt 2016-07-22 03:29:45 +0000
30+++ src/qt/client/CMakeLists.txt 2016-07-27 02:21:43 +0000
31@@ -113,7 +113,6 @@
32 Qt5::Core
33 Qt5::DBus
34 Qt5::Network
35- ${Boost_LIBRARIES}
36 ${ONLINEACCOUNTS_DEPS_LDFLAGS}
37 )
38 install(
39
40=== modified file 'src/qt/client/internal/FolderBase.cpp'
41--- src/qt/client/internal/FolderBase.cpp 2016-07-15 03:34:00 +0000
42+++ src/qt/client/internal/FolderBase.cpp 2016-07-27 02:21:43 +0000
43@@ -18,6 +18,8 @@
44
45 #include <unity/storage/qt/client/internal/FolderBase.h>
46
47+#include <cassert>
48+
49 using namespace std;
50
51 namespace unity
52
53=== modified file 'src/qt/client/internal/RootBase.cpp'
54--- src/qt/client/internal/RootBase.cpp 2016-07-14 04:50:36 +0000
55+++ src/qt/client/internal/RootBase.cpp 2016-07-27 02:21:43 +0000
56@@ -20,6 +20,8 @@
57
58 #include <unity/storage/qt/client/Exceptions.h>
59
60+#include <cassert>
61+
62 using namespace std;
63
64 namespace unity
65
66=== modified file 'src/qt/client/internal/remote_client/AccountImpl.cpp'
67--- src/qt/client/internal/remote_client/AccountImpl.cpp 2016-07-15 03:56:14 +0000
68+++ src/qt/client/internal/remote_client/AccountImpl.cpp 2016-07-27 02:21:43 +0000
69@@ -24,6 +24,8 @@
70 #include <unity/storage/qt/client/internal/remote_client/RuntimeImpl.h>
71 #include <unity/storage/qt/client/Runtime.h>
72
73+#include <cassert>
74+
75 using namespace std;
76
77 namespace unity
78
79=== modified file 'src/qt/client/internal/remote_client/FolderImpl.cpp'
80--- src/qt/client/internal/remote_client/FolderImpl.cpp 2016-07-22 01:45:39 +0000
81+++ src/qt/client/internal/remote_client/FolderImpl.cpp 2016-07-27 02:21:43 +0000
82@@ -24,6 +24,8 @@
83 #include <unity/storage/qt/client/internal/remote_client/Handler.h>
84 #include <unity/storage/qt/client/internal/remote_client/UploaderImpl.h>
85
86+#include <cassert>
87+
88 using namespace std;
89
90 namespace unity
91
92=== modified file 'src/qt/client/internal/remote_client/ItemImpl.cpp'
93--- src/qt/client/internal/remote_client/ItemImpl.cpp 2016-07-22 01:45:39 +0000
94+++ src/qt/client/internal/remote_client/ItemImpl.cpp 2016-07-27 02:21:43 +0000
95@@ -25,6 +25,8 @@
96 #include <unity/storage/qt/client/internal/remote_client/Handler.h>
97 #include <unity/storage/qt/client/internal/remote_client/RootImpl.h>
98
99+#include <cassert>
100+
101 using namespace std;
102
103 namespace unity
104
105=== modified file 'src/qt/client/internal/remote_client/RootImpl.cpp'
106--- src/qt/client/internal/remote_client/RootImpl.cpp 2016-07-15 03:56:14 +0000
107+++ src/qt/client/internal/remote_client/RootImpl.cpp 2016-07-27 02:21:43 +0000
108@@ -22,6 +22,8 @@
109 #include <unity/storage/qt/client/internal/remote_client/FileImpl.h>
110 #include <unity/storage/qt/client/internal/remote_client/Handler.h>
111
112+#include <cassert>
113+
114 using namespace std;
115
116 namespace unity
117
118=== modified file 'tests/local-client/local-client_test.cpp'
119--- tests/local-client/local-client_test.cpp 2016-07-22 00:17:24 +0000
120+++ tests/local-client/local-client_test.cpp 2016-07-27 02:21:43 +0000
121@@ -18,7 +18,7 @@
122
123 #include <unity/storage/qt/client/client-api.h>
124
125-#include <unity/storage/qt/client/internal/boost_filesystem.h>
126+#include <unity/storage/qt/client/internal/local_client/boost_filesystem.h>
127
128 #include <gtest/gtest.h>
129 #include <QCoreApplication>

Subscribers

People subscribed via source and target branches

to all changes: