From 74ed591db3369b925eb3319511beadab9a61f25a Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Tue, 3 Feb 2015 23:56:02 +0200 Subject: [PATCH] Misc: Remove unneeded qualifications Mostly done using the following ruby script: Dir.glob('**/*.cpp').each { |file| next if file =~ %r{src/shared/qbs|/qmljs/} s = File.read(file) s.scan(/^using namespace (.*);$/) { ns = $1 t = s.gsub(/^(.*)\b#{ns}::((?!Const)[A-Z])/) { |m| before = $1 char = $2 if before =~ /"|\/\/|\\|using|SIGNAL|SLOT|Q_/ m else before + char end } if t != s puts file File.open(file, 'w').write(t) end } } Change-Id: I919da493d0629b719d328e5e71c96a29d230dfd1 Reviewed-by: Christian Kandeler Reviewed-by: hjk --- .../bb-cascades-app/src/applicationui.cpp | 2 +- src/libs/extensionsystem/pluginmanager.cpp | 8 +-- src/libs/extensionsystem/pluginspec.cpp | 2 +- src/libs/extensionsystem/pluginview.cpp | 2 +- src/libs/glsl/glslengine.cpp | 2 +- src/libs/glsl/glslsemantic.cpp | 4 +- src/libs/ssh/sshcryptofacility.cpp | 8 +-- src/libs/ssh/sshkeygenerator.cpp | 6 +-- src/libs/utils/tooltip/tooltip.cpp | 2 +- src/plugins/analyzerbase/analyzermanager.cpp | 2 +- .../analyzerbase/analyzerruncontrol.cpp | 2 +- .../autotoolsbuildconfiguration.cpp | 10 ++-- .../autotoolsprojectnode.cpp | 4 +- .../autotoolsprojectmanager/makestep.cpp | 2 +- src/plugins/baremetal/baremetaldevice.cpp | 6 +-- .../baremetalgdbcommandsdeploystep.cpp | 2 +- .../baremetal/baremetalrunconfiguration.cpp | 2 +- .../baremetalrunconfigurationfactory.cpp | 2 +- .../baremetal/baremetalruncontrolfactory.cpp | 2 +- src/plugins/bineditor/bineditorplugin.cpp | 38 +++++++------- src/plugins/bookmarks/bookmarkmanager.cpp | 16 +++--- src/plugins/clearcase/clearcaseplugin.cpp | 6 +-- src/plugins/clearcase/settingspage.cpp | 2 +- src/plugins/cpaster/cpasterplugin.cpp | 28 +++++----- .../genericbuildconfiguration.cpp | 6 +-- .../genericprojectmanager/genericproject.cpp | 4 +- .../genericprojectnodes.cpp | 2 +- .../genericprojectplugin_test.cpp | 4 +- .../glsleditor/glslcompletionassist.cpp | 2 +- src/plugins/glsleditor/glsleditor.cpp | 8 +-- src/plugins/glsleditor/glslhighlighter.cpp | 26 +++++----- src/plugins/help/generalsettingspage.cpp | 8 +-- src/plugins/help/helpfindsupport.cpp | 12 ++--- src/plugins/help/helpindexfilter.cpp | 2 +- src/plugins/help/helpplugin.cpp | 52 +++++++++---------- src/plugins/help/qtwebkithelpviewer.cpp | 8 +-- src/plugins/qbsprojectmanager/qbsproject.cpp | 52 +++++++++---------- .../qbsprojectmanagerplugin.cpp | 10 ++-- .../qbsprojectmanager/qbsprojectparser.cpp | 2 +- .../resourceeditor/resourceeditorfactory.cpp | 2 +- .../resourceeditor/resourceeditorplugin.cpp | 12 ++--- src/plugins/tasklist/tasklistplugin.cpp | 10 ++-- src/plugins/todo/todoitemsprovider.cpp | 4 +- src/plugins/valgrind/callgrindengine.cpp | 16 +++--- src/plugins/valgrind/callgrindtool.cpp | 20 +++---- src/plugins/valgrind/memcheckengine.cpp | 2 +- src/plugins/valgrind/memchecktool.cpp | 4 +- src/plugins/valgrind/valgrindengine.cpp | 2 +- .../valgrind/valgrindruncontrolfactory.cpp | 4 +- src/plugins/winrt/winrtdevice.cpp | 2 +- .../winrt/winrtpackagedeploymentstep.cpp | 8 +-- src/plugins/winrt/winrtrunfactories.cpp | 6 +-- tests/auto/valgrind/memcheck/modeldemo.cpp | 4 +- tests/auto/valgrind/memcheck/parsertests.cpp | 22 ++++---- tests/manual/ssh/errorhandling/main.cpp | 2 +- .../ssh/remoteprocess/argumentscollector.cpp | 2 +- .../ssh/remoteprocess/remoteprocesstest.cpp | 7 ++- tests/manual/ssh/sftp/sftptest.cpp | 2 +- tests/manual/ssh/shell/shell.cpp | 2 +- .../manual/ssh/tunnel/argumentscollector.cpp | 2 +- tests/manual/ssh/tunnel/tunnel.cpp | 2 +- 61 files changed, 247 insertions(+), 248 deletions(-) diff --git a/share/qtcreator/templates/wizards/bb-cascades-app/src/applicationui.cpp b/share/qtcreator/templates/wizards/bb-cascades-app/src/applicationui.cpp index e61e3fc5cc2..4c2aba3b66a 100644 --- a/share/qtcreator/templates/wizards/bb-cascades-app/src/applicationui.cpp +++ b/share/qtcreator/templates/wizards/bb-cascades-app/src/applicationui.cpp @@ -6,7 +6,7 @@ using namespace bb::cascades; -ApplicationUI::ApplicationUI(bb::cascades::Application *app) : +ApplicationUI::ApplicationUI(Application *app) : QObject(app) { // By default the QmlDocument object is owned by the Application instance diff --git a/src/libs/extensionsystem/pluginmanager.cpp b/src/libs/extensionsystem/pluginmanager.cpp index 37f557a68f9..b9c1f2771ec 100644 --- a/src/libs/extensionsystem/pluginmanager.cpp +++ b/src/libs/extensionsystem/pluginmanager.cpp @@ -106,8 +106,8 @@ enum { debugLeaks = 0 }; loading. \code // 'plugins' and subdirs will be searched for plugins - ExtensionSystem::PluginManager::setPluginPaths(QStringList() << "plugins"); - ExtensionSystem::PluginManager::loadPlugins(); // try to load all the plugins + PluginManager::setPluginPaths(QStringList() << "plugins"); + PluginManager::loadPlugins(); // try to load all the plugins \endcode Additionally, it is possible to directly access the plugin specifications (the information in the descriptor file), the plugin instances (via PluginSpec), @@ -129,10 +129,10 @@ enum { debugLeaks = 0 }; // Plugin A provides a "MimeTypeHandler" extension point // in plugin B: MyMimeTypeHandler *handler = new MyMimeTypeHandler(); - ExtensionSystem::PluginManager::instance()->addObject(handler); + PluginManager::instance()->addObject(handler); // In plugin A: QList mimeHandlers = - ExtensionSystem::PluginManager::getObjects(); + PluginManager::getObjects(); \endcode diff --git a/src/libs/extensionsystem/pluginspec.cpp b/src/libs/extensionsystem/pluginspec.cpp index 7e4bf609853..105ff9acf79 100644 --- a/src/libs/extensionsystem/pluginspec.cpp +++ b/src/libs/extensionsystem/pluginspec.cpp @@ -136,7 +136,7 @@ using namespace ExtensionSystem::Internal; /*! \internal */ -uint ExtensionSystem::qHash(const ExtensionSystem::PluginDependency &value) +uint ExtensionSystem::qHash(const PluginDependency &value) { return qHash(value.name); } diff --git a/src/libs/extensionsystem/pluginview.cpp b/src/libs/extensionsystem/pluginview.cpp index f27284a89d0..29e466b2a18 100644 --- a/src/libs/extensionsystem/pluginview.cpp +++ b/src/libs/extensionsystem/pluginview.cpp @@ -280,7 +280,7 @@ PluginView::PluginView(QWidget *parent) m_categoryView->setColumnWidth(LoadedColumn, 40); m_categoryView->header()->setDefaultSectionSize(120); m_categoryView->header()->setMinimumSectionSize(35); - m_categoryView->setActivationMode(Utils::DoubleClickActivation); + m_categoryView->setActivationMode(DoubleClickActivation); m_categoryView->setSelectionMode(QAbstractItemView::SingleSelection); m_categoryView->setSelectionBehavior(QAbstractItemView::SelectRows); diff --git a/src/libs/glsl/glslengine.cpp b/src/libs/glsl/glslengine.cpp index cefc453e309..f5bcfcc4470 100644 --- a/src/libs/glsl/glslengine.cpp +++ b/src/libs/glsl/glslengine.cpp @@ -231,7 +231,7 @@ bool DiagnosticMessage::isError() const return _kind == Error; } -bool GLSL::DiagnosticMessage::isWarning() const +bool DiagnosticMessage::isWarning() const { return _kind == Warning; } diff --git a/src/libs/glsl/glslsemantic.cpp b/src/libs/glsl/glslsemantic.cpp index 9d7989cc003..ccfb788c2cc 100644 --- a/src/libs/glsl/glslsemantic.cpp +++ b/src/libs/glsl/glslsemantic.cpp @@ -378,8 +378,8 @@ bool Semantic::visit(FunctionCallExpressionAST *ast) _engine->error(ast->lineno, QString::fromLatin1("too many arguments")); _expr.type = funTy->returnType(); } else if (const OverloadSet *overloads = id.type->asOverloadSetType()) { - QVector candidates; - foreach (GLSL::Function *f, overloads->functions()) { + QVector candidates; + foreach (Function *f, overloads->functions()) { if (f->argumentCount() == actuals.size()) { int argc = 0; for (; argc < actuals.size(); ++argc) { diff --git a/src/libs/ssh/sshcryptofacility.cpp b/src/libs/ssh/sshcryptofacility.cpp index 08abce26907..5198eb78bee 100644 --- a/src/libs/ssh/sshcryptofacility.cpp +++ b/src/libs/ssh/sshcryptofacility.cpp @@ -263,10 +263,10 @@ bool SshEncryptionFacility::createAuthenticationKeyFromPKCS8(const QByteArray &p qWarning("%s: Unexpected code flow, expected success or exception.", Q_FUNC_INFO); return false; } - } catch (const Botan::Exception &ex) { + } catch (const Exception &ex) { error = QLatin1String(ex.what()); return false; - } catch (const Botan::Decoding_Error &ex) { + } catch (const Decoding_Error &ex) { error = QLatin1String(ex.what()); return false; } @@ -334,10 +334,10 @@ bool SshEncryptionFacility::createAuthenticationKeyFromOpenSSL(const QByteArray sequence.discard_remaining(); sequence.verify_end(); - } catch (const Botan::Exception &ex) { + } catch (const Exception &ex) { error = QLatin1String(ex.what()); return false; - } catch (const Botan::Decoding_Error &ex) { + } catch (const Decoding_Error &ex) { error = QLatin1String(ex.what()); return false; } diff --git a/src/libs/ssh/sshkeygenerator.cpp b/src/libs/ssh/sshkeygenerator.cpp index b389afa425c..befebdbcd3b 100644 --- a/src/libs/ssh/sshkeygenerator.cpp +++ b/src/libs/ssh/sshkeygenerator.cpp @@ -78,20 +78,20 @@ bool SshKeyGenerator::generateKeys(KeyType type, PrivateKeyFormat format, int ke generateOpenSslPublicKeyString(key); } return true; - } catch (const Botan::Exception &e) { + } catch (const Exception &e) { m_error = tr("Error generating key: %1").arg(QString::fromLatin1(e.what())); return false; } } -void SshKeyGenerator::generatePkcs8KeyStrings(const KeyPtr &key, Botan::RandomNumberGenerator &rng) +void SshKeyGenerator::generatePkcs8KeyStrings(const KeyPtr &key, RandomNumberGenerator &rng) { generatePkcs8KeyString(key, false, rng); generatePkcs8KeyString(key, true, rng); } void SshKeyGenerator::generatePkcs8KeyString(const KeyPtr &key, bool privateKey, - Botan::RandomNumberGenerator &rng) + RandomNumberGenerator &rng) { Pipe pipe; pipe.start_msg(); diff --git a/src/libs/utils/tooltip/tooltip.cpp b/src/libs/utils/tooltip/tooltip.cpp index f4885719d63..8c2ee90eb8a 100644 --- a/src/libs/utils/tooltip/tooltip.cpp +++ b/src/libs/utils/tooltip/tooltip.cpp @@ -102,7 +102,7 @@ bool ToolTip::pinToolTip(QWidget *w, QWidget *parent) // Find the parent WidgetTip, tell it to pin/release the // widget and close. for (QWidget *p = w->parentWidget(); p ; p = p->parentWidget()) { - if (Internal::WidgetTip *wt = qobject_cast(p)) { + if (WidgetTip *wt = qobject_cast(p)) { wt->pinToolTipWidget(parent); ToolTip::hide(); return true; diff --git a/src/plugins/analyzerbase/analyzermanager.cpp b/src/plugins/analyzerbase/analyzermanager.cpp index 037ae69ed7f..e898e63bbbc 100644 --- a/src/plugins/analyzerbase/analyzermanager.cpp +++ b/src/plugins/analyzerbase/analyzermanager.cpp @@ -161,7 +161,7 @@ public slots: void startTool(); void selectToolboxAction(int); void selectMenuAction(); - void modeChanged(Core::IMode *mode); + void modeChanged(IMode *mode); void resetLayout(); void updateRunActions(); diff --git a/src/plugins/analyzerbase/analyzerruncontrol.cpp b/src/plugins/analyzerbase/analyzerruncontrol.cpp index 818c387d391..a59ae410c02 100644 --- a/src/plugins/analyzerbase/analyzerruncontrol.cpp +++ b/src/plugins/analyzerbase/analyzerruncontrol.cpp @@ -48,7 +48,7 @@ using namespace ProjectExplorer; namespace Analyzer { AnalyzerRunControl::AnalyzerRunControl(const AnalyzerStartParameters &sp, - ProjectExplorer::RunConfiguration *runConfiguration) + RunConfiguration *runConfiguration) : RunControl(runConfiguration, sp.runMode) { setIcon(QLatin1String(":/images/analyzer_start_small.png")); diff --git a/src/plugins/autotoolsprojectmanager/autotoolsbuildconfiguration.cpp b/src/plugins/autotoolsprojectmanager/autotoolsbuildconfiguration.cpp index 190d9f9d052..3a790b596cc 100644 --- a/src/plugins/autotoolsprojectmanager/autotoolsbuildconfiguration.cpp +++ b/src/plugins/autotoolsprojectmanager/autotoolsbuildconfiguration.cpp @@ -62,7 +62,7 @@ using namespace ProjectExplorer::Constants; ////////////////////////////////////// // AutotoolsBuildConfiguration class ////////////////////////////////////// -AutotoolsBuildConfiguration::AutotoolsBuildConfiguration(ProjectExplorer::Target *parent) +AutotoolsBuildConfiguration::AutotoolsBuildConfiguration(Target *parent) : BuildConfiguration(parent, Core::Id(AUTOTOOLS_BC_ID)) { } @@ -71,11 +71,11 @@ NamedWidget *AutotoolsBuildConfiguration::createConfigWidget() return new AutotoolsBuildSettingsWidget(this); } -AutotoolsBuildConfiguration::AutotoolsBuildConfiguration(ProjectExplorer::Target *parent, Core::Id id) +AutotoolsBuildConfiguration::AutotoolsBuildConfiguration(Target *parent, Core::Id id) : BuildConfiguration(parent, id) { } -AutotoolsBuildConfiguration::AutotoolsBuildConfiguration(ProjectExplorer::Target *parent, +AutotoolsBuildConfiguration::AutotoolsBuildConfiguration(Target *parent, AutotoolsBuildConfiguration *source) : BuildConfiguration(parent, source) { @@ -173,7 +173,7 @@ bool AutotoolsBuildConfigurationFactory::canHandle(const Target *t) const return t->project()->id() == Constants::AUTOTOOLS_PROJECT_ID; } -BuildInfo *AutotoolsBuildConfigurationFactory::createBuildInfo(const ProjectExplorer::Kit *k, +BuildInfo *AutotoolsBuildConfigurationFactory::createBuildInfo(const Kit *k, const Utils::FileName &buildDir) const { BuildInfo *info = new BuildInfo(this); @@ -230,7 +230,7 @@ void AutotoolsBuildConfiguration::setBuildDirectory(const Utils::FileName &direc if (directory == buildDirectory()) return; BuildConfiguration::setBuildDirectory(directory); - ProjectExplorer::BuildStepList *bsl = stepList(ProjectExplorer::Constants::BUILDSTEPS_BUILD); + BuildStepList *bsl = stepList(BUILDSTEPS_BUILD); foreach (BuildStep *bs, bsl->steps()) { ConfigureStep *cs = qobject_cast(bs); if (cs) { diff --git a/src/plugins/autotoolsprojectmanager/autotoolsprojectnode.cpp b/src/plugins/autotoolsprojectmanager/autotoolsprojectnode.cpp index 6f6d395f756..e41db65f6ac 100644 --- a/src/plugins/autotoolsprojectmanager/autotoolsprojectnode.cpp +++ b/src/plugins/autotoolsprojectmanager/autotoolsprojectnode.cpp @@ -51,10 +51,10 @@ bool AutotoolsProjectNode::showInSimpleTree() const return true; } -QList AutotoolsProjectNode::supportedActions(Node *node) const +QList AutotoolsProjectNode::supportedActions(Node *node) const { Q_UNUSED(node); - return QList(); + return QList(); } bool AutotoolsProjectNode::canAddSubProject(const QString &proFilePath) const diff --git a/src/plugins/autotoolsprojectmanager/makestep.cpp b/src/plugins/autotoolsprojectmanager/makestep.cpp index 03242e1bacc..157f0d4ec6b 100644 --- a/src/plugins/autotoolsprojectmanager/makestep.cpp +++ b/src/plugins/autotoolsprojectmanager/makestep.cpp @@ -304,7 +304,7 @@ void MakeStepConfigWidget::updateDetails() BuildConfiguration *bc = m_makeStep->buildConfiguration(); if (!bc) bc = m_makeStep->target()->activeBuildConfiguration(); - ToolChain *tc = ProjectExplorer::ToolChainKitInformation::toolChain(m_makeStep->target()->kit()); + ToolChain *tc = ToolChainKitInformation::toolChain(m_makeStep->target()->kit()); if (tc) { QString arguments = Utils::QtcProcess::joinArgs(m_makeStep->m_buildTargets); diff --git a/src/plugins/baremetal/baremetaldevice.cpp b/src/plugins/baremetal/baremetaldevice.cpp index 259174596a2..cec583ca8f8 100644 --- a/src/plugins/baremetal/baremetaldevice.cpp +++ b/src/plugins/baremetal/baremetaldevice.cpp @@ -90,7 +90,7 @@ BareMetalDevice::IDevice::Ptr BareMetalDevice::clone() const DeviceProcessSignalOperation::Ptr BareMetalDevice::signalOperation() const { - return ProjectExplorer::DeviceProcessSignalOperation::Ptr(); + return DeviceProcessSignalOperation::Ptr(); } QString BareMetalDevice::displayType() const @@ -98,7 +98,7 @@ QString BareMetalDevice::displayType() const return QCoreApplication::translate("BareMetal::Internal::BareMetalDevice", "Bare Metal"); } -ProjectExplorer::IDeviceWidget *BareMetalDevice::createWidget() +IDeviceWidget *BareMetalDevice::createWidget() { return new BareMetalDeviceConfigurationWidget(sharedFromThis()); } @@ -120,7 +120,7 @@ void BareMetalDevice::executeAction(Core::Id actionId, QWidget *parent) Q_UNUSED(parent); } -ProjectExplorer::DeviceProcess *BareMetalDevice::createProcess(QObject *parent) const +DeviceProcess *BareMetalDevice::createProcess(QObject *parent) const { return new GdbServerProviderProcess(sharedFromThis(), parent); } diff --git a/src/plugins/baremetal/baremetalgdbcommandsdeploystep.cpp b/src/plugins/baremetal/baremetalgdbcommandsdeploystep.cpp index 85fef8b9b84..efbc8e8c6d5 100644 --- a/src/plugins/baremetal/baremetalgdbcommandsdeploystep.cpp +++ b/src/plugins/baremetal/baremetalgdbcommandsdeploystep.cpp @@ -109,7 +109,7 @@ QVariantMap BareMetalGdbCommandsDeployStep::toMap() const return map; } -ProjectExplorer::BuildStepConfigWidget *BareMetalGdbCommandsDeployStep::createConfigWidget() +BuildStepConfigWidget *BareMetalGdbCommandsDeployStep::createConfigWidget() { return new BareMetalGdbCommandsDeployStepWidget(*this); } diff --git a/src/plugins/baremetal/baremetalrunconfiguration.cpp b/src/plugins/baremetal/baremetalrunconfiguration.cpp index 0a0da61bb27..7741200e3fd 100644 --- a/src/plugins/baremetal/baremetalrunconfiguration.cpp +++ b/src/plugins/baremetal/baremetalrunconfiguration.cpp @@ -137,7 +137,7 @@ QString BareMetalRunConfiguration::defaultDisplayName() QString BareMetalRunConfiguration::localExecutableFilePath() const { return target()->applicationTargets() - .targetForProject(Utils::FileName::fromString(m_projectFilePath)).toString(); + .targetForProject(FileName::fromString(m_projectFilePath)).toString(); } QString BareMetalRunConfiguration::arguments() const diff --git a/src/plugins/baremetal/baremetalrunconfigurationfactory.cpp b/src/plugins/baremetal/baremetalrunconfigurationfactory.cpp index 588e8fd4265..3e19120a85c 100644 --- a/src/plugins/baremetal/baremetalrunconfigurationfactory.cpp +++ b/src/plugins/baremetal/baremetalrunconfigurationfactory.cpp @@ -55,7 +55,7 @@ static QString pathFromId(Core::Id id) } BareMetalRunConfigurationFactory::BareMetalRunConfigurationFactory(QObject *parent) : - ProjectExplorer::IRunConfigurationFactory(parent) + IRunConfigurationFactory(parent) { setObjectName(QLatin1String("BareMetalRunConfigurationFactory")); } diff --git a/src/plugins/baremetal/baremetalruncontrolfactory.cpp b/src/plugins/baremetal/baremetalruncontrolfactory.cpp index 5046e847d5e..a6cd670e39c 100644 --- a/src/plugins/baremetal/baremetalruncontrolfactory.cpp +++ b/src/plugins/baremetal/baremetalruncontrolfactory.cpp @@ -63,7 +63,7 @@ namespace BareMetal { namespace Internal { BareMetalRunControlFactory::BareMetalRunControlFactory(QObject *parent) : - ProjectExplorer::IRunControlFactory(parent) + IRunControlFactory(parent) { } diff --git a/src/plugins/bineditor/bineditorplugin.cpp b/src/plugins/bineditor/bineditorplugin.cpp index 85786c21e43..d88fe12a63e 100644 --- a/src/plugins/bineditor/bineditorplugin.cpp +++ b/src/plugins/bineditor/bineditorplugin.cpp @@ -91,7 +91,7 @@ public: namespace Internal { -class BinEditorFind : public Core::IFindSupport +class BinEditorFind : public IFindSupport { Q_OBJECT @@ -107,7 +107,7 @@ public: QString currentFindString() const { return QString(); } QString completedFindString() const { return QString(); } - Core::FindFlags supportedFindFlags() const + FindFlags supportedFindFlags() const { return FindBackward | FindCaseSensitively; } @@ -118,7 +118,7 @@ public: m_incrementalWrappedState = false; } - virtual void highlightAll(const QString &txt, Core::FindFlags findFlags) + virtual void highlightAll(const QString &txt, FindFlags findFlags) { m_widget->highlightSearchResults(txt.toLatin1(), textDocumentFlagsForFindFlags(findFlags)); } @@ -128,7 +128,7 @@ public: m_widget->highlightSearchResults(QByteArray()); } - int find(const QByteArray &pattern, int pos, Core::FindFlags findFlags, bool *wrapped) + int find(const QByteArray &pattern, int pos, FindFlags findFlags, bool *wrapped) { if (wrapped) *wrapped = false; @@ -149,7 +149,7 @@ public: return res; } - Result findIncremental(const QString &txt, Core::FindFlags findFlags) { + Result findIncremental(const QString &txt, FindFlags findFlags) { QByteArray pattern = txt.toLatin1(); if (pattern != m_lastPattern) resetIncrementalSearch(); // Because we don't search for nibbles. @@ -184,7 +184,7 @@ public: return result; } - Result findStep(const QString &txt, Core::FindFlags findFlags) { + Result findStep(const QString &txt, FindFlags findFlags) { QByteArray pattern = txt.toLatin1(); bool wasReset = (m_incrementalStartPos < 0); if (m_contPos == -1) { @@ -224,12 +224,12 @@ private: }; -class BinEditorDocument : public Core::IDocument +class BinEditorDocument : public IDocument { Q_OBJECT public: BinEditorDocument(BinEditorWidget *parent) : - Core::IDocument(parent) + IDocument(parent) { setId(Core::Constants::K_DEFAULT_BINARY_EDITOR_ID); setMimeType(QLatin1String(BinEditor::Constants::C_BINEDITOR_MIMETYPE)); @@ -274,14 +274,14 @@ public: if (errorString) *errorString = msg; else - QMessageBox::critical(Core::ICore::mainWindow(), tr("File Error"), msg); + QMessageBox::critical(ICore::mainWindow(), tr("File Error"), msg); return false; } if (offset >= size) return false; if (file.open(QIODevice::ReadOnly)) { file.close(); - setFilePath(Utils::FileName::fromString(fileName)); + setFilePath(FileName::fromString(fileName)); m_widget->setSizes(offset, file.size()); return true; } @@ -290,7 +290,7 @@ public: if (errorString) *errorString = errStr; else - QMessageBox::critical(Core::ICore::mainWindow(), tr("File Error"), errStr); + QMessageBox::critical(ICore::mainWindow(), tr("File Error"), errStr); return false; } @@ -311,7 +311,7 @@ private slots: data += QByteArray(blockSize - dataSize, 0); m_widget->addData(block, data); } else { - QMessageBox::critical(Core::ICore::mainWindow(), tr("File Error"), + QMessageBox::critical(ICore::mainWindow(), tr("File Error"), tr("Cannot open %1: %2").arg( fn.toUserOutput(), file.errorString())); } @@ -361,7 +361,7 @@ private: BinEditorWidget *m_widget; }; -class BinEditor : public Core::IEditor +class BinEditor : public IEditor { Q_OBJECT public: @@ -406,7 +406,7 @@ public: QTC_ASSERT(fileName == realFileName, return false); // The bineditor can do no autosaving return m_file->open(errorString, fileName); } - Core::IDocument *document() { return m_file; } + IDocument *document() { return m_file; } QWidget *toolBar() { return m_toolBar; } @@ -445,7 +445,7 @@ BinEditorFactory::BinEditorFactory(BinEditorPlugin *owner) : addMimeType(Constants::C_BINEDITOR_MIMETYPE); } -Core::IEditor *BinEditorFactory::createEditor() +IEditor *BinEditorFactory::createEditor() { BinEditorWidget *widget = new BinEditorWidget(); BinEditor *editor = new BinEditor(widget); @@ -466,14 +466,14 @@ BinEditorPlugin::~BinEditorPlugin() { } -QAction *BinEditorPlugin::registerNewAction(Core::Id id, const QString &title) +QAction *BinEditorPlugin::registerNewAction(Id id, const QString &title) { QAction *result = new QAction(title, this); - Core::ActionManager::registerAction(result, id, m_context); + ActionManager::registerAction(result, id, m_context); return result; } -QAction *BinEditorPlugin::registerNewAction(Core::Id id, +QAction *BinEditorPlugin::registerNewAction(Id id, QObject *receiver, const char *slot, const QString &title) @@ -522,7 +522,7 @@ void BinEditorPlugin::extensionsInitialized() { } -void BinEditorPlugin::updateCurrentEditor(Core::IEditor *editor) +void BinEditorPlugin::updateCurrentEditor(IEditor *editor) { BinEditorWidget *binEditor = 0; if (editor) diff --git a/src/plugins/bookmarks/bookmarkmanager.cpp b/src/plugins/bookmarks/bookmarkmanager.cpp index c81a9aed985..8f324215c5e 100644 --- a/src/plugins/bookmarks/bookmarkmanager.cpp +++ b/src/plugins/bookmarks/bookmarkmanager.cpp @@ -209,17 +209,17 @@ void BookmarkDelegate::paint(QPainter *painter, const QStyleOptionViewItem &opti } BookmarkView::BookmarkView(BookmarkManager *manager) : - m_bookmarkContext(new Core::IContext(this)), + m_bookmarkContext(new IContext(this)), m_manager(manager) { setWindowTitle(tr("Bookmarks")); m_bookmarkContext->setWidget(this); - m_bookmarkContext->setContext(Core::Context(Constants::BOOKMARKS_CONTEXT)); + m_bookmarkContext->setContext(Context(Constants::BOOKMARKS_CONTEXT)); ICore::addContextObject(m_bookmarkContext); - Utils::ListView::setModel(manager); + ListView::setModel(manager); setItemDelegate(new BookmarkDelegate(this)); setFrameStyle(QFrame::NoFrame); @@ -289,12 +289,12 @@ void BookmarkView::keyPressEvent(QKeyEvent *event) event->accept(); return; } - Utils::ListView::keyPressEvent(event); + ListView::keyPressEvent(event); } void BookmarkView::removeAll() { - if (Utils::CheckableMessageBox::doNotAskAgainQuestion(this, + if (CheckableMessageBox::doNotAskAgainQuestion(this, tr("Remove All Bookmarks"), tr("Are you sure you want to remove all bookmarks from all files in the current session?"), ICore::settings(), @@ -323,7 +323,7 @@ BookmarkManager::BookmarkManager() : m_bookmarkIcon(QLatin1String(":/bookmarks/images/bookmark.png")), m_selectionModel(new QItemSelectionModel(this, this)) { - connect(Core::ICore::instance(), &ICore::contextChanged, + connect(ICore::instance(), &ICore::contextChanged, this, &BookmarkManager::updateActionStatus); connect(SessionManager::instance(), &SessionManager::sessionLoaded, @@ -421,7 +421,7 @@ QStringList BookmarkManager::mimeTypes() const QMimeData *BookmarkManager::mimeData(const QModelIndexList &indexes) const { - auto data = new Utils::FileDropMimeData; + auto data = new FileDropMimeData; foreach (const QModelIndex &index, indexes) { if (!index.isValid() || index.column() != 0 || index.row() < 0 || index.row() >= m_bookmarksList.count()) continue; @@ -861,7 +861,7 @@ BookmarkViewFactory::BookmarkViewFactory(BookmarkManager *bm) setDisplayName(BookmarkView::tr("Bookmarks")); setPriority(300); setId("Bookmarks"); - setActivationSequence(QKeySequence(Core::UseMacShortcuts ? tr("Alt+Meta+M") : tr("Alt+M"))); + setActivationSequence(QKeySequence(UseMacShortcuts ? tr("Alt+Meta+M") : tr("Alt+M"))); } NavigationView BookmarkViewFactory::createWidget() diff --git a/src/plugins/clearcase/clearcaseplugin.cpp b/src/plugins/clearcase/clearcaseplugin.cpp index 83c29a60ce6..0d4b6340a87 100644 --- a/src/plugins/clearcase/clearcaseplugin.cpp +++ b/src/plugins/clearcase/clearcaseplugin.cpp @@ -131,15 +131,15 @@ static const char CMD_ID_STATUS[] = "ClearCase.Status"; static const VcsBaseEditorParameters editorParameters[] = { { - VcsBase::LogOutput, + LogOutput, "ClearCase File Log Editor", // id QT_TRANSLATE_NOOP("VCS", "ClearCase File Log Editor"), // display_name "text/vnd.qtcreator.clearcase.log"}, -{ VcsBase::AnnotateOutput, +{ AnnotateOutput, "ClearCase Annotation Editor", // id QT_TRANSLATE_NOOP("VCS", "ClearCase Annotation Editor"), // display_name "text/vnd.qtcreator.clearcase.annotation"}, -{ VcsBase::DiffOutput, +{ DiffOutput, "ClearCase Diff Editor", // id QT_TRANSLATE_NOOP("VCS", "ClearCase Diff Editor"), // display_name "text/x-patch"} diff --git a/src/plugins/clearcase/settingspage.cpp b/src/plugins/clearcase/settingspage.cpp index 8a6f4a5803b..a49bb36f26c 100644 --- a/src/plugins/clearcase/settingspage.cpp +++ b/src/plugins/clearcase/settingspage.cpp @@ -82,7 +82,7 @@ void SettingsPageWidget::setSettings(const ClearCaseSettings &s) m_ui.commandPathChooser->setPath(s.ccCommand); m_ui.timeOutSpinBox->setValue(s.timeOutS); m_ui.autoCheckOutCheckBox->setChecked(s.autoCheckOut); - bool extDiffAvailable = !Utils::Environment::systemEnvironment().searchInPath(QLatin1String("diff")).isEmpty(); + bool extDiffAvailable = !Environment::systemEnvironment().searchInPath(QLatin1String("diff")).isEmpty(); if (extDiffAvailable) { m_ui.diffWarningLabel->setVisible(false); } else { diff --git a/src/plugins/cpaster/cpasterplugin.cpp b/src/plugins/cpaster/cpasterplugin.cpp index a0f4b17d019..3956062b7fc 100644 --- a/src/plugins/cpaster/cpasterplugin.cpp +++ b/src/plugins/cpaster/cpasterplugin.cpp @@ -122,10 +122,10 @@ bool CodepasterPlugin::initialize(const QStringList &arguments, QString *errorMe Q_UNUSED(errorMessage) // Create the globalcontext list to register actions accordingly - Core::Context globalcontext(Core::Constants::C_GLOBAL); + Context globalcontext(Core::Constants::C_GLOBAL); // Create the settings Page - m_settings->fromSettings(Core::ICore::settings()); + m_settings->fromSettings(ICore::settings()); SettingsPage *settingsPage = new SettingsPage(m_settings); addAutoReleasedObject(settingsPage); @@ -151,30 +151,30 @@ bool CodepasterPlugin::initialize(const QStringList &arguments, QString *errorMe //register actions - Core::ActionContainer *toolsContainer = - Core::ActionManager::actionContainer(Core::Constants::M_TOOLS); + ActionContainer *toolsContainer = + ActionManager::actionContainer(Core::Constants::M_TOOLS); - Core::ActionContainer *cpContainer = - Core::ActionManager::createMenu("CodePaster"); + ActionContainer *cpContainer = + ActionManager::createMenu("CodePaster"); cpContainer->menu()->setTitle(tr("&Code Pasting")); toolsContainer->addMenu(cpContainer); - Core::Command *command; + Command *command; m_postEditorAction = new QAction(tr("Paste Snippet..."), this); - command = Core::ActionManager::registerAction(m_postEditorAction, "CodePaster.Post", globalcontext); + command = ActionManager::registerAction(m_postEditorAction, "CodePaster.Post", globalcontext); command->setDefaultKeySequence(QKeySequence(UseMacShortcuts ? tr("Meta+C,Meta+P") : tr("Alt+C,Alt+P"))); connect(m_postEditorAction, &QAction::triggered, this, &CodepasterPlugin::pasteSnippet); cpContainer->addAction(command); m_fetchAction = new QAction(tr("Fetch Snippet..."), this); - command = Core::ActionManager::registerAction(m_fetchAction, "CodePaster.Fetch", globalcontext); + command = ActionManager::registerAction(m_fetchAction, "CodePaster.Fetch", globalcontext); command->setDefaultKeySequence(QKeySequence(UseMacShortcuts ? tr("Meta+C,Meta+F") : tr("Alt+C,Alt+F"))); connect(m_fetchAction, &QAction::triggered, this, &CodepasterPlugin::fetch); cpContainer->addAction(command); m_fetchUrlAction = new QAction(tr("Fetch from URL..."), this); - command = Core::ActionManager::registerAction(m_fetchUrlAction, "CodePaster.FetchUrl", globalcontext); + command = ActionManager::registerAction(m_fetchUrlAction, "CodePaster.FetchUrl", globalcontext); connect(m_fetchUrlAction, &QAction::triggered, this, &CodepasterPlugin::fetchUrl); cpContainer->addAction(command); @@ -274,7 +274,7 @@ void CodepasterPlugin::post(QString data, const QString &mimeType) if (dialogResult == QDialog::Accepted && m_settings->protocol != view.protocol()) { m_settings->protocol = view.protocol(); - m_settings->toSettings(Core::ICore::settings()); + m_settings->toSettings(ICore::settings()); } } @@ -305,7 +305,7 @@ void CodepasterPlugin::fetch() // Save new protocol in case user changed it. if (m_settings->protocol != dialog.protocol()) { m_settings->protocol = dialog.protocol(); - m_settings->toSettings(Core::ICore::settings()); + m_settings->toSettings(ICore::settings()); } const QString pasteID = dialog.pasteId(); @@ -320,7 +320,7 @@ void CodepasterPlugin::finishPost(const QString &link) { if (m_settings->copyToClipboard) QApplication::clipboard()->setText(link); - MessageManager::write(link, m_settings->displayOutput ? Core::MessageManager::ModeSwitch : Core::MessageManager::Silent); + MessageManager::write(link, m_settings->displayOutput ? MessageManager::ModeSwitch : MessageManager::Silent); } // Extract the characters that can be used for a file name from a title @@ -392,7 +392,7 @@ void CodepasterPlugin::finishFetch(const QString &titleDescription, const QString fileName = saver.fileName(); m_fetchedSnippets.push_back(fileName); // Open editor with title. - Core::IEditor *editor = EditorManager::openEditor(fileName); + IEditor *editor = EditorManager::openEditor(fileName); QTC_ASSERT(editor, return); editor->document()->setDisplayName(titleDescription); } diff --git a/src/plugins/genericprojectmanager/genericbuildconfiguration.cpp b/src/plugins/genericprojectmanager/genericbuildconfiguration.cpp index 3ba87db76f7..7b8b7381147 100644 --- a/src/plugins/genericprojectmanager/genericbuildconfiguration.cpp +++ b/src/plugins/genericprojectmanager/genericbuildconfiguration.cpp @@ -95,7 +95,7 @@ int GenericBuildConfigurationFactory::priority(const Target *parent) const QList GenericBuildConfigurationFactory::availableBuilds(const Target *parent) const { - QList result; + QList result; BuildInfo *info = createBuildInfo(parent->kit(), parent->project()->projectDirectory()); result << info; return result; @@ -110,7 +110,7 @@ int GenericBuildConfigurationFactory::priority(const Kit *k, const QString &proj QList GenericBuildConfigurationFactory::availableSetups(const Kit *k, const QString &projectPath) const { QList result; - BuildInfo *info = createBuildInfo(k, ProjectExplorer::Project::projectDirectory(Utils::FileName::fromString(projectPath))); + BuildInfo *info = createBuildInfo(k, Project::projectDirectory(Utils::FileName::fromString(projectPath))); //: The name of the build configuration created by default for a generic project. info->displayName = tr("Default"); result << info; @@ -184,7 +184,7 @@ bool GenericBuildConfigurationFactory::canHandle(const Target *t) const return qobject_cast(t->project()); } -BuildInfo *GenericBuildConfigurationFactory::createBuildInfo(const ProjectExplorer::Kit *k, +BuildInfo *GenericBuildConfigurationFactory::createBuildInfo(const Kit *k, const Utils::FileName &buildDir) const { BuildInfo *info = new BuildInfo(this); diff --git a/src/plugins/genericprojectmanager/genericproject.cpp b/src/plugins/genericprojectmanager/genericproject.cpp index e4d61047aa2..74bdca8e28b 100644 --- a/src/plugins/genericprojectmanager/genericproject.cpp +++ b/src/plugins/genericprojectmanager/genericproject.cpp @@ -358,8 +358,8 @@ void GenericProject::refreshCppCodeModel() ppBuilder.setConfigFileName(configFileName()); ppBuilder.setCxxFlags(QStringList() << QLatin1String("-std=c++11")); - const QList languages = ppBuilder.createProjectPartsForFiles(files()); - foreach (Core::Id language, languages) + const QList languages = ppBuilder.createProjectPartsForFiles(files()); + foreach (Id language, languages) setProjectLanguage(language, true); pInfo.finish(); diff --git a/src/plugins/genericprojectmanager/genericprojectnodes.cpp b/src/plugins/genericprojectmanager/genericprojectnodes.cpp index 3b2970971a6..e4ee6885a02 100644 --- a/src/plugins/genericprojectmanager/genericprojectnodes.cpp +++ b/src/plugins/genericprojectmanager/genericprojectnodes.cpp @@ -213,7 +213,7 @@ bool GenericProjectNode::showInSimpleTree() const return true; } -QList GenericProjectNode::supportedActions(Node *node) const +QList GenericProjectNode::supportedActions(Node *node) const { Q_UNUSED(node); return QList() diff --git a/src/plugins/genericprojectmanager/genericprojectplugin_test.cpp b/src/plugins/genericprojectmanager/genericprojectplugin_test.cpp index ea2471c602d..2194715c70f 100644 --- a/src/plugins/genericprojectmanager/genericprojectplugin_test.cpp +++ b/src/plugins/genericprojectmanager/genericprojectplugin_test.cpp @@ -78,11 +78,11 @@ void GenericProjectPlugin::test_simple() QCOMPARE(pPart->files.first().kind, ProjectFile::CXXSource); } -static QStringList simplify(const QList &files, const QString &prefix) +static QStringList simplify(const QList &files, const QString &prefix) { QStringList result; - foreach (const CppTools::ProjectFile &file, files) { + foreach (const ProjectFile &file, files) { if (file.path.startsWith(prefix)) result.append(file.path.mid(prefix.size())); else diff --git a/src/plugins/glsleditor/glslcompletionassist.cpp b/src/plugins/glsleditor/glslcompletionassist.cpp index 9d9d6a85160..e8aef98ab42 100644 --- a/src/plugins/glsleditor/glslcompletionassist.cpp +++ b/src/plugins/glsleditor/glslcompletionassist.cpp @@ -268,7 +268,7 @@ IAssistProposal *GlslCompletionAssistProcessor::perform(const AssistInterface *i QList members; QStringList specialMembers; - QList m_completions; + QList m_completions; bool functionCall = (ch == QLatin1Char('(') && pos == m_interface->position() - 1); diff --git a/src/plugins/glsleditor/glsleditor.cpp b/src/plugins/glsleditor/glsleditor.cpp index e624bd8219c..5c4fd9274b4 100644 --- a/src/plugins/glsleditor/glsleditor.cpp +++ b/src/plugins/glsleditor/glsleditor.cpp @@ -82,7 +82,7 @@ enum { UPDATE_DOCUMENT_DEFAULT_INTERVAL = 150 }; -class CreateRanges: protected GLSL::Visitor +class CreateRanges: protected Visitor { QTextDocument *textDocument; Document::Ptr glslDocument; @@ -91,12 +91,12 @@ public: CreateRanges(QTextDocument *textDocument, Document::Ptr glslDocument) : textDocument(textDocument), glslDocument(glslDocument) {} - void operator()(GLSL::AST *ast) { accept(ast); } + void operator()(AST *ast) { accept(ast); } protected: using GLSL::Visitor::visit; - virtual void endVisit(GLSL::CompoundStatementAST *ast) + virtual void endVisit(CompoundStatementAST *ast) { if (ast->symbol) { QTextCursor tc(textDocument); @@ -214,7 +214,7 @@ void GlslEditorWidget::updateDocumentNow() Document::Ptr doc(new Document()); Engine engine; - doc->_engine = new GLSL::Engine(); + doc->_engine = new Engine(); Parser parser(doc->_engine, preprocessedCode.constData(), preprocessedCode.size(), variant); TranslationUnitAST *ast = parser.parse(); if (ast != 0 || extraSelections(CodeWarningsSelection).isEmpty()) { diff --git a/src/plugins/glsleditor/glslhighlighter.cpp b/src/plugins/glsleditor/glslhighlighter.cpp index 113b47a9d88..cc8d5a6ec20 100644 --- a/src/plugins/glsleditor/glslhighlighter.cpp +++ b/src/plugins/glsleditor/glslhighlighter.cpp @@ -43,20 +43,20 @@ namespace Internal { GlslHighlighter::GlslHighlighter() { - static QVector categories; + static QVector categories; if (categories.isEmpty()) { - categories << TextEditor::C_NUMBER - << TextEditor::C_STRING - << TextEditor::C_TYPE - << TextEditor::C_KEYWORD - << TextEditor::C_OPERATOR - << TextEditor::C_PREPROCESSOR - << TextEditor::C_LABEL - << TextEditor::C_COMMENT - << TextEditor::C_DOXYGEN_COMMENT - << TextEditor::C_DOXYGEN_TAG - << TextEditor::C_VISUAL_WHITESPACE - << TextEditor::C_REMOVED_LINE; + categories << C_NUMBER + << C_STRING + << C_TYPE + << C_KEYWORD + << C_OPERATOR + << C_PREPROCESSOR + << C_LABEL + << C_COMMENT + << C_DOXYGEN_COMMENT + << C_DOXYGEN_TAG + << C_VISUAL_WHITESPACE + << C_REMOVED_LINE; } setTextFormatCategories(categories); } diff --git a/src/plugins/help/generalsettingspage.cpp b/src/plugins/help/generalsettingspage.cpp index a2fdc44b65d..7984ec49bc5 100644 --- a/src/plugins/help/generalsettingspage.cpp +++ b/src/plugins/help/generalsettingspage.cpp @@ -99,7 +99,7 @@ QWidget *GeneralSettingsPage::widget() m_ui->helpStartComboBox->setCurrentIndex(m_startOption); m_contextOption = HelpManager::customValue(QLatin1String("ContextHelpOption"), - Core::HelpManager::SideBySideIfPossible).toInt(); + HelpManager::SideBySideIfPossible).toInt(); m_ui->contextHelpComboBox->setCurrentIndex(m_contextOption); connect(m_ui->currentPageButton, &QPushButton::clicked, @@ -182,7 +182,7 @@ void GeneralSettingsPage::apply() m_contextOption = helpOption; HelpManager::setCustomValue(QLatin1String("ContextHelpOption"), helpOption); - QSettings *settings = Core::ICore::settings(); + QSettings *settings = ICore::settings(); settings->beginGroup(QLatin1String(Help::Constants::ID_MODE_HELP)); settings->setValue(QLatin1String("ContextHelpOption"), helpOption); settings->endGroup(); @@ -217,7 +217,7 @@ void GeneralSettingsPage::importBookmarks() { m_ui->errorLabel->setVisible(false); - QString fileName = QFileDialog::getOpenFileName(Core::ICore::dialogParent(), + QString fileName = QFileDialog::getOpenFileName(ICore::dialogParent(), tr("Import Bookmarks"), QDir::currentPath(), tr("Files (*.xbel)")); if (fileName.isEmpty()) @@ -239,7 +239,7 @@ void GeneralSettingsPage::exportBookmarks() { m_ui->errorLabel->setVisible(false); - QString fileName = QFileDialog::getSaveFileName(Core::ICore::dialogParent(), + QString fileName = QFileDialog::getSaveFileName(ICore::dialogParent(), tr("Save File"), QLatin1String("untitled.xbel"), tr("Files (*.xbel)")); QLatin1String suffix(".xbel"); diff --git a/src/plugins/help/helpfindsupport.cpp b/src/plugins/help/helpfindsupport.cpp index a5c32c29487..253febab19d 100644 --- a/src/plugins/help/helpfindsupport.cpp +++ b/src/plugins/help/helpfindsupport.cpp @@ -41,7 +41,7 @@ HelpViewerFindSupport::HelpViewerFindSupport(HelpViewer *viewer) { } -Core::FindFlags HelpViewerFindSupport::supportedFindFlags() const +FindFlags HelpViewerFindSupport::supportedFindFlags() const { return FindBackward | FindCaseSensitively; } @@ -52,23 +52,23 @@ QString HelpViewerFindSupport::currentFindString() const return m_viewer->selectedText(); } -Core::IFindSupport::Result HelpViewerFindSupport::findIncremental(const QString &txt, - Core::FindFlags findFlags) +IFindSupport::Result HelpViewerFindSupport::findIncremental(const QString &txt, + FindFlags findFlags) { QTC_ASSERT(m_viewer, return NotFound); findFlags &= ~FindBackward; return find(txt, findFlags, true) ? Found : NotFound; } -Core::IFindSupport::Result HelpViewerFindSupport::findStep(const QString &txt, - Core::FindFlags findFlags) +IFindSupport::Result HelpViewerFindSupport::findStep(const QString &txt, + FindFlags findFlags) { QTC_ASSERT(m_viewer, return NotFound); return find(txt, findFlags, false) ? Found : NotFound; } bool HelpViewerFindSupport::find(const QString &txt, - Core::FindFlags findFlags, bool incremental) + FindFlags findFlags, bool incremental) { QTC_ASSERT(m_viewer, return false); bool wrapped = false; diff --git a/src/plugins/help/helpindexfilter.cpp b/src/plugins/help/helpindexfilter.cpp index 28cfb08fce5..4be93c9c819 100644 --- a/src/plugins/help/helpindexfilter.cpp +++ b/src/plugins/help/helpindexfilter.cpp @@ -139,7 +139,7 @@ QList HelpIndexFilter::matchesFor(QFutureInterface &links = Core::HelpManager::linksForKeyword(key); + const QMap &links = HelpManager::linksForKeyword(key); if (links.size() == 1) emit linkActivated(links.begin().value()); diff --git a/src/plugins/help/helpplugin.cpp b/src/plugins/help/helpplugin.cpp index 9b711af5fe3..e4704e365f5 100644 --- a/src/plugins/help/helpplugin.cpp +++ b/src/plugins/help/helpplugin.cpp @@ -149,7 +149,7 @@ bool HelpPlugin::initialize(const QStringList &arguments, QString *error) addAutoReleasedObject(m_generalSettingsPage = new GeneralSettingsPage()); addAutoReleasedObject(m_searchTaskHandler = new SearchTaskHandler); - m_centralWidget = new Help::Internal::CentralWidget(modecontext); + m_centralWidget = new CentralWidget(modecontext); connect(m_centralWidget, SIGNAL(sourceChanged(QUrl)), this, SLOT(updateSideBarSource(QUrl))); connect(m_centralWidget, &CentralWidget::closeButtonClicked, @@ -302,7 +302,7 @@ void HelpPlugin::saveExternalWindowSettings() if (!m_externalWindow) return; m_externalWindowState = m_externalWindow->geometry(); - QSettings *settings = Core::ICore::settings(); + QSettings *settings = ICore::settings(); settings->setValue(QLatin1String(kExternalWindowStateKey), qVariantFromValue(m_externalWindowState)); } @@ -331,7 +331,7 @@ void HelpPlugin::createRightPaneContextViewer() { if (m_rightPaneSideBarWidget) return; - m_rightPaneSideBarWidget = createHelpWidget(Core::Context(Constants::C_HELP_SIDEBAR), + m_rightPaneSideBarWidget = createHelpWidget(Context(Constants::C_HELP_SIDEBAR), HelpWidget::SideBarWidget); } @@ -340,10 +340,10 @@ HelpViewer *HelpPlugin::externalHelpViewer() if (m_externalWindow) return m_externalWindow->currentViewer(); doSetupIfNeeded(); - m_externalWindow = createHelpWidget(Core::Context(Constants::C_HELP_EXTERNAL), + m_externalWindow = createHelpWidget(Context(Constants::C_HELP_EXTERNAL), HelpWidget::ExternalWindow); if (m_externalWindowState.isNull()) { - QSettings *settings = Core::ICore::settings(); + QSettings *settings = ICore::settings(); m_externalWindowState = settings->value(QLatin1String(kExternalWindowStateKey)).toRect(); } if (m_externalWindowState.isNull()) @@ -413,7 +413,7 @@ void HelpPlugin::activateHelpMode() void HelpPlugin::showLinkInHelpMode(const QUrl &source) { activateHelpMode(); - Core::ICore::raiseWindow(m_mode->widget()); + ICore::raiseWindow(m_mode->widget()); m_centralWidget->setSource(source); m_centralWidget->setFocus(); } @@ -421,7 +421,7 @@ void HelpPlugin::showLinkInHelpMode(const QUrl &source) void HelpPlugin::showLinksInHelpMode(const QMap &links, const QString &key) { activateHelpMode(); - Core::ICore::raiseWindow(m_mode->widget()); + ICore::raiseWindow(m_mode->widget()); m_centralWidget->showTopicChooser(links, key); } @@ -477,7 +477,7 @@ void HelpPlugin::setupHelpEngineIfNeeded() { LocalHelpManager::setEngineNeedsUpdate(); if (ModeManager::currentMode() == m_mode - || contextHelpOption() == Core::HelpManager::ExternalHelpAlways) + || contextHelpOption() == HelpManager::ExternalHelpAlways) LocalHelpManager::setupGuiHelpEngine(); } @@ -500,24 +500,24 @@ bool HelpPlugin::canShowHelpSideBySide() const return true; } -HelpViewer *HelpPlugin::viewerForHelpViewerLocation(Core::HelpManager::HelpViewerLocation location) +HelpViewer *HelpPlugin::viewerForHelpViewerLocation(HelpManager::HelpViewerLocation location) { - Core::HelpManager::HelpViewerLocation actualLocation = location; - if (location == Core::HelpManager::SideBySideIfPossible) - actualLocation = canShowHelpSideBySide() ? Core::HelpManager::SideBySideAlways - : Core::HelpManager::HelpModeAlways; + HelpManager::HelpViewerLocation actualLocation = location; + if (location == HelpManager::SideBySideIfPossible) + actualLocation = canShowHelpSideBySide() ? HelpManager::SideBySideAlways + : HelpManager::HelpModeAlways; - if (actualLocation == Core::HelpManager::ExternalHelpAlways) + if (actualLocation == HelpManager::ExternalHelpAlways) return externalHelpViewer(); - if (actualLocation == Core::HelpManager::SideBySideAlways) { + if (actualLocation == HelpManager::SideBySideAlways) { createRightPaneContextViewer(); RightPaneWidget::instance()->setWidget(m_rightPaneSideBarWidget); RightPaneWidget::instance()->setShown(true); return m_rightPaneSideBarWidget->currentViewer(); } - QTC_CHECK(actualLocation == Core::HelpManager::HelpModeAlways); + QTC_CHECK(actualLocation == HelpManager::HelpModeAlways); activateHelpMode(); // should trigger an createPage... HelpViewer *viewer = m_centralWidget->currentViewer(); @@ -567,7 +567,7 @@ void HelpPlugin::showContextHelp() // Find out what to show QMap links; QString idFromContext; - if (IContext *context = Core::ICore::currentContextObject()) { + if (IContext *context = ICore::currentContextObject()) { idFromContext = context->contextHelpId(); links = HelpManager::linksForIdentifier(idFromContext); // Maybe the id is already an URL @@ -597,7 +597,7 @@ void HelpPlugin::showContextHelp() viewer->scrollToAnchor(source.fragment()); } viewer->setFocus(); - Core::ICore::raiseWindow(viewer); + ICore::raiseWindow(viewer); } } } @@ -624,7 +624,7 @@ void HelpPlugin::highlightSearchTermsInContextHelp() m_contextHelpHighlightId.clear(); } -void HelpPlugin::handleHelpRequest(const QUrl &url, Core::HelpManager::HelpViewerLocation location) +void HelpPlugin::handleHelpRequest(const QUrl &url, HelpManager::HelpViewerLocation location) { if (HelpViewer::launchWithExternalApp(url)) return; @@ -648,7 +648,7 @@ void HelpPlugin::handleHelpRequest(const QUrl &url, Core::HelpManager::HelpViewe HelpViewer *viewer = viewerForHelpViewerLocation(location); QTC_ASSERT(viewer, return); viewer->setSource(newUrl); - Core::ICore::raiseWindow(viewer); + ICore::raiseWindow(viewer); } void HelpPlugin::slotOpenSupportPage() @@ -672,15 +672,15 @@ void HelpPlugin::doSetupIfNeeded() } } -Core::HelpManager::HelpViewerLocation HelpPlugin::contextHelpOption() const +HelpManager::HelpViewerLocation HelpPlugin::contextHelpOption() const { - QSettings *settings = Core::ICore::settings(); + QSettings *settings = ICore::settings(); const QString key = QLatin1String(Help::Constants::ID_MODE_HELP) + QLatin1String("/ContextHelpOption"); if (settings->contains(key)) - return Core::HelpManager::HelpViewerLocation( - settings->value(key, Core::HelpManager::SideBySideIfPossible).toInt()); + return HelpManager::HelpViewerLocation( + settings->value(key, HelpManager::SideBySideIfPossible).toInt()); const QHelpEngineCore &engine = LocalHelpManager::helpEngine(); - return Core::HelpManager::HelpViewerLocation(engine.customValue(QLatin1String("ContextHelpOption"), - Core::HelpManager::SideBySideIfPossible).toInt()); + return HelpManager::HelpViewerLocation(engine.customValue(QLatin1String("ContextHelpOption"), + HelpManager::SideBySideIfPossible).toInt()); } diff --git a/src/plugins/help/qtwebkithelpviewer.cpp b/src/plugins/help/qtwebkithelpviewer.cpp index ab3e0777755..eefbef406ef 100644 --- a/src/plugins/help/qtwebkithelpviewer.cpp +++ b/src/plugins/help/qtwebkithelpviewer.cpp @@ -385,7 +385,7 @@ bool QtWebKitHelpWidget::eventFilter(QObject *obj, QEvent *event) if (event->type() == QEvent::KeyPress) { if (QKeyEvent *keyEvent = static_cast (event)) { if (keyEvent->key() == Qt::Key_Slash) - Core::FindPlugin::instance()->openFindToolBar(Core::FindPlugin::FindForwardDirection); + FindPlugin::instance()->openFindToolBar(FindPlugin::FindForwardDirection); } } return QWebView::eventFilter(obj, event); @@ -569,7 +569,7 @@ void QtWebKitHelpViewer::setOpenInNewPageActionVisible(bool visible) m_webView->setOpenInNewPageActionVisible(visible); } -bool QtWebKitHelpViewer::findText(const QString &text, Core::FindFlags flags, +bool QtWebKitHelpViewer::findText(const QString &text, FindFlags flags, bool incremental, bool fromSearch, bool *wrapped) { Q_UNUSED(incremental); @@ -577,9 +577,9 @@ bool QtWebKitHelpViewer::findText(const QString &text, Core::FindFlags flags, if (wrapped) *wrapped = false; QWebPage::FindFlags options; - if (flags & Core::FindBackward) + if (flags & FindBackward) options |= QWebPage::FindBackward; - if (flags & Core::FindCaseSensitively) + if (flags & FindCaseSensitively) options |= QWebPage::FindCaseSensitively; bool found = m_webView->findText(text, options); diff --git a/src/plugins/qbsprojectmanager/qbsproject.cpp b/src/plugins/qbsprojectmanager/qbsproject.cpp index 3fa7e633b22..9302865acd7 100644 --- a/src/plugins/qbsprojectmanager/qbsproject.cpp +++ b/src/plugins/qbsprojectmanager/qbsproject.cpp @@ -201,36 +201,36 @@ QStringList QbsProject::files(Project::FilesMode fileMode) const bool QbsProject::isProjectEditable() const { - return m_qbsProject.isValid() && !isParsing() && !ProjectExplorer::BuildManager::isBuilding(); + return m_qbsProject.isValid() && !isParsing() && !BuildManager::isBuilding(); } class ChangeExpector { public: - ChangeExpector(const QString &filePath, const QSet &documents) + ChangeExpector(const QString &filePath, const QSet &documents) : m_document(0) { - foreach (Core::IDocument * const doc, documents) { + foreach (IDocument * const doc, documents) { if (doc->filePath().toString() == filePath) { m_document = doc; break; } } QTC_ASSERT(m_document, return); - Core::DocumentManager::expectFileChange(filePath); - m_wasInDocumentManager = Core::DocumentManager::removeDocument(m_document); + DocumentManager::expectFileChange(filePath); + m_wasInDocumentManager = DocumentManager::removeDocument(m_document); QTC_CHECK(m_wasInDocumentManager); } ~ChangeExpector() { QTC_ASSERT(m_document, return); - Core::DocumentManager::addDocument(m_document); - Core::DocumentManager::unexpectFileChange(m_document->filePath().toString()); + DocumentManager::addDocument(m_document); + DocumentManager::unexpectFileChange(m_document->filePath().toString()); } private: - Core::IDocument *m_document; + IDocument *m_document; bool m_wasInDocumentManager; }; @@ -240,12 +240,12 @@ bool QbsProject::ensureWriteableQbsFile(const QString &file) QFileInfo fi(file); if (!fi.isWritable()) { // Try via vcs manager - Core::IVersionControl *versionControl = - Core::VcsManager::findVersionControlForDirectory(fi.absolutePath()); + IVersionControl *versionControl = + VcsManager::findVersionControlForDirectory(fi.absolutePath()); if (!versionControl || !versionControl->vcsOpen(file)) { bool makeWritable = QFile::setPermissions(file, fi.permissions() | QFile::WriteUser); if (!makeWritable) { - QMessageBox::warning(Core::ICore::mainWindow(), + QMessageBox::warning(ICore::mainWindow(), tr("Failed!"), tr("Could not write project file %1.").arg(file)); return false; @@ -266,7 +266,7 @@ bool QbsProject::addFilesToProduct(QbsBaseProjectNode *node, const QStringList & foreach (const QString &path, filePaths) { qbs::ErrorInfo err = m_qbsProject.addFiles(productData, groupData, QStringList() << path); if (err.hasError()) { - Core::MessageManager::write(err.toString()); + MessageManager::write(err.toString()); *notAdded += path; } else { allPaths += path; @@ -293,7 +293,7 @@ bool QbsProject::removeFilesFromProduct(QbsBaseProjectNode *node, const QStringL qbs::ErrorInfo err = m_qbsProject.removeFiles(productData, groupData, QStringList() << path); if (err.hasError()) { - Core::MessageManager::write(err.toString()); + MessageManager::write(err.toString()); *notRemoved += path; } else { allPaths.removeOne(path); @@ -489,7 +489,7 @@ void QbsProject::startParsing() { // Qbs does update the build graph during the build. So we cannot // start to parse while a build is running or we will lose information. - if (ProjectExplorer::BuildManager::isBuilding(this)) { + if (BuildManager::isBuilding(this)) { scheduleParsing(); return; } @@ -771,9 +771,9 @@ void QbsProject::updateCppCodeModel() } } - const QList languages = + const QList languages = ppBuilder.createProjectPartsForFiles(grp.allFilePaths()); - foreach (Core::Id language, languages) + foreach (Id language, languages) setProjectLanguage(language, true); } } @@ -847,24 +847,24 @@ void QbsProject::updateQmlJsCodeModel() void QbsProject::updateApplicationTargets() { - ProjectExplorer::BuildTargetInfoList applications; + BuildTargetInfoList applications; foreach (const qbs::ProductData &productData, m_projectData.allProducts()) { if (!productData.isEnabled() || !productData.isRunnable()) continue; const QString displayName = productDisplayName(m_qbsProject, productData); if (productData.targetArtifacts().isEmpty()) { // No build yet. - applications.list << ProjectExplorer::BuildTargetInfo(displayName, - Utils::FileName(), - Utils::FileName::fromString(productData.location().filePath())); + applications.list << BuildTargetInfo(displayName, + FileName(), + FileName::fromString(productData.location().filePath())); continue; } foreach (const qbs::TargetArtifact &ta, productData.targetArtifacts()) { QTC_ASSERT(ta.isValid(), continue); if (!ta.isExecutable()) continue; - applications.list << ProjectExplorer::BuildTargetInfo(displayName, - Utils::FileName::fromString(ta.filePath()), - Utils::FileName::fromString(productData.location().filePath())); + applications.list << BuildTargetInfo(displayName, + FileName::fromString(ta.filePath()), + FileName::fromString(productData.location().filePath())); } } activeTarget()->setApplicationTargets(applications); @@ -872,15 +872,15 @@ void QbsProject::updateApplicationTargets() void QbsProject::updateDeploymentInfo() { - ProjectExplorer::DeploymentData deploymentData; + DeploymentData deploymentData; if (m_qbsProject.isValid()) { qbs::InstallOptions installOptions; installOptions.setInstallRoot(QLatin1String("/")); foreach (const qbs::InstallableFile &f, m_qbsProject .installableFilesForProject(m_projectData, installOptions)) { deploymentData.addFile(f.sourceFilePath(), f.targetDirectory(), f.isExecutable() - ? ProjectExplorer::DeployableFile::TypeExecutable - : ProjectExplorer::DeployableFile::TypeNormal); + ? DeployableFile::TypeExecutable + : DeployableFile::TypeNormal); } } activeTarget()->setDeploymentData(deploymentData); diff --git a/src/plugins/qbsprojectmanager/qbsprojectmanagerplugin.cpp b/src/plugins/qbsprojectmanager/qbsprojectmanagerplugin.cpp index ddff34bae48..a8682fe8c11 100644 --- a/src/plugins/qbsprojectmanager/qbsprojectmanagerplugin.cpp +++ b/src/plugins/qbsprojectmanager/qbsprojectmanagerplugin.cpp @@ -254,7 +254,7 @@ void QbsProjectManagerPlugin::updateContextActions() && m_selectedProject && !m_selectedProject->isParsing() && m_selectedNode && m_selectedNode->isEnabled(); - bool isFile = m_selectedProject && m_selectedNode && (m_selectedNode->nodeType() == ProjectExplorer::FileNodeType); + bool isFile = m_selectedProject && m_selectedNode && (m_selectedNode->nodeType() == FileNodeType); bool isProduct = m_selectedProject && m_selectedNode && dynamic_cast(m_selectedNode->projectNode()); QbsProjectNode *subproject = dynamic_cast(m_selectedNode); bool isSubproject = m_selectedProject && subproject && subproject != m_selectedProject->rootProjectNode(); @@ -318,7 +318,7 @@ void QbsProjectManagerPlugin::updateBuildActions() m_buildSubproject->setParameter(subprojectName); } -void QbsProjectManagerPlugin::buildStateChanged(ProjectExplorer::Project *project) +void QbsProjectManagerPlugin::buildStateChanged(Project *project) { if (project == m_currentProject) updateReparseQbsAction(); @@ -445,7 +445,7 @@ void QbsProjectManagerPlugin::buildFiles(QbsProject *project, const QStringList QTC_ASSERT(project, return); QTC_ASSERT(!files.isEmpty(), return); - ProjectExplorer::Target *t = project->activeTarget(); + Target *t = project->activeTarget(); if (!t) return; QbsBuildConfiguration *bc = qobject_cast(t->activeBuildConfiguration()); @@ -461,7 +461,7 @@ void QbsProjectManagerPlugin::buildFiles(QbsProject *project, const QStringList const Core::Id buildStep = ProjectExplorer::Constants::BUILDSTEPS_BUILD; - const QString name = ProjectExplorer::ProjectExplorerPlugin::displayNameForStepId(buildStep); + const QString name = ProjectExplorerPlugin::displayNameForStepId(buildStep); BuildManager::buildList(bc->stepList(buildStep), name); bc->setChangedFiles(QStringList()); @@ -479,7 +479,7 @@ void QbsProjectManagerPlugin::buildProducts(QbsProject *project, const QStringLi QTC_ASSERT(project, return); QTC_ASSERT(!products.isEmpty(), return); - ProjectExplorer::Target *t = project->activeTarget(); + Target *t = project->activeTarget(); if (!t) return; QbsBuildConfiguration *bc = qobject_cast(t->activeBuildConfiguration()); diff --git a/src/plugins/qbsprojectmanager/qbsprojectparser.cpp b/src/plugins/qbsprojectmanager/qbsprojectparser.cpp index 5fdaf2a256d..f53b8dcd087 100644 --- a/src/plugins/qbsprojectmanager/qbsprojectparser.cpp +++ b/src/plugins/qbsprojectmanager/qbsprojectparser.cpp @@ -168,7 +168,7 @@ QString QbsProjectParser::pluginsBaseDirectory() const const QString qbsInstallDir = QLatin1String(QBS_INSTALL_DIR); if (!qbsInstallDir.isEmpty()) return qbsInstallDir + QLatin1String("/lib/"); - if (Utils::HostOsInfo::isMacHost()) + if (HostOsInfo::isMacHost()) return QDir::cleanPath(QCoreApplication::applicationDirPath() + QLatin1String("/../PlugIns")); else diff --git a/src/plugins/resourceeditor/resourceeditorfactory.cpp b/src/plugins/resourceeditor/resourceeditorfactory.cpp index da193de98a8..1b82254ec3b 100644 --- a/src/plugins/resourceeditor/resourceeditorfactory.cpp +++ b/src/plugins/resourceeditor/resourceeditorfactory.cpp @@ -56,6 +56,6 @@ ResourceEditorFactory::ResourceEditorFactory(ResourceEditorPlugin *plugin) : Core::IEditor *ResourceEditorFactory::createEditor() { - Core::Context context(ResourceEditor::Constants::C_RESOURCEEDITOR); + Core::Context context(C_RESOURCEEDITOR); return new ResourceEditorW(context, m_plugin); } diff --git a/src/plugins/resourceeditor/resourceeditorplugin.cpp b/src/plugins/resourceeditor/resourceeditorplugin.cpp index e13376cec68..6f1255f91c0 100644 --- a/src/plugins/resourceeditor/resourceeditorplugin.cpp +++ b/src/plugins/resourceeditor/resourceeditorplugin.cpp @@ -206,7 +206,7 @@ bool ResourceEditorPlugin::initialize(const QStringList &arguments, QString *err m_renameResourceFile->setEnabled(false); m_removeResourceFile->setEnabled(false); - connect(ProjectExplorer::ProjectTree::instance(), &ProjectTree::currentNodeChanged, + connect(ProjectTree::instance(), &ProjectTree::currentNodeChanged, this, &ResourceEditorPlugin::updateContextActions); return true; @@ -264,7 +264,7 @@ void ResourceEditorPlugin::removeFileContextMenu() { ResourceFolderNode *rfn = static_cast(ProjectTree::currentNode()); QString path = rfn->path(); - ProjectExplorer::FolderNode *parent = rfn->parentFolderNode(); + FolderNode *parent = rfn->parentFolderNode(); if (!parent->removeFiles(QStringList() << path)) QMessageBox::warning(Core::ICore::mainWindow(), tr("File Removal Failed"), @@ -302,7 +302,7 @@ void ResourceEditorPlugin::renamePrefixContextMenu() node->renamePrefix(prefix, dialog.lang()); } -void ResourceEditorPlugin::updateContextActions(ProjectExplorer::Node *node, ProjectExplorer::Project *) +void ResourceEditorPlugin::updateContextActions(Node *node, Project *) { bool isResourceNode = dynamic_cast(node); m_addPrefix->setEnabled(isResourceNode); @@ -312,9 +312,9 @@ void ResourceEditorPlugin::updateContextActions(ProjectExplorer::Node *node, Pro bool enableRemove = false; if (isResourceNode) { - ProjectExplorer::FolderNode *parent = node ? node->parentFolderNode() : 0; - enableRename = parent && parent->supportedActions(node).contains(ProjectExplorer::Rename); - enableRemove = parent && parent->supportedActions(node).contains(ProjectExplorer::RemoveFile); + FolderNode *parent = node ? node->parentFolderNode() : 0; + enableRename = parent && parent->supportedActions(node).contains(Rename); + enableRemove = parent && parent->supportedActions(node).contains(RemoveFile); } m_renameResourceFile->setEnabled(isResourceNode && enableRename); diff --git a/src/plugins/tasklist/tasklistplugin.cpp b/src/plugins/tasklist/tasklistplugin.cpp index 7381c4e1313..a6b5f2d7686 100644 --- a/src/plugins/tasklist/tasklistplugin.cpp +++ b/src/plugins/tasklist/tasklistplugin.cpp @@ -166,7 +166,7 @@ static bool parseTaskFile(QString *errorString, const QString &base, const QStri // TaskListPlugin // -------------------------------------------------------------------------- -Core::IDocument *TaskListPlugin::openTasks(const QString &base, const QString &fileName) +IDocument *TaskListPlugin::openTasks(const QString &base, const QString &fileName) { foreach (TaskFile *doc, m_openFiles) { if (doc->filePath().toString() == fileName) @@ -178,7 +178,7 @@ Core::IDocument *TaskListPlugin::openTasks(const QString &base, const QString &f QString errorString; if (!file->open(&errorString, fileName)) { - QMessageBox::critical(Core::ICore::mainWindow(), tr("File Error"), errorString); + QMessageBox::critical(ICore::mainWindow(), tr("File Error"), errorString); delete file; return 0; } @@ -186,7 +186,7 @@ Core::IDocument *TaskListPlugin::openTasks(const QString &base, const QString &f m_openFiles.append(file); // Register with filemanager: - Core::DocumentManager::addDocument(file); + DocumentManager::addDocument(file); return file; } @@ -203,13 +203,13 @@ bool TaskListPlugin::initialize(const QStringList &arguments, QString *errorMess //: Category under which tasklist tasks are listed in Issues view TaskHub::addCategory(Constants::TASKLISTTASK_ID, tr("My Tasks")); - if (!Core::MimeDatabase::addMimeTypes(QLatin1String(":tasklist/TaskList.mimetypes.xml"), errorMessage)) + if (!MimeDatabase::addMimeTypes(QLatin1String(":tasklist/TaskList.mimetypes.xml"), errorMessage)) return false; m_fileFactory = new IDocumentFactory; m_fileFactory->addMimeType(QLatin1String("text/x-tasklist")); m_fileFactory->setOpener([this](const QString &fileName) -> IDocument * { - ProjectExplorer::Project *project = ProjectExplorer::ProjectTree::currentProject(); + Project *project = ProjectTree::currentProject(); return this->openTasks(project ? project->projectDirectory().toString() : QString(), fileName); }); diff --git a/src/plugins/todo/todoitemsprovider.cpp b/src/plugins/todo/todoitemsprovider.cpp index 0e76c9cd28f..a13877cbcaf 100644 --- a/src/plugins/todo/todoitemsprovider.cpp +++ b/src/plugins/todo/todoitemsprovider.cpp @@ -109,7 +109,7 @@ void TodoItemsProvider::createScanners() void TodoItemsProvider::setItemsListWithinStartupProject() { QHashIterator > it(m_itemsHash); - QSet fileNames = QSet::fromList(m_startupProject->files(ProjectExplorer::Project::ExcludeGeneratedFiles)); + QSet fileNames = QSet::fromList(m_startupProject->files(Project::ExcludeGeneratedFiles)); while (it.hasNext()) { it.next(); if (fileNames.contains(it.key())) @@ -125,7 +125,7 @@ void TodoItemsProvider::itemsFetched(const QString &fileName, const QListrun(Valgrind::Callgrind::CallgrindController::Dump); + m_runner.controller()->run(Callgrind::CallgrindController::Dump); } void CallgrindRunControl::setPaused(bool paused) @@ -135,20 +135,20 @@ void CallgrindRunControl::setToggleCollectFunction(const QString &toggleCollectF void CallgrindRunControl::reset() { - m_runner.controller()->run(Valgrind::Callgrind::CallgrindController::ResetEventCounters); + m_runner.controller()->run(Callgrind::CallgrindController::ResetEventCounters); } void CallgrindRunControl::pause() { - m_runner.controller()->run(Valgrind::Callgrind::CallgrindController::Pause); + m_runner.controller()->run(Callgrind::CallgrindController::Pause); } void CallgrindRunControl::unpause() { - m_runner.controller()->run(Valgrind::Callgrind::CallgrindController::UnPause); + m_runner.controller()->run(Callgrind::CallgrindController::UnPause); } -Valgrind::Callgrind::ParseData *CallgrindRunControl::takeParserData() +Callgrind::ParseData *CallgrindRunControl::takeParserData() { return m_runner.parser()->takeData(); } diff --git a/src/plugins/valgrind/callgrindtool.cpp b/src/plugins/valgrind/callgrindtool.cpp index 65e63e05860..cafafe5c66c 100644 --- a/src/plugins/valgrind/callgrindtool.cpp +++ b/src/plugins/valgrind/callgrindtool.cpp @@ -118,7 +118,7 @@ public: void updateEventCombo(); AnalyzerRunControl *createRunControl(const AnalyzerStartParameters &sp, - ProjectExplorer::RunConfiguration *runConfiguration = 0); + RunConfiguration *runConfiguration = 0); signals: void cycleDetectionEnabled(bool enabled); @@ -131,8 +131,8 @@ public slots: void slotRequestDump(); void loadExternalLogFile(); - void selectFunction(const Valgrind::Callgrind::Function *); - void setCostFormat(Valgrind::Internal::CostDelegate::CostFormat format); + void selectFunction(const Function *); + void setCostFormat(CostDelegate::CostFormat format); void enableCycleDetection(bool enabled); void shortenTemplates(bool enabled); void setCostEvent(int index); @@ -160,15 +160,15 @@ public slots: void dataFunctionSelected(const QModelIndex &index); void calleeFunctionSelected(const QModelIndex &index); void callerFunctionSelected(const QModelIndex &index); - void visualisationFunctionSelected(const Valgrind::Callgrind::Function *function); - void showParserResults(const Valgrind::Callgrind::ParseData *data); + void visualisationFunctionSelected(const Function *function); + void showParserResults(const ParseData *data); void takeParserDataFromRunControl(CallgrindRunControl *rc); void takeParserData(ParseData *data); - void engineStarting(const Analyzer::AnalyzerRunControl *); + void engineStarting(const AnalyzerRunControl *); void engineFinished(); - void editorOpened(Core::IEditor *); + void editorOpened(IEditor *); void requestContextMenu(TextEditorWidget *widget, int line, QMenu *menu); public: @@ -401,7 +401,7 @@ void CallgrindToolPrivate::updateCostFormat() void CallgrindToolPrivate::handleFilterProjectCosts() { - ProjectExplorer::Project *pro = ProjectExplorer::ProjectTree::currentProject(); + Project *pro = ProjectTree::currentProject(); QTC_ASSERT(pro, return); if (m_filterProjectCosts->isChecked()) { @@ -819,7 +819,7 @@ void CallgrindToolPrivate::clearTextMarks() m_textMarks.clear(); } -void CallgrindToolPrivate::engineStarting(const Analyzer::AnalyzerRunControl *) +void CallgrindToolPrivate::engineStarting(const AnalyzerRunControl *) { // enable/disable actions m_resetAction->setEnabled(true); @@ -929,7 +929,7 @@ void CallgrindToolPrivate::slotRequestDump() void CallgrindToolPrivate::loadExternalLogFile() { const QString filePath = QFileDialog::getOpenFileName( - Core::ICore::mainWindow(), + ICore::mainWindow(), tr("Open Callgrind Log File"), QString(), tr("Callgrind Output (callgrind.out*);;All Files (*)")); diff --git a/src/plugins/valgrind/memcheckengine.cpp b/src/plugins/valgrind/memcheckengine.cpp index 992aed5e40f..37d018c312c 100644 --- a/src/plugins/valgrind/memcheckengine.cpp +++ b/src/plugins/valgrind/memcheckengine.cpp @@ -49,7 +49,7 @@ namespace Valgrind { namespace Internal { MemcheckRunControl::MemcheckRunControl(const AnalyzerStartParameters &sp, - ProjectExplorer::RunConfiguration *runConfiguration) + RunConfiguration *runConfiguration) : ValgrindRunControl(sp, runConfiguration) { connect(&m_parser, &XmlProtocol::ThreadedParser::error, diff --git a/src/plugins/valgrind/memchecktool.cpp b/src/plugins/valgrind/memchecktool.cpp index 9deb62f3296..7c2b957b80f 100644 --- a/src/plugins/valgrind/memchecktool.cpp +++ b/src/plugins/valgrind/memchecktool.cpp @@ -146,7 +146,7 @@ bool MemcheckErrorFilterProxyModel::filterAcceptsRow(int sourceRow, const QModel foreach (Project *project, SessionManager::projects()) { validFolders << project->projectDirectory().toString(); foreach (Target *target, project->targets()) { - foreach (const ProjectExplorer::DeployableFile &file, + foreach (const DeployableFile &file, target->deploymentData().allFiles()) { if (file.isExecutable()) validFolders << file.remoteDirectory(); @@ -519,7 +519,7 @@ void MemcheckTool::loadExternalXmlLogFile() parser->parse(logFile); // ThreadedParser owns the file } -void MemcheckTool::parserError(const Valgrind::XmlProtocol::Error &error) +void MemcheckTool::parserError(const Error &error) { m_errorModel->addError(error); } diff --git a/src/plugins/valgrind/valgrindengine.cpp b/src/plugins/valgrind/valgrindengine.cpp index 157bc149f82..f3e03932f09 100644 --- a/src/plugins/valgrind/valgrindengine.cpp +++ b/src/plugins/valgrind/valgrindengine.cpp @@ -55,7 +55,7 @@ namespace Valgrind { namespace Internal { ValgrindRunControl::ValgrindRunControl(const AnalyzerStartParameters &sp, - ProjectExplorer::RunConfiguration *runConfiguration) + RunConfiguration *runConfiguration) : AnalyzerRunControl(sp, runConfiguration), m_settings(0), m_isStopping(false) diff --git a/src/plugins/valgrind/valgrindruncontrolfactory.cpp b/src/plugins/valgrind/valgrindruncontrolfactory.cpp index c6d2c087405..e207d78f855 100644 --- a/src/plugins/valgrind/valgrindruncontrolfactory.cpp +++ b/src/plugins/valgrind/valgrindruncontrolfactory.cpp @@ -95,7 +95,7 @@ RunControl *ValgrindRunControlFactory::create(RunConfiguration *runConfiguration sp.connParams.host = server.serverAddress().toString(); sp.connParams.port = server.serverPort(); sp.startMode = StartLocal; - sp.localRunMode = static_cast(rc1->runMode()); + sp.localRunMode = static_cast(rc1->runMode()); } else if (RemoteLinux::AbstractRemoteLinuxRunConfiguration *rc2 = qobject_cast(runConfiguration)) { sp.startMode = StartRemote; @@ -131,7 +131,7 @@ public: RunConfigWidget *createConfigurationWidget() { - return new Analyzer::AnalyzerRunConfigWidget(this); + return new AnalyzerRunConfigWidget(this); } }; diff --git a/src/plugins/winrt/winrtdevice.cpp b/src/plugins/winrt/winrtdevice.cpp index 9757babb83f..7cd23240710 100644 --- a/src/plugins/winrt/winrtdevice.cpp +++ b/src/plugins/winrt/winrtdevice.cpp @@ -88,7 +88,7 @@ void WinRtDevice::executeAction(Core::Id actionId, QWidget *parent) DeviceProcessSignalOperation::Ptr WinRtDevice::signalOperation() const { - class WinRtDesktopSignalOperation : public ProjectExplorer::DesktopProcessSignalOperation + class WinRtDesktopSignalOperation : public DesktopProcessSignalOperation { public: WinRtDesktopSignalOperation() {} diff --git a/src/plugins/winrt/winrtpackagedeploymentstep.cpp b/src/plugins/winrt/winrtpackagedeploymentstep.cpp index 71f902d66e0..5b350f66428 100644 --- a/src/plugins/winrt/winrtpackagedeploymentstep.cpp +++ b/src/plugins/winrt/winrtpackagedeploymentstep.cpp @@ -242,15 +242,15 @@ QString WinRtPackageDeploymentStep::defaultWinDeployQtArguments() const void WinRtPackageDeploymentStep::raiseError(const QString &errorMessage) { emit addOutput(errorMessage, BuildStep::ErrorMessageOutput); - emit addTask(ProjectExplorer::Task(ProjectExplorer::Task::Error, errorMessage, Utils::FileName(), -1, - ProjectExplorer::Constants::TASK_CATEGORY_DEPLOYMENT)); + emit addTask(Task(Task::Error, errorMessage, Utils::FileName(), -1, + ProjectExplorer::Constants::TASK_CATEGORY_DEPLOYMENT)); } void WinRtPackageDeploymentStep::raiseWarning(const QString &warningMessage) { emit addOutput(warningMessage, BuildStep::MessageOutput); - emit addTask(ProjectExplorer::Task(ProjectExplorer::Task::Warning, warningMessage, Utils::FileName(), -1, - ProjectExplorer::Constants::TASK_CATEGORY_DEPLOYMENT)); + emit addTask(Task(Task::Warning, warningMessage, Utils::FileName(), -1, + ProjectExplorer::Constants::TASK_CATEGORY_DEPLOYMENT)); } bool WinRtPackageDeploymentStep::fromMap(const QVariantMap &map) diff --git a/src/plugins/winrt/winrtrunfactories.cpp b/src/plugins/winrt/winrtrunfactories.cpp index 579d8d9141a..1c2c763a163 100644 --- a/src/plugins/winrt/winrtrunfactories.cpp +++ b/src/plugins/winrt/winrtrunfactories.cpp @@ -136,8 +136,8 @@ WinRtRunControlFactory::WinRtRunControlFactory() { } -bool WinRtRunControlFactory::canRun(ProjectExplorer::RunConfiguration *runConfiguration, - ProjectExplorer::RunMode mode) const +bool WinRtRunControlFactory::canRun(RunConfiguration *runConfiguration, + RunMode mode) const { if (!runConfiguration) return false; @@ -158,7 +158,7 @@ bool WinRtRunControlFactory::canRun(ProjectExplorer::RunConfiguration *runConfig } } -ProjectExplorer::RunControl *WinRtRunControlFactory::create( +RunControl *WinRtRunControlFactory::create( RunConfiguration *runConfiguration, RunMode mode, QString *errorMessage) { WinRtRunConfiguration *rc = qobject_cast(runConfiguration); diff --git a/tests/auto/valgrind/memcheck/modeldemo.cpp b/tests/auto/valgrind/memcheck/modeldemo.cpp index ec87b77f87e..ebcc7afab15 100644 --- a/tests/auto/valgrind/memcheck/modeldemo.cpp +++ b/tests/auto/valgrind/memcheck/modeldemo.cpp @@ -56,11 +56,11 @@ static QString dataFile(const QLatin1String &file) int main(int argc, char *argv[]) { QApplication app(argc, argv); - qRegisterMetaType(); + qRegisterMetaType(); ThreadedParser parser; - Valgrind::Memcheck::MemcheckRunner runner; + Memcheck::MemcheckRunner runner; runner.setValgrindExecutable(fakeValgrindExecutable()); runner.setValgrindArguments(QStringList() << QLatin1String("-i") << dataFile(QLatin1String("memcheck-output-sample1.xml")) ); runner.setParser(&parser); diff --git a/tests/auto/valgrind/memcheck/parsertests.cpp b/tests/auto/valgrind/memcheck/parsertests.cpp index 9743493262e..947b1831d64 100644 --- a/tests/auto/valgrind/memcheck/parsertests.cpp +++ b/tests/auto/valgrind/memcheck/parsertests.cpp @@ -59,7 +59,7 @@ QT_BEGIN_NAMESPACE namespace QTest { template<> -inline bool qCompare(int const &t1, Valgrind::XmlProtocol::MemcheckErrorKind const &t2, +inline bool qCompare(int const &t1, MemcheckErrorKind const &t2, char const *actual, char const *expected, char const *file, int line) { return qCompare(t1, int(t2), actual, expected, file, line); @@ -219,7 +219,7 @@ void ParserTests::testHelgrindSample1() expectedErrors.append(error1); } - Valgrind::XmlProtocol::Parser parser; + Parser parser; Recorder rec(&parser); parser.parse(m_socket); @@ -295,7 +295,7 @@ void ParserTests::testMemcheckSample1() expectedSuppCounts.push_back(qMakePair(QString::fromLatin1("dl-hack3-cond-1"), static_cast(2))); expectedSuppCounts.push_back(qMakePair(QString::fromLatin1("glibc-2.5.x-on-SUSE-10.2-(PPC)-2a"), static_cast(2))); - Valgrind::XmlProtocol::Parser parser; + Parser parser; Recorder rec(&parser); parser.parse(m_socket); @@ -326,7 +326,7 @@ void ParserTests::testMemcheckSample2() initTest(QLatin1String("memcheck-output-sample2.xml")); - Valgrind::XmlProtocol::Parser parser; + Parser parser; Recorder rec(&parser); parser.parse(m_socket); @@ -352,7 +352,7 @@ void ParserTests::testMemcheckSample3() initTest(QLatin1String("memcheck-output-sample3.xml")); - Valgrind::XmlProtocol::Parser parser; + Parser parser; Recorder rec(&parser); parser.parse(m_socket); @@ -405,7 +405,7 @@ void ParserTests::testMemcheckCharm() // a somewhat larger file, to make sure buffering and partial I/O works ok initTest(QLatin1String("memcheck-output-untitled.xml")); - Valgrind::XmlProtocol::Parser parser; + Parser parser; Recorder rec(&parser); parser.parse(m_socket); @@ -423,7 +423,7 @@ void ParserTests::testValgrindCrash() { initTest(QLatin1String("memcheck-output-sample1.xml"), QStringList() << "--crash"); - Valgrind::XmlProtocol::Parser parser; + Parser parser; parser.parse(m_socket); m_process->waitForFinished(); QCOMPARE(m_process->state(), QProcess::NotRunning); @@ -438,7 +438,7 @@ void ParserTests::testValgrindGarbage() { initTest(QLatin1String("memcheck-output-sample1.xml"), QStringList() << "--garbage"); - Valgrind::XmlProtocol::Parser parser; + Parser parser; parser.parse(m_socket); m_process->waitForFinished(); QCOMPARE(m_process->state(), QProcess::NotRunning); @@ -451,7 +451,7 @@ void ParserTests::testValgrindGarbage() void ParserTests::testParserStop() { ThreadedParser parser; - Valgrind::Memcheck::MemcheckRunner runner; + Memcheck::MemcheckRunner runner; runner.setValgrindExecutable(fakeValgrindExecutable()); runner.setParser(&parser); runner.setValgrindArguments(QStringList() << QLatin1String("-i") @@ -471,7 +471,7 @@ void ParserTests::testRealValgrind() qDebug() << "running exe:" << executable << " HINT: set VALGRIND_TEST_BIN to change this"; ThreadedParser parser; - Valgrind::Memcheck::MemcheckRunner runner; + Memcheck::MemcheckRunner runner; runner.setValgrindExecutable(QLatin1String("valgrind")); runner.setDebuggeeExecutable(executable); runner.setParser(&parser); @@ -507,7 +507,7 @@ void ParserTests::testValgrindStartError() ThreadedParser parser; - Valgrind::Memcheck::MemcheckRunner runner; + Memcheck::MemcheckRunner runner; runner.setParser(&parser); runner.setValgrindExecutable(valgrindExe); runner.setValgrindArguments(valgrindArgs); diff --git a/tests/manual/ssh/errorhandling/main.cpp b/tests/manual/ssh/errorhandling/main.cpp index 6ec1121c5a6..038afc51850 100644 --- a/tests/manual/ssh/errorhandling/main.cpp +++ b/tests/manual/ssh/errorhandling/main.cpp @@ -133,7 +133,7 @@ private slots: qApp->quit(); } - void handleError(QSsh::SshError error) + void handleError(SshError error) { if (m_testSet.isEmpty()) { qDebug("Error: Received error %d, but no test was running.", error); diff --git a/tests/manual/ssh/remoteprocess/argumentscollector.cpp b/tests/manual/ssh/remoteprocess/argumentscollector.cpp index d3d1a7a923d..753c959b3da 100644 --- a/tests/manual/ssh/remoteprocess/argumentscollector.cpp +++ b/tests/manual/ssh/remoteprocess/argumentscollector.cpp @@ -43,7 +43,7 @@ ArgumentsCollector::ArgumentsCollector(const QStringList &args) { } -QSsh::SshConnectionParameters ArgumentsCollector::collect(bool &success) const +SshConnectionParameters ArgumentsCollector::collect(bool &success) const { SshConnectionParameters parameters; parameters.options &= ~SshIgnoreDefaultProxy; diff --git a/tests/manual/ssh/remoteprocess/remoteprocesstest.cpp b/tests/manual/ssh/remoteprocess/remoteprocesstest.cpp index d83db43d987..6a59b300988 100644 --- a/tests/manual/ssh/remoteprocess/remoteprocesstest.cpp +++ b/tests/manual/ssh/remoteprocess/remoteprocesstest.cpp @@ -93,8 +93,7 @@ void RemoteProcessTest::handleProcessStarted() } else { m_started = true; if (m_state == TestingCrash) { - QSsh::SshRemoteProcessRunner * const killer - = new QSsh::SshRemoteProcessRunner(this); + SshRemoteProcessRunner * const killer = new SshRemoteProcessRunner(this); killer->run("pkill -9 sleep", m_sshParams); } else if (m_state == TestingIoDevice) { connect(m_catProcess.data(), SIGNAL(readyRead()), SLOT(handleReadyRead())); @@ -214,7 +213,7 @@ void RemoteProcessTest::handleProcessClosed(int exitStatus) } std::cout << "Ok.\nTesting I/O device functionality... " << std::flush; m_state = TestingIoDevice; - m_sshConnection = new QSsh::SshConnection(m_sshParams); + m_sshConnection = new SshConnection(m_sshParams); connect(m_sshConnection, SIGNAL(connected()), SLOT(handleConnected())); connect(m_sshConnection, SIGNAL(error(QSsh::SshError)), SLOT(handleConnectionError())); @@ -308,7 +307,7 @@ void RemoteProcessTest::handleReadyRead() << qPrintable(testString()) << "', got '" << qPrintable(data) << "'." << std::endl; qApp->exit(1); } - QSsh::SshRemoteProcessRunner * const killer = new QSsh::SshRemoteProcessRunner(this); + SshRemoteProcessRunner * const killer = new SshRemoteProcessRunner(this); killer->run("pkill -9 cat", m_sshParams); break; } diff --git a/tests/manual/ssh/sftp/sftptest.cpp b/tests/manual/ssh/sftp/sftptest.cpp index 69e60cf4d94..08df4b70e26 100644 --- a/tests/manual/ssh/sftp/sftptest.cpp +++ b/tests/manual/ssh/sftp/sftptest.cpp @@ -196,7 +196,7 @@ void SftpTest::handleChannelClosed() m_connection->disconnectFromHost(); } -void SftpTest::handleJobFinished(QSsh::SftpJobId job, const QString &error) +void SftpTest::handleJobFinished(SftpJobId job, const QString &error) { switch (m_state) { case UploadingSmall: diff --git a/tests/manual/ssh/shell/shell.cpp b/tests/manual/ssh/shell/shell.cpp index 253521716c5..8cba3749197 100644 --- a/tests/manual/ssh/shell/shell.cpp +++ b/tests/manual/ssh/shell/shell.cpp @@ -41,7 +41,7 @@ using namespace QSsh; -Shell::Shell(const QSsh::SshConnectionParameters ¶meters, QObject *parent) +Shell::Shell(const SshConnectionParameters ¶meters, QObject *parent) : QObject(parent), m_connection(new SshConnection(parameters)), m_stdin(new QFile(this)) diff --git a/tests/manual/ssh/tunnel/argumentscollector.cpp b/tests/manual/ssh/tunnel/argumentscollector.cpp index 3ac29d1fa9e..972bffba5f7 100644 --- a/tests/manual/ssh/tunnel/argumentscollector.cpp +++ b/tests/manual/ssh/tunnel/argumentscollector.cpp @@ -43,7 +43,7 @@ ArgumentsCollector::ArgumentsCollector(const QStringList &args) { } -QSsh::SshConnectionParameters ArgumentsCollector::collect(bool &success) const +SshConnectionParameters ArgumentsCollector::collect(bool &success) const { SshConnectionParameters parameters; parameters.options &= ~SshIgnoreDefaultProxy; diff --git a/tests/manual/ssh/tunnel/tunnel.cpp b/tests/manual/ssh/tunnel/tunnel.cpp index 677a23b4345..c2ef6fb8bdf 100644 --- a/tests/manual/ssh/tunnel/tunnel.cpp +++ b/tests/manual/ssh/tunnel/tunnel.cpp @@ -45,7 +45,7 @@ const QByteArray TestData("Urgsblubb?"); using namespace QSsh; -Tunnel::Tunnel(const QSsh::SshConnectionParameters ¶meters, QObject *parent) +Tunnel::Tunnel(const SshConnectionParameters ¶meters, QObject *parent) : QObject(parent), m_connection(new SshConnection(parameters, this)), m_tunnelServer(new QTcpServer(this)),