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

[Gerry Boland]

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

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:272
http://jenkins.qa.ubuntu.com/job/qtubuntu-ci/238/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-wily-armhf-ci/29
        deb: http://jenkins.qa.ubuntu.com/job/qtubuntu-wily-armhf-ci/29/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtubuntu-ci/238/rebuild

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"

=== renamed file 'src/ubuntumirclient/backingstore.cpp' => 'src/ubuntumirclient/qmirclientbackingstore.cpp'
--- src/ubuntumirclient/backingstore.cpp	2014-12-04 12:29:39 +0000
+++ src/ubuntumirclient/qmirclientbackingstore.cpp	2015-08-10 17:31:24 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "backingstore.h"
-#include "logging.h"
+#include "qmirclientbackingstore.h"
+#include "qmirclientlogging.h"
 #include <QtGui/QOpenGLContext>
 #include <QtGui/QOpenGLTexture>
 #include <QtGui/QMatrix4x4>

=== renamed file 'src/ubuntumirclient/backingstore.h' => 'src/ubuntumirclient/qmirclientbackingstore.h'
=== renamed file 'src/ubuntumirclient/clipboard.cpp' => 'src/ubuntumirclient/qmirclientclipboard.cpp'
--- src/ubuntumirclient/clipboard.cpp	2014-09-23 11:49:03 +0000
+++ src/ubuntumirclient/qmirclientclipboard.cpp	2015-08-10 17:31:24 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "clipboard.h"
+#include "qmirclientclipboard.h"
 
 #include <QtCore/QMimeData>
 #include <QtCore/QStringList>

=== renamed file 'src/ubuntumirclient/clipboard.h' => 'src/ubuntumirclient/qmirclientclipboard.h'
=== renamed file 'src/ubuntumirclient/glcontext.cpp' => 'src/ubuntumirclient/qmirclientglcontext.cpp'
--- src/ubuntumirclient/glcontext.cpp	2014-06-18 23:10:00 +0000
+++ src/ubuntumirclient/qmirclientglcontext.cpp	2015-08-10 17:31:24 +0000
@@ -14,9 +14,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "glcontext.h"
-#include "window.h"
-#include "logging.h"
+#include "qmirclientglcontext.h"
+#include "qmirclientwindow.h"
+#include "qmirclientlogging.h"
 #include <QtPlatformSupport/private/qeglconvenience_p.h>
 
 #if !defined(QT_NO_DEBUG)

=== renamed file 'src/ubuntumirclient/glcontext.h' => 'src/ubuntumirclient/qmirclientglcontext.h'
--- src/ubuntumirclient/glcontext.h	2014-06-18 23:10:00 +0000
+++ src/ubuntumirclient/qmirclientglcontext.h	2015-08-10 17:31:24 +0000
@@ -18,7 +18,7 @@
 #define UBUNTU_OPENGL_CONTEXT_H
 
 #include <qpa/qplatformopenglcontext.h>
-#include "screen.h"
+#include "qmirclientscreen.h"
 
 class UbuntuOpenGLContext : public QPlatformOpenGLContext
 {

=== renamed file 'src/ubuntumirclient/input.cpp' => 'src/ubuntumirclient/qmirclientinput.cpp'
--- src/ubuntumirclient/input.cpp	2015-06-17 13:46:49 +0000
+++ src/ubuntumirclient/qmirclientinput.cpp	2015-08-10 17:31:24 +0000
@@ -15,13 +15,13 @@
  */
 
 // Local
-#include "input.h"
-#include "integration.h"
-#include "nativeinterface.h"
-#include "screen.h"
-#include "window.h"
-#include "logging.h"
-#include "orientationchangeevent_p.h"
+#include "qmirclientinput.h"
+#include "qmirclientintegration.h"
+#include "qmirclientnativeinterface.h"
+#include "qmirclientscreen.h"
+#include "qmirclientwindow.h"
+#include "qmirclientlogging.h"
+#include "qmirclientorientationchangeevent_p.h"
 
 // Qt
 #if !defined(QT_NO_DEBUG)

=== renamed file 'src/ubuntumirclient/input.h' => 'src/ubuntumirclient/qmirclientinput.h'
=== renamed file 'src/ubuntumirclient/integration.cpp' => 'src/ubuntumirclient/qmirclientintegration.cpp'
--- src/ubuntumirclient/integration.cpp	2015-06-23 22:19:27 +0000
+++ src/ubuntumirclient/qmirclientintegration.cpp	2015-08-10 17:31:24 +0000
@@ -25,16 +25,16 @@
 #include <QOpenGLContext>
 
 // Local
-#include "backingstore.h"
-#include "clipboard.h"
-#include "glcontext.h"
-#include "input.h"
-#include "integration.h"
-#include "logging.h"
-#include "nativeinterface.h"
-#include "screen.h"
-#include "theme.h"
-#include "window.h"
+#include "qmirclientbackingstore.h"
+#include "qmirclientclipboard.h"
+#include "qmirclientglcontext.h"
+#include "qmirclientinput.h"
+#include "qmirclientintegration.h"
+#include "qmirclientlogging.h"
+#include "qmirclientnativeinterface.h"
+#include "qmirclientscreen.h"
+#include "qmirclienttheme.h"
+#include "qmirclientwindow.h"
 
 // platform-api
 #include <ubuntu/application/lifecycle_delegate.h>

=== renamed file 'src/ubuntumirclient/integration.h' => 'src/ubuntumirclient/qmirclientintegration.h'
--- src/ubuntumirclient/integration.h	2015-06-24 17:21:21 +0000
+++ src/ubuntumirclient/qmirclientintegration.h	2015-08-10 17:31:24 +0000
@@ -20,7 +20,7 @@
 #include <qpa/qplatformintegration.h>
 #include <QSharedPointer>
 
-#include "platformservices.h"
+#include "qmirclientplatformservices.h"
 
 // platform-api
 #include <ubuntu/application/description.h>

=== renamed file 'src/ubuntumirclient/logging.h' => 'src/ubuntumirclient/qmirclientlogging.h'
=== renamed file 'src/ubuntumirclient/nativeinterface.cpp' => 'src/ubuntumirclient/qmirclientnativeinterface.cpp'
--- src/ubuntumirclient/nativeinterface.cpp	2014-06-18 23:10:00 +0000
+++ src/ubuntumirclient/qmirclientnativeinterface.cpp	2015-08-10 17:31:24 +0000
@@ -21,9 +21,9 @@
 #include <QtCore/QMap>
 
 // Local
-#include "nativeinterface.h"
-#include "screen.h"
-#include "glcontext.h"
+#include "qmirclientnativeinterface.h"
+#include "qmirclientscreen.h"
+#include "qmirclientglcontext.h"
 
 class UbuntuResourceMap : public QMap<QByteArray, UbuntuNativeInterface::ResourceType>
 {

=== renamed file 'src/ubuntumirclient/nativeinterface.h' => 'src/ubuntumirclient/qmirclientnativeinterface.h'
=== renamed file 'src/ubuntumirclient/orientationchangeevent_p.h' => 'src/ubuntumirclient/qmirclientorientationchangeevent_p.h'
--- src/ubuntumirclient/orientationchangeevent_p.h	2014-09-02 10:34:47 +0000
+++ src/ubuntumirclient/qmirclientorientationchangeevent_p.h	2015-08-10 17:31:24 +0000
@@ -19,7 +19,7 @@
 
 #include <QEvent>
 #include <QOrientationReading>
-#include "logging.h"
+#include "qmirclientlogging.h"
 
 class OrientationChangeEvent : public QEvent {
 public:

=== renamed file 'src/ubuntumirclient/platformservices.cpp' => 'src/ubuntumirclient/qmirclientplatformservices.cpp'
--- src/ubuntumirclient/platformservices.cpp	2014-06-18 23:10:00 +0000
+++ src/ubuntumirclient/qmirclientplatformservices.cpp	2015-08-10 17:31:24 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "platformservices.h"
+#include "qmirclientplatformservices.h"
 
 #include <QUrl>
 

=== renamed file 'src/ubuntumirclient/platformservices.h' => 'src/ubuntumirclient/qmirclientplatformservices.h'
=== renamed file 'src/ubuntumirclient/plugin.cpp' => 'src/ubuntumirclient/qmirclientplugin.cpp'
--- src/ubuntumirclient/plugin.cpp	2014-06-18 23:10:00 +0000
+++ src/ubuntumirclient/qmirclientplugin.cpp	2015-08-10 17:31:24 +0000
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "plugin.h"
-#include "integration.h"
+#include "qmirclientplugin.h"
+#include "qmirclientintegration.h"
 
 QStringList UbuntuMirClientIntegrationPlugin::keys() const
 {

=== renamed file 'src/ubuntumirclient/plugin.h' => 'src/ubuntumirclient/qmirclientplugin.h'
=== renamed file 'src/ubuntumirclient/screen.cpp' => 'src/ubuntumirclient/qmirclientscreen.cpp'
--- src/ubuntumirclient/screen.cpp	2015-06-24 17:21:21 +0000
+++ src/ubuntumirclient/qmirclientscreen.cpp	2015-08-10 17:31:24 +0000
@@ -25,9 +25,9 @@
 #include <QtPlatformSupport/private/qeglconvenience_p.h>
 
 // local
-#include "screen.h"
-#include "logging.h"
-#include "orientationchangeevent_p.h"
+#include "qmirclientscreen.h"
+#include "qmirclientlogging.h"
+#include "qmirclientorientationchangeevent_p.h"
 
 #include "memory"
 

=== renamed file 'src/ubuntumirclient/screen.h' => 'src/ubuntumirclient/qmirclientscreen.h'
=== renamed file 'src/ubuntumirclient/theme.cpp' => 'src/ubuntumirclient/qmirclienttheme.cpp'
--- src/ubuntumirclient/theme.cpp	2014-06-18 23:10:00 +0000
+++ src/ubuntumirclient/qmirclienttheme.cpp	2015-08-10 17:31:24 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "theme.h"
+#include "qmirclienttheme.h"
 
 #include <QtCore/QVariant>
 

=== renamed file 'src/ubuntumirclient/theme.h' => 'src/ubuntumirclient/qmirclienttheme.h'
=== renamed file 'src/ubuntumirclient/window.cpp' => 'src/ubuntumirclient/qmirclientwindow.cpp'
--- src/ubuntumirclient/window.cpp	2015-06-24 17:21:21 +0000
+++ src/ubuntumirclient/qmirclientwindow.cpp	2015-08-10 17:31:24 +0000
@@ -15,11 +15,11 @@
  */
 
 // Local
-#include "clipboard.h"
-#include "input.h"
-#include "window.h"
-#include "screen.h"
-#include "logging.h"
+#include "qmirclientclipboard.h"
+#include "qmirclientinput.h"
+#include "qmirclientwindow.h"
+#include "qmirclientscreen.h"
+#include "qmirclientlogging.h"
 
 // Qt
 #include <qpa/qwindowsysteminterface.h>

=== renamed file 'src/ubuntumirclient/window.h' => 'src/ubuntumirclient/qmirclientwindow.h'
=== modified file 'src/ubuntumirclient/ubuntumirclient.pro'
--- src/ubuntumirclient/ubuntumirclient.pro	2015-01-28 17:26:55 +0000
+++ src/ubuntumirclient/ubuntumirclient.pro	2015-08-10 17:31:24 +0000
@@ -15,32 +15,32 @@
 PKGCONFIG += egl mirclient ubuntu-platform-api
 
 SOURCES = \
-    backingstore.cpp \
-    clipboard.cpp \
-    glcontext.cpp \
-    input.cpp \
-    integration.cpp \
-    nativeinterface.cpp \
-    platformservices.cpp \
-    plugin.cpp \
-    screen.cpp \
-    theme.cpp \
-    window.cpp
+    qmirclientbackingstore.cpp \
+    qmirclientclipboard.cpp \
+    qmirclientglcontext.cpp \
+    qmirclientinput.cpp \
+    qmirclientintegration.cpp \
+    qmirclientnativeinterface.cpp \
+    qmirclientplatformservices.cpp \
+    qmirclientplugin.cpp \
+    qmirclientscreen.cpp \
+    qmirclienttheme.cpp \
+    qmirclientwindow.cpp
 
 HEADERS = \
-    backingstore.h \
-    clipboard.h \
-    glcontext.h \
-    input.h \
-    integration.h \
-    logging.h \
-    nativeinterface.h \
-    orientationchangeevent_p.h \    
-    platformservices.h \
-    plugin.h \
-    screen.h \
-    theme.h \
-    window.h
+    qmirclientbackingstore.h \
+    qmirclientclipboard.h \
+    qmirclientglcontext.h \
+    qmirclientinput.h \
+    qmirclientintegration.h \
+    qmirclientlogging.h \
+    qmirclientnativeinterface.h \
+    qmirclientorientationchangeevent_p.h \    
+    qmirclientplatformservices.h \
+    qmirclientplugin.h \
+    qmirclientscreen.h \
+    qmirclienttheme.h \
+    qmirclientwindow.h
 
 # Installation path
 target.path +=  $$[QT_INSTALL_PLUGINS]/platforms