diff --git a/src/Gui/DlgEditFileIncludePropertyExternal.cpp b/src/Gui/DlgEditFileIncludePropertyExternal.cpp index 3dc581571c..b9d3be6301 100644 --- a/src/Gui/DlgEditFileIncludePropertyExternal.cpp +++ b/src/Gui/DlgEditFileIncludePropertyExternal.cpp @@ -55,7 +55,7 @@ DlgEditFileIncludePropertyExternal::~DlgEditFileIncludePropertyExternal() } -int DlgEditFileIncludePropertyExternal::Do() +int DlgEditFileIncludePropertyExternal::processFile() { QFileInfo file = QString::fromUtf8(Prop.getValue()); assert(file.exists()); @@ -64,11 +64,11 @@ int DlgEditFileIncludePropertyExternal::Do() QString TempFile = tmp.absoluteFilePath(file.fileName()); QFile::remove(TempFile); - QFile::copy(file.absoluteFilePath(),TempFile); + QFile::copy(file.absoluteFilePath(), TempFile); - arguments.append(TempFile); + addArgument(TempFile); - int ret = DlgRunExternal::Do(); + int ret = DlgRunExternal::runProcess(); if (ret == QDialog::Accepted) Prop.setValue(TempFile.toUtf8()); diff --git a/src/Gui/DlgEditFileIncludePropertyExternal.h b/src/Gui/DlgEditFileIncludePropertyExternal.h index 6c1737fb57..9826c4c047 100644 --- a/src/Gui/DlgEditFileIncludePropertyExternal.h +++ b/src/Gui/DlgEditFileIncludePropertyExternal.h @@ -39,13 +39,12 @@ class GuiExport DlgEditFileIncludePropertyExternal : public DlgRunExternal Q_OBJECT public: - DlgEditFileIncludePropertyExternal( App::PropertyFileIncluded& Prop, QWidget* parent = nullptr, Qt::WindowFlags fl = Qt::WindowFlags() ); + DlgEditFileIncludePropertyExternal(App::PropertyFileIncluded& Prop, QWidget* parent = nullptr, Qt::WindowFlags fl = Qt::WindowFlags()); ~DlgEditFileIncludePropertyExternal() override; - int Do(); + int processFile(); -protected Q_SLOTS: -protected: +private: App::PropertyFileIncluded& Prop; }; diff --git a/src/Gui/DlgRunExternal.cpp b/src/Gui/DlgRunExternal.cpp index 374fabb35f..52d4692005 100644 --- a/src/Gui/DlgRunExternal.cpp +++ b/src/Gui/DlgRunExternal.cpp @@ -67,7 +67,12 @@ DlgRunExternal::~DlgRunExternal() delete ui; } -int DlgRunExternal::Do() +void DlgRunExternal::addArgument(const QString& arg) +{ + arguments.append(arg); +} + +int DlgRunExternal::runProcess() { QFileInfo ifo (ProcName); diff --git a/src/Gui/DlgRunExternal.h b/src/Gui/DlgRunExternal.h index 2d0014027e..535054ee86 100644 --- a/src/Gui/DlgRunExternal.h +++ b/src/Gui/DlgRunExternal.h @@ -44,10 +44,8 @@ public: explicit DlgRunExternal(QWidget* parent = nullptr, Qt::WindowFlags fl = Qt::WindowFlags()); ~DlgRunExternal() override; - int Do(); - - QString ProcName; - QStringList arguments; + void addArgument(const QString&); + int runProcess(); protected Q_SLOTS: void reject() override; @@ -57,11 +55,11 @@ protected Q_SLOTS: void finished (int exitCode, QProcess::ExitStatus exitStatus); void onChooseProgramClicked(); -protected: +private: + QString ProcName; + QStringList arguments; QProcess process; bool advancedHidden; - -private: Ui_DlgRunExternal* ui; };