Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt

Conflicts:
	src/corelib/kernel/qcoreevent.h
	src/gui/graphicsview/qgraphicsitem_p.h

8 files changed, 27 insertions, 41 deletions

diff --git a/src/gui/kernel/qapplication.cpp b/src/gui/kernel/qapplication.cpp
index b142f2e..307d0ad 100644
--- a/src/gui/kernel/qapplication.cpp
+++ b/src/gui/kernel/qapplication.cpp
@@ -853,6 +853,9 @@ void QApplicationPrivate::initialize()
     // trigger registering of QVariant's GUI types
     extern int qRegisterGuiVariant();
     qRegisterGuiVariant();
+    // trigger registering of QStateMachine's GUI types
+    extern int qRegisterGuiStateMachine();
+    qRegisterGuiStateMachine();
 
     is_app_running = true; // no longer starting up
 
@@ -1074,6 +1077,9 @@ QApplication::~QApplication()
     QApplicationPrivate::fade_tooltip = false;
     QApplicationPrivate::widgetCount = false;
 
+    // trigger unregistering of QStateMachine's GUI types
+    extern int qUnregisterGuiStateMachine();
+    qUnregisterGuiStateMachine();
     // trigger unregistering of QVariant's GUI types
     extern int qUnregisterGuiVariant();
     qUnregisterGuiVariant();
diff --git a/src/gui/kernel/qapplication_win.cpp b/src/gui/kernel/qapplication_win.cpp
index f537805..f134e55 100644
--- a/src/gui/kernel/qapplication_win.cpp
+++ b/src/gui/kernel/qapplication_win.cpp
@@ -410,11 +410,6 @@ QRgb qt_colorref2qrgb(COLORREF col)
   Internal variables and functions
  *****************************************************************************/
 
-extern Q_CORE_EXPORT char      theAppName[];
-extern Q_CORE_EXPORT char      appFileName[];
-extern Q_CORE_EXPORT HINSTANCE appInst;                        // handle to app instance
-extern Q_CORE_EXPORT HINSTANCE appPrevInst;                        // handle to prev app instance
-extern Q_CORE_EXPORT int appCmdShow;                                // main window show command
 static HWND         curWin                = 0;                // current window
 static HDC         displayDC        = 0;                // display device context
 
@@ -786,20 +781,11 @@ void qt_init(QApplicationPrivate *priv, int)
         priv->argc = j;
     }
 
-    // Get the application name/instance if qWinMain() was not invoked
 #ifndef Q_WS_WINCE
     // No message boxes but important ones
     SetErrorMode(SetErrorMode(0) | SEM_FAILCRITICALERRORS|SEM_NOOPENFILEERRORBOX);
 #endif
 
-    if (appInst == 0) {
-        QT_WA({
-            appInst = GetModuleHandle(0);
-        }, {
-            appInst = GetModuleHandleA(0);
-        });
-    }
-
 #ifndef Q_WS_WINCE
     // Initialize OLE/COM
     //         S_OK means success and S_FALSE means that it has already
@@ -824,7 +810,7 @@ void qt_init(QApplicationPrivate *priv, int)
 #ifndef QT_NO_CURSOR
     QCursorData::initialize();
 #endif
-    qApp->setObjectName(QLatin1String(theAppName));
+    qApp->setObjectName(priv->appName());
 
 #if !defined(Q_WS_WINCE)
     // default font
@@ -924,12 +910,6 @@ void qt_cleanup()
   Platform specific global and internal functions
  *****************************************************************************/
 
-Q_GUI_EXPORT int qWinAppCmdShow()                        // get main window show command
-{
-    return appCmdShow;
-}
-
-
 Q_GUI_EXPORT HDC qt_win_display_dc()                        // get display DC
 {
     Q_ASSERT(qApp && qApp->thread() == QThread::currentThread());
@@ -1025,11 +1005,11 @@ const QString qt_reg_winclass(QWidget *w)        // register window class
     if (classExists == -1) {
         QT_WA({
             WNDCLASS wcinfo;
-            classExists = GetClassInfo((HINSTANCE)qWinAppInst(), (TCHAR*)cname.utf16(), &wcinfo);
+            classExists = GetClassInfo(qWinAppInst(), (TCHAR*)cname.utf16(), &wcinfo);
             classExists = classExists && wcinfo.lpfnWndProc != QtWndProc;
         }, {
             WNDCLASSA wcinfo;
-            classExists = GetClassInfoA((HINSTANCE)qWinAppInst(), cname.toLatin1(), &wcinfo);
+            classExists = GetClassInfoA(qWinAppInst(), cname.toLatin1(), &wcinfo);
             classExists = classExists && wcinfo.lpfnWndProc != QtWndProc;
         });
     }
@@ -1049,9 +1029,9 @@ const QString qt_reg_winclass(QWidget *w)        // register window class
         wc.lpfnWndProc        = (WNDPROC)QtWndProc;
         wc.cbClsExtra        = 0;
         wc.cbWndExtra        = 0;
-        wc.hInstance        = (HINSTANCE)qWinAppInst();
+        wc.hInstance        = qWinAppInst();
         if (icon) {
-            wc.hIcon = LoadIcon(appInst, L"IDI_ICON1");
+            wc.hIcon = LoadIcon(qWinAppInst(), L"IDI_ICON1");
             if (!wc.hIcon)
                 wc.hIcon = LoadIcon(0, IDI_APPLICATION);
         } else {
@@ -1068,9 +1048,9 @@ const QString qt_reg_winclass(QWidget *w)        // register window class
         wc.lpfnWndProc        = (WNDPROC)QtWndProc;
         wc.cbClsExtra        = 0;
         wc.cbWndExtra        = 0;
-        wc.hInstance        = (HINSTANCE)qWinAppInst();
+        wc.hInstance        = qWinAppInst();
         if (icon) {
-            wc.hIcon = LoadIconA(appInst, (char*)"IDI_ICON1");
+            wc.hIcon = LoadIconA(qWinAppInst(), (char*)"IDI_ICON1");
             if (!wc.hIcon)
                 wc.hIcon = LoadIconA(0, (char*)IDI_APPLICATION);
         } else {
@@ -1089,9 +1069,9 @@ const QString qt_reg_winclass(QWidget *w)        // register window class
         wc.lpfnWndProc        = (WNDPROC)QtWndProc;
         wc.cbClsExtra        = 0;
         wc.cbWndExtra        = 0;
-        wc.hInstance        = (HINSTANCE)qWinAppInst();
+        wc.hInstance        = qWinAppInst();
         if (icon) {
-            wc.hIcon = LoadIcon(appInst, L"IDI_ICON1");
+            wc.hIcon = LoadIcon(qWinAppInst(), L"IDI_ICON1");
 //            if (!wc.hIcon)
 //                wc.hIcon = LoadIcon(0, IDI_APPLICATION);
         } else {
@@ -1125,9 +1105,9 @@ static void unregWinClasses()
     QHash<QString, int>::ConstIterator it = hash->constBegin();
     while (it != hash->constEnd()) {
         QT_WA({
-            UnregisterClass((TCHAR*)it.key().utf16(), (HINSTANCE)qWinAppInst());
+            UnregisterClass((TCHAR*)it.key().utf16(), qWinAppInst());
         } , {
-            UnregisterClassA(it.key().toLatin1(), (HINSTANCE)qWinAppInst());
+            UnregisterClassA(it.key().toLatin1(), qWinAppInst());
         });
         ++it;
     }
diff --git a/src/gui/kernel/qevent.cpp b/src/gui/kernel/qevent.cpp
index d616e5e..53010e1 100644
--- a/src/gui/kernel/qevent.cpp
+++ b/src/gui/kernel/qevent.cpp
@@ -3083,7 +3083,7 @@ QDebug operator<<(QDebug dbg, const QEvent *e) {
                       << ", " << me->button()
                       << ", " << hex << (int)me->buttons()
                       << ", " << hex << (int)me->modifiers()
-                      << ")";
+                      << ')';
     }
     return dbg.space();
 
@@ -3104,7 +3104,7 @@ QDebug operator<<(QDebug dbg, const QEvent *e) {
 #ifndef QT_NO_WHEELEVENT
     case QEvent::Wheel:
         dbg.nospace() << "QWheelEvent("  << static_cast<const QWheelEvent *>(e)->delta()
-                      << ")";
+                      << ')';
         return dbg.space();
 #endif
     case QEvent::KeyPress:
@@ -3130,7 +3130,7 @@ QDebug operator<<(QDebug dbg, const QEvent *e) {
                           << ", \"" << ke->text()
                           << "\", " << ke->isAutoRepeat()
                           << ", " << ke->count()
-                          << ")";
+                          << ')';
         }
         return dbg.space();
     case QEvent::FocusIn:
diff --git a/src/gui/kernel/qlayoutengine.cpp b/src/gui/kernel/qlayoutengine.cpp
index fbaa388..3673f08 100644
--- a/src/gui/kernel/qlayoutengine.cpp
+++ b/src/gui/kernel/qlayoutengine.cpp
@@ -329,7 +329,7 @@ void qGeomCalc(QVector<QLayoutStruct> &chain, int start, int count,
     qDebug() << "qGeomCalc" << "start" << start <<  "count" << count <<  "pos" << pos
              <<  "space" << space <<  "spacer" << spacer;
     for (i = start; i < start + count; ++i) {
-        qDebug() << i << ":" << chain[i].minimumSize << chain[i].smartSizeHint()
+        qDebug() << i << ':' << chain[i].minimumSize << chain[i].smartSizeHint()
                  << chain[i].maximumSize << "stretch" << chain[i].stretch
                  << "empty" << chain[i].empty << "expansive" << chain[i].expansive
                  << "spacing" << chain[i].spacing;
diff --git a/src/gui/kernel/qmime_win.cpp b/src/gui/kernel/qmime_win.cpp
index cd0aae6..109ce20 100644
--- a/src/gui/kernel/qmime_win.cpp
+++ b/src/gui/kernel/qmime_win.cpp
@@ -852,7 +852,7 @@ QVariant QWindowsMimeHtml::convertToMime(const QString &mime, IDataObject *pData
         if (end > start && start > 0) {
             html = "<!--StartFragment-->" + html.mid(start, end - start);
             html += "<!--EndFragment-->";
-            html.replace("\r", "");
+            html.replace('\r', "");
             result = QString::fromUtf8(html);
         }
     }
diff --git a/src/gui/kernel/qshortcutmap.cpp b/src/gui/kernel/qshortcutmap.cpp
index f998bb2..3c2fcdd 100644
--- a/src/gui/kernel/qshortcutmap.cpp
+++ b/src/gui/kernel/qshortcutmap.cpp
@@ -109,7 +109,7 @@ QDebug &operator<<(QDebug &dbg, const QShortcutEntry *se) {
     dbg.nospace()
         << "QShortcutEntry(" << se->keyseq
         << "), id(" << se->id << "), enabled(" << se->enabled << "), autorepeat(" << se->autorepeat
-        << "), owner(" << se->owner << ")";
+        << "), owner(" << se->owner << ')';
     return dbg.space();
 }
 #endif // QT_NO_DEBUGSTREAM
@@ -876,7 +876,7 @@ void QShortcutMap::dispatchEvent(QKeyEvent *e)
     qDebug().nospace()
         << "QShortcutMap::dispatchEvent(): Sending QShortcutEvent(\""
         << (QString)next->keyseq << "\", " << next->id << ", "
-        << (bool)(enabledShortcuts>1) << ") to object(" << next->owner << ")";
+        << (bool)(enabledShortcuts>1) << ") to object(" << next->owner << ')';
 #endif
     QShortcutEvent se(next->keyseq, next->id, enabledShortcuts>1);
     QApplication::sendEvent(const_cast<QObject *>(next->owner), &se);
diff --git a/src/gui/kernel/qwidget.cpp b/src/gui/kernel/qwidget.cpp
index 4b2fed7..7b1b38c 100644
--- a/src/gui/kernel/qwidget.cpp
+++ b/src/gui/kernel/qwidget.cpp
@@ -5239,7 +5239,7 @@ static QString constructWindowTitleFromFilePath(const QString &filePath)
 #ifndef Q_WS_MAC
     QString appName = QApplication::applicationName();
     if (!appName.isEmpty())
-        windowTitle += QLatin1String(" ") + QChar(0x2014) + QLatin1String(" ") + appName;
+        windowTitle += QLatin1Char(' ') + QChar(0x2014) + QLatin1Char(' ') + appName;
 #endif
     return windowTitle;
 }
@@ -5303,7 +5303,7 @@ QString qt_setWindowTitle_helperHelper(const QString &title, const QWidget *widg
              && widget->style()->styleHint(QStyle::SH_TitleBar_ModifyNotification, 0, widget))
                 cap.replace(lastIndex, 3, QWidget::tr("*"));
             else
-                cap.replace(lastIndex, 3, QLatin1String(""));
+                cap.remove(lastIndex, 3);
         }
 
         index = cap.indexOf(placeHolder, index);
diff --git a/src/gui/kernel/qwindowdefs_win.h b/src/gui/kernel/qwindowdefs_win.h
index 3899c23..a24afd4 100644
--- a/src/gui/kernel/qwindowdefs_win.h
+++ b/src/gui/kernel/qwindowdefs_win.h
@@ -122,7 +122,7 @@ QT_BEGIN_NAMESPACE
 
 Q_CORE_EXPORT HINSTANCE qWinAppInst();
 Q_CORE_EXPORT HINSTANCE qWinAppPrevInst();
-Q_GUI_EXPORT int           qWinAppCmdShow();
+Q_CORE_EXPORT int       qWinAppCmdShow();
 Q_GUI_EXPORT HDC           qt_win_display_dc();
 
 QT_END_NAMESPACE