From 4474ab4e693cc78c54adb6f8645e36885df42f21 Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Mon, 29 Nov 2010 09:45:30 +0100 Subject: [PATCH] QmlProject: Code cleanup --- .../qmlprojectrunconfiguration.cpp | 54 ++++++++++++++-------- .../qmlprojectmanager/qmlprojectrunconfiguration.h | 13 ++---- 2 files changed, 39 insertions(+), 28 deletions(-) diff --git a/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp b/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp index fff164066f..98c9bc6874 100644 --- a/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp +++ b/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp @@ -51,16 +51,24 @@ #include #include -#include #include #include -#include #include -#include + +using Core::EditorManager; +using Core::ICore; +using Core::IEditor; +using Utils::DebuggerLanguageChooser; +using Qt4ProjectManager::QtVersionManager; + +using namespace QmlProjectManager::Internal; namespace QmlProjectManager { -QmlProjectRunConfiguration::QmlProjectRunConfiguration(Internal::QmlProjectTarget *parent) : +const char * const CURRENT_FILE = QT_TRANSLATE_NOOP("QmlManager", ""); +const char * const M_CURRENT_FILE = "CurrentFile"; + +QmlProjectRunConfiguration::QmlProjectRunConfiguration(QmlProjectTarget *parent) : ProjectExplorer::RunConfiguration(parent, QLatin1String(Constants::QML_RC_ID)), m_qtVersionId(-1), m_fileListModel(new QStringListModel(this)), @@ -72,7 +80,8 @@ QmlProjectRunConfiguration::QmlProjectRunConfiguration(Internal::QmlProjectTarge updateQtVersions(); } -QmlProjectRunConfiguration::QmlProjectRunConfiguration(Internal::QmlProjectTarget *parent, QmlProjectRunConfiguration *source) : +QmlProjectRunConfiguration::QmlProjectRunConfiguration(QmlProjectTarget *parent, + QmlProjectRunConfiguration *source) : ProjectExplorer::RunConfiguration(parent, source), m_qtVersionId(source->m_qtVersionId), m_qmlViewerArgs(source->m_qmlViewerArgs), @@ -97,11 +106,11 @@ void QmlProjectRunConfiguration::ctor() setUseCppDebugger(false); setUseQmlDebugger(true); - Core::EditorManager *em = Core::EditorManager::instance(); + EditorManager *em = Core::EditorManager::instance(); connect(em, SIGNAL(currentEditorChanged(Core::IEditor*)), this, SLOT(changeCurrentFile(Core::IEditor*))); - Qt4ProjectManager::QtVersionManager *qtVersions = Qt4ProjectManager::QtVersionManager::instance(); + QtVersionManager *qtVersions = QtVersionManager::instance(); connect(qtVersions, SIGNAL(qtVersionsChanged(QList)), this, SLOT(updateQtVersions())); setDisplayName(tr("QML Viewer", "QMLRunConfiguration display name.")); @@ -111,9 +120,9 @@ QmlProjectRunConfiguration::~QmlProjectRunConfiguration() { } -Internal::QmlProjectTarget *QmlProjectRunConfiguration::qmlTarget() const +QmlProjectTarget *QmlProjectRunConfiguration::qmlTarget() const { - return static_cast(target()); + return static_cast(target()); } QString QmlProjectRunConfiguration::viewerPath() const @@ -178,7 +187,7 @@ Qt4ProjectManager::QtVersion *QmlProjectRunConfiguration::qtVersion() const if (m_qtVersionId == -1) return 0; - Qt4ProjectManager::QtVersionManager *versionManager = Qt4ProjectManager::QtVersionManager::instance(); + QtVersionManager *versionManager = QtVersionManager::instance(); Qt4ProjectManager::QtVersion *version = versionManager->version(m_qtVersionId); QTC_ASSERT(version, return 0); @@ -204,12 +213,15 @@ QWidget *QmlProjectRunConfiguration::createConfigurationWidget() m_fileListCombo.data()->setModel(m_fileListModel); updateFileComboBox(); - connect(m_fileListCombo.data(), SIGNAL(activated(QString)), this, SLOT(setMainScript(QString))); - connect(ProjectExplorer::ProjectExplorerPlugin::instance(), SIGNAL(fileListChanged()), SLOT(updateFileComboBox())); + connect(m_fileListCombo.data(), SIGNAL(activated(QString)), + this, SLOT(setMainScript(QString))); + connect(ProjectExplorer::ProjectExplorerPlugin::instance(), SIGNAL(fileListChanged()), + SLOT(updateFileComboBox())); m_qtVersionComboBox = new QComboBox; m_qtVersionComboBox.data()->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred); - connect(m_qtVersionComboBox.data(), SIGNAL(activated(int)), this, SLOT(onQtVersionSelectionChanged())); + connect(m_qtVersionComboBox.data(), SIGNAL(activated(int)), + this, SLOT(onQtVersionSelectionChanged())); QPushButton *pushButton = new QPushButton; pushButton->setText(tr("Manage Qt versions")); @@ -235,7 +247,7 @@ QWidget *QmlProjectRunConfiguration::createConfigurationWidget() debuggerLabelLayout->addWidget(debuggerLabel); debuggerLabelLayout->addStretch(10); - Utils::DebuggerLanguageChooser *debuggerLanguageChooser = new Utils::DebuggerLanguageChooser(formWidget); + DebuggerLanguageChooser *debuggerLanguageChooser = new DebuggerLanguageChooser(formWidget); form->addRow(tr("Main QML file:"), m_fileListCombo.data()); form->addRow(debuggerLabelWidget, debuggerLanguageChooser); @@ -382,19 +394,21 @@ void QmlProjectRunConfiguration::updateEnabled() bool qmlFileFound = false; if (m_usingCurrentFile) { Core::IEditor *editor = Core::EditorManager::instance()->currentEditor(); + Core::MimeDatabase *db = ICore::instance()->mimeDatabase(); if (editor) { m_currentFileFilename = editor->file()->fileName(); - if (Core::ICore::instance()->mimeDatabase()->findByFile(mainScript()).type() == QLatin1String("application/x-qml")) + if (db->findByFile(mainScript()).type() == QLatin1String("application/x-qml")) qmlFileFound = true; } if (!editor - || Core::ICore::instance()->mimeDatabase()->findByFile(mainScript()).type() == QLatin1String("application/x-qmlproject")) { - // find a qml file with lowercase filename. This is slow but only done in initialization/other border cases. + || db->findByFile(mainScript()).type() == QLatin1String("application/x-qmlproject")) { + // find a qml file with lowercase filename. This is slow, but only done + // in initialization/other border cases. foreach(const QString &filename, m_projectTarget->qmlProject()->files()) { const QFileInfo fi(filename); if (!filename.isEmpty() && fi.baseName()[0].isLower() - && Core::ICore::instance()->mimeDatabase()->findByFile(fi).type() == QLatin1String("application/x-qml")) + && db->findByFile(fi).type() == QLatin1String("application/x-qml")) { m_currentFileFilename = filename; qmlFileFound = true; @@ -418,7 +432,7 @@ void QmlProjectRunConfiguration::updateEnabled() void QmlProjectRunConfiguration::updateQtVersions() { - Qt4ProjectManager::QtVersionManager *qtVersions = Qt4ProjectManager::QtVersionManager::instance(); + QtVersionManager *qtVersions = QtVersionManager::instance(); // // update m_qtVersionId @@ -465,7 +479,7 @@ void QmlProjectRunConfiguration::updateQtVersions() void QmlProjectRunConfiguration::manageQtVersions() { - Core::ICore *core = Core::ICore::instance(); + ICore *core = ICore::instance(); core->showOptionsDialog(Qt4ProjectManager::Constants::QT_SETTINGS_CATEGORY, Qt4ProjectManager::Constants::QTVERSION_SETTINGS_PAGE_ID); } diff --git a/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.h b/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.h index 74d61dce6e..6690686244 100644 --- a/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.h +++ b/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.h @@ -43,20 +43,16 @@ namespace Core { } namespace Qt4ProjectManager { -class QtVersion; + class QtVersion; } namespace QmlProjectManager { namespace Internal { -class QmlProjectTarget; -class QmlProjectRunConfigurationFactory; + class QmlProjectTarget; + class QmlProjectRunConfigurationFactory; } -const char * const CURRENT_FILE = QT_TRANSLATE_NOOP("QmlManager", ""); -const char * const M_CURRENT_FILE = "CurrentFile"; - - class QMLPROJECTMANAGER_EXPORT QmlProjectRunConfiguration : public ProjectExplorer::RunConfiguration { Q_OBJECT @@ -106,7 +102,8 @@ private slots: void manageQtVersions(); protected: - QmlProjectRunConfiguration(Internal::QmlProjectTarget *parent, QmlProjectRunConfiguration *source); + QmlProjectRunConfiguration(Internal::QmlProjectTarget *parent, + QmlProjectRunConfiguration *source); virtual bool fromMap(const QVariantMap &map); void setEnabled(bool value); -- 2.11.0