Fold qpaintdevice_qpa.cpp into qpaintdevice.cpp

Change-Id: I274508826b9be4eb00f67fccae5a18ecbdf41a36
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>

diff --git a/src/gui/painting/painting.pri b/src/gui/painting/painting.pri
index 977aea2..a79c247 100644 (file)
--- a/src/gui/painting/painting.pri
+++ b/src/gui/painting/painting.pri
@@ -53,7 +53,6 @@ SOURCES += \
         painting/qoutlinemapper.cpp \
         painting/qpagedpaintdevice.cpp \
         painting/qpaintdevice.cpp \
-        painting/qpaintdevice_qpa.cpp \
         painting/qpaintengine.cpp \
         painting/qpaintengineex.cpp \
         painting/qpainter.cpp \

diff --git a/src/gui/painting/qpaintdevice.cpp b/src/gui/painting/qpaintdevice.cpp
index d1dfa70..afbd866 100644 (file)
--- a/src/gui/painting/qpaintdevice.cpp
+++ b/src/gui/painting/qpaintdevice.cpp
@@ -76,4 +76,20 @@ Q_GUI_EXPORT int qt_paint_device_metric(const QPaintDevice *device, QPaintDevice
     return device->metric(metric);
 }
 
+int QPaintDevice::metric(PaintDeviceMetric m) const
+{
+    qWarning("QPaintDevice::metrics: Device has no metric information");
+    if (m == PdmDpiX) {
+        return 72;
+    } else if (m == PdmDpiY) {
+        return 72;
+    } else if (m == PdmNumColors) {
+        // FIXME: does this need to be a real value?
+        return 256;
+    } else {
+        qDebug("Unrecognised metric %d!",m);
+        return 0;
+    }
+}
+
 QT_END_NAMESPACE

diff --git a/src/gui/painting/qpaintdevice_qpa.cpp b/src/gui/painting/qpaintdevice_qpa.cpp
deleted file mode 100644 (file)
index e469a5f..0000000
--- a/src/gui/painting/qpaintdevice_qpa.cpp
+++ /dev/null
@@ -1,65 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
-**
-** This file is part of the QtGui module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this
-** file. Please review the following information to ensure the GNU Lesser
-** General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qpaintdevice.h"
-#include "qpainter.h"
-#include "qbitmap.h"
-#include "qguiapplication.h"
-
-QT_BEGIN_NAMESPACE
-
-int QPaintDevice::metric(PaintDeviceMetric m) const
-{
-    qWarning("QPaintDevice::metrics: Device has no metric information");
-    if (m == PdmDpiX) {
-        return 72;
-    } else if (m == PdmDpiY) {
-        return 72;
-    } else if (m == PdmNumColors) {
-        // FIXME: does this need to be a real value?
-        return 256;
-    } else {
-        qDebug("Unrecognised metric %d!",m);
-        return 0;
-    }
-}
-
-QT_END_NAMESPACE