Merge lp:~mir-team/qtubuntu/change-naming-to-match-upstream into lp:qtubuntu

Proposed by Gerry Boland on 2015-08-10
Status: Work in progress
Proposed branch: lp:~mir-team/qtubuntu/change-naming-to-match-upstream
Merge into: lp:qtubuntu
Diff against target: 306 lines (+65/-65)
15 files modified
src/ubuntumirclient/qmirclientbackingstore.cpp (+2/-2)
src/ubuntumirclient/qmirclientclipboard.cpp (+1/-1)
src/ubuntumirclient/qmirclientglcontext.cpp (+3/-3)
src/ubuntumirclient/qmirclientglcontext.h (+1/-1)
src/ubuntumirclient/qmirclientinput.cpp (+7/-7)
src/ubuntumirclient/qmirclientintegration.cpp (+10/-10)
src/ubuntumirclient/qmirclientintegration.h (+1/-1)
src/ubuntumirclient/qmirclientnativeinterface.cpp (+3/-3)
src/ubuntumirclient/qmirclientorientationchangeevent_p.h (+1/-1)
src/ubuntumirclient/qmirclientplatformservices.cpp (+1/-1)
src/ubuntumirclient/qmirclientplugin.cpp (+2/-2)
src/ubuntumirclient/qmirclientscreen.cpp (+3/-3)
src/ubuntumirclient/qmirclienttheme.cpp (+1/-1)
src/ubuntumirclient/qmirclientwindow.cpp (+5/-5)
src/ubuntumirclient/ubuntumirclient.pro (+24/-24)
To merge this branch: bzr merge lp:~mir-team/qtubuntu/change-naming-to-match-upstream
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve on 2015-08-10
Ubuntu Phablet Team 2015-08-10 Pending
Review via email: mp+267550@code.launchpad.net

Commit message

Rename QPA files to match upstream, all files prefixed with "qmirclient"

To post a comment you must log in.
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)

Unmerged revisions

272. By Gerry Boland on 2015-08-10

Rename QPA files to match upstream, all files prefixed with "qmirclient"

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== renamed file 'src/ubuntumirclient/backingstore.cpp' => 'src/ubuntumirclient/qmirclientbackingstore.cpp'
2--- src/ubuntumirclient/backingstore.cpp 2014-12-04 12:29:39 +0000
3+++ src/ubuntumirclient/qmirclientbackingstore.cpp 2015-08-10 17:31:24 +0000
4@@ -14,8 +14,8 @@
5 * along with this program. If not, see <http://www.gnu.org/licenses/>.
6 */
7
8-#include "backingstore.h"
9-#include "logging.h"
10+#include "qmirclientbackingstore.h"
11+#include "qmirclientlogging.h"
12 #include <QtGui/QOpenGLContext>
13 #include <QtGui/QOpenGLTexture>
14 #include <QtGui/QMatrix4x4>
15
16=== renamed file 'src/ubuntumirclient/backingstore.h' => 'src/ubuntumirclient/qmirclientbackingstore.h'
17=== renamed file 'src/ubuntumirclient/clipboard.cpp' => 'src/ubuntumirclient/qmirclientclipboard.cpp'
18--- src/ubuntumirclient/clipboard.cpp 2014-09-23 11:49:03 +0000
19+++ src/ubuntumirclient/qmirclientclipboard.cpp 2015-08-10 17:31:24 +0000
20@@ -14,7 +14,7 @@
21 * along with this program. If not, see <http://www.gnu.org/licenses/>.
22 */
23
24-#include "clipboard.h"
25+#include "qmirclientclipboard.h"
26
27 #include <QtCore/QMimeData>
28 #include <QtCore/QStringList>
29
30=== renamed file 'src/ubuntumirclient/clipboard.h' => 'src/ubuntumirclient/qmirclientclipboard.h'
31=== renamed file 'src/ubuntumirclient/glcontext.cpp' => 'src/ubuntumirclient/qmirclientglcontext.cpp'
32--- src/ubuntumirclient/glcontext.cpp 2014-06-18 23:10:00 +0000
33+++ src/ubuntumirclient/qmirclientglcontext.cpp 2015-08-10 17:31:24 +0000
34@@ -14,9 +14,9 @@
35 * along with this program. If not, see <http://www.gnu.org/licenses/>.
36 */
37
38-#include "glcontext.h"
39-#include "window.h"
40-#include "logging.h"
41+#include "qmirclientglcontext.h"
42+#include "qmirclientwindow.h"
43+#include "qmirclientlogging.h"
44 #include <QtPlatformSupport/private/qeglconvenience_p.h>
45
46 #if !defined(QT_NO_DEBUG)
47
48=== renamed file 'src/ubuntumirclient/glcontext.h' => 'src/ubuntumirclient/qmirclientglcontext.h'
49--- src/ubuntumirclient/glcontext.h 2014-06-18 23:10:00 +0000
50+++ src/ubuntumirclient/qmirclientglcontext.h 2015-08-10 17:31:24 +0000
51@@ -18,7 +18,7 @@
52 #define UBUNTU_OPENGL_CONTEXT_H
53
54 #include <qpa/qplatformopenglcontext.h>
55-#include "screen.h"
56+#include "qmirclientscreen.h"
57
58 class UbuntuOpenGLContext : public QPlatformOpenGLContext
59 {
60
61=== renamed file 'src/ubuntumirclient/input.cpp' => 'src/ubuntumirclient/qmirclientinput.cpp'
62--- src/ubuntumirclient/input.cpp 2015-06-17 13:46:49 +0000
63+++ src/ubuntumirclient/qmirclientinput.cpp 2015-08-10 17:31:24 +0000
64@@ -15,13 +15,13 @@
65 */
66
67 // Local
68-#include "input.h"
69-#include "integration.h"
70-#include "nativeinterface.h"
71-#include "screen.h"
72-#include "window.h"
73-#include "logging.h"
74-#include "orientationchangeevent_p.h"
75+#include "qmirclientinput.h"
76+#include "qmirclientintegration.h"
77+#include "qmirclientnativeinterface.h"
78+#include "qmirclientscreen.h"
79+#include "qmirclientwindow.h"
80+#include "qmirclientlogging.h"
81+#include "qmirclientorientationchangeevent_p.h"
82
83 // Qt
84 #if !defined(QT_NO_DEBUG)
85
86=== renamed file 'src/ubuntumirclient/input.h' => 'src/ubuntumirclient/qmirclientinput.h'
87=== renamed file 'src/ubuntumirclient/integration.cpp' => 'src/ubuntumirclient/qmirclientintegration.cpp'
88--- src/ubuntumirclient/integration.cpp 2015-06-23 22:19:27 +0000
89+++ src/ubuntumirclient/qmirclientintegration.cpp 2015-08-10 17:31:24 +0000
90@@ -25,16 +25,16 @@
91 #include <QOpenGLContext>
92
93 // Local
94-#include "backingstore.h"
95-#include "clipboard.h"
96-#include "glcontext.h"
97-#include "input.h"
98-#include "integration.h"
99-#include "logging.h"
100-#include "nativeinterface.h"
101-#include "screen.h"
102-#include "theme.h"
103-#include "window.h"
104+#include "qmirclientbackingstore.h"
105+#include "qmirclientclipboard.h"
106+#include "qmirclientglcontext.h"
107+#include "qmirclientinput.h"
108+#include "qmirclientintegration.h"
109+#include "qmirclientlogging.h"
110+#include "qmirclientnativeinterface.h"
111+#include "qmirclientscreen.h"
112+#include "qmirclienttheme.h"
113+#include "qmirclientwindow.h"
114
115 // platform-api
116 #include <ubuntu/application/lifecycle_delegate.h>
117
118=== renamed file 'src/ubuntumirclient/integration.h' => 'src/ubuntumirclient/qmirclientintegration.h'
119--- src/ubuntumirclient/integration.h 2015-06-24 17:21:21 +0000
120+++ src/ubuntumirclient/qmirclientintegration.h 2015-08-10 17:31:24 +0000
121@@ -20,7 +20,7 @@
122 #include <qpa/qplatformintegration.h>
123 #include <QSharedPointer>
124
125-#include "platformservices.h"
126+#include "qmirclientplatformservices.h"
127
128 // platform-api
129 #include <ubuntu/application/description.h>
130
131=== renamed file 'src/ubuntumirclient/logging.h' => 'src/ubuntumirclient/qmirclientlogging.h'
132=== renamed file 'src/ubuntumirclient/nativeinterface.cpp' => 'src/ubuntumirclient/qmirclientnativeinterface.cpp'
133--- src/ubuntumirclient/nativeinterface.cpp 2014-06-18 23:10:00 +0000
134+++ src/ubuntumirclient/qmirclientnativeinterface.cpp 2015-08-10 17:31:24 +0000
135@@ -21,9 +21,9 @@
136 #include <QtCore/QMap>
137
138 // Local
139-#include "nativeinterface.h"
140-#include "screen.h"
141-#include "glcontext.h"
142+#include "qmirclientnativeinterface.h"
143+#include "qmirclientscreen.h"
144+#include "qmirclientglcontext.h"
145
146 class UbuntuResourceMap : public QMap<QByteArray, UbuntuNativeInterface::ResourceType>
147 {
148
149=== renamed file 'src/ubuntumirclient/nativeinterface.h' => 'src/ubuntumirclient/qmirclientnativeinterface.h'
150=== renamed file 'src/ubuntumirclient/orientationchangeevent_p.h' => 'src/ubuntumirclient/qmirclientorientationchangeevent_p.h'
151--- src/ubuntumirclient/orientationchangeevent_p.h 2014-09-02 10:34:47 +0000
152+++ src/ubuntumirclient/qmirclientorientationchangeevent_p.h 2015-08-10 17:31:24 +0000
153@@ -19,7 +19,7 @@
154
155 #include <QEvent>
156 #include <QOrientationReading>
157-#include "logging.h"
158+#include "qmirclientlogging.h"
159
160 class OrientationChangeEvent : public QEvent {
161 public:
162
163=== renamed file 'src/ubuntumirclient/platformservices.cpp' => 'src/ubuntumirclient/qmirclientplatformservices.cpp'
164--- src/ubuntumirclient/platformservices.cpp 2014-06-18 23:10:00 +0000
165+++ src/ubuntumirclient/qmirclientplatformservices.cpp 2015-08-10 17:31:24 +0000
166@@ -14,7 +14,7 @@
167 * along with this program. If not, see <http://www.gnu.org/licenses/>.
168 */
169
170-#include "platformservices.h"
171+#include "qmirclientplatformservices.h"
172
173 #include <QUrl>
174
175
176=== renamed file 'src/ubuntumirclient/platformservices.h' => 'src/ubuntumirclient/qmirclientplatformservices.h'
177=== renamed file 'src/ubuntumirclient/plugin.cpp' => 'src/ubuntumirclient/qmirclientplugin.cpp'
178--- src/ubuntumirclient/plugin.cpp 2014-06-18 23:10:00 +0000
179+++ src/ubuntumirclient/qmirclientplugin.cpp 2015-08-10 17:31:24 +0000
180@@ -14,8 +14,8 @@
181 * along with this program. If not, see <http://www.gnu.org/licenses/>.
182 */
183
184-#include "plugin.h"
185-#include "integration.h"
186+#include "qmirclientplugin.h"
187+#include "qmirclientintegration.h"
188
189 QStringList UbuntuMirClientIntegrationPlugin::keys() const
190 {
191
192=== renamed file 'src/ubuntumirclient/plugin.h' => 'src/ubuntumirclient/qmirclientplugin.h'
193=== renamed file 'src/ubuntumirclient/screen.cpp' => 'src/ubuntumirclient/qmirclientscreen.cpp'
194--- src/ubuntumirclient/screen.cpp 2015-06-24 17:21:21 +0000
195+++ src/ubuntumirclient/qmirclientscreen.cpp 2015-08-10 17:31:24 +0000
196@@ -25,9 +25,9 @@
197 #include <QtPlatformSupport/private/qeglconvenience_p.h>
198
199 // local
200-#include "screen.h"
201-#include "logging.h"
202-#include "orientationchangeevent_p.h"
203+#include "qmirclientscreen.h"
204+#include "qmirclientlogging.h"
205+#include "qmirclientorientationchangeevent_p.h"
206
207 #include "memory"
208
209
210=== renamed file 'src/ubuntumirclient/screen.h' => 'src/ubuntumirclient/qmirclientscreen.h'
211=== renamed file 'src/ubuntumirclient/theme.cpp' => 'src/ubuntumirclient/qmirclienttheme.cpp'
212--- src/ubuntumirclient/theme.cpp 2014-06-18 23:10:00 +0000
213+++ src/ubuntumirclient/qmirclienttheme.cpp 2015-08-10 17:31:24 +0000
214@@ -14,7 +14,7 @@
215 * along with this program. If not, see <http://www.gnu.org/licenses/>.
216 */
217
218-#include "theme.h"
219+#include "qmirclienttheme.h"
220
221 #include <QtCore/QVariant>
222
223
224=== renamed file 'src/ubuntumirclient/theme.h' => 'src/ubuntumirclient/qmirclienttheme.h'
225=== renamed file 'src/ubuntumirclient/window.cpp' => 'src/ubuntumirclient/qmirclientwindow.cpp'
226--- src/ubuntumirclient/window.cpp 2015-06-24 17:21:21 +0000
227+++ src/ubuntumirclient/qmirclientwindow.cpp 2015-08-10 17:31:24 +0000
228@@ -15,11 +15,11 @@
229 */
230
231 // Local
232-#include "clipboard.h"
233-#include "input.h"
234-#include "window.h"
235-#include "screen.h"
236-#include "logging.h"
237+#include "qmirclientclipboard.h"
238+#include "qmirclientinput.h"
239+#include "qmirclientwindow.h"
240+#include "qmirclientscreen.h"
241+#include "qmirclientlogging.h"
242
243 // Qt
244 #include <qpa/qwindowsysteminterface.h>
245
246=== renamed file 'src/ubuntumirclient/window.h' => 'src/ubuntumirclient/qmirclientwindow.h'
247=== modified file 'src/ubuntumirclient/ubuntumirclient.pro'
248--- src/ubuntumirclient/ubuntumirclient.pro 2015-01-28 17:26:55 +0000
249+++ src/ubuntumirclient/ubuntumirclient.pro 2015-08-10 17:31:24 +0000
250@@ -15,32 +15,32 @@
251 PKGCONFIG += egl mirclient ubuntu-platform-api
252
253 SOURCES = \
254- backingstore.cpp \
255- clipboard.cpp \
256- glcontext.cpp \
257- input.cpp \
258- integration.cpp \
259- nativeinterface.cpp \
260- platformservices.cpp \
261- plugin.cpp \
262- screen.cpp \
263- theme.cpp \
264- window.cpp
265+ qmirclientbackingstore.cpp \
266+ qmirclientclipboard.cpp \
267+ qmirclientglcontext.cpp \
268+ qmirclientinput.cpp \
269+ qmirclientintegration.cpp \
270+ qmirclientnativeinterface.cpp \
271+ qmirclientplatformservices.cpp \
272+ qmirclientplugin.cpp \
273+ qmirclientscreen.cpp \
274+ qmirclienttheme.cpp \
275+ qmirclientwindow.cpp
276
277 HEADERS = \
278- backingstore.h \
279- clipboard.h \
280- glcontext.h \
281- input.h \
282- integration.h \
283- logging.h \
284- nativeinterface.h \
285- orientationchangeevent_p.h \
286- platformservices.h \
287- plugin.h \
288- screen.h \
289- theme.h \
290- window.h
291+ qmirclientbackingstore.h \
292+ qmirclientclipboard.h \
293+ qmirclientglcontext.h \
294+ qmirclientinput.h \
295+ qmirclientintegration.h \
296+ qmirclientlogging.h \
297+ qmirclientnativeinterface.h \
298+ qmirclientorientationchangeevent_p.h \
299+ qmirclientplatformservices.h \
300+ qmirclientplugin.h \
301+ qmirclientscreen.h \
302+ qmirclienttheme.h \
303+ qmirclientwindow.h
304
305 # Installation path
306 target.path += $$[QT_INSTALL_PLUGINS]/platforms

Subscribers

People subscribed via source and target branches