diff options
29 files changed, 159 insertions, 161 deletions
diff --git a/src/plugins/projectexplorer/buildstepspage.cpp b/src/plugins/projectexplorer/buildstepspage.cpp index c98919a33c..92607e452e 100644 --- a/src/plugins/projectexplorer/buildstepspage.cpp +++ b/src/plugins/projectexplorer/buildstepspage.cpp @@ -56,13 +56,13 @@ using namespace ProjectExplorer::Internal; using namespace Utils; ToolWidget::ToolWidget(QWidget *parent) - : Utils::FadingPanel(parent), m_buildStepEnabled(true), m_targetOpacity(1.0f) + : FadingPanel(parent), m_buildStepEnabled(true), m_targetOpacity(1.0f) { QHBoxLayout *layout = new QHBoxLayout; layout->setMargin(4); layout->setSpacing(4); setLayout(layout); - m_firstWidget = new Utils::FadingWidget(this); + m_firstWidget = new FadingWidget(this); m_firstWidget->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); QHBoxLayout *hbox = new QHBoxLayout(); hbox->setContentsMargins(0, 0, 0, 0); @@ -79,7 +79,7 @@ ToolWidget::ToolWidget(QWidget *parent) hbox->addWidget(m_disableButton); layout->addWidget(m_firstWidget); - m_secondWidget = new Utils::FadingWidget(this); + m_secondWidget = new FadingWidget(this); m_secondWidget->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Expanding); hbox = new QHBoxLayout(); hbox->setMargin(0); @@ -179,7 +179,7 @@ BuildStepsWidgetData::BuildStepsWidgetData(BuildStep *s) : widget = s->createConfigWidget(); Q_ASSERT(widget); - detailsWidget = new Utils::DetailsWidget; + detailsWidget = new DetailsWidget; detailsWidget->setWidget(widget); toolWidget = new ToolWidget(detailsWidget); @@ -278,7 +278,7 @@ void BuildStepListWidget::init(BuildStepList *bsl) addBuildStep(i); // addBuilStep expands the config widget by default, which we don't want here if (m_buildStepsData.at(i)->widget->showWidget()) - m_buildStepsData.at(i)->detailsWidget->setState(Utils::DetailsWidget::Collapsed); + m_buildStepsData.at(i)->detailsWidget->setState(DetailsWidget::Collapsed); } m_noStepsLabel->setVisible(bsl->isEmpty()); @@ -354,9 +354,9 @@ void BuildStepListWidget::addBuildStep(int pos) BuildStepsWidgetData *s = m_buildStepsData.at(pos); // Expand new build steps by default if (s->widget->showWidget()) - s->detailsWidget->setState(Utils::DetailsWidget::Expanded); + s->detailsWidget->setState(DetailsWidget::Expanded); else - s->detailsWidget->setState(Utils::DetailsWidget::OnlySummary); + s->detailsWidget->setState(DetailsWidget::OnlySummary); m_noStepsLabel->setVisible(false); updateBuildStepButtonsState(); diff --git a/src/plugins/projectexplorer/clangparser.cpp b/src/plugins/projectexplorer/clangparser.cpp index a93a9583e8..fc6c8a7ce6 100644 --- a/src/plugins/projectexplorer/clangparser.cpp +++ b/src/plugins/projectexplorer/clangparser.cpp @@ -141,7 +141,7 @@ void ProjectExplorerPlugin::testClangOutputParser_data() QTest::addColumn<OutputParserTester::Channel>("inputChannel"); QTest::addColumn<QString>("childStdOutLines"); QTest::addColumn<QString>("childStdErrLines"); - QTest::addColumn<QList<ProjectExplorer::Task> >("tasks"); + QTest::addColumn<QList<Task> >("tasks"); QTest::addColumn<QString>("outputLines"); const Core::Id categoryCompile = Constants::TASK_CATEGORY_COMPILE; @@ -149,19 +149,19 @@ void ProjectExplorerPlugin::testClangOutputParser_data() QTest::newRow("pass-through stdout") << QString::fromLatin1("Sometext") << OutputParserTester::STDOUT << QString::fromLatin1("Sometext\n") << QString() - << QList<ProjectExplorer::Task>() + << QList<Task>() << QString(); QTest::newRow("pass-through stderr") << QString::fromLatin1("Sometext") << OutputParserTester::STDERR << QString() << QString::fromLatin1("Sometext\n") - << QList<ProjectExplorer::Task>() + << QList<Task>() << QString(); QTest::newRow("clang++ warning") << QString::fromLatin1("clang++: warning: argument unused during compilation: '-mthreads'") << OutputParserTester::STDERR << QString() << QString() - << (QList<ProjectExplorer::Task>() + << (QList<Task>() << Task(Task::Warning, QLatin1String("argument unused during compilation: '-mthreads'"), Utils::FileName(), -1, @@ -171,7 +171,7 @@ void ProjectExplorerPlugin::testClangOutputParser_data() << QString::fromLatin1("clang++: error: no input files [err_drv_no_input_files]") << OutputParserTester::STDERR << QString() << QString() - << (QList<ProjectExplorer::Task>() + << (QList<Task>() << Task(Task::Error, QLatin1String("no input files [err_drv_no_input_files]"), Utils::FileName(), -1, @@ -184,7 +184,7 @@ void ProjectExplorerPlugin::testClangOutputParser_data() " ^") << OutputParserTester::STDERR << QString() << QString() - << (QList<ProjectExplorer::Task>() + << (QList<Task>() << Task(Task::Unknown, QLatin1String("In file included from ..\\..\\..\\QtSDK1.1\\Desktop\\Qt\\4.7.3\\mingw\\include/QtCore/qnamespace.h:45:"), Utils::FileName::fromUserInput(QLatin1String("..\\..\\..\\QtSDK1.1\\Desktop\\Qt\\4.7.3\\mingw\\include/QtCore/qnamespace.h")), 45, @@ -202,7 +202,7 @@ void ProjectExplorerPlugin::testClangOutputParser_data() " ^") << OutputParserTester::STDERR << QString() << QString() - << (QList<ProjectExplorer::Task>() + << (QList<Task>() << Task(Task::Unknown, QLatin1String("instantiated from:\n" "# define Q_CORE_EXPORT Q_DECL_IMPORT\n" @@ -216,7 +216,7 @@ void ProjectExplorerPlugin::testClangOutputParser_data() " ^") << OutputParserTester::STDERR << QString() << QString() - << (QList<ProjectExplorer::Task>() + << (QList<Task>() << Task(Task::Error, QLatin1String("'bits/c++config.h' file not found\n" "#include <bits/c++config.h>\n" @@ -231,7 +231,7 @@ void ProjectExplorerPlugin::testClangOutputParser_data() " ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ^") << OutputParserTester::STDERR << QString() << QString() - << (QList<ProjectExplorer::Task>() + << (QList<Task>() << Task(Task::Warning, QLatin1String("?: has lower precedence than +; + will be evaluated first [-Wparentheses]\n" " int x = option->rect.x() + horizontal ? 2 : 6;\n" @@ -245,7 +245,7 @@ void ProjectExplorerPlugin::testClangOutputParser_data() "CodeSign error: code signing is required for product type 'Application' in SDK 'iOS 7.0'") << OutputParserTester::STDERR << QString() << QString::fromLatin1("Check dependencies\n") - << (QList<ProjectExplorer::Task>() + << (QList<Task>() << Task(Task::Error, QLatin1String("No matching provisioning profiles found: No provisioning profiles with a valid signing identity (i.e. certificate and private key pair) were found."), Utils::FileName(), -1, diff --git a/src/plugins/projectexplorer/codestylesettingspropertiespage.cpp b/src/plugins/projectexplorer/codestylesettingspropertiespage.cpp index 4bb2af261b..7ca448ad26 100644 --- a/src/plugins/projectexplorer/codestylesettingspropertiespage.cpp +++ b/src/plugins/projectexplorer/codestylesettingspropertiespage.cpp @@ -46,7 +46,7 @@ CodeStyleSettingsWidget::CodeStyleSettingsWidget(Project *project) : QWidget(), const EditorConfiguration *config = m_project->editorConfiguration(); QMap<Core::Id, ICodeStylePreferencesFactory *> factories - = TextEditor::TextEditorSettings::codeStyleFactories(); + = TextEditorSettings::codeStyleFactories(); QMapIterator<Core::Id, ICodeStylePreferencesFactory *> it(factories); while (it.hasNext()) { it.next(); diff --git a/src/plugins/projectexplorer/currentprojectfilter.cpp b/src/plugins/projectexplorer/currentprojectfilter.cpp index 573ace278d..dc4bbaf27c 100644 --- a/src/plugins/projectexplorer/currentprojectfilter.cpp +++ b/src/plugins/projectexplorer/currentprojectfilter.cpp @@ -75,7 +75,7 @@ void CurrentProjectFilter::prepareSearch(const QString &entry) BaseFileFilter::prepareSearch(entry); } -void CurrentProjectFilter::currentProjectChanged(ProjectExplorer::Project *project) +void CurrentProjectFilter::currentProjectChanged(Project *project) { if (project == m_project) return; diff --git a/src/plugins/projectexplorer/customparser.cpp b/src/plugins/projectexplorer/customparser.cpp index e1f0369909..486a5ac205 100644 --- a/src/plugins/projectexplorer/customparser.cpp +++ b/src/plugins/projectexplorer/customparser.cpp @@ -36,6 +36,7 @@ #include <QString> +using namespace Utils; using namespace ProjectExplorer; CustomParserSettings::CustomParserSettings() : @@ -138,8 +139,7 @@ bool CustomParser::parseLine(const QString &rawLine) if (m_errorRegExp.indexIn(rawLine.trimmed()) == -1) return false; - const Utils::FileName fileName = - Utils::FileName::fromUserInput(m_errorRegExp.cap(m_fileNameCap)); + const FileName fileName = FileName::fromUserInput(m_errorRegExp.cap(m_fileNameCap)); const int lineNumber = m_errorRegExp.cap(m_lineNumberCap).toInt(); const QString message = m_errorRegExp.cap(m_messageCap); @@ -156,8 +156,6 @@ bool CustomParser::parseLine(const QString &rawLine) # include "metatypedeclarations.h" # include "outputparser_test.h" -using namespace Utils; - void ProjectExplorerPlugin::testCustomOutputParsers_data() { QTest::addColumn<QString>("input"); @@ -168,12 +166,12 @@ void ProjectExplorerPlugin::testCustomOutputParsers_data() QTest::addColumn<int>("messageCap"); QTest::addColumn<QString>("childStdOutLines"); QTest::addColumn<QString>("childStdErrLines"); - QTest::addColumn<QList<ProjectExplorer::Task> >("tasks"); + QTest::addColumn<QList<Task> >("tasks"); QTest::addColumn<QString>("outputLines"); const Core::Id categoryCompile = Constants::TASK_CATEGORY_COMPILE; const QString simplePattern = QLatin1String("^([a-z]+\\.[a-z]+):(\\d+): error: ([^\\s].+)$"); - const Utils::FileName fileName = Utils::FileName::fromUserInput(QLatin1String("main.c")); + const FileName fileName = FileName::fromUserInput(QLatin1String("main.c")); QTest::newRow("empty pattern") << QString::fromLatin1("Sometext") @@ -181,7 +179,7 @@ void ProjectExplorerPlugin::testCustomOutputParsers_data() << QString::fromLatin1("") << 1 << 2 << 3 << QString::fromLatin1("Sometext\n") << QString() - << QList<ProjectExplorer::Task>() + << QList<Task>() << QString(); QTest::newRow("pass-through stdout") @@ -190,7 +188,7 @@ void ProjectExplorerPlugin::testCustomOutputParsers_data() << simplePattern << 1 << 2 << 3 << QString::fromLatin1("Sometext\n") << QString() - << QList<ProjectExplorer::Task>() + << QList<Task>() << QString(); QTest::newRow("pass-through stderr") @@ -199,7 +197,7 @@ void ProjectExplorerPlugin::testCustomOutputParsers_data() << simplePattern << 1 << 2 << 3 << QString() << QString::fromLatin1("Sometext\n") - << QList<ProjectExplorer::Task>() + << QList<Task>() << QString(); const QString simpleError = QLatin1String("main.c:9: error: `sfasdf' undeclared (first use this function)"); @@ -211,7 +209,7 @@ void ProjectExplorerPlugin::testCustomOutputParsers_data() << simplePattern << 1 << 2 << 3 << QString() << QString() - << (QList<ProjectExplorer::Task>() + << (QList<Task>() << Task(Task::Error, message, fileName, 9, categoryCompile) ) << QString(); @@ -226,7 +224,7 @@ void ProjectExplorerPlugin::testCustomOutputParsers_data() << simplePattern2 << 1 << 2 << 3 << QString() << QString() - << (QList<ProjectExplorer::Task>() + << (QList<Task>() << Task(Task::Error, message, fileName, lineNumber2, categoryCompile) ) << QString(); @@ -237,7 +235,7 @@ void ProjectExplorerPlugin::testCustomOutputParsers_data() << simplePattern2 << 1 << 2 << 3 << QString() << QString() - << (QList<ProjectExplorer::Task>() + << (QList<Task>() << Task(Task::Error, message, fileName, lineNumber2, categoryCompile) ) << QString(); @@ -254,7 +252,7 @@ void ProjectExplorerPlugin::testCustomOutputParsers_data() << unitTestPattern << 1 << 2 << 3 << QString() << QString() - << (QList<ProjectExplorer::Task>() + << (QList<Task>() << Task(Task::Error, unitTestMessage, unitTestFileName, unitTestLineNumber, categoryCompile) ) << QString(); diff --git a/src/plugins/projectexplorer/customtoolchain.cpp b/src/plugins/projectexplorer/customtoolchain.cpp index c9308689ac..8adf20aca2 100644 --- a/src/plugins/projectexplorer/customtoolchain.cpp +++ b/src/plugins/projectexplorer/customtoolchain.cpp @@ -177,7 +177,7 @@ void CustomToolChain::setPredefinedMacros(const QStringList &list) m_predefinedMacros = list; } -QList<HeaderPath> CustomToolChain::systemHeaderPaths(const QStringList &cxxFlags, const Utils::FileName &) const +QList<HeaderPath> CustomToolChain::systemHeaderPaths(const QStringList &cxxFlags, const FileName &) const { QList<HeaderPath> flagHeaderPaths; foreach (const QString &cxxFlag, cxxFlags) { @@ -251,7 +251,7 @@ void CustomToolChain::setMakeCommand(const FileName &path) toolChainUpdated(); } -QString CustomToolChain::makeCommand(const Utils::Environment &) const +QString CustomToolChain::makeCommand(const Environment &) const { return m_makeCommand.toString(); } @@ -272,7 +272,7 @@ const QStringList &CustomToolChain::cxx11Flags() const void CustomToolChain::setMkspecs(const QString &specs) { m_mkspecs = Utils::transform(specs.split(QLatin1Char(',')), - [](QString fn) { return Utils::FileName::fromString(fn); }); + [](QString fn) { return FileName::fromString(fn); }); } QString CustomToolChain::mkspecs() const @@ -585,7 +585,7 @@ void CustomToolChainConfigWidget::setFromToolchain() bool blocked = blockSignals(true); CustomToolChain *tc = static_cast<CustomToolChain *>(toolChain()); m_compilerCommand->setFileName(tc->compilerCommand()); - m_makeCommand->setFileName(FileName::fromString(tc->makeCommand(Utils::Environment()))); + m_makeCommand->setFileName(FileName::fromString(tc->makeCommand(Environment()))); m_abiWidget->setAbis(QList<Abi>(), tc->targetAbi()); m_predefinedMacros->setPlainText(tc->rawPredefinedMacros().join(QLatin1Char('\n'))); m_headerPaths->setPlainText(tc->headerPathsList().join(QLatin1Char('\n'))); @@ -601,7 +601,7 @@ bool CustomToolChainConfigWidget::isDirtyImpl() const CustomToolChain *tc = static_cast<CustomToolChain *>(toolChain()); Q_ASSERT(tc); return m_compilerCommand->fileName() != tc->compilerCommand() - || m_makeCommand->path() != tc->makeCommand(Utils::Environment()) + || m_makeCommand->path() != tc->makeCommand(Environment()) || m_abiWidget->currentAbi() != tc->targetAbi() || m_predefinedDetails->entries() != tc->rawPredefinedMacros() || m_headerDetails->entries() != tc->headerPathsList() diff --git a/src/plugins/projectexplorer/devicesupport/deviceprocessesdialog.cpp b/src/plugins/projectexplorer/devicesupport/deviceprocessesdialog.cpp index cc0adb72b6..fd3567d36a 100644 --- a/src/plugins/projectexplorer/devicesupport/deviceprocessesdialog.cpp +++ b/src/plugins/projectexplorer/devicesupport/deviceprocessesdialog.cpp @@ -114,7 +114,7 @@ public: QLabel *kitLabel; KitChooser *kitChooser; - Utils::TreeView *procView; + TreeView *procView; QTextBrowser *errorText; FancyLineEdit *processFilterLineEdit; QPushButton *updateListButton; @@ -144,7 +144,7 @@ DeviceProcessesDialogPrivate::DeviceProcessesDialogPrivate(KitChooser *chooser, kitChooser->populate(); - procView = new Utils::TreeView(q); + procView = new TreeView(q); procView->setModel(&proxyModel); procView->setSelectionBehavior(QAbstractItemView::SelectRows); procView->setSelectionMode(QAbstractItemView::SingleSelection); @@ -155,7 +155,7 @@ DeviceProcessesDialogPrivate::DeviceProcessesDialogPrivate(KitChooser *chooser, procView->header()->setDefaultSectionSize(100); procView->header()->setStretchLastSection(true); procView->sortByColumn(1, Qt::AscendingOrder); - procView->setActivationMode(Utils::DoubleClickActivation); + procView->setActivationMode(DoubleClickActivation); errorText = new QTextBrowser(q); diff --git a/src/plugins/projectexplorer/devicesupport/devicesettingswidget.cpp b/src/plugins/projectexplorer/devicesupport/devicesettingswidget.cpp index eab2b49f9a..64bc221d76 100644 --- a/src/plugins/projectexplorer/devicesupport/devicesettingswidget.cpp +++ b/src/plugins/projectexplorer/devicesupport/devicesettingswidget.cpp @@ -124,7 +124,7 @@ void DeviceSettingsWidget::initGui() m_ui->addConfigButton->setEnabled(hasDeviceFactories); - int lastIndex = Core::ICore::settings() + int lastIndex = ICore::settings() ->value(QLatin1String(LastDeviceIndexKey), 0).toInt(); if (lastIndex == -1) lastIndex = 0; @@ -143,7 +143,7 @@ void DeviceSettingsWidget::addDevice() if (d.exec() != QDialog::Accepted) return; - Core::Id toCreate = d.selectedId(); + Id toCreate = d.selectedId(); if (!toCreate.isValid()) return; IDeviceFactory *factory = IDeviceFactory::find(toCreate); @@ -221,7 +221,7 @@ void DeviceSettingsWidget::updateDeviceFromUi() void DeviceSettingsWidget::saveSettings() { - Core::ICore::settings()->setValue(QLatin1String(LastDeviceIndexKey), currentIndex()); + ICore::settings()->setValue(QLatin1String(LastDeviceIndexKey), currentIndex()); DeviceManager::replaceInstance(); } @@ -299,7 +299,7 @@ void DeviceSettingsWidget::currentDeviceChanged(int index) m_ui->buttonsLayout->insertWidget(m_ui->buttonsLayout->count() - 1, button); } - foreach (Core::Id actionId, device->actionIds()) { + foreach (Id actionId, device->actionIds()) { QPushButton * const button = new QPushButton(device->displayNameForActionId(actionId)); m_additionalActionButtons << button; connect(button, SIGNAL(clicked()), m_additionalActionsMapper, SLOT(map())); @@ -327,7 +327,7 @@ void DeviceSettingsWidget::handleAdditionalActionRequest(int actionId) const IDevice::Ptr device = m_deviceManager->mutableDevice(currentDevice()->id()); QTC_ASSERT(device, return); updateDeviceFromUi(); - device->executeAction(Core::Id::fromUniqueIdentifier(actionId), this); + device->executeAction(Id::fromUniqueIdentifier(actionId), this); // Widget must be set up from scratch, because the action could have changed random attributes. currentDeviceChanged(currentIndex()); diff --git a/src/plugins/projectexplorer/doubletabwidget.cpp b/src/plugins/projectexplorer/doubletabwidget.cpp index e67005872d..dd455440e7 100644 --- a/src/plugins/projectexplorer/doubletabwidget.cpp +++ b/src/plugins/projectexplorer/doubletabwidget.cpp @@ -51,7 +51,7 @@ static const int MARGIN = 12; static const int OTHER_HEIGHT = 38; static const int SELECTION_IMAGE_WIDTH = 10; static const int SELECTION_IMAGE_HEIGHT = 20; -static const int OVERFLOW_DROPDOWN_WIDTH = Utils::StyleHelper::navigationWidgetHeight(); +static const int OVERFLOW_DROPDOWN_WIDTH = StyleHelper::navigationWidgetHeight(); static void drawFirstLevelSeparator(QPainter *painter, QPoint top, QPoint bottom) { @@ -170,7 +170,7 @@ void DoubleTabWidget::setTitle(const QString &title) QSize DoubleTabWidget::minimumSizeHint() const { - return QSize(0, Utils::StyleHelper::navigationWidgetHeight() + OTHER_HEIGHT + 1); + return QSize(0, StyleHelper::navigationWidgetHeight() + OTHER_HEIGHT + 1); } void DoubleTabWidget::updateNameIsUniqueAdd(Tab *tab) @@ -258,7 +258,7 @@ int DoubleTabWidget::tabCount() const /// is the tab or subtab number QPair<DoubleTabWidget::HitArea, int> DoubleTabWidget::convertPosToTab(QPoint pos) { - if (pos.y() < Utils::StyleHelper::navigationWidgetHeight()) { + if (pos.y() < StyleHelper::navigationWidgetHeight()) { // on the top level part of the bar int eventX = pos.x(); QFontMetrics fm(font()); @@ -282,10 +282,10 @@ QPair<DoubleTabWidget::HitArea, int> DoubleTabWidget::convertPosToTab(QPoint pos if (eventX > x && eventX < x + OVERFLOW_DROPDOWN_WIDTH) return qMakePair(HITOVERFLOW, -1); } - } else if (pos.y() < Utils::StyleHelper::navigationWidgetHeight() + OTHER_HEIGHT) { + } else if (pos.y() < StyleHelper::navigationWidgetHeight() + OTHER_HEIGHT) { int diff = (OTHER_HEIGHT - SELECTION_IMAGE_HEIGHT) / 2; - if (pos.y() < Utils::StyleHelper::navigationWidgetHeight() + diff - || pos.y() > Utils::StyleHelper::navigationWidgetHeight() + OTHER_HEIGHT - diff) + if (pos.y() < StyleHelper::navigationWidgetHeight() + diff + || pos.y() > StyleHelper::navigationWidgetHeight() + OTHER_HEIGHT - diff) return qMakePair(HITNOTHING, -1); // on the lower level part of the bar if (m_currentIndex == -1) @@ -363,13 +363,13 @@ void DoubleTabWidget::paintEvent(QPaintEvent *event) QRect r = rect(); // draw top level tab bar - r.setHeight(Utils::StyleHelper::navigationWidgetHeight()); + r.setHeight(StyleHelper::navigationWidgetHeight()); if (creatorTheme()->widgetStyle () == Theme::StyleDefault) { QPoint offset = window()->mapToGlobal(QPoint(0, 0)) - mapToGlobal(r.topLeft()); QRect gradientSpan = QRect(offset, window()->size()); - Utils::StyleHelper::horizontalGradient(&painter, gradientSpan, r); - painter.setPen(Utils::StyleHelper::borderColor()); + StyleHelper::horizontalGradient(&painter, gradientSpan, r); + painter.setPen(StyleHelper::borderColor()); QColor lighter(255, 255, 255, 40); painter.drawLine(r.bottomLeft(), r.bottomRight()); painter.setPen(lighter); @@ -383,7 +383,7 @@ void DoubleTabWidget::paintEvent(QPaintEvent *event) // top level title if (!m_title.isEmpty()) { - painter.setPen(Utils::StyleHelper::panelTextColor()); + painter.setPen(StyleHelper::panelTextColor()); painter.drawText(MARGIN, baseline, m_title); } @@ -478,7 +478,7 @@ void DoubleTabWidget::paintEvent(QPaintEvent *event) int actualIndex = m_currentTabIndices.at(i); Tab tab = m_tabs.at(actualIndex); if (actualIndex == m_currentIndex) { - painter.setPen(Utils::StyleHelper::borderColor()); + painter.setPen(StyleHelper::borderColor()); painter.drawLine(x - 1, 0, x - 1, r.height() - 1); painter.fillRect(QRect(x, 0, 2 * MARGIN + fm.width(tab.displayName()), @@ -495,7 +495,7 @@ void DoubleTabWidget::paintEvent(QPaintEvent *event) x += nameWidth.at(actualIndex); x += MARGIN; if (creatorTheme()->widgetStyle() == Theme::StyleDefault) { - painter.setPen(Utils::StyleHelper::borderColor()); + painter.setPen(StyleHelper::borderColor()); painter.drawLine(x, 0, x, r.height() - 1); painter.setPen(QColor(0, 0, 0, 20)); painter.drawLine(x + 1, 0, x + 1, r.height() - 1); diff --git a/src/plugins/projectexplorer/editorconfiguration.cpp b/src/plugins/projectexplorer/editorconfiguration.cpp index 2bb35c8107..b5c58efef2 100644 --- a/src/plugins/projectexplorer/editorconfiguration.cpp +++ b/src/plugins/projectexplorer/editorconfiguration.cpp @@ -333,25 +333,25 @@ void EditorConfiguration::switchSettings(TextEditorWidget *widget) const } } -void EditorConfiguration::setTypingSettings(const TextEditor::TypingSettings &settings) +void EditorConfiguration::setTypingSettings(const TypingSettings &settings) { d->m_typingSettings = settings; emit typingSettingsChanged(d->m_typingSettings); } -void EditorConfiguration::setStorageSettings(const TextEditor::StorageSettings &settings) +void EditorConfiguration::setStorageSettings(const StorageSettings &settings) { d->m_storageSettings = settings; emit storageSettingsChanged(d->m_storageSettings); } -void EditorConfiguration::setBehaviorSettings(const TextEditor::BehaviorSettings &settings) +void EditorConfiguration::setBehaviorSettings(const BehaviorSettings &settings) { d->m_behaviorSettings = settings; emit behaviorSettingsChanged(d->m_behaviorSettings); } -void EditorConfiguration::setExtraEncodingSettings(const TextEditor::ExtraEncodingSettings &settings) +void EditorConfiguration::setExtraEncodingSettings(const ExtraEncodingSettings &settings) { d->m_extraEncodingSettings = settings; emit extraEncodingSettingsChanged(d->m_extraEncodingSettings); @@ -391,7 +391,7 @@ void EditorConfiguration::slotAboutToRemoveProject(Project *project) if (project->editorConfiguration() != this) return; - foreach (TextEditor::BaseTextEditor *editor, d->m_editors) + foreach (BaseTextEditor *editor, d->m_editors) deconfigureEditor(editor); } diff --git a/src/plugins/projectexplorer/gccparser.cpp b/src/plugins/projectexplorer/gccparser.cpp index 3189432179..f71280a710 100644 --- a/src/plugins/projectexplorer/gccparser.cpp +++ b/src/plugins/projectexplorer/gccparser.cpp @@ -197,7 +197,7 @@ void ProjectExplorerPlugin::testGccOutputParsers_data() QTest::addColumn<OutputParserTester::Channel>("inputChannel"); QTest::addColumn<QString>("childStdOutLines"); QTest::addColumn<QString>("childStdErrLines"); - QTest::addColumn<QList<ProjectExplorer::Task> >("tasks"); + QTest::addColumn<QList<Task> >("tasks"); QTest::addColumn<QString>("outputLines"); const Core::Id categoryCompile = Constants::TASK_CATEGORY_COMPILE; diff --git a/src/plugins/projectexplorer/gcctoolchain.cpp b/src/plugins/projectexplorer/gcctoolchain.cpp index 9c0cf68a8b..8cc9299086 100644 --- a/src/plugins/projectexplorer/gcctoolchain.cpp +++ b/src/plugins/projectexplorer/gcctoolchain.cpp @@ -128,7 +128,7 @@ static QByteArray gccPredefinedMacros(const FileName &gcc, const QStringList &ar QByteArray predefinedMacros = runGcc(gcc, arguments, env); // Sanity check in case we get an error message instead of real output: QTC_CHECK(predefinedMacros.isNull() || predefinedMacros.startsWith("#define ")); - if (Utils::HostOsInfo::isMacHost()) { + if (HostOsInfo::isMacHost()) { // Turn off flag indicating Apple's blocks support const QByteArray blocksDefine("#define __BLOCKS__ 1"); const QByteArray blocksUndefine("#undef __BLOCKS__"); @@ -539,7 +539,7 @@ GccToolChain::WarningFlags GccToolChain::warningFlags(const QStringList &cflags) return flags; } -QList<HeaderPath> GccToolChain::systemHeaderPaths(const QStringList &cxxflags, const Utils::FileName &sysRoot) const +QList<HeaderPath> GccToolChain::systemHeaderPaths(const QStringList &cxxflags, const FileName &sysRoot) const { if (m_headerPaths.isEmpty()) { // Using a clean environment breaks ccache/distcc/etc. @@ -617,7 +617,7 @@ QList<FileName> GccToolChain::suggestedMkspecList() const return QList<FileName>(); } -QString GccToolChain::makeCommand(const Utils::Environment &environment) const +QString GccToolChain::makeCommand(const Environment &environment) const { QString make = QLatin1String("make"); FileName tmp = environment.searchInPath(make); @@ -791,7 +791,7 @@ ToolChain *GccToolChainFactory::create() QList<ToolChain *> GccToolChainFactory::autoDetect() { QList<ToolChain *> tcs; - if (Utils::HostOsInfo::isMacHost()) { + if (HostOsInfo::isMacHost()) { // Old mac compilers needed to support macx-gccXY mkspecs: tcs.append(autoDetectToolchains(QLatin1String("g++-4.0"), Abi::hostAbi())); tcs.append(autoDetectToolchains(QLatin1String("g++-4.2"), Abi::hostAbi())); @@ -1036,10 +1036,10 @@ QString ClangToolChain::typeDisplayName() const return ClangToolChainFactory::tr("Clang"); } -QString ClangToolChain::makeCommand(const Utils::Environment &environment) const +QString ClangToolChain::makeCommand(const Environment &environment) const { QStringList makes; - if (Utils::HostOsInfo::isWindowsHost()) { + if (HostOsInfo::isWindowsHost()) { makes << QLatin1String("mingw32-make.exe"); makes << QLatin1String("make.exe"); } else { @@ -1186,9 +1186,9 @@ QString MingwToolChain::typeDisplayName() const QList<FileName> MingwToolChain::suggestedMkspecList() const { - if (Utils::HostOsInfo::isWindowsHost()) + if (HostOsInfo::isWindowsHost()) return QList<FileName>() << FileName::fromLatin1("win32-g++"); - if (Utils::HostOsInfo::isLinuxHost()) { + if (HostOsInfo::isLinuxHost()) { if (version().startsWith(QLatin1String("4.6."))) return QList<FileName>() << FileName::fromLatin1("win32-g++-4.6-cross") @@ -1201,10 +1201,10 @@ QList<FileName> MingwToolChain::suggestedMkspecList() const return QList<FileName>(); } -QString MingwToolChain::makeCommand(const Utils::Environment &environment) const +QString MingwToolChain::makeCommand(const Environment &environment) const { QStringList makes; - if (Utils::HostOsInfo::isWindowsHost()) { + if (HostOsInfo::isWindowsHost()) { makes << QLatin1String("mingw32-make.exe"); makes << QLatin1String("make.exe"); } else { diff --git a/src/plugins/projectexplorer/jsonwizard/jsonfieldpage.cpp b/src/plugins/projectexplorer/jsonwizard/jsonfieldpage.cpp index 8363cdd657..f79a2ce9c1 100644 --- a/src/plugins/projectexplorer/jsonwizard/jsonfieldpage.cpp +++ b/src/plugins/projectexplorer/jsonwizard/jsonfieldpage.cpp @@ -97,7 +97,7 @@ public: m_expander.setAccumulating(true); m_expander.registerVariable("INPUT", tr("The text edit input to fix up."), [this]() { return m_currentInput; }); - m_expander.registerSubProvider([expander]() -> Utils::MacroExpander * { return expander; }); + m_expander.registerSubProvider([expander]() -> MacroExpander * { return expander; }); } void setFixupExpando(const QString &expando) diff --git a/src/plugins/projectexplorer/jsonwizard/jsonwizardgeneratorfactory.cpp b/src/plugins/projectexplorer/jsonwizard/jsonwizardgeneratorfactory.cpp index 88e9810aee..8e842eb66c 100644 --- a/src/plugins/projectexplorer/jsonwizard/jsonwizardgeneratorfactory.cpp +++ b/src/plugins/projectexplorer/jsonwizard/jsonwizardgeneratorfactory.cpp @@ -83,7 +83,7 @@ static ICodeStylePreferences *codeStylePreferences(Project *project, Id language // JsonWizardGenerator: // -------------------------------------------------------------------- -bool JsonWizardGenerator::formatFile(const JsonWizard *wizard, Core::GeneratedFile *file, QString *errorMessage) +bool JsonWizardGenerator::formatFile(const JsonWizard *wizard, GeneratedFile *file, QString *errorMessage) { Q_UNUSED(errorMessage); @@ -132,7 +132,7 @@ JsonWizardGenerator::OverwriteResult JsonWizardGenerator::promptForOverwrite(Jso foreach (const JsonWizard::GeneratorFile &f, *files) { const QFileInfo fi(f.file.path()); - if (fi.exists() && !(f.file.attributes() & Core::GeneratedFile::ForceOverwrite)) + if (fi.exists() && !(f.file.attributes() & GeneratedFile::ForceOverwrite)) existingFiles.append(f.file.path()); } if (existingFiles.isEmpty()) @@ -173,7 +173,7 @@ JsonWizardGenerator::OverwriteResult JsonWizardGenerator::promptForOverwrite(Jso } // Prompt to overwrite existing files. - Core::PromptOverwriteDialog overwriteDialog; + PromptOverwriteDialog overwriteDialog; // Scripts cannot handle overwrite overwriteDialog.setFiles(existingFiles); @@ -195,7 +195,7 @@ JsonWizardGenerator::OverwriteResult JsonWizardGenerator::promptForOverwrite(Jso { return f.file.path() == keepFile; }); if (!file.isValid()) return OverwriteCanceled; - file.file.setAttributes(file.file.attributes() | Core::GeneratedFile::KeepExistingFileAttribute); + file.file.setAttributes(file.file.attributes() | GeneratedFile::KeepExistingFileAttribute); } return OverwriteOk; } @@ -243,7 +243,7 @@ bool JsonWizardGenerator::allDone(const JsonWizard *wizard, JsonWizard::Generato void JsonWizardGeneratorFactory::setTypeIdsSuffixes(const QStringList &suffixes) { m_typeIds = Utils::transform(suffixes, [](QString suffix) - { return Core::Id::fromString(QString::fromLatin1(Constants::GENERATOR_ID_PREFIX) + suffix); }); + { return Id::fromString(QString::fromLatin1(Constants::GENERATOR_ID_PREFIX) + suffix); }); } void JsonWizardGeneratorFactory::setTypeIdsSuffix(const QString &suffix) @@ -261,7 +261,7 @@ FileGeneratorFactory::FileGeneratorFactory() setTypeIdsSuffix(QLatin1String("File")); } -JsonWizardGenerator *FileGeneratorFactory::create(Core::Id typeId, const QVariant &data, +JsonWizardGenerator *FileGeneratorFactory::create(Id typeId, const QVariant &data, const QString &path, const QString &platform, const QVariantMap &variables) { @@ -285,7 +285,7 @@ JsonWizardGenerator *FileGeneratorFactory::create(Core::Id typeId, const QVarian return gen; } -bool FileGeneratorFactory::validateData(Core::Id typeId, const QVariant &data, QString *errorMessage) +bool FileGeneratorFactory::validateData(Id typeId, const QVariant &data, QString *errorMessage) { Q_UNUSED(data); Q_UNUSED(errorMessage); diff --git a/src/plugins/projectexplorer/kit.cpp b/src/plugins/projectexplorer/kit.cpp index a6005a84da..04d024c812 100644 --- a/src/plugins/projectexplorer/kit.cpp +++ b/src/plugins/projectexplorer/kit.cpp @@ -129,9 +129,9 @@ public: QIcon m_icon; FileName m_iconPath; - QHash<Core::Id, QVariant> m_data; - QSet<Core::Id> m_sticky; - QSet<Core::Id> m_mutable; + QHash<Id, QVariant> m_data; + QSet<Id> m_sticky; + QSet<Id> m_mutable; MacroExpander m_macroExpander; }; @@ -141,7 +141,7 @@ public: // Kit: // ------------------------------------------------------------------------- -Kit::Kit(Core::Id id) : +Kit::Kit(Id id) : d(new Internal::KitPrivate(id, this)) { foreach (KitInformation *sti, KitManager::kitInformation()) @@ -151,7 +151,7 @@ Kit::Kit(Core::Id id) : } Kit::Kit(const QVariantMap &data) : - d(new Internal::KitPrivate(Core::Id(), this)) + d(new Internal::KitPrivate(Id(), this)) { d->m_id = Id::fromSetting(data.value(QLatin1String(ID_KEY))); @@ -180,11 +180,11 @@ Kit::Kit(const QVariantMap &data) : QStringList mutableInfoList = data.value(QLatin1String(MUTABLE_INFO_KEY)).toStringList(); foreach (const QString &mutableInfo, mutableInfoList) - d->m_mutable.insert(Core::Id::fromString(mutableInfo)); + d->m_mutable.insert(Id::fromString(mutableInfo)); QStringList stickyInfoList = data.value(QLatin1String(STICKY_INFO_KEY)).toStringList(); foreach (const QString &stickyInfo, stickyInfoList) - d->m_sticky.insert(Core::Id::fromString(stickyInfo)); + d->m_sticky.insert(Id::fromString(stickyInfo)); } Kit::~Kit() @@ -469,7 +469,7 @@ void Kit::removeKey(Id key) kitUpdated(); } -bool Kit::isSticky(Core::Id id) const +bool Kit::isSticky(Id id) const { return d->m_sticky.contains(id); } @@ -491,7 +491,7 @@ bool Kit::isEqual(const Kit *other) const QVariantMap Kit::toMap() const { - typedef QHash<Core::Id, QVariant>::ConstIterator IdVariantConstIt; + typedef QHash<Id, QVariant>::ConstIterator IdVariantConstIt; QVariantMap data; data.insert(QLatin1String(ID_KEY), QString::fromLatin1(d->m_id.name())); @@ -504,12 +504,12 @@ QVariantMap Kit::toMap() const data.insert(QLatin1String(ICON_KEY), d->m_iconPath.toString()); QStringList mutableInfo; - foreach (Core::Id id, d->m_mutable) + foreach (Id id, d->m_mutable) mutableInfo << id.toString(); data.insert(QLatin1String(MUTABLE_INFO_KEY), mutableInfo); QStringList stickyInfo; - foreach (Core::Id id, d->m_sticky) + foreach (Id id, d->m_sticky) stickyInfo << id.toString(); data.insert(QLatin1String(STICKY_INFO_KEY), stickyInfo); @@ -602,7 +602,7 @@ void Kit::makeSticky() } } -void Kit::setSticky(Core::Id id, bool b) +void Kit::setSticky(Id id, bool b) { if (b) d->m_sticky.insert(id); @@ -656,7 +656,7 @@ QString Kit::displayNameForPlatform(const QString &platform) const FeatureSet Kit::availableFeatures() const { - Core::FeatureSet features; + FeatureSet features; foreach (const KitInformation *ki, KitManager::kitInformation()) features |= ki->availableFeatures(this); return features; diff --git a/src/plugins/projectexplorer/kitinformationconfigwidget.cpp b/src/plugins/projectexplorer/kitinformationconfigwidget.cpp index f741ae1e56..42056989cf 100644 --- a/src/plugins/projectexplorer/kitinformationconfigwidget.cpp +++ b/src/plugins/projectexplorer/kitinformationconfigwidget.cpp @@ -215,7 +215,7 @@ void ToolChainInformationConfigWidget::toolChainUpdated(ToolChain *tc) void ToolChainInformationConfigWidget::manageToolChains() { - Core::ICore::showOptionsDialog(Constants::PROJECTEXPLORER_SETTINGS_CATEGORY, + ICore::showOptionsDialog(Constants::PROJECTEXPLORER_SETTINGS_CATEGORY, Constants::TOOLCHAIN_SETTINGS_PAGE_ID, buttonWidget()); } @@ -261,7 +261,7 @@ DeviceTypeInformationConfigWidget::DeviceTypeInformationConfigWidget(Kit *workin QList<IDeviceFactory *> factories = ExtensionSystem::PluginManager::getObjects<IDeviceFactory>(); foreach (IDeviceFactory *factory, factories) { - foreach (Core::Id id, factory->availableCreationIds()) + foreach (Id id, factory->availableCreationIds()) m_comboBox->addItem(factory->displayNameForId(id), id.uniqueIdentifier()); } @@ -293,7 +293,7 @@ QString DeviceTypeInformationConfigWidget::toolTip() const void DeviceTypeInformationConfigWidget::refresh() { - Core::Id devType = DeviceTypeKitInformation::deviceTypeId(m_kit); + Id devType = DeviceTypeKitInformation::deviceTypeId(m_kit); if (!devType.isValid()) m_comboBox->setCurrentIndex(-1); for (int i = 0; i < m_comboBox->count(); ++i) { @@ -311,7 +311,7 @@ void DeviceTypeInformationConfigWidget::makeReadOnly() void DeviceTypeInformationConfigWidget::currentTypeChanged(int idx) { - Core::Id type = idx < 0 ? Core::Id() : Core::Id::fromUniqueIdentifier(m_comboBox->itemData(idx).toInt()); + Id type = idx < 0 ? Id() : Id::fromUniqueIdentifier(m_comboBox->itemData(idx).toInt()); DeviceTypeKitInformation::setDeviceTypeId(m_kit, type); } diff --git a/src/plugins/projectexplorer/linuxiccparser.cpp b/src/plugins/projectexplorer/linuxiccparser.cpp index e75aeff81d..583577b5e9 100644 --- a/src/plugins/projectexplorer/linuxiccparser.cpp +++ b/src/plugins/projectexplorer/linuxiccparser.cpp @@ -140,7 +140,7 @@ void ProjectExplorerPlugin::testLinuxIccOutputParsers_data() QTest::addColumn<OutputParserTester::Channel>("inputChannel"); QTest::addColumn<QString>("childStdOutLines"); QTest::addColumn<QString>("childStdErrLines"); - QTest::addColumn<QList<ProjectExplorer::Task> >("tasks"); + QTest::addColumn<QList<Task> >("tasks"); QTest::addColumn<QString>("outputLines"); QTest::newRow("pass-through stdout") diff --git a/src/plugins/projectexplorer/miniprojecttargetselector.cpp b/src/plugins/projectexplorer/miniprojecttargetselector.cpp index 17a312e971..eb92194f89 100644 --- a/src/plugins/projectexplorer/miniprojecttargetselector.cpp +++ b/src/plugins/projectexplorer/miniprojecttargetselector.cpp @@ -142,7 +142,7 @@ void TargetSelectorDelegate::paint(QPainter *painter, option.palette.highlight().color() : option.palette.dark().color(); painter->fillRect(option.rect, color.darker(140)); - Utils::StyleHelper::drawCornerImage(selectionGradient, painter, option.rect.adjusted(0, 0, 0, -1), 5, 5, 5, 5); + StyleHelper::drawCornerImage(selectionGradient, painter, option.rect.adjusted(0, 0, 0, -1), 5, 5, 5, 5); painter->setPen(QColor(255, 255, 255, 60)); painter->drawLine(option.rect.topLeft(), option.rect.topRight()); painter->setPen(QColor(255, 255, 255, 30)); @@ -625,7 +625,7 @@ void KitAreaWidget::updateKit(Kit *k) QWidget *MiniProjectTargetSelector::createTitleLabel(const QString &text) { - Utils::StyledBar *bar = new Utils::StyledBar(this); + StyledBar *bar = new StyledBar(this); bar->setSingleRow(true); QVBoxLayout *toolLayout = new QVBoxLayout(bar); toolLayout->setContentsMargins(6, 0, 6, 0); @@ -1599,7 +1599,7 @@ void MiniProjectTargetSelector::paintEvent(QPaintEvent *) // draw thicker border on the bottom QRect bottomRect(0, rect().height() - 8, rect().width(), 8); static QImage image(QLatin1String(":/projectexplorer/images/targetpanel_bottom.png")); - Utils::StyleHelper::drawCornerImage(image, &painter, bottomRect, 1, 1, 1, 1); + StyleHelper::drawCornerImage(image, &painter, bottomRect, 1, 1, 1, 1); } } diff --git a/src/plugins/projectexplorer/panelswidget.cpp b/src/plugins/projectexplorer/panelswidget.cpp index c379ad5986..c49b67e7f5 100644 --- a/src/plugins/projectexplorer/panelswidget.cpp +++ b/src/plugins/projectexplorer/panelswidget.cpp @@ -92,9 +92,9 @@ void RootWidget::paintEvent(QPaintEvent *e) if (creatorTheme()->widgetStyle() == Theme::StyleDefault) { // draw separator line to the right of the settings panel QPainter painter(this); - QColor light = Utils::StyleHelper::mergedColors( + QColor light = StyleHelper::mergedColors( palette().button().color(), Qt::white, 30); - QColor dark = Utils::StyleHelper::mergedColors( + QColor dark = StyleHelper::mergedColors( palette().button().color(), Qt::black, 85); painter.setPen(light); @@ -119,7 +119,7 @@ PanelsWidget::PanelsWidget(QWidget *parent) : m_root->setContentsMargins(0, 0, 40, 0); QPalette pal; - QColor background = Utils::StyleHelper::mergedColors( + QColor background = StyleHelper::mergedColors( palette().window().color(), Qt::white, 85); pal.setColor(QPalette::All, QPalette::Window, background.darker(102)); setPalette(pal); diff --git a/src/plugins/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp index ba9ea4e368..be9c6b63f2 100644 --- a/src/plugins/projectexplorer/projectexplorer.cpp +++ b/src/plugins/projectexplorer/projectexplorer.cpp @@ -197,7 +197,7 @@ public: ProjectExplorerPluginPrivate(); void deploy(QList<Project *>); - int queue(QList<Project *>, QList<Core::Id> stepIds); + int queue(QList<Project *>, QList<Id> stepIds); void updateContextMenuActions(); void executeRunConfiguration(RunConfiguration *, RunMode mode); QPair<bool, QString> buildSettingsEnabledForSession(); @@ -391,7 +391,7 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er dd->m_kitManager = new KitManager; // register before ToolChainManager dd->m_toolChainManager = new ToolChainManager; - Core::IWizardFactory::registerFeatureProvider(new KitFeatureProvider); + IWizardFactory::registerFeatureProvider(new KitFeatureProvider); // Register KitInformation: KitManager::registerKitInformation(new DeviceTypeKitInformation); @@ -442,9 +442,9 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er connect(tree, &ProjectTree::currentProjectChanged, dd, &ProjectExplorerPluginPrivate::updateActions); - addAutoReleasedObject(new CustomWizardMetaFactory<CustomProjectWizard>(Core::IWizardFactory::ProjectWizard)); - addAutoReleasedObject(new CustomWizardMetaFactory<CustomWizard>(Core::IWizardFactory::FileWizard)); - addAutoReleasedObject(new CustomWizardMetaFactory<CustomWizard>(Core::IWizardFactory::ClassWizard)); + addAutoReleasedObject(new CustomWizardMetaFactory<CustomProjectWizard>(IWizardFactory::ProjectWizard)); + addAutoReleasedObject(new CustomWizardMetaFactory<CustomWizard>(IWizardFactory::FileWizard)); + addAutoReleasedObject(new CustomWizardMetaFactory<CustomWizard>(IWizardFactory::ClassWizard)); // For JsonWizard: JsonWizardFactory::registerPageFactory(new FieldPageFactory); @@ -906,7 +906,7 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er // add existing directory action dd->m_addExistingDirectoryAction = new QAction(tr("Add Existing Directory..."), this); - cmd = Core::ActionManager::registerAction(dd->m_addExistingDirectoryAction, + cmd = ActionManager::registerAction(dd->m_addExistingDirectoryAction, Constants::ADDEXISTINGDIRECTORY, projecTreeContext); mprojectContextMenu->addAction(cmd, Constants::G_PROJECT_FILES); @@ -1254,7 +1254,7 @@ void ProjectExplorerPlugin::loadAction() dir = isProject ? fn : QFileInfo(fn).absolutePath(); } - QString filename = QFileDialog::getOpenFileName(Core::ICore::dialogParent(), + QString filename = QFileDialog::getOpenFileName(ICore::dialogParent(), tr("Load Project"), dir, dd->m_projectFilterString); if (filename.isEmpty()) @@ -1337,7 +1337,7 @@ void ProjectExplorerPlugin::extensionsInitialized() QList<IProjectManager*> projectManagers = ExtensionSystem::PluginManager::getObjects<IProjectManager>(); - QList<Core::MimeGlobPattern> allGlobPatterns; + QList<MimeGlobPattern> allGlobPatterns; const QString filterSeparator = QLatin1String(";;"); QStringList filterStrings; @@ -1347,7 +1347,7 @@ void ProjectExplorerPlugin::extensionsInitialized() QString errorMessage; ProjectExplorerPlugin::openProject(fileName, &errorMessage); if (!errorMessage.isEmpty()) - QMessageBox::critical(Core::ICore::mainWindow(), + QMessageBox::critical(ICore::mainWindow(), tr("Failed to open project"), errorMessage); return 0; }); @@ -2905,7 +2905,7 @@ void ProjectExplorerPlugin::addExistingDirectory() { QTC_ASSERT(ProjectTree::currentNode(), return); - SelectableFilesDialogAddDirectory dialog(directoryFor(ProjectTree::currentNode()), QStringList(), Core::ICore::mainWindow()); + SelectableFilesDialogAddDirectory dialog(directoryFor(ProjectTree::currentNode()), QStringList(), ICore::mainWindow()); if (dialog.exec() == QDialog::Accepted) addExistingFiles(dialog.selectedFiles()); diff --git a/src/plugins/projectexplorer/projectnodes.cpp b/src/plugins/projectexplorer/projectnodes.cpp index 5fc890c964..677f9210c2 100644 --- a/src/plugins/projectexplorer/projectnodes.cpp +++ b/src/plugins/projectexplorer/projectnodes.cpp @@ -185,7 +185,7 @@ bool Node::isEnabled() const QList<ProjectAction> Node::supportedActions(Node *node) const { QList<ProjectAction> list = parentFolderNode()->supportedActions(node); - list.append(ProjectExplorer::InheritedFromParent); + list.append(InheritedFromParent); return list; } diff --git a/src/plugins/projectexplorer/projecttreewidget.cpp b/src/plugins/projectexplorer/projecttreewidget.cpp index 8dc5afe33d..8f82faabb3 100644 --- a/src/plugins/projectexplorer/projecttreewidget.cpp +++ b/src/plugins/projectexplorer/projecttreewidget.cpp @@ -133,7 +133,7 @@ ProjectTreeWidget::ProjectTreeWidget(QWidget *parent) initView(); QVBoxLayout *layout = new QVBoxLayout(); - layout->addWidget(Core::ItemViewFind::createSearchableWrapper( + layout->addWidget(ItemViewFind::createSearchableWrapper( m_view, ItemViewFind::DarkColored, ItemViewFind::FetchMoreWhileSearching)); layout->setContentsMargins(0, 0, 0, 0); diff --git a/src/plugins/projectexplorer/projectwizardpage.cpp b/src/plugins/projectexplorer/projectwizardpage.cpp index 9c662af590..d9df19ea7d 100644 --- a/src/plugins/projectexplorer/projectwizardpage.cpp +++ b/src/plugins/projectexplorer/projectwizardpage.cpp @@ -65,7 +65,7 @@ using namespace Utils; namespace ProjectExplorer { namespace Internal { -class AddNewTree : public Utils::TreeItem +class AddNewTree : public TreeItem { public: AddNewTree(const QString &displayName); @@ -323,15 +323,15 @@ ProjectWizardPage::ProjectWizardPage(QWidget *parent) : m_repositoryExists(false) { m_ui->setupUi(this); - m_ui->vcsManageButton->setText(Core::ICore::msgShowOptionsDialog()); + m_ui->vcsManageButton->setText(ICore::msgShowOptionsDialog()); connect(m_ui->projectComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(projectChanged(int))); connect(m_ui->addToVersionControlComboBox, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged), this, &ProjectWizardPage::versionControlChanged); connect(m_ui->vcsManageButton, &QAbstractButton::clicked, this, &ProjectWizardPage::manageVcs); - setProperty(Utils::SHORT_TITLE_PROPERTY, tr("Summary")); + setProperty(SHORT_TITLE_PROPERTY, tr("Summary")); - connect(Core::VcsManager::instance(), SIGNAL(configurationChanged(const IVersionControl*)), + connect(VcsManager::instance(), SIGNAL(configurationChanged(const IVersionControl*)), this, SLOT(initializeVersionControls())); } @@ -556,7 +556,7 @@ void ProjectWizardPage::setFiles(const QStringList &fileNames) const bool filePath2HasDir = filePath2.contains(QLatin1Char('/')); if (filePath1HasDir == filePath2HasDir) - return Utils::FileName::fromString(filePath1) < Utils::FileName::fromString(filePath2); + return FileName::fromString(filePath1) < FileName::fromString(filePath2); return filePath1HasDir; } ); @@ -584,7 +584,7 @@ void ProjectWizardPage::projectChanged(int index) void ProjectWizardPage::manageVcs() { - Core::ICore::showOptionsDialog(VcsBase::Constants::VCS_SETTINGS_CATEGORY, + ICore::showOptionsDialog(VcsBase::Constants::VCS_SETTINGS_CATEGORY, VcsBase::Constants::VCS_COMMON_SETTINGS_ID, this); } diff --git a/src/plugins/projectexplorer/runconfiguration.cpp b/src/plugins/projectexplorer/runconfiguration.cpp index 5e6c73f3f9..90d6cf5e64 100644 --- a/src/plugins/projectexplorer/runconfiguration.cpp +++ b/src/plugins/projectexplorer/runconfiguration.cpp @@ -313,7 +313,7 @@ QVariantMap RunConfiguration::toMap() const return map; } -ProjectExplorer::Abi RunConfiguration::abi() const +Abi RunConfiguration::abi() const { BuildConfiguration *bc = target()->activeBuildConfiguration(); if (!bc) diff --git a/src/plugins/projectexplorer/runsettingspropertiespage.cpp b/src/plugins/projectexplorer/runsettingspropertiespage.cpp index 802fe98f55..4e77d31a50 100644 --- a/src/plugins/projectexplorer/runsettingspropertiespage.cpp +++ b/src/plugins/projectexplorer/runsettingspropertiespage.cpp @@ -61,7 +61,7 @@ namespace Internal { struct FactoryAndId { - ProjectExplorer::IRunConfigurationFactory *factory; + IRunConfigurationFactory *factory; Core::Id id; }; diff --git a/src/plugins/projectexplorer/session.cpp b/src/plugins/projectexplorer/session.cpp index a2571abfe3..576fcab5ca 100644 --- a/src/plugins/projectexplorer/session.cpp +++ b/src/plugins/projectexplorer/session.cpp @@ -175,7 +175,7 @@ bool SessionManager::isDefaultSession(const QString &session) } -void SessionManager::saveActiveMode(Core::IMode *mode) +void SessionManager::saveActiveMode(IMode *mode) { setValue(QLatin1String("ActiveMode"), mode->id().toString()); } @@ -411,7 +411,7 @@ bool SessionManager::save() data.insert(QLatin1String("valueKeys"), keys); - bool result = d->m_writer->save(data, Core::ICore::mainWindow()); + bool result = d->m_writer->save(data, ICore::mainWindow()); if (!result) { QMessageBox::warning(ICore::dialogParent(), tr("Error while saving session"), tr("Could not save session to file %1").arg(d->m_writer->fileName().toUserOutput())); @@ -595,7 +595,7 @@ bool SessionManagerPrivate::projectContainsFile(Project *p, const QString &fileN return m_projectFileCache.value(p).contains(fileName); } -void SessionManager::configureEditor(Core::IEditor *editor, const QString &fileName) +void SessionManager::configureEditor(IEditor *editor, const QString &fileName) { if (TextEditor::BaseTextEditor *textEditor = qobject_cast<TextEditor::BaseTextEditor*>(editor)) { Project *project = projectForFile(fileName); @@ -702,7 +702,7 @@ QStringList SessionManager::sessions() { if (d->m_sessions.isEmpty()) { // We are not initialized yet, so do that now - QDir sessionDir(Core::ICore::userResourcePath()); + QDir sessionDir(ICore::userResourcePath()); QList<QFileInfo> sessionFiles = sessionDir.entryInfoList(QStringList() << QLatin1String("*.qws"), QDir::NoFilter, QDir::Time); foreach (const QFileInfo &fileInfo, sessionFiles) { if (fileInfo.completeBaseName() != QLatin1String("default")) @@ -746,7 +746,7 @@ bool SessionManager::renameSession(const QString &original, const QString &newNa */ bool SessionManager::confirmSessionDelete(const QString &session) { - return QMessageBox::question(Core::ICore::mainWindow(), + return QMessageBox::question(ICore::mainWindow(), tr("Delete Session"), tr("Delete session %1?").arg(session), QMessageBox::Yes | QMessageBox::No) == QMessageBox::Yes; @@ -870,7 +870,7 @@ void SessionManagerPrivate::restoreProjects(const QStringList &fileList) QString errors; QList<Project *> projects = ProjectExplorerPlugin::openProjects(fileList, &errors); if (!errors.isEmpty()) - QMessageBox::critical(Core::ICore::mainWindow(), SessionManager::tr("Failed to open project"), errors); + QMessageBox::critical(ICore::mainWindow(), SessionManager::tr("Failed to open project"), errors); foreach (Project *p, projects) m_failedProjects.removeAll(p->projectFilePath().toString()); } diff --git a/src/plugins/projectexplorer/settingsaccessor.cpp b/src/plugins/projectexplorer/settingsaccessor.cpp index cc3edf9c6e..ef67b99596 100644 --- a/src/plugins/projectexplorer/settingsaccessor.cpp +++ b/src/plugins/projectexplorer/settingsaccessor.cpp @@ -501,7 +501,7 @@ public: bool isValid() const; QVariantMap map; - Utils::FileName path; + FileName path; }; int firstVersion() const { return m_upgraders.isEmpty() ? -1 : m_upgraders.first()->version(); } @@ -514,10 +514,10 @@ public: return m_upgraders.at(pos); return 0; } - Settings bestSettings(const SettingsAccessor *accessor, const QList<Utils::FileName> &pathList); + Settings bestSettings(const SettingsAccessor *accessor, const QList<FileName> &pathList); QList<VersionUpgrader *> m_upgraders; - Utils::PersistentSettingsWriter *m_writer; + PersistentSettingsWriter *m_writer; }; // Return path to shared directory for .user files, create if necessary. @@ -577,16 +577,16 @@ static QString makeRelative(QString path) } // Return complete file path of the .user file. -static Utils::FileName userFilePath(const ProjectExplorer::Project *project, const QString &suffix) +static FileName userFilePath(const Project *project, const QString &suffix) { - Utils::FileName result; - const Utils::FileName projectFilePath = project->projectFilePath(); + FileName result; + const FileName projectFilePath = project->projectFilePath(); if (sharedUserFileDir().isEmpty()) { result = projectFilePath; } else { // Recreate the relative project file hierarchy under the shared directory. // PersistentSettingsWriter::write() takes care of creating the path. - result = Utils::FileName::fromString(sharedUserFileDir()); + result = FileName::fromString(sharedUserFileDir()); result.appendString(QLatin1Char('/') + makeRelative(projectFilePath.toString())); } result.appendString(suffix); @@ -788,7 +788,7 @@ QVariantMap SettingsAccessor::upgradeSettings(const QVariantMap &data) const * Returns \c true if the settings are not usable anymore and \c false otherwise. */ SettingsAccessor::ProceedInfo SettingsAccessor::reportIssues(const QVariantMap &data, - const Utils::FileName &path, + const FileName &path, QWidget *parent) const { IssueInfo issue = findIssues(data, path); @@ -819,11 +819,11 @@ SettingsAccessor::ProceedInfo SettingsAccessor::reportIssues(const QVariantMap & * * Returns a IssueInfo object which is then used by reportIssues. */ -SettingsAccessor::IssueInfo SettingsAccessor::findIssues(const QVariantMap &data, const Utils::FileName &path) const +SettingsAccessor::IssueInfo SettingsAccessor::findIssues(const QVariantMap &data, const FileName &path) const { SettingsAccessor::IssueInfo result; - const Utils::FileName defaultSettingsPath = userFilePath(project(), m_userSuffix); + const FileName defaultSettingsPath = userFilePath(project(), m_userSuffix); int version = versionFromMap(data); if (!path.exists()) { @@ -953,7 +953,7 @@ bool SettingsAccessor::saveSettings(const QVariantMap &map, QWidget *parent) con QVariantMap data = prepareToSaveSettings(map); - Utils::FileName path = FileName::fromString(defaultFileName(m_userSuffix)); + FileName path = FileName::fromString(defaultFileName(m_userSuffix)); if (!d->m_writer || d->m_writer->fileName() != path) { delete d->m_writer; d->m_writer = new PersistentSettingsWriter(path, QLatin1String("QtCreatorProject")); @@ -981,7 +981,7 @@ bool SettingsAccessor::addVersionUpgrader(VersionUpgrader *upgrader) /* Will always return the default name first (if applicable) */ QList<FileName> SettingsAccessor::settingsFiles(const QString &suffix) const { - QList<Utils::FileName> result; + QList<FileName> result; QFileInfoList list; const QFileInfo pfi = project()->projectFilePath().toFileInfo(); @@ -995,7 +995,7 @@ QList<FileName> SettingsAccessor::settingsFiles(const QString &suffix) const list.append(QDir(pfi.dir()).entryInfoList(filter, QDir::Files)); foreach (const QFileInfo &fi, list) { - const Utils::FileName path = Utils::FileName::fromString(fi.absoluteFilePath()); + const FileName path = FileName::fromString(fi.absoluteFilePath()); if (!result.contains(path)) { if (path.endsWith(suffix)) result.prepend(path); @@ -1027,7 +1027,7 @@ int SettingsAccessor::firstSupportedVersion() const return d->firstVersion(); } -Utils::FileName SettingsAccessor::backupName(const QVariantMap &data) const +FileName SettingsAccessor::backupName(const QVariantMap &data) const { QString backupName = defaultFileName(m_userSuffix); const QByteArray oldEnvironmentId = environmentIdFromMap(data); @@ -1041,7 +1041,7 @@ Utils::FileName SettingsAccessor::backupName(const QVariantMap &data) const else backupName += QLatin1Char('.') + QString::number(oldVersion); } - return Utils::FileName::fromString(backupName); + return FileName::fromString(backupName); } void SettingsAccessor::backupUserFile() const @@ -1062,7 +1062,7 @@ void SettingsAccessor::backupUserFile() const QVariantMap SettingsAccessor::readUserSettings(QWidget *parent) const { SettingsAccessorPrivate::Settings result; - QList<Utils::FileName> fileList = settingsFiles(m_userSuffix); + QList<FileName> fileList = settingsFiles(m_userSuffix); if (fileList.isEmpty()) // No settings found at all. return result.map; @@ -1112,10 +1112,10 @@ QVariantMap SettingsAccessor::readSharedSettings(QWidget *parent) const } SettingsAccessorPrivate::Settings SettingsAccessorPrivate::bestSettings(const SettingsAccessor *accessor, - const QList<Utils::FileName> &pathList) + const QList<FileName> &pathList) { Settings bestMatch; - foreach (const Utils::FileName &path, pathList) { + foreach (const FileName &path, pathList) { QVariantMap tmp = accessor->readFile(path); int version = SettingsAccessor::versionFromMap(tmp); @@ -1160,9 +1160,9 @@ bool SettingsAccessorPrivate::Settings::isValid() const return SettingsAccessor::versionFromMap(map) > -1 && !path.isEmpty(); } -QVariantMap SettingsAccessor::readFile(const Utils::FileName &path) const +QVariantMap SettingsAccessor::readFile(const FileName &path) const { - Utils::PersistentSettingsReader reader; + PersistentSettingsReader reader; if (!reader.load(path)) return QVariantMap(); @@ -2362,7 +2362,7 @@ void UserFileVersion11Upgrader::parseQtversionFile() { PersistentSettingsReader reader; QFileInfo settingsLocation = QFileInfo(Core::ICore::settings()->fileName()); - reader.load(Utils::FileName::fromString(settingsLocation.absolutePath() + QLatin1String("/qtversion.xml"))); + reader.load(FileName::fromString(settingsLocation.absolutePath() + QLatin1String("/qtversion.xml"))); QVariantMap data = reader.restoreValues(); int count = data.value(QLatin1String("QtVersion.Count"), 0).toInt(); @@ -2401,7 +2401,7 @@ void UserFileVersion11Upgrader::parseToolChainFile() { PersistentSettingsReader reader; QFileInfo settingsLocation(Core::ICore::settings()->fileName()); - reader.load(Utils::FileName::fromString(settingsLocation.absolutePath() + QLatin1String("/toolChains.xml"))); + reader.load(FileName::fromString(settingsLocation.absolutePath() + QLatin1String("/toolChains.xml"))); QVariantMap data = reader.restoreValues(); int count = data.value(QLatin1String("ToolChain.Count"), 0).toInt(); for (int i = 0; i < count; ++i) { diff --git a/src/plugins/projectexplorer/targetsettingspanel.cpp b/src/plugins/projectexplorer/targetsettingspanel.cpp index 6b6bbc40dc..db08bf47a9 100644 --- a/src/plugins/projectexplorer/targetsettingspanel.cpp +++ b/src/plugins/projectexplorer/targetsettingspanel.cpp @@ -301,7 +301,7 @@ void TargetSettingsPanelWidget::menuShown(int targetIndex) void TargetSettingsPanelWidget::changeActionTriggered(QAction *action) { - Kit *k = KitManager::find(action->data().value<Core::Id>()); + Kit *k = KitManager::find(action->data().value<Id>()); Target *sourceTarget = m_targets.at(m_menuTargetIndex); Target *newTarget = cloneTarget(sourceTarget, k); @@ -314,7 +314,7 @@ void TargetSettingsPanelWidget::changeActionTriggered(QAction *action) void TargetSettingsPanelWidget::duplicateActionTriggered(QAction *action) { - Kit *k = KitManager::find(action->data().value<Core::Id>()); + Kit *k = KitManager::find(action->data().value<Id>()); Target *newTarget = cloneTarget(m_targets.at(m_menuTargetIndex), k); if (newTarget) { @@ -326,8 +326,8 @@ void TargetSettingsPanelWidget::duplicateActionTriggered(QAction *action) void TargetSettingsPanelWidget::addActionTriggered(QAction *action) { const QVariant data = action->data(); - if (data.canConvert<Core::Id>()) { // id of kit - Kit *k = KitManager::find(action->data().value<Core::Id>()); + if (data.canConvert<Id>()) { // id of kit + Kit *k = KitManager::find(action->data().value<Id>()); QTC_ASSERT(!m_project->target(k), return); Target *target = m_project->createTarget(k); @@ -427,7 +427,7 @@ Target *TargetSettingsPanelWidget::cloneTarget(Target *sourceTarget, Kit *k) if (fatalError) { // That could be a more granular error message - QMessageBox::critical(Core::ICore::mainWindow(), + QMessageBox::critical(ICore::mainWindow(), tr("Incompatible Kit"), tr("Kit %1 is incompatible with kit %2.") .arg(sourceTarget->kit()->displayName()) @@ -460,7 +460,7 @@ Target *TargetSettingsPanelWidget::cloneTarget(Target *sourceTarget, Kit *k) + runconfigurationError.join(QLatin1Char('\n')); } - QMessageBox msgBox(Core::ICore::mainWindow()); + QMessageBox msgBox(ICore::mainWindow()); msgBox.setIcon(QMessageBox::Warning); msgBox.setWindowTitle(tr("Partially Incompatible Kit")); msgBox.setText(tr("Some configurations could not be copied.")); diff --git a/src/plugins/projectexplorer/targetsetuppage.cpp b/src/plugins/projectexplorer/targetsetuppage.cpp index a560009504..71b685b4f3 100644 --- a/src/plugins/projectexplorer/targetsetuppage.cpp +++ b/src/plugins/projectexplorer/targetsetuppage.cpp @@ -149,7 +149,7 @@ TargetSetupPage::TargetSetupPage(QWidget *parent) : m_baseLayout(0), m_firstWidget(0), m_ui(new TargetSetupPageUi), - m_importWidget(new Internal::ImportWidget(this)), + m_importWidget(new ImportWidget(this)), m_spacer(new QSpacerItem(0,0, QSizePolicy::Minimum, QSizePolicy::MinimumExpanding)), m_forceOptionHint(false) { @@ -213,7 +213,7 @@ void TargetSetupPage::setRequiredKitMatcher(const KitMatcher &matcher) QList<Core::Id> TargetSetupPage::selectedKits() const { QList<Core::Id> result; - QMap<Core::Id, Internal::TargetSetupWidget *>::const_iterator it, end; + QMap<Core::Id, TargetSetupWidget *>::const_iterator it, end; it = m_widgets.constBegin(); end = m_widgets.constEnd(); |