1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Blackberry: Change name from QQnxTheme to QBlackberryTheme

Browse Source 
Change-Id: Ia30a18c988986f8c20bc4e4475c5e24b06493035
Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com>
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
This commit is contained in:
Fabian Bumberger 2014-02-28 20:57:45 +01:00 committed by The Qt Project
parent 63608e4e32
commit f0257cc1fd
4 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/platforms/qnx/qqnxtheme.cpp → src/plugins/platforms/qnx/qblackberrytheme.cpp
View File

@ -39,7 +39,7 @@
** **
****************************************************************************/ ****************************************************************************/
#include "qqnxtheme.h" #include "qblackberrytheme.h"
#include "qqnxfiledialoghelper.h" #include "qqnxfiledialoghelper.h"
#include "qqnxsystemsettings.h" #include "qqnxsystemsettings.h"
@ -47,7 +47,7 @@
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
QQnxTheme::QQnxTheme(const QQnxIntegration *integration) : m_integration(integration) QBlackberryTheme::QBlackberryTheme(const QQnxIntegration *integration) : m_integration(integration)
{ {
// Set the dark theme as default palette // Set the dark theme as default palette
QColor color = QColor(211, 211, 211); QColor color = QColor(211, 211, 211);
@ -68,12 +68,12 @@ QQnxTheme::QQnxTheme(const QQnxIntegration *integration) : m_integration(integra
m_defaultPalette.setBrush(QPalette::HighlightedText, QColor(250, 250,250)); m_defaultPalette.setBrush(QPalette::HighlightedText, QColor(250, 250,250));
} }
QQnxTheme::~QQnxTheme() QBlackberryTheme::~QBlackberryTheme()
{ {
qDeleteAll(m_fonts); qDeleteAll(m_fonts);
} }
bool QQnxTheme::usePlatformNativeDialog(DialogType type) const bool QBlackberryTheme::usePlatformNativeDialog(DialogType type) const
{ {
if (type == QPlatformTheme::FileDialog) if (type == QPlatformTheme::FileDialog)
return true; return true;
@ -88,7 +88,7 @@ bool QQnxTheme::usePlatformNativeDialog(DialogType type) const
return false; return false;
} }
QPlatformDialogHelper *QQnxTheme::createPlatformDialogHelper(DialogType type) const QPlatformDialogHelper *QBlackberryTheme::createPlatformDialogHelper(DialogType type) const
{ {
switch (type) { switch (type) {
case QPlatformTheme::FileDialog: case QPlatformTheme::FileDialog:
@ -104,7 +104,7 @@ QPlatformDialogHelper *QQnxTheme::createPlatformDialogHelper(DialogType type) co
} }
} }
const QFont *QQnxTheme::font(Font type) const const QFont *QBlackberryTheme::font(Font type) const
{ {
QPlatformFontDatabase *fontDatabase = m_integration->fontDatabase(); QPlatformFontDatabase *fontDatabase = m_integration->fontDatabase();
@ -113,7 +113,7 @@ const QFont *QQnxTheme::font(Font type) const
return m_fonts.value(type, 0); return m_fonts.value(type, 0);
} }
const QPalette *QQnxTheme::palette(Palette type) const const QPalette *QBlackberryTheme::palette(Palette type) const
{ {
// Return the default palette // Return the default palette
if (type == SystemPalette) if (type == SystemPalette)

12
src/plugins/platforms/qnx/qqnxtheme.h → src/plugins/platforms/qnx/qblackberrytheme.h
View File

@ -39,8 +39,8 @@
** **
****************************************************************************/ ****************************************************************************/
#ifndef QQNXTHEME_H #ifndef QBLACKBERRYTHEME_H
#define QQNXTHEME_H #define QBLACKBERRYTHEME_H
#include <qpa/qplatformtheme.h> #include <qpa/qplatformtheme.h>
@ -55,11 +55,11 @@ QT_BEGIN_NAMESPACE
class QQnxIntegration; class QQnxIntegration;
class QQnxTheme : public QPlatformTheme class QBlackberryTheme : public QPlatformTheme
{ {
public: public:
explicit QQnxTheme(const QQnxIntegration *); explicit QBlackberryTheme(const QQnxIntegration *);
~QQnxTheme(); ~QBlackberryTheme();
static QString name() { return QStringLiteral("blackberry"); } static QString name() { return QStringLiteral("blackberry"); }
@ -78,4 +78,4 @@ private:
QT_END_NAMESPACE QT_END_NAMESPACE
#endif // QQNXTHEME_H #endif // QBLACKBERRYTHEME_H

4
src/plugins/platforms/qnx/qnx.pro
View File

@ -91,14 +91,14 @@ CONFIG(blackberry) {
qqnxeventdispatcher_blackberry.cpp \ qqnxeventdispatcher_blackberry.cpp \
qqnxbpseventfilter.cpp \ qqnxbpseventfilter.cpp \
qqnxvirtualkeyboardbps.cpp \ qqnxvirtualkeyboardbps.cpp \
qqnxtheme.cpp \ qblackberrytheme.cpp \
qqnxsystemsettings.cpp qqnxsystemsettings.cpp
HEADERS += qqnxnavigatorbps.h \ HEADERS += qqnxnavigatorbps.h \
qqnxeventdispatcher_blackberry.h \ qqnxeventdispatcher_blackberry.h \
qqnxbpseventfilter.h \ qqnxbpseventfilter.h \
qqnxvirtualkeyboardbps.h \ qqnxvirtualkeyboardbps.h \
qqnxtheme.h \ qblackberrytheme.h \
qqnxsystemsettings.h \ qqnxsystemsettings.h \
qqnxfiledialoghelper.h qqnxfiledialoghelper.h

8
src/plugins/platforms/qnx/qqnxintegration.cpp
View File

@ -63,7 +63,7 @@
#if defined(Q_OS_BLACKBERRY) #if defined(Q_OS_BLACKBERRY)
#include "qqnxbpseventfilter.h" #include "qqnxbpseventfilter.h"
#include "qqnxnavigatorbps.h" #include "qqnxnavigatorbps.h"
#include "qqnxtheme.h" #include "qblackberrytheme.h"
#include "qqnxvirtualkeyboardbps.h" #include "qqnxvirtualkeyboardbps.h"
#elif defined(QQNX_PPS) #elif defined(QQNX_PPS)
#include "qqnxnavigatorpps.h" #include "qqnxnavigatorpps.h"
@ -462,14 +462,14 @@ QPlatformServices * QQnxIntegration::services() const
#if defined(Q_OS_BLACKBERRY) #if defined(Q_OS_BLACKBERRY)
QStringList QQnxIntegration::themeNames() const QStringList QQnxIntegration::themeNames() const
{ {
return QStringList(QQnxTheme::name()); return QStringList(QBlackberryTheme::name());
} }
QPlatformTheme *QQnxIntegration::createPlatformTheme(const QString &name) const QPlatformTheme *QQnxIntegration::createPlatformTheme(const QString &name) const
{ {
qIntegrationDebug() << Q_FUNC_INFO << "name =" << name; qIntegrationDebug() << Q_FUNC_INFO << "name =" << name;
if (name == QQnxTheme::name()) if (name == QBlackberryTheme::name())
return new QQnxTheme(this); return new QBlackberryTheme(this);
return QPlatformIntegration::createPlatformTheme(name); return QPlatformIntegration::createPlatformTheme(name);
} }
#endif #endif