From 28cfdf388ae3e3ed7e073e98a83c737d889d887f Mon Sep 17 00:00:00 2001 From: hjk Date: Wed, 13 Apr 2022 12:26:54 +0200 Subject: Promote previously python-specific InterpreterAspect ... and drop PythonRunConfiguration, which is a plain RunConfiguration now. Change-Id: I540cb738180fc1424f730d6d1998886915ce527b Reviewed-by: Reviewed-by: David Schulz --- src/plugins/python/pythonsettings.h | 27 ++++----------------------- 1 file changed, 4 insertions(+), 23 deletions(-) (limited to 'src/plugins/python/pythonsettings.h') diff --git a/src/plugins/python/pythonsettings.h b/src/plugins/python/pythonsettings.h index 565a80d4e7..3b5e60fc77 100644 --- a/src/plugins/python/pythonsettings.h +++ b/src/plugins/python/pythonsettings.h @@ -25,6 +25,8 @@ #pragma once +#include + #include #include @@ -33,35 +35,14 @@ namespace Python { namespace Internal { -class Interpreter -{ -public: - Interpreter() = default; - Interpreter(const Utils::FilePath &python, - const QString &defaultName, - bool windowedSuffix = false); - Interpreter(const QString &id, - const QString &name, - const Utils::FilePath &command, - bool autoDetected = true); - - inline bool operator==(const Interpreter &other) const - { - return id == other.id && name == other.name && command == other.command; - } - - QString id = QUuid::createUuid().toString(); - QString name; - Utils::FilePath command; - bool autoDetected = true; -}; - class PythonSettings : public QObject { Q_OBJECT public: static void init(); + using Interpreter = ProjectExplorer::Interpreter; + static QList interpreters(); static Interpreter defaultInterpreter(); static Interpreter interpreter(const QString &interpreterId); -- cgit v1.2.1