Remove more QApp dependencies

platformIntegration() lives in QGuiApplication
QFont and QFontDatabase can live with QGuiApp only
as well.

4 files changed, 44 insertions, 61 deletions

diff --git a/src/gui/text/qfont.cpp b/src/gui/text/qfont.cpp
index f2e76531d9..dd5dfdaf81 100644
--- a/src/gui/text/qfont.cpp
+++ b/src/gui/text/qfont.cpp
@@ -48,7 +48,7 @@
 #include "qpainter.h"
 #include "qhash.h"
 #include "qdatastream.h"
-#include "qapplication.h"
+#include "qguiapplication.h"
 #include "qstringlist.h"
 
 #include "qthread.h"
@@ -77,7 +77,7 @@
 #endif
 #ifdef Q_WS_QPA
 #include <QtGui/qplatformscreen_qpa.h>
-#include <QtGui/private/qapplication_p.h>
+#include <QtGui/private/qguiapplication_p.h>
 #endif
 
 #include <QMutexLocker>
@@ -180,9 +180,9 @@ Q_GUI_EXPORT int qt_defaultDpiX()
         screen = subScreens.at(0);
     dpi = qRound(screen->width() / (screen->physicalWidth() / qreal(25.4)));
 #elif defined(Q_WS_QPA)
-    QPlatformIntegration *pi = QApplicationPrivate::platformIntegration();
+    QPlatformIntegration *pi = QGuiApplicationPrivate::platformIntegration();
     if (pi) {
-        QPlatformScreen *screen = QApplicationPrivate::platformIntegration()->screens().at(0);
+        QPlatformScreen *screen = pi->screens().at(0);
         const QSize screenSize = screen->geometry().size();
         const QSize physicalSize = screen->physicalSize();
         dpi = qRound(screenSize.width() / (physicalSize.width() / qreal(25.4)));
@@ -219,9 +219,9 @@ Q_GUI_EXPORT int qt_defaultDpiY()
         screen = subScreens.at(0);
     dpi = qRound(screen->height() / (screen->physicalHeight() / qreal(25.4)));
 #elif defined(Q_WS_QPA)
-    QPlatformIntegration *pi = QApplicationPrivate::platformIntegration();
+    QPlatformIntegration *pi = QGuiApplicationPrivate::platformIntegration();
     if (pi) {
-        QPlatformScreen *screen = QApplicationPrivate::platformIntegration()->screens().at(0);
+        QPlatformScreen *screen = pi->screens().at(0);
         const QSize screenSize = screen->geometry().size();
         const QSize physicalSize = screen->physicalSize();
         dpi = qRound(screenSize.height() / (physicalSize.height() / qreal(25.4)));
@@ -448,9 +448,9 @@ QFontEngineData::~QFontEngineData()
     Use QFontMetrics to get measurements, e.g. the pixel length of a
     string using QFontMetrics::width().
 
-    Note that a QApplication instance must exist before a QFont can be
+    Note that a QGuiApplication instance must exist before a QFont can be
     used. You can set the application's default font with
-    QApplication::setFont().
+    QGuiApplication::setFont().
 
     If a chosen font does not include all the characters that
     need to be displayed, QFont will try to find the characters in the
@@ -781,10 +781,10 @@ void QFont::detach()
 /*!
     Constructs a font object that uses the application's default font.
 
-    \sa QApplication::setFont(), QApplication::font()
+    \sa QGuiApplication::setFont(), QGuiApplication::font()
 */
 QFont::QFont()
-    : d(QApplication::font().d.data()), resolve_mask(0)
+    : d(QGuiApplication::font().d.data()), resolve_mask(0)
 {
 }
 
@@ -804,7 +804,7 @@ QFont::QFont()
     algorithm.
 
     \sa Weight, setFamily(), setPointSize(), setWeight(), setItalic(),
-    setStyleHint() QApplication::font()
+    setStyleHint() QGuiApplication::font()
 */
 QFont::QFont(const QString &family, int pointSize, int weight, bool italic)
     : d(new QFontPrivate()), resolve_mask(QFont::FamilyResolved)
diff --git a/src/gui/text/qfont_qpa.cpp b/src/gui/text/qfont_qpa.cpp
index ff12da8d97..981c313201 100644
--- a/src/gui/text/qfont_qpa.cpp
+++ b/src/gui/text/qfont_qpa.cpp
@@ -39,14 +39,14 @@
 **
 ****************************************************************************/
 
-#include <QtGui/private/qapplication_p.h>
+#include <QtGui/private/qguiapplication_p.h>
 #include <QtGui/QPlatformFontDatabase>
 
 QT_BEGIN_NAMESPACE
 
 void QFont::initialize()
 {
-    QApplicationPrivate::platformIntegration()->fontDatabase()->populateFontDatabase();
+    QGuiApplicationPrivate::platformIntegration()->fontDatabase()->populateFontDatabase();
 }
 
 void QFont::cleanup()
@@ -90,7 +90,7 @@ QString QFont::defaultFamily() const
             familyName = QString::fromLatin1("helvetica");
     }
 
-    QStringList list = QApplicationPrivate::platformIntegration()->fontDatabase()->fallbacksForFamily(familyName,QFont::StyleNormal,QFont::StyleHint(d->request.styleHint),QUnicodeTables::Common);
+    QStringList list = QGuiApplicationPrivate::platformIntegration()->fontDatabase()->fallbacksForFamily(familyName,QFont::StyleNormal,QFont::StyleHint(d->request.styleHint),QUnicodeTables::Common);
     if (list.size()) {
         familyName = list.at(0);
     }
diff --git a/src/gui/text/qfontdatabase.cpp b/src/gui/text/qfontdatabase.cpp
index 36b0ea9b68..0381286f10 100644
--- a/src/gui/text/qfontdatabase.cpp
+++ b/src/gui/text/qfontdatabase.cpp
@@ -43,7 +43,7 @@
 #include "qfontdatabase.h"
 #include "qdebug.h"
 #include "qalgorithms.h"
-#include "qapplication.h"
+#include "qguiapplication.h"
 #include "qvarlengtharray.h" // here or earlier - workaround for VC++6
 #include "qthread.h"
 #include "qmutex.h"
@@ -51,7 +51,7 @@
 #include "qfontengine_p.h"
 
 #ifdef Q_WS_QPA
-#include <QtGui/private/qapplication_p.h>
+#include <QtGui/private/qguiapplication_p.h>
 #include <QtGui/qplatformfontdatabase_qpa.h>
 #include "qabstractfileengine.h"
 #endif
@@ -103,34 +103,34 @@ static int getFontWeight(const QString &weightString)
     // Test in decreasing order of commonness
     if (s == QLatin1String("medium") ||
         s == QLatin1String("normal")
-        || s.compare(QApplication::translate("QFontDatabase", "Normal"), Qt::CaseInsensitive) == 0)
+        || s.compare(QCoreApplication::translate("QFontDatabase", "Normal"), Qt::CaseInsensitive) == 0)
         return QFont::Normal;
     if (s == QLatin1String("bold")
-        || s.compare(QApplication::translate("QFontDatabase", "Bold"), Qt::CaseInsensitive) == 0)
+        || s.compare(QCoreApplication::translate("QFontDatabase", "Bold"), Qt::CaseInsensitive) == 0)
         return QFont::Bold;
     if (s == QLatin1String("demibold") || s == QLatin1String("demi bold")
-        || s.compare(QApplication::translate("QFontDatabase", "Demi Bold"), Qt::CaseInsensitive) == 0)
+        || s.compare(QCoreApplication::translate("QFontDatabase", "Demi Bold"), Qt::CaseInsensitive) == 0)
         return QFont::DemiBold;
     if (s == QLatin1String("black")
-        || s.compare(QApplication::translate("QFontDatabase", "Black"), Qt::CaseInsensitive) == 0)
+        || s.compare(QCoreApplication::translate("QFontDatabase", "Black"), Qt::CaseInsensitive) == 0)
         return QFont::Black;
     if (s == QLatin1String("light"))
         return QFont::Light;
 
     if (s.contains(QLatin1String("bold"))
-        || s.contains(QApplication::translate("QFontDatabase", "Bold"), Qt::CaseInsensitive)) {
+        || s.contains(QCoreApplication::translate("QFontDatabase", "Bold"), Qt::CaseInsensitive)) {
         if (s.contains(QLatin1String("demi"))
-            || s.compare(QApplication::translate("QFontDatabase", "Demi"), Qt::CaseInsensitive) == 0)
+            || s.compare(QCoreApplication::translate("QFontDatabase", "Demi"), Qt::CaseInsensitive) == 0)
             return (int) QFont::DemiBold;
         return (int) QFont::Bold;
     }
 
     if (s.contains(QLatin1String("light"))
-        || s.compare(QApplication::translate("QFontDatabase", "Light"), Qt::CaseInsensitive) == 0)
+        || s.compare(QCoreApplication::translate("QFontDatabase", "Light"), Qt::CaseInsensitive) == 0)
         return (int) QFont::Light;
 
     if (s.contains(QLatin1String("black"))
-        || s.compare(QApplication::translate("QFontDatabase", "Black"), Qt::CaseInsensitive) == 0)
+        || s.compare(QCoreApplication::translate("QFontDatabase", "Black"), Qt::CaseInsensitive) == 0)
         return (int) QFont::Black;
 
     return (int) QFont::Normal;
@@ -264,7 +264,7 @@ struct QtFontStyle
             pixelSizes[count].fileName.~QByteArray();
 #endif
 #if defined (Q_WS_QPA)
-            QPlatformIntegration *integration = QApplicationPrivate::platformIntegration();
+            QPlatformIntegration *integration = QGuiApplicationPrivate::platformIntegration();
             if (integration) { //on shut down there will be some that we don't release.
                 integration->fontDatabase()->releaseHandle(pixelSizes[count].handle);
             }
@@ -297,10 +297,10 @@ QtFontStyle::Key::Key(const QString &styleString)
     weight = getFontWeight(styleString);
 
     if (styleString.contains(QLatin1String("Italic"))
-        || styleString.contains(QApplication::translate("QFontDatabase", "Italic")))
+        || styleString.contains(QCoreApplication::translate("QFontDatabase", "Italic")))
         style = QFont::StyleItalic;
     else if (styleString.contains(QLatin1String("Oblique"))
-             || styleString.contains(QApplication::translate("QFontDatabase", "Oblique")))
+             || styleString.contains(QCoreApplication::translate("QFontDatabase", "Oblique")))
         style = QFont::StyleOblique;
 }
 
@@ -748,7 +748,7 @@ void QFontDatabasePrivate::invalidate()
 {
     QFontCache::instance()->clear();
     free();
-    emit static_cast<QApplication *>(QApplication::instance())->fontDatabaseChanged();
+    emit static_cast<QGuiApplication *>(QCoreApplication::instance())->fontDatabaseChanged();
 }
 
 QtFontFamily *QFontDatabasePrivate::family(const QString &f, bool create)
@@ -1506,21 +1506,21 @@ static QString styleStringHelper(int weight, QFont::Style style)
 {
     QString result;
     if (weight >= QFont::Black)
-        result = QApplication::translate("QFontDatabase", "Black");
+        result = QCoreApplication::translate("QFontDatabase", "Black");
     else if (weight >= QFont::Bold)
-        result = QApplication::translate("QFontDatabase", "Bold");
+        result = QCoreApplication::translate("QFontDatabase", "Bold");
     else if (weight >= QFont::DemiBold)
-        result = QApplication::translate("QFontDatabase", "Demi Bold");
+        result = QCoreApplication::translate("QFontDatabase", "Demi Bold");
     else if (weight < QFont::Normal)
-        result = QApplication::translate("QFontDatabase", "Light");
+        result = QCoreApplication::translate("QFontDatabase", "Light");
 
     if (style == QFont::StyleItalic)
-        result += QLatin1Char(' ') + QApplication::translate("QFontDatabase", "Italic");
+        result += QLatin1Char(' ') + QCoreApplication::translate("QFontDatabase", "Italic");
     else if (style == QFont::StyleOblique)
-        result += QLatin1Char(' ') + QApplication::translate("QFontDatabase", "Oblique");
+        result += QLatin1Char(' ') + QCoreApplication::translate("QFontDatabase", "Oblique");
 
     if (result.isEmpty())
-        result = QApplication::translate("QFontDatabase", "Normal");
+        result = QCoreApplication::translate("QFontDatabase", "Normal");
 
     return result.simplified();
 }
@@ -2002,7 +2002,7 @@ QFont QFontDatabase::font(const QString &family, const QString &style,
 
     QtFontFoundry allStyles(foundryName);
     QtFontFamily *f = d->family(familyName);
-    if (!f) return QApplication::font();
+    if (!f) return QGuiApplication::font();
 
     for (int j = 0; j < f->count; j++) {
         QtFontFoundry *foundry = f->foundries[j];
@@ -2016,7 +2016,7 @@ QFont QFontDatabase::font(const QString &family, const QString &style,
     QtFontStyle *s = bestStyle(&allStyles, styleKey);
 
     if (!s) // no styles found?
-        return QApplication::font();
+        return QGuiApplication::font();
     QFont fnt(family, pointSize, s->key.weight);
     fnt.setStyle((QFont::Style)s->key.style);
     return fnt;
@@ -2326,7 +2326,7 @@ QString QFontDatabase::writingSystemName(WritingSystem writingSystem)
         Q_ASSERT_X(false, "QFontDatabase::writingSystemName", "invalid 'writingSystem' parameter");
         break;
     }
-    return QApplication::translate("QFontDatabase", name);
+    return QCoreApplication::translate("QFontDatabase", name);
 }
 
 
diff --git a/src/gui/text/qfontdatabase_qpa.cpp b/src/gui/text/qfontdatabase_qpa.cpp
index 7bcce56ac8..fcf87f6379 100644
--- a/src/gui/text/qfontdatabase_qpa.cpp
+++ b/src/gui/text/qfontdatabase_qpa.cpp
@@ -45,7 +45,7 @@
 #include "qfontengine_qpa_p.h"
 #include "qplatformdefs.h"
 
-#include <QtGui/private/qapplication_p.h>
+#include <QtGui/private/qguiapplication_p.h>
 #include <QtGui/qplatformfontdatabase_qpa.h>
 
 #include <QtCore/qmath.h>
@@ -82,7 +82,7 @@ Q_GUI_EXPORT  void qt_registerFont(const QString &familyName, const QString &fou
 
 static QStringList fallbackFamilies(const QString &family, const QFont::Style &style, const QFont::StyleHint &styleHint, const QUnicodeTables::Script &script)
 {
-    QStringList retList = QApplicationPrivate::platformIntegration()->fontDatabase()->fallbacksForFamily(family,style,styleHint,script);
+    QStringList retList = QGuiApplicationPrivate::platformIntegration()->fontDatabase()->fallbacksForFamily(family,style,styleHint,script);
     QFontDatabasePrivate *db = privateDb();
 
     QStringList::iterator i;
@@ -109,28 +109,11 @@ static void initializeDb()
 
     if (!initialized) {
         //init by asking for the platformfontdb for the first time :)
-        QApplicationPrivate::platformIntegration()->fontDatabase()->populateFontDatabase();
+        QGuiApplicationPrivate::platformIntegration()->fontDatabase()->populateFontDatabase();
         initialized = true;
     }
 }
 
-#ifndef QT_NO_SETTINGS
-// called from qapplication_qws.cpp
-void qt_applyFontDatabaseSettings(const QSettings &settings)
-{
-    initializeDb();
-    QFontDatabasePrivate *db = privateDb();
-    for (int i = 0; i < db->count; ++i) {
-        QtFontFamily *family = db->families[i];
-        if (settings.contains(family->name))
-            family->fallbackFamilies = settings.value(family->name).toStringList();
-    }
-
-    if (settings.contains(QLatin1String("Global Fallbacks")))
-        db->fallbackFamilies = settings.value(QLatin1String("Global Fallbacks")).toStringList();
-}
-#endif // QT_NO_SETTINGS
-
 static inline void load(const QString & = QString(), int = -1)
 {
     initializeDb();
@@ -155,7 +138,7 @@ QFontEngine *loadSingleEngine(int script,
     QFontCache::Key key(def,script);
     QFontEngine *engine = QFontCache::instance()->findEngine(key);
     if (!engine) {
-        QPlatformFontDatabase *pfdb = QApplicationPrivate::platformIntegration()->fontDatabase();
+        QPlatformFontDatabase *pfdb = QGuiApplicationPrivate::platformIntegration()->fontDatabase();
         engine = pfdb->fontEngine(def,QUnicodeTables::Script(script),size->handle);
         if (engine) {
             QFontCache::Key key(def,script);
@@ -200,7 +183,7 @@ static void registerFont(QFontDatabasePrivate::ApplicationFont *fnt)
 {
     QFontDatabasePrivate *db = privateDb();
 
-    fnt->families = QApplicationPrivate::platformIntegration()->fontDatabase()->addApplicationFont(fnt->data,fnt->fileName);
+    fnt->families = QGuiApplicationPrivate::platformIntegration()->fontDatabase()->addApplicationFont(fnt->data,fnt->fileName);
 
     db->reregisterAppFonts = true;
 }
@@ -360,7 +343,7 @@ void QFontDatabase::load(const QFontPrivate *d, int script)
         family_list = familyList(req);
 
         // add the default family
-        QString defaultFamily = QApplication::font().family();
+        QString defaultFamily = QGuiApplication::font().family();
         if (! family_list.contains(defaultFamily))
             family_list << defaultFamily;