Changeset 846 for trunk/src/gui/kernel/qdesktopwidget_win.cpp

Timestamp:

May 5, 2011, 5:36:53 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/gui/kernel/qdesktopwidget_win.cpp (modified) (6 diffs)

trunk/src/gui/kernel/qdesktopwidget_win.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])
@@ -43 +43 @@
 #include "qt_windows.h"
 #include "qapplication_p.h"
-#include "qlibrary.h"
+#include 
 #include <qvector.h>
 #include <limits.h>
@@ -77 +77 @@
 
     typedef BOOL (WINAPI *InfoFunc)(HMONITOR, MONITORINFO*);
-    typedef BOOL (CALLBACK *EnumProc)(HMONITOR, HDC, LPRECT, LPARAM);
+    typedef BOOL (CALLBACK *EnumProc)(HMONITOR, HDC, LPRECT, LPARAM);
     typedef BOOL (WINAPI *EnumFunc)(HDC, LPCRECT, EnumProc, LPARAM);
 
@@ -108 +108 @@
 
 
-BOOL CALLBACK enumCallback(HMONITOR hMonitor, HDC, LPRECT, LPARAM)
+BOOL CALLBACK enumCallback(HMONITOR hMonitor, HDC, LPRECT, LPARAM)
 {
     QDesktopWidgetPrivate::screenCount++;
@@ -156 +156 @@
 
 #ifndef Q_OS_WINCE
-    QLibrary user32Lib(QLatin1String("user32"));
+    QLibrary user32Lib(QLatin1String("user32"));
     if (user32Lib.load()) {
         enumDisplayMonitors = (EnumFunc)user32Lib.resolve("EnumDisplayMonitors");
@@ -174 +174 @@
     getMonitorInfo = 0;
 #else
-    QLibrary coreLib(QLatin1String("coredll"));
+    QLibrary coreLib(QLatin1String("coredll"));
     if (coreLib.load()) {
         // CE >= 4.0 case