alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Avoid references to QApplication

Browse Source 
They cause problems when running in QGuiApplication

REVIEW: 118470
This commit is contained in:
David Edmundson 2014-06-02 17:26:43 +02:00
parent 5b9cb0a0a6
commit 23068fb2b0
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/declarativeimports/core/units.cpp
View File

@ -20,7 +20,7 @@
#include "units.h" #include "units.h"
#include <QApplication> #include <QGuiApplication>
#include <QDebug> #include <QDebug>
#include <QDesktopWidget> #include <QDesktopWidget>
#include <QtGlobal> #include <QtGlobal>
@ -55,7 +55,7 @@ Units::Units(QObject *parent)
themeChanged(); themeChanged();
connect(&m_theme, SIGNAL(themeChanged()), connect(&m_theme, SIGNAL(themeChanged()),
this, SLOT(themeChanged())); this, SLOT(themeChanged()));
qApp->installEventFilter(this); QCoreApplication::instance()->installEventFilter(this);
const QString configFile = QStandardPaths::writableLocation(QStandardPaths::GenericConfigLocation) + QLatin1Char('/') + plasmarc; const QString configFile = QStandardPaths::writableLocation(QStandardPaths::GenericConfigLocation) + QLatin1Char('/') + plasmarc;
KDirWatch::self()->addFile(configFile); KDirWatch::self()->addFile(configFile);

6
src/plasma/private/theme_p.cpp
View File

@ -22,7 +22,7 @@
#include "framesvg.h" #include "framesvg.h"
#include "framesvg_p.h" #include "framesvg_p.h"
#include <QApplication> #include <QGuiApplication>
#include <QFile> #include <QFile>
#include <QFileInfo> #include <QFileInfo>
#include <QFontDatabase> #include <QFontDatabase>
@ -97,7 +97,7 @@ ThemePrivate::ThemePrivate(QObject *parent)
QObject::connect(s_blurEffectWatcher, SIGNAL(effectChanged(bool)), this, SLOT(blurBehindChanged(bool))); QObject::connect(s_blurEffectWatcher, SIGNAL(effectChanged(bool)), this, SLOT(blurBehindChanged(bool)));
#endif #endif
} }
qApp->installEventFilter(this); QCoreApplication::instance()->installEventFilter(this);
const QString configFile = QStandardPaths::writableLocation(QStandardPaths::GenericConfigLocation) + QLatin1Char('/') + themeRcFile; const QString configFile = QStandardPaths::writableLocation(QStandardPaths::GenericConfigLocation) + QLatin1Char('/') + themeRcFile;
KDirWatch::self()->addFile(configFile); KDirWatch::self()->addFile(configFile);
@ -414,7 +414,7 @@ const QString ThemePrivate::processStyleSheet(const QString &css)
elements[QStringLiteral("%viewhovercolor")] = color(Theme::ViewHoverColor).name(); elements[QStringLiteral("%viewhovercolor")] = color(Theme::ViewHoverColor).name();
elements[QStringLiteral("%viewfocuscolor")] = color(Theme::ViewFocusColor).name(); elements[QStringLiteral("%viewfocuscolor")] = color(Theme::ViewFocusColor).name();
QFont font = QApplication::font(); QFont font = QGuiApplication::font();
elements[QStringLiteral("%fontsize")] = QStringLiteral("%1pt").arg(font.pointSize()); elements[QStringLiteral("%fontsize")] = QStringLiteral("%1pt").arg(font.pointSize());
elements[QStringLiteral("%fontfamily")] = font.family().split('[').first(); elements[QStringLiteral("%fontfamily")] = font.family().split('[').first();
elements[QStringLiteral("%smallfontsize")] = QString("%1pt").arg(QFontDatabase::systemFont(QFontDatabase::SmallestReadableFont).pointSize()); elements[QStringLiteral("%smallfontsize")] = QString("%1pt").arg(QFontDatabase::systemFont(QFontDatabase::SmallestReadableFont).pointSize());