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

Core/Utils: Migrate further to Utils::Id

Browse Source 
The coreplugin/id.h header is kept for downstream for now.

Change-Id: I8c44590f7b988b3770ecdc177c40783e12353e66
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2020-06-26 13:59:38 +02:00
parent 4924392620
commit 430a33dcd9
655 changed files with 2115 additions and 2093 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/coreplugin/externaltool.h
View File

@@ -25,10 +25,9 @@
#pragma once
#include "id.h"
#include <utils/fileutils.h>
#include <utils/environment.h>
#include <utils/fileutils.h>
#include <utils/id.h>
#include <QObject>
#include <QStringList>
@@ -69,7 +68,7 @@ public:
QString arguments() const;
QString input() const;
QString workingDirectory() const;
Id baseEnvironmentProviderId() const;
Utils::Id baseEnvironmentProviderId() const;
Utils::Environment baseEnvironment() const;
Utils::EnvironmentItems environmentUserChanges() const;
@@ -100,7 +99,7 @@ public:
void setArguments(const QString &arguments);
void setInput(const QString &input);
void setWorkingDirectory(const QString &workingDirectory);
void setBaseEnvironmentProviderId(Id id);
void setBaseEnvironmentProviderId(Utils::Id id);
void setEnvironmentUserChanges(const Utils::EnvironmentItems &items);
private:
@@ -113,7 +112,7 @@ private:
QString m_arguments;
QString m_input;
QString m_workingDirectory;
Id m_baseEnvironmentProviderId;
Utils::Id m_baseEnvironmentProviderId;
Utils::EnvironmentItems m_environment;
OutputHandling m_outputHandling = ShowInPane;
OutputHandling m_errorHandling = ShowInPane;