summaryrefslogtreecommitdiff
path: root/src/plugins/pythoneditor/pythoneditorplugin.cpp
diff options
context:
space:
mode:
authorhjk <hjk@qt.io>2018-09-07 13:29:45 +0200
committerhjk <hjk@qt.io>2018-10-02 08:32:51 +0000
commit1c9410e353337052bb141cbe4f519012545d735d (patch)
treeca63b9174a8e8bdf0c6ee9aa26ae27454900a24e /src/plugins/pythoneditor/pythoneditorplugin.cpp
parent2f6c6b632c25f3d9adc79b8e971129cc2ee7c3ee (diff)
downloadqt-creator-1c9410e353337052bb141cbe4f519012545d735d.tar.gz
ProjectExplorer: Rename 'extraAspect' to 'aspect'
Using aspects is the standard pattern nowadays, there's nothing 'extra' to them anymore. Change-Id: I446f9d7b1db58a4899e5e44df33ce51f655e7be4 Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Diffstat (limited to 'src/plugins/pythoneditor/pythoneditorplugin.cpp')
-rw-r--r--src/plugins/pythoneditor/pythoneditorplugin.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/plugins/pythoneditor/pythoneditorplugin.cpp b/src/plugins/pythoneditor/pythoneditorplugin.cpp
index b17f1990a4..5dd91d7067 100644
--- a/src/plugins/pythoneditor/pythoneditorplugin.cpp
+++ b/src/plugins/pythoneditor/pythoneditorplugin.cpp
@@ -241,9 +241,9 @@ private:
Runnable runnable() const final;
bool supportsDebugger() const { return true; }
- QString mainScript() const { return extraAspect<MainScriptAspect>()->value(); }
- QString arguments() const { return extraAspect<ArgumentsAspect>()->arguments(macroExpander()); }
- QString interpreter() const { return extraAspect<InterpreterAspect>()->value(); }
+ QString mainScript() const { return aspect<MainScriptAspect>()->value(); }
+ QString arguments() const { return aspect<ArgumentsAspect>()->arguments(macroExpander()); }
+ QString interpreter() const { return aspect<InterpreterAspect>()->value(); }
void updateTargetInformation();
};
@@ -283,7 +283,7 @@ void PythonRunConfiguration::updateTargetInformation()
const BuildTargetInfo bti = buildTargetInfo();
const QString script = bti.targetFilePath.toString();
setDefaultDisplayName(tr("Run %1").arg(script));
- extraAspect<MainScriptAspect>()->setValue(script);
+ aspect<MainScriptAspect>()->setValue(script);
}
Runnable PythonRunConfiguration::runnable() const
@@ -291,9 +291,9 @@ Runnable PythonRunConfiguration::runnable() const
Runnable r;
QtcProcess::addArg(&r.commandLineArguments, mainScript());
QtcProcess::addArgs(&r.commandLineArguments,
- extraAspect<ArgumentsAspect>()->arguments(macroExpander()));
- r.executable = extraAspect<InterpreterAspect>()->value();
- r.environment = extraAspect<EnvironmentAspect>()->environment();
+ aspect<ArgumentsAspect>()->arguments(macroExpander()));
+ r.executable = aspect<InterpreterAspect>()->value();
+ r.environment = aspect<EnvironmentAspect>()->environment();
return r;
}