From c1538fd1834a268b0e05694e612ff18dfe827636 Mon Sep 17 00:00:00 2001 From: Jason Barron Date: Tue, 18 Aug 2009 10:20:43 +0200 Subject: Remove qpaintdevice_s60.cpp. The functionality in this file was recently moved into qpaintdevice.cpp so this file can be removed. Also remove a define which is no longer required. --- src/gui/painting/painting.pri | 2 - src/gui/painting/qpaintdevice_s60.cpp | 72 ----------------------------------- 2 files changed, 74 deletions(-) delete mode 100644 src/gui/painting/qpaintdevice_s60.cpp diff --git a/src/gui/painting/painting.pri b/src/gui/painting/painting.pri index 7ea4dc1..feef15a 100644 --- a/src/gui/painting/painting.pri +++ b/src/gui/painting/painting.pri @@ -80,7 +80,6 @@ SOURCES += \ painting/qtransform.cpp \ painting/qwindowsurface.cpp \ - symbian:DEFINES += QT_RASTER_PAINTENGINE SOURCES += \ painting/qpaintengine_raster.cpp \ painting/qdrawhelper.cpp \ @@ -177,7 +176,6 @@ embedded { symbian { SOURCES += \ - painting/qpaintdevice_s60.cpp \ painting/qregion_s60.cpp \ painting/qcolormap_s60.cpp } diff --git a/src/gui/painting/qpaintdevice_s60.cpp b/src/gui/painting/qpaintdevice_s60.cpp deleted file mode 100644 index 26ff37a..0000000 --- a/src/gui/painting/qpaintdevice_s60.cpp +++ /dev/null @@ -1,72 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the QtGui of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the either Technology Preview License Agreement or the -** Beta Release License Agreement. -** -** GNU Lesser General Public License Usage -** Alternatively, 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.0, 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. -** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "qpaintdevice.h" -#include "qpainter.h" -#include "qwidget.h" -#include "qbitmap.h" -#include "qapplication.h" -#include -#include "qprinter.h" - -QT_BEGIN_NAMESPACE - -QPaintDevice::QPaintDevice() -{ - painters = 0; -} - - -QPaintDevice::~QPaintDevice() -{ - if (paintingActive()) - qWarning("QPaintDevice: Cannot destroy paint device that is being " - "painted. Be sure to QPainter::end() painters!"); -} - -int QPaintDevice::metric(PaintDeviceMetric) const -{ - qWarning("QPaintDevice::metrics: Device has no metric information"); - return 0; -} - - -QT_END_NAMESPACE -- cgit v0.12