feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QNX: Fix capitilization of QnxPlugin

Browse Source 
Change-Id: I583cee500acc78ee2eb6075b0f951def0bd87d22
Reviewed-by: David Kaspar <dkaspar@blackberry.com>
Reviewed-by: Mehdi Fekari <mfekari@blackberry.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Tobias Hunger
2014-03-19 12:06:03 +01:00
parent 84cf3cf7a5
commit 1c13798c56
3 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/qnx/blackberryconfigurationmanager.h
View File

@@ -45,7 +45,7 @@ namespace Internal {
class BlackBerryApiLevelConfiguration; class BlackBerryApiLevelConfiguration;
class BlackBerryRuntimeConfiguration; class BlackBerryRuntimeConfiguration;
class QNXPlugin; class QnxPlugin;
class BlackBerryConfigurationManager : public QObject class BlackBerryConfigurationManager : public QObject
{ {
@@ -112,7 +112,7 @@ private:
void insertApiLevelByVersion(BlackBerryApiLevelConfiguration* apiLevel); void insertApiLevelByVersion(BlackBerryApiLevelConfiguration* apiLevel);
void insertRuntimeByVersion(BlackBerryRuntimeConfiguration* runtime); void insertRuntimeByVersion(BlackBerryRuntimeConfiguration* runtime);
friend class QNXPlugin; friend class QnxPlugin;
}; };
} // namespace Internal } // namespace Internal

24
src/plugins/qnx/qnxplugin.cpp
View File

@@ -76,18 +76,18 @@
using namespace Qnx::Internal; using namespace Qnx::Internal;
QNXPlugin::QNXPlugin() QnxPlugin::QnxPlugin()
: m_debugSeparator(0) : m_debugSeparator(0)
, m_attachToQnxApplication(0) , m_attachToQnxApplication(0)
{ {
} }
QNXPlugin::~QNXPlugin() QnxPlugin::~QnxPlugin()
{ {
delete BlackBerryDeviceConnectionManager::instance(); delete BlackBerryDeviceConnectionManager::instance();
} }
bool QNXPlugin::initialize(const QStringList &arguments, QString *errorString) bool QnxPlugin::initialize(const QStringList &arguments, QString *errorString)
{ {
Q_UNUSED(arguments) Q_UNUSED(arguments)
Q_UNUSED(errorString) Q_UNUSED(errorString)
@@ -141,7 +141,7 @@ bool QNXPlugin::initialize(const QStringList &arguments, QString *errorString)
return true; return true;
} }
void QNXPlugin::extensionsInitialized() void QnxPlugin::extensionsInitialized()
{ {
ProjectExplorer::TaskHub::addCategory(Constants::QNX_TASK_CATEGORY_BARDESCRIPTOR, ProjectExplorer::TaskHub::addCategory(Constants::QNX_TASK_CATEGORY_BARDESCRIPTOR,
tr("BAR Descriptor")); tr("BAR Descriptor"));
@@ -164,12 +164,12 @@ void QNXPlugin::extensionsInitialized()
connect(ProjectExplorer::KitManager::instance(), SIGNAL(kitsChanged()), this, SLOT(updateDebuggerActions())); connect(ProjectExplorer::KitManager::instance(), SIGNAL(kitsChanged()), this, SLOT(updateDebuggerActions()));
} }
ExtensionSystem::IPlugin::ShutdownFlag QNXPlugin::aboutToShutdown() ExtensionSystem::IPlugin::ShutdownFlag QnxPlugin::aboutToShutdown()
{ {
return SynchronousShutdown; return SynchronousShutdown;
} }
void QNXPlugin::updateDebuggerActions() void QnxPlugin::updateDebuggerActions()
{ {
bool hasValidQnxKit = false; bool hasValidQnxKit = false;
ProjectExplorer::DeviceTypeMatcher qnxTypeMatcher(Constants::QNX_QNX_OS_TYPE); ProjectExplorer::DeviceTypeMatcher qnxTypeMatcher(Constants::QNX_QNX_OS_TYPE);
@@ -191,7 +191,7 @@ void QNXPlugin::updateDebuggerActions()
#include "bardescriptordocument.h" #include "bardescriptordocument.h"
void QNXPlugin::testBarDescriptorDocumentSetValue_data() void QnxPlugin::testBarDescriptorDocumentSetValue_data()
{ {
QTest::addColumn<BarDescriptorDocument::Tag>("tag"); QTest::addColumn<BarDescriptorDocument::Tag>("tag");
QTest::addColumn<QVariant>("value"); QTest::addColumn<QVariant>("value");
@@ -362,7 +362,7 @@ void QNXPlugin::testBarDescriptorDocumentSetValue_data()
<< true; << true;
} }
void QNXPlugin::testBarDescriptorDocumentSetValue() void QnxPlugin::testBarDescriptorDocumentSetValue()
{ {
QFETCH(BarDescriptorDocument::Tag, tag); QFETCH(BarDescriptorDocument::Tag, tag);
QFETCH(QVariant, value); QFETCH(QVariant, value);
@@ -381,7 +381,7 @@ void QNXPlugin::testBarDescriptorDocumentSetValue()
QCOMPARE(doc.value(tag), value); QCOMPARE(doc.value(tag), value);
} }
void QNXPlugin::testBarDescriptorDocumentSetBannerComment_data() void QnxPlugin::testBarDescriptorDocumentSetBannerComment_data()
{ {
QTest::addColumn<QString>("comment"); QTest::addColumn<QString>("comment");
QTest::addColumn<QString>("baseXml"); QTest::addColumn<QString>("baseXml");
@@ -426,7 +426,7 @@ void QNXPlugin::testBarDescriptorDocumentSetBannerComment_data()
} }
void QNXPlugin::testBarDescriptorDocumentSetBannerComment() void QnxPlugin::testBarDescriptorDocumentSetBannerComment()
{ {
QFETCH(QString, comment); QFETCH(QString, comment);
QFETCH(QString, baseXml); QFETCH(QString, baseXml);
@@ -442,7 +442,7 @@ void QNXPlugin::testBarDescriptorDocumentSetBannerComment()
QCOMPARE(doc.bannerComment(), comment); QCOMPARE(doc.bannerComment(), comment);
} }
void QNXPlugin::testConfigurationManager_data() void QnxPlugin::testConfigurationManager_data()
{ {
const QLatin1String NDKEnvFileKey("NDKEnvFile"); const QLatin1String NDKEnvFileKey("NDKEnvFile");
const QLatin1String NDKPathKey("NDKPath"); const QLatin1String NDKPathKey("NDKPath");
@@ -479,7 +479,7 @@ void QNXPlugin::testConfigurationManager_data()
QTest::newRow("configurations") << newerConfiguration << olderConfiguration;; QTest::newRow("configurations") << newerConfiguration << olderConfiguration;;
} }
void QNXPlugin::testConfigurationManager() void QnxPlugin::testConfigurationManager()
{ {
BlackBerryConfigurationManager *manager = BlackBerryConfigurationManager::instance(); BlackBerryConfigurationManager *manager = BlackBerryConfigurationManager::instance();

6
src/plugins/qnx/qnxplugin.h
View File

@@ -41,14 +41,14 @@ QT_END_NAMESPACE
namespace Qnx { namespace Qnx {
namespace Internal { namespace Internal {
class QNXPlugin : public ExtensionSystem::IPlugin class QnxPlugin : public ExtensionSystem::IPlugin
{ {
Q_OBJECT Q_OBJECT
Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QtCreatorPlugin" FILE "Qnx.json") Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QtCreatorPlugin" FILE "Qnx.json")
public: public:
QNXPlugin(); QnxPlugin();
~QNXPlugin(); ~QnxPlugin();
bool initialize(const QStringList &arguments, QString *errorString); bool initialize(const QStringList &arguments, QString *errorString);
void extensionsInitialized(); void extensionsInitialized();