summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@nokia.com>2011-06-22 14:18:18 +0200
committerFriedemann Kleint <Friedemann.Kleint@nokia.com>2011-06-22 14:20:16 +0200
commita009fec1078c52056a69b2fd73fc72fc6d5ddc75 (patch)
tree913a34716580a8291465743194d2b5bbd5584a86
parentca494ce782a5bc354fa3215f19154da0b5e1385a (diff)
Remove Windows code from platform lib.
Rubber-stamped-by: Jørgen <jorgen.lind@nokia.com>
-rw-r--r--src/platformsupport/eventdispatchers/eventdispatchers.pri8
-rw-r--r--src/platformsupport/eventdispatchers/qguieventdispatcherwin32.cpp76
-rw-r--r--src/platformsupport/printersupport/printersupport.pri4
-rw-r--r--src/platformsupport/printersupport/windows/qwindowsprintersupport.cpp118
-rw-r--r--src/platformsupport/printersupport/windows/qwindowsprintersupport_p.h62
-rw-r--r--src/platformsupport/printersupport/windows/windows.pri2
6 files changed, 0 insertions, 270 deletions
diff --git a/src/platformsupport/eventdispatchers/eventdispatchers.pri b/src/platformsupport/eventdispatchers/eventdispatchers.pri
index cffbf4bc0a..38aca26b42 100644
--- a/src/platformsupport/eventdispatchers/eventdispatchers.pri
+++ b/src/platformsupport/eventdispatchers/eventdispatchers.pri
@@ -8,14 +8,6 @@ HEADERS +=\
$$PWD/qgenericunixeventdispatcher_p.h\
}
-win32 {
-SOURCES +=\
- $$PWD/qguieventdispatcherwin32.cpp
-
-HEADERS +=\
- $$PWD/qguieventdispatcherwin32_p.h
-}
-
contains(QT_CONFIG, glib) {
SOURCES +=$$PWD/qeventdispatcher_glib.cpp
HEADERS +=$$PWD/qeventdispatcher_glib_p.h
diff --git a/src/platformsupport/eventdispatchers/qguieventdispatcherwin32.cpp b/src/platformsupport/eventdispatchers/qguieventdispatcherwin32.cpp
deleted file mode 100644
index ae44a94d97..0000000000
--- a/src/platformsupport/eventdispatchers/qguieventdispatcherwin32.cpp
+++ /dev/null
@@ -1,76 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the plugins 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 "qguieventdispatcherwin32_p.h"
-
-#include <QtGui/QWindowSystemInterface>
-#include <private/qguiapplication_p.h>
-
-QT_BEGIN_NAMESPACE
-
-QGuiEventDispatcherWin32::QGuiEventDispatcherWin32(QObject *parent) :
- QEventDispatcherWin32(parent)
-{
-}
-
-bool QGuiEventDispatcherWin32::dispatchGuiEvents()
-{
- bool result = false;
- while (QWindowSystemInterfacePrivate::windowSystemEventsQueued()) {
- QWindowSystemInterfacePrivate::WindowSystemEvent * event =
- QWindowSystemInterfacePrivate::getWindowSystemEvent();
- if (!event)
- break;
-
- // send through event filter
- result = true;
- if (filterEvent(event)) {
- delete event;
- continue;
- }
- QGuiApplicationPrivate::processWindowSystemEvent(event);
- delete event;
- }
-
- return result;
-}
-
-QT_END_NAMESPACE
diff --git a/src/platformsupport/printersupport/printersupport.pri b/src/platformsupport/printersupport/printersupport.pri
index 1eca1e2d89..797ac771e7 100644
--- a/src/platformsupport/printersupport/printersupport.pri
+++ b/src/platformsupport/printersupport/printersupport.pri
@@ -1,7 +1,3 @@
unix {
include($$PWD/genericunix/genericunix.pri)
}
-
-win {
- include($$PWD/windows/windows.pri)
-}
diff --git a/src/platformsupport/printersupport/windows/qwindowsprintersupport.cpp b/src/platformsupport/printersupport/windows/qwindowsprintersupport.cpp
deleted file mode 100644
index 62449295bb..0000000000
--- a/src/platformsupport/printersupport/windows/qwindowsprintersupport.cpp
+++ /dev/null
@@ -1,118 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the plugins 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 <qwindowsprintersupport_p.h>
-#include <qprintengine_win_p.h>
-
-#include <QtGui/QPrinterInfo>
-
-#include <QtCore/QStringList>
-
-#include <QtCore/qt_windows.h>
-
-QT_BEGIN_NAMESPACE
-
-QPrintEngine *QWindowsPrinterSupport::createNativePrintEngine(QPrinter::PrinterMode mode)
-{
- return new QWin32PrintEngine(mode);
-}
-
-QPaintEngine *QWindowsPrinterSupport::createPaintEngine(QPrintEngine *engine, QPrinter::PrinterMode)
-{
- return static_cast<QWin32PrintEngine *>(engine);
-}
-
-QList<QPrinter::PaperSize> QWindowsPrinterSupport::supportedPaperSizes(const QPrinterInfo &printerInfo) const
-{
- QList<QPrinter::PaperSize> paperSizes;
- const QString printerName = printerInfo.printerName();
- const wchar_t *nameUtf16 = reinterpret_cast<const wchar_t*>(printerName.utf16());
- DWORD size = DeviceCapabilities(nameUtf16, NULL, DC_PAPERS, NULL, NULL);
- if ((int)size != -1) {
- wchar_t *papers = new wchar_t[size];
- size = DeviceCapabilities(nameUtf16, NULL, DC_PAPERS, papers, NULL);
- for (int c = 0; c < (int)size; ++c)
- paperSizes.append(mapDevmodePaperSize(papers[c]));
- delete [] papers;
- }
- return paperSizes;
-}
-
-QList<QPrinterInfo> QWindowsPrinterSupport::availablePrinters()
-{
- QList<QPrinterInfo> printers;
-
- DWORD needed = 0;
- DWORD returned = 0;
- if (!EnumPrinters(PRINTER_ENUM_LOCAL | PRINTER_ENUM_CONNECTIONS, NULL, 4, 0, 0, &needed, &returned)) {
- LPBYTE buffer = new BYTE[needed];
- if (EnumPrinters(PRINTER_ENUM_LOCAL | PRINTER_ENUM_CONNECTIONS, NULL, 4, buffer, needed, &needed, &returned)) {
- PPRINTER_INFO_4 infoList = reinterpret_cast<PPRINTER_INFO_4>(buffer);
- QPrinterInfo defPrn = defaultPrinter();
- for (uint i = 0; i < returned; ++i) {
- const QString printerName(QString::fromWCharArray(infoList[i].pPrinterName));
- const bool isDefault = printerName == defPrn.printerName();
- printers.append(QPlatformPrinterSupport::printerInfo(printerName,
- isDefault));
- }
- }
- delete [] buffer;
- }
-
- return printers;
-}
-
-QPrinterInfo QWindowsPrinterSupport::defaultPrinter()
-{
- QString noPrinters(QLatin1String("qt_no_printers"));
- wchar_t buffer[256];
- GetProfileString(L"windows", L"device", (wchar_t*)noPrinters.utf16(), buffer, 256);
- QString output = QString::fromWCharArray(buffer);
- if (output != noPrinters) {
- // Filter out the name of the printer, which should be everything before a comma.
- const QString printerName = output.split(QLatin1Char(',')).value(0);
- return QPlatformPrinterSupport::printerInfo(printerName, true);
- }
-
- return QPrinterInfo();
-}
-
-QT_END_NAMESPACE
diff --git a/src/platformsupport/printersupport/windows/qwindowsprintersupport_p.h b/src/platformsupport/printersupport/windows/qwindowsprintersupport_p.h
deleted file mode 100644
index d648846ef2..0000000000
--- a/src/platformsupport/printersupport/windows/qwindowsprintersupport_p.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the plugins 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$
-**
-****************************************************************************/
-
-#ifndef QWINDOWSPRINTERSUPPORT_H
-#define QWINDOWSPRINTERSUPPORT_H
-
-#include <QtGui/QPlatformPrinterSupport>
-
-QT_BEGIN_NAMESPACE
-
-class QWindowsPrinterSupport : public QPlatformPrinterSupport
-{
-public:
- virtual QPrintEngine *createNativePrintEngine(QPrinter::PrinterMode);
- virtual QPaintEngine *createPaintEngine(QPrintEngine *, QPrinter::PrinterMode);
-
- virtual QList<QPrinter::PaperSize> supportedPaperSizes(const QPrinterInfo &) const;
- virtual QPrinterInfo defaultPrinter();
- virtual QList<QPrinterInfo> availablePrinters();
-};
-
-QT_END_NAMESPACE
-
-#endif // QWINDOWSPRINTERSUPPORT_H
diff --git a/src/platformsupport/printersupport/windows/windows.pri b/src/platformsupport/printersupport/windows/windows.pri
deleted file mode 100644
index 69a8c47443..0000000000
--- a/src/platformsupport/printersupport/windows/windows.pri
+++ /dev/null
@@ -1,2 +0,0 @@
-HEADERS += $$PWD/qwindowsprintersupport_p.h
-SOURCES += $$PWD/qwindowsprintersupport.cpp