From 20beb5ff538a4de73b7430583829089e39024d05 Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Mon, 30 Jan 2012 11:26:27 +0100 Subject: Windows: Fix compilation with -qtnamespace Change-Id: Ib006d74299d65e5872a5a524eaa937e127306ec7 Reviewed-by: Friedemann Kleint --- src/corelib/tools/qelapsedtimer_win.cpp | 6 +++--- src/gui/text/qfontengine_ft.cpp | 3 ++- src/platformsupport/fontdatabases/basic/qbasicfontdatabase.cpp | 7 ++++++- src/platformsupport/fontdatabases/basic/qbasicfontdatabase_p.h | 4 ++++ src/plugins/platforms/windows/qwindowsaccessibility.h | 6 ++++++ src/plugins/platforms/windows/qwindowsfontengine.cpp | 2 -- src/plugins/platforms/windows/qwindowsscreen.cpp | 4 ++-- src/plugins/printsupport/windows/qwindowsprintersupport.cpp | 4 ++++ src/plugins/printsupport/windows/qwindowsprintersupport.h | 5 +++++ src/widgets/dialogs/qwizard_win.cpp | 4 ++-- src/widgets/itemviews/qfileiconprovider.cpp | 6 ++++-- 11 files changed, 38 insertions(+), 13 deletions(-) diff --git a/src/corelib/tools/qelapsedtimer_win.cpp b/src/corelib/tools/qelapsedtimer_win.cpp index 1dee7d3e06..aba61f48eb 100644 --- a/src/corelib/tools/qelapsedtimer_win.cpp +++ b/src/corelib/tools/qelapsedtimer_win.cpp @@ -42,14 +42,14 @@ #include "qelapsedtimer.h" #include -// Result of QueryPerformanceFrequency, 0 indicates that the high resolution timer is unavailable -static quint64 counterFrequency = 0; - typedef ULONGLONG (WINAPI *PtrGetTickCount64)(void); static PtrGetTickCount64 ptrGetTickCount64 = 0; QT_BEGIN_NAMESPACE +// Result of QueryPerformanceFrequency, 0 indicates that the high resolution timer is unavailable +static quint64 counterFrequency = 0; + static void resolveLibs() { static bool done = false; diff --git a/src/gui/text/qfontengine_ft.cpp b/src/gui/text/qfontengine_ft.cpp index ca1d6bbc50..cecf9d1feb 100644 --- a/src/gui/text/qfontengine_ft.cpp +++ b/src/gui/text/qfontengine_ft.cpp @@ -205,6 +205,8 @@ HB_Error QFreetypeFace::getPointInOutline(HB_Glyph glyph, int flags, hb_uint32 p return HB_Err_Ok; } +extern QByteArray qt_fontdata_from_index(int); + /* * One font file can contain more than one font (bold/italic for example) * find the right one and return it. @@ -232,7 +234,6 @@ QFreetypeFace *QFreetypeFace::getFace(const QFontEngine::FaceId &face_id, QFile file(QString::fromUtf8(face_id.filename)); if (face_id.filename.startsWith(":qmemoryfonts/")) { // from qfontdatabase.cpp - extern QByteArray qt_fontdata_from_index(int); QByteArray idx = face_id.filename; idx.remove(0, 14); // remove ':qmemoryfonts/' bool ok = false; diff --git a/src/platformsupport/fontdatabases/basic/qbasicfontdatabase.cpp b/src/platformsupport/fontdatabases/basic/qbasicfontdatabase.cpp index e10be2da17..5cfbc6cb4f 100644 --- a/src/platformsupport/fontdatabases/basic/qbasicfontdatabase.cpp +++ b/src/platformsupport/fontdatabases/basic/qbasicfontdatabase.cpp @@ -56,6 +56,8 @@ #include #include FT_TRUETYPE_TABLES_H +QT_BEGIN_NAMESPACE + #define SimplifiedChineseCsbBit 18 #define TraditionalChineseCsbBit 20 #define JapaneseCsbBit 17 @@ -322,9 +324,10 @@ void QBasicFontDatabase::releaseHandle(void *handle) delete file; } +extern FT_Library qt_getFreetype(); + QStringList QBasicFontDatabase::addTTFile(const QByteArray &fontData, const QByteArray &file) { - extern FT_Library qt_getFreetype(); FT_Library library = qt_getFreetype(); int index = 0; @@ -425,3 +428,5 @@ QStringList QBasicFontDatabase::addTTFile(const QByteArray &fontData, const QByt } while (index < numFaces); return families; } + +QT_END_NAMESPACE diff --git a/src/platformsupport/fontdatabases/basic/qbasicfontdatabase_p.h b/src/platformsupport/fontdatabases/basic/qbasicfontdatabase_p.h index 5cfb1e72ab..fd6e180c75 100644 --- a/src/platformsupport/fontdatabases/basic/qbasicfontdatabase_p.h +++ b/src/platformsupport/fontdatabases/basic/qbasicfontdatabase_p.h @@ -46,6 +46,8 @@ #include #include +QT_BEGIN_NAMESPACE + struct FontFile { QString fileName; @@ -66,4 +68,6 @@ public: static QSupportedWritingSystems determineWritingSystemsFromTrueTypeBits(quint32 unicodeRange[4], quint32 codePageRange[2]); }; +QT_END_NAMESPACE + #endif // QBASICFONTDATABASE_H diff --git a/src/plugins/platforms/windows/qwindowsaccessibility.h b/src/plugins/platforms/windows/qwindowsaccessibility.h index addd748523..9294f23565 100644 --- a/src/plugins/platforms/windows/qwindowsaccessibility.h +++ b/src/plugins/platforms/windows/qwindowsaccessibility.h @@ -45,6 +45,9 @@ #include "qtwindowsglobal.h" #include +QT_BEGIN_HEADER +QT_BEGIN_NAMESPACE + class QWindowsAccessibility : public QPlatformAccessibility { public: @@ -58,4 +61,7 @@ public: */ }; +QT_END_NAMESPACE +QT_END_HEADER + #endif // QWINDOWSACCESSIBILITY_H diff --git a/src/plugins/platforms/windows/qwindowsfontengine.cpp b/src/plugins/platforms/windows/qwindowsfontengine.cpp index 8fcfac876e..ffa57ad58f 100644 --- a/src/plugins/platforms/windows/qwindowsfontengine.cpp +++ b/src/plugins/platforms/windows/qwindowsfontengine.cpp @@ -89,8 +89,6 @@ QT_BEGIN_NAMESPACE // common DC for all fonts -QT_BEGIN_NAMESPACE - typedef BOOL (WINAPI *PtrGetCharWidthI)(HDC, UINT, UINT, LPWORD, LPINT); static PtrGetCharWidthI ptrGetCharWidthI = 0; static bool resolvedGetCharWidthI = false; diff --git a/src/plugins/platforms/windows/qwindowsscreen.cpp b/src/plugins/platforms/windows/qwindowsscreen.cpp index 8efb0aab0e..1dc5175515 100644 --- a/src/plugins/platforms/windows/qwindowsscreen.cpp +++ b/src/plugins/platforms/windows/qwindowsscreen.cpp @@ -159,10 +159,10 @@ QWindowsScreen::QWindowsScreen(const QWindowsScreenData &data) : { } +Q_GUI_EXPORT QPixmap qt_pixmapFromWinHBITMAP(HBITMAP bitmap, int hbitmapFormat = 0); + QPixmap QWindowsScreen::grabWindow(WId window, int x, int y, int width, int height) const { - Q_GUI_EXPORT QPixmap qt_pixmapFromWinHBITMAP(HBITMAP bitmap, int hbitmapFormat = 0); - if (QWindowsContext::verboseIntegration) qDebug() << __FUNCTION__ << window << x << y << width << height; RECT r; diff --git a/src/plugins/printsupport/windows/qwindowsprintersupport.cpp b/src/plugins/printsupport/windows/qwindowsprintersupport.cpp index 48313ce889..9444038997 100644 --- a/src/plugins/printsupport/windows/qwindowsprintersupport.cpp +++ b/src/plugins/printsupport/windows/qwindowsprintersupport.cpp @@ -47,6 +47,8 @@ #include #include +QT_BEGIN_NAMESPACE + QWindowsPrinterSupport::QWindowsPrinterSupport() : QPlatformPrinterSupport() { @@ -100,3 +102,5 @@ QList QWindowsPrinterSupport::availablePrinters() { return mPrinterList; } + +QT_END_NAMESPACE diff --git a/src/plugins/printsupport/windows/qwindowsprintersupport.h b/src/plugins/printsupport/windows/qwindowsprintersupport.h index 8510a4228c..35d794aaea 100644 --- a/src/plugins/printsupport/windows/qwindowsprintersupport.h +++ b/src/plugins/printsupport/windows/qwindowsprintersupport.h @@ -45,6 +45,8 @@ #include #include +QT_BEGIN_HEADER +QT_BEGIN_NAMESPACE class QWin32PrintEngine; @@ -65,4 +67,7 @@ private: QPrinter::PrinterMode mCurrentMode; }; +QT_END_NAMESPACE +QT_END_HEADER + #endif // WINDOWSPRINTERSUPPORT_H diff --git a/src/widgets/dialogs/qwizard_win.cpp b/src/widgets/dialogs/qwizard_win.cpp index d60a47f2c2..2c4c738681 100644 --- a/src/widgets/dialogs/qwizard_win.cpp +++ b/src/widgets/dialogs/qwizard_win.cpp @@ -318,10 +318,10 @@ bool QVistaHelper::setDWMTitleBar(TitleBarChangeType type) return value; } +Q_GUI_EXPORT HICON qt_pixmapToWinHICON(const QPixmap &); + void QVistaHelper::drawTitleBar(QPainter *painter) { - Q_GUI_EXPORT HICON qt_pixmapToWinHICON(const QPixmap &); - Q_ASSERT(backButton_); QPlatformNativeInterface *nativeInterface = QGuiApplication::platformNativeInterface(); QBackingStore *backingStore = backButton_->backingStore(); diff --git a/src/widgets/itemviews/qfileiconprovider.cpp b/src/widgets/itemviews/qfileiconprovider.cpp index a6683758fc..0da942eba0 100644 --- a/src/widgets/itemviews/qfileiconprovider.cpp +++ b/src/widgets/itemviews/qfileiconprovider.cpp @@ -52,8 +52,6 @@ # include # include -Q_GUI_EXPORT QPixmap qt_pixmapFromWinHICON(HICON icon); - #elif defined(Q_WS_MAC) # include #endif @@ -73,6 +71,10 @@ Q_GUI_EXPORT QPixmap qt_pixmapFromWinHICON(HICON icon); QT_BEGIN_NAMESPACE +#if defined (Q_OS_WIN) +Q_GUI_EXPORT QPixmap qt_pixmapFromWinHICON(HICON icon); +#endif + /*! \class QFileIconProvider -- cgit v1.2.3