Skip to content

Commit

Permalink
Merge pull request #1583 from matterhorn103/master
Browse files Browse the repository at this point in the history
Fixed typo in setDefaultPythonInterpretor()
  • Loading branch information
ghutchis authored Jan 25, 2024
2 parents ce5cdea + a529625 commit 58334a3
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion avogadro/molequeue/inputgenerator.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ void InputGenerator::setScriptFilePath(const QString& scriptFile)

void InputGenerator::reset()
{
m_interpreter->setDefaultPythonInterpretor();
m_interpreter->setDefaultPythonInterpreter();
m_interpreter->setScriptFilePath(QString());
m_moleculeExtension = "Unknown";
m_displayName = QString();
Expand Down
2 changes: 1 addition & 1 deletion avogadro/molequeue/inputgenerator.h
Original file line number Diff line number Diff line change
Expand Up @@ -592,7 +592,7 @@ public slots:
private:
QtGui::PythonScript* m_interpreter;

void setDefaultPythonInterpretor();
void setDefaultPythonInterpreter();
QByteArray execute(const QStringList& args,
const QByteArray& scriptStdin = QByteArray()) const;
bool parseJson(const QByteArray& json, QJsonDocument& doc) const;
Expand Down
2 changes: 1 addition & 1 deletion avogadro/qtgui/interfacescript.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ void InterfaceScript::setScriptFilePath(const QString& scriptFile)

void InterfaceScript::reset()
{
m_interpreter->setDefaultPythonInterpretor();
m_interpreter->setDefaultPythonInterpreter();
m_interpreter->setScriptFilePath(QString());
m_moleculeExtension = QLatin1String("Unknown");
m_displayName = QString();
Expand Down
2 changes: 1 addition & 1 deletion avogadro/qtgui/interfacescript.h
Original file line number Diff line number Diff line change
Expand Up @@ -625,7 +625,7 @@ public slots:
private:
QtGui::PythonScript* m_interpreter;

void setDefaultPythonInterpretor();
void setDefaultPythonInterpreter();
QByteArray execute(const QStringList& args,
const QByteArray& scriptStdin = QByteArray()) const;
bool parseJson(const QByteArray& json, QJsonDocument& doc) const;
Expand Down
6 changes: 3 additions & 3 deletions avogadro/qtgui/pythonscript.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@ PythonScript::PythonScript(const QString& scriptFilePath_, QObject* parent_)
: QObject(parent_), m_debug(!qgetenv("AVO_PYTHON_SCRIPT_DEBUG").isEmpty()),
m_scriptFilePath(scriptFilePath_), m_process(nullptr)
{
setDefaultPythonInterpretor();
setDefaultPythonInterpreter();
}

PythonScript::PythonScript(QObject* parent_)
: QObject(parent_), m_debug(!qgetenv("AVO_PYTHON_SCRIPT_DEBUG").isEmpty()),
m_process(nullptr)
{
setDefaultPythonInterpretor();
setDefaultPythonInterpreter();
}

PythonScript::~PythonScript() {}
Expand All @@ -37,7 +37,7 @@ void PythonScript::setScriptFilePath(const QString& scriptFile)
m_scriptFilePath = scriptFile;
}

void PythonScript::setDefaultPythonInterpretor()
void PythonScript::setDefaultPythonInterpreter()
{
if (m_pythonInterpreter.isEmpty()) {
m_pythonInterpreter =
Expand Down
2 changes: 1 addition & 1 deletion avogadro/qtgui/pythonscript.h
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ class AVOGADROQTGUI_EXPORT PythonScript : public QObject
* - The "interpreters/python" QSettings value
* - The path specified in avogadropython.h.
*/
void setDefaultPythonInterpretor();
void setDefaultPythonInterpreter();

/**
* Start a new process to execute:
Expand Down

0 comments on commit 58334a3

Please sign in to comment.