More QApplication prefixes changed.

diff --git a/src/gui/guikernel/qcursor.cpp b/src/gui/guikernel/qcursor.cpp
index c2f92b4..be533a3 100644 (file)
--- a/src/gui/guikernel/qcursor.cpp
+++ b/src/gui/guikernel/qcursor.cpp
@@ -71,7 +71,7 @@ QT_BEGIN_NAMESPACE
 
     To associate a cursor with a widget, use QWidget::setCursor(). To
     associate a cursor with all widgets (normally for a short period
-    of time), use QApplication::setOverrideCursor().
+    of time), use QGuiApplication::setOverrideCursor().
 
     To set a cursor shape use QCursor::setShape() or use the QCursor
     constructor which takes the shape as argument, or you can use one
@@ -85,9 +85,9 @@ QT_BEGIN_NAMESPACE
     methods QCursor::pos() and QCursor::setPos().
 
     \bold{Note:} It is possible to create a QCursor before
-    QApplication, but it is not useful except as a place-holder for a
-    real QCursor created after QApplication. Attempting to use a
-    QCursor that was created before QApplication will result in a
+    QGuiApplication, but it is not useful except as a place-holder for a
+    real QCursor created after QGuiApplication. Attempting to use a
+    QCursor that was created before QGuiApplication will result in a
     crash.
 
     \section1 A Note for X11 Users

diff --git a/src/gui/guikernel/qguiapplication.cpp b/src/gui/guikernel/qguiapplication.cpp
index e9e1402..0962e62 100644 (file)
--- a/src/gui/guikernel/qguiapplication.cpp
+++ b/src/gui/guikernel/qguiapplication.cpp
@@ -111,7 +111,7 @@ QFont *QGuiApplicationPrivate::app_font = 0;
 static bool qt_detectRTLLanguage()
 {
     return force_reverse ^
-        (QApplication::tr("QT_LAYOUT_DIRECTION",
+        (QCoreApplication::tr("QT_LAYOUT_DIRECTION",
                          "Translate this string to the string 'LTR' in left-to-right"
                          " languages or to 'RTL' in right-to-left languages (such as Hebrew"
                          " and Arabic) to get proper widget layout.") == QLatin1String("RTL"));
@@ -811,7 +811,7 @@ QClipboard * QGuiApplication::clipboard()
 {
     if (QGuiApplicationPrivate::qt_clipboard == 0) {
         if (!qApp) {
-            qWarning("QApplication: Must construct a QApplication before accessing a QClipboard");
+            qWarning("QGuiApplication: Must construct a QGuiApplication before accessing a QClipboard");
             return 0;
         }
         QGuiApplicationPrivate::qt_clipboard = new QClipboard(0);

diff --git a/src/gui/guikernel/qsessionmanager.h b/src/gui/guikernel/qsessionmanager.h
index bd851b8..66ca0b8 100644 (file)
--- a/src/gui/guikernel/qsessionmanager.h
+++ b/src/gui/guikernel/qsessionmanager.h
@@ -61,7 +61,7 @@ class Q_GUI_EXPORT  QSessionManager : public QObject
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(QSessionManager)
-    QSessionManager(QApplication *app, QString &id, QString &key);
+    QSessionManager(QGuiApplication *app, QString &id, QString &key);
     ~QSessionManager();
 public:
     QString sessionId() const;

diff --git a/src/gui/guikernel/qsessionmanager_qpa.cpp b/src/gui/guikernel/qsessionmanager_qpa.cpp
index 0730204..f6879f9 100644 (file)
--- a/src/gui/guikernel/qsessionmanager_qpa.cpp
+++ b/src/gui/guikernel/qsessionmanager_qpa.cpp
@@ -69,7 +69,7 @@ QSessionManagerPrivate::QSessionManagerPrivate(QSessionManager*,
 {
 }
 
-QSessionManager::QSessionManager(QApplication *app, QString &id, QString &key)
+QSessionManager::QSessionManager(QGuiApplication *app, QString &id, QString &key)
     : QObject(*(new QSessionManagerPrivate(this, id, key)), app)
 {
     Q_D(QSessionManager);

diff --git a/src/gui/guikernel/qshortcutmap.cpp b/src/gui/guikernel/qshortcutmap.cpp
index 32b70ed..d6baa13 100644 (file)
--- a/src/gui/guikernel/qshortcutmap.cpp
+++ b/src/gui/guikernel/qshortcutmap.cpp
@@ -876,7 +876,7 @@ void QShortcutMap::dispatchEvent(QKeyEvent *e)
         << (bool)(enabledShortcuts>1) << ") to object(" << next->owner << ')';
 #endif
     QShortcutEvent se(next->keyseq, next->id, enabledShortcuts>1);
-    QApplication::sendEvent(const_cast<QObject *>(next->owner), &se);
+    QCoreApplication::sendEvent(const_cast<QObject *>(next->owner), &se);
 }
 
 /* \internal

diff --git a/src/gui/guikernel/qwindowsysteminterface_qpa.cpp b/src/gui/guikernel/qwindowsysteminterface_qpa.cpp
index 5fd7d76..6c6edb5 100644 (file)
--- a/src/gui/guikernel/qwindowsysteminterface_qpa.cpp
+++ b/src/gui/guikernel/qwindowsysteminterface_qpa.cpp
@@ -187,7 +187,7 @@ void QWindowSystemInterfacePrivate::queueWindowSystemEvent(QWindowSystemInterfac
     windowSystemEventQueue.append(ev);
     queueMutex.unlock();
 
-    QAbstractEventDispatcher *dispatcher = QApplicationPrivate::qt_qpa_core_dispatcher();
+    QAbstractEventDispatcher *dispatcher = QGuiApplicationPrivate::qt_qpa_core_dispatcher();
     if (dispatcher)
         dispatcher->wakeUp();
 }