whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clean headers in the Windows plugin. 

Change-Id: Ibc6b904e6e0b21f5daa0730a7eda2cae43cd3dcf
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
bb10
Friedemann Kleint 2015-03-02 12:12:55 +01:00
parent e1ae71d3c3
commit eee4c6f190
12 changed files with 18 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/platforms/windows/qwindowsguieventdispatcher.h
View File

@ -34,11 +34,8 @@
#ifndef QWINDOWSGUIEVENTDISPATCHER_H
#define QWINDOWSGUIEVENTDISPATCHER_H
#include "qtwindowsglobal.h"
#include "qtwindows_additional.h"
#include <QtCore/QPair>
#include <QtCore/QEventLoop>
#include <QtCore/private/qeventdispatcher_win_p.h>
QT_BEGIN_NAMESPACE

1
src/plugins/platforms/windows/qwindowsintegration.h
View File

@ -35,7 +35,6 @@
#ifndef QWINDOWSINTEGRATION_H
#define QWINDOWSINTEGRATION_H
#include <QtCore/qconfig.h>
#include <qpa/qplatformintegration.h>
#include <QtCore/QScopedPointer>

1
src/plugins/platforms/windows/qwindowsmime.h
View File

@ -39,7 +39,6 @@
#include <QtCore/QVector>
#include <QtCore/QList>
#include <QtCore/QVariant>
#include <QtCore/QSharedPointer>
QT_BEGIN_NAMESPACE

2
src/plugins/platforms/windows/qwindowsnativeimage.h
View File

@ -38,8 +38,6 @@
#include <QtGui/QImage>
#include <QtCore/QtGlobal>
QT_BEGIN_NAMESPACE
class QWindowsNativeImage

5
src/plugins/platforms/windows/qwindowsnativeinterface.cpp
View File

@ -192,6 +192,11 @@ QString QWindowsNativeInterface::registerWindowClass(const QString &classNameIn,
return QWindowsContext::instance()->registerWindowClass(classNameIn, (WNDPROC)eventProc);
}
void QWindowsNativeInterface::beep()
{
MessageBeep(MB_OK); // For QApplication
}
bool QWindowsNativeInterface::asyncExpose() const
{
return QWindowsContext::instance()->asyncExpose();

3
src/plugins/platforms/windows/qwindowsnativeinterface.h
View File

@ -34,7 +34,6 @@
#ifndef QWINDOWSNATIVEINTERFACE_H
#define QWINDOWSNATIVEINTERFACE_H
#include "qtwindows_additional.h"
#include <QtGui/qpa/qplatformnativeinterface.h>
QT_BEGIN_NAMESPACE
@ -73,7 +72,7 @@ public:
Q_INVOKABLE QString registerWindowClass(const QString &classNameIn, void *eventProc) const;
Q_INVOKABLE void beep() { MessageBeep(MB_OK); } // For QApplication
Q_INVOKABLE void beep();
Q_INVOKABLE void registerWindowsMime(void *mimeIn);
Q_INVOKABLE void unregisterWindowsMime(void *mime);

3
src/plugins/platforms/windows/qwindowsole.h
View File

@ -36,12 +36,9 @@
#include "qtwindows_additional.h"
#include <QtCore/QObject>
#include <QtCore/QMap>
#include <QtCore/QPoint>
#include <QtCore/QPointer>
#include <QtCore/QVector>
#include <QtCore/QRect>
#include <objidl.h>

2
src/plugins/platforms/windows/qwindowsopengltester.h
View File

@ -34,8 +34,6 @@
#ifndef QWINDOWSOPENGLTESTER_H
#define QWINDOWSOPENGLTESTER_H
#include <qtwindowsglobal.h>
#include <QtCore/QByteArray>
#include <QtCore/QFlags>
#include <private/qversionnumber_p.h>

11
src/plugins/platforms/windows/qwindowstheme.cpp
View File

@ -62,6 +62,7 @@
#include <QtCore/QTextStream>
#include <QtCore/QSysInfo>
#include <QtCore/QCache>
#include <QtGui/QColor>
#include <QtGui/QPalette>
#include <QtGui/QGuiApplication>
#include <QtGui/QPainter>
@ -77,6 +78,16 @@
QT_BEGIN_NAMESPACE
static inline COLORREF qColorToCOLORREF(const QColor &color)
{
return RGB(color.red(), color.green(), color.blue());
}
static inline QColor COLORREFToQColor(COLORREF cr)
{
return QColor(GetRValue(cr), GetGValue(cr), GetBValue(cr));
}
static inline QTextStream& operator<<(QTextStream &str, const QColor &c)
{
str.setIntegerBase(16);

9
src/plugins/platforms/windows/qwindowstheme.h
View File

@ -35,9 +35,6 @@
#define QWINDOWSTHEME_H
#include <qpa/qplatformtheme.h>
#include <QtGui/QColor>
#include "qtwindows_additional.h"
QT_BEGIN_NAMESPACE
@ -79,12 +76,6 @@ private:
QFont *m_fonts[NFonts];
};
static inline COLORREF qColorToCOLORREF(const QColor &color)
{ return RGB(color.red(), color.green(), color.blue()); }
static inline QColor COLORREFToQColor(COLORREF cr)
{ return QColor(GetRValue(cr), GetGValue(cr), GetBValue(cr)); }
QT_END_NAMESPACE
#endif // QWINDOWSTHEME_H

1
src/plugins/platforms/windows/qwindowswindow.cpp
View File

@ -38,6 +38,7 @@
#include "qwindowsscreen.h"
#include "qwindowsscaling.h"
#include "qwindowsintegration.h"
#include "qwindowsopenglcontext.h"
#ifdef QT_NO_CURSOR
# include "qwindowscursor.h"
#endif

1
src/plugins/platforms/windows/qwindowswindow.h
View File

@ -40,7 +40,6 @@
#endif
#include "qwindowsscaling.h"
#include "qwindowscursor.h"
#include "qwindowsopenglcontext.h"
#include <qpa/qplatformwindow.h>
#include <QtPlatformHeaders/qwindowswindowfunctions.h>