summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabian Bumberger <fbumberger@rim.com>2014-02-28 20:57:45 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-03-07 10:19:34 +0100
commitf0257cc1fd38af671d34384e56401069008fd68a (patch)
tree303026499d01daabfec148a789d57d32c373896f
parent63608e4e3257cf08526c19c3d7d627b5cb74db14 (diff)
Blackberry: Change name from QQnxTheme to QBlackberryTheme
Change-Id: Ia30a18c988986f8c20bc4e4475c5e24b06493035 Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com> Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
-rw-r--r--src/plugins/platforms/qnx/qblackberrytheme.cpp (renamed from src/plugins/platforms/qnx/qqnxtheme.cpp)14
-rw-r--r--src/plugins/platforms/qnx/qblackberrytheme.h (renamed from src/plugins/platforms/qnx/qqnxtheme.h)12
-rw-r--r--src/plugins/platforms/qnx/qnx.pro4
-rw-r--r--src/plugins/platforms/qnx/qqnxintegration.cpp8
4 files changed, 19 insertions, 19 deletions
diff --git a/src/plugins/platforms/qnx/qqnxtheme.cpp b/src/plugins/platforms/qnx/qblackberrytheme.cpp
index d91dd81210..a0f334d909 100644
--- a/src/plugins/platforms/qnx/qqnxtheme.cpp
+++ b/src/plugins/platforms/qnx/qblackberrytheme.cpp
@@ -39,7 +39,7 @@
**
****************************************************************************/
-#include "qqnxtheme.h"
+#include "qblackberrytheme.h"
#include "qqnxfiledialoghelper.h"
#include "qqnxsystemsettings.h"
@@ -47,7 +47,7 @@
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
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));
}
-QQnxTheme::~QQnxTheme()
+QBlackberryTheme::~QBlackberryTheme()
{
qDeleteAll(m_fonts);
}
-bool QQnxTheme::usePlatformNativeDialog(DialogType type) const
+bool QBlackberryTheme::usePlatformNativeDialog(DialogType type) const
{
if (type == QPlatformTheme::FileDialog)
return true;
@@ -88,7 +88,7 @@ bool QQnxTheme::usePlatformNativeDialog(DialogType type) const
return false;
}
-QPlatformDialogHelper *QQnxTheme::createPlatformDialogHelper(DialogType type) const
+QPlatformDialogHelper *QBlackberryTheme::createPlatformDialogHelper(DialogType type) const
{
switch (type) {
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();
@@ -113,7 +113,7 @@ const QFont *QQnxTheme::font(Font type) const
return m_fonts.value(type, 0);
}
-const QPalette *QQnxTheme::palette(Palette type) const
+const QPalette *QBlackberryTheme::palette(Palette type) const
{
// Return the default palette
if (type == SystemPalette)
diff --git a/src/plugins/platforms/qnx/qqnxtheme.h b/src/plugins/platforms/qnx/qblackberrytheme.h
index 8698ab36a1..29fa0b8f61 100644
--- a/src/plugins/platforms/qnx/qqnxtheme.h
+++ b/src/plugins/platforms/qnx/qblackberrytheme.h
@@ -39,8 +39,8 @@
**
****************************************************************************/
-#ifndef QQNXTHEME_H
-#define QQNXTHEME_H
+#ifndef QBLACKBERRYTHEME_H
+#define QBLACKBERRYTHEME_H
#include <qpa/qplatformtheme.h>
@@ -55,11 +55,11 @@ QT_BEGIN_NAMESPACE
class QQnxIntegration;
-class QQnxTheme : public QPlatformTheme
+class QBlackberryTheme : public QPlatformTheme
{
public:
- explicit QQnxTheme(const QQnxIntegration *);
- ~QQnxTheme();
+ explicit QBlackberryTheme(const QQnxIntegration *);
+ ~QBlackberryTheme();
static QString name() { return QStringLiteral("blackberry"); }
@@ -78,4 +78,4 @@ private:
QT_END_NAMESPACE
-#endif // QQNXTHEME_H
+#endif // QBLACKBERRYTHEME_H
diff --git a/src/plugins/platforms/qnx/qnx.pro b/src/plugins/platforms/qnx/qnx.pro
index 2399a91c12..04c6087cd1 100644
--- a/src/plugins/platforms/qnx/qnx.pro
+++ b/src/plugins/platforms/qnx/qnx.pro
@@ -91,14 +91,14 @@ CONFIG(blackberry) {
qqnxeventdispatcher_blackberry.cpp \
qqnxbpseventfilter.cpp \
qqnxvirtualkeyboardbps.cpp \
- qqnxtheme.cpp \
+ qblackberrytheme.cpp \
qqnxsystemsettings.cpp
HEADERS += qqnxnavigatorbps.h \
qqnxeventdispatcher_blackberry.h \
qqnxbpseventfilter.h \
qqnxvirtualkeyboardbps.h \
- qqnxtheme.h \
+ qblackberrytheme.h \
qqnxsystemsettings.h \
qqnxfiledialoghelper.h
diff --git a/src/plugins/platforms/qnx/qqnxintegration.cpp b/src/plugins/platforms/qnx/qqnxintegration.cpp
index dd32116360..43045f99d1 100644
--- a/src/plugins/platforms/qnx/qqnxintegration.cpp
+++ b/src/plugins/platforms/qnx/qqnxintegration.cpp
@@ -63,7 +63,7 @@
#if defined(Q_OS_BLACKBERRY)
#include "qqnxbpseventfilter.h"
#include "qqnxnavigatorbps.h"
-#include "qqnxtheme.h"
+#include "qblackberrytheme.h"
#include "qqnxvirtualkeyboardbps.h"
#elif defined(QQNX_PPS)
#include "qqnxnavigatorpps.h"
@@ -462,14 +462,14 @@ QPlatformServices * QQnxIntegration::services() const
#if defined(Q_OS_BLACKBERRY)
QStringList QQnxIntegration::themeNames() const
{
- return QStringList(QQnxTheme::name());
+ return QStringList(QBlackberryTheme::name());
}
QPlatformTheme *QQnxIntegration::createPlatformTheme(const QString &name) const
{
qIntegrationDebug() << Q_FUNC_INFO << "name =" << name;
- if (name == QQnxTheme::name())
- return new QQnxTheme(this);
+ if (name == QBlackberryTheme::name())
+ return new QBlackberryTheme(this);
return QPlatformIntegration::createPlatformTheme(name);
}
#endif