| 修订版 | 37522d4c157099ae1b335908ddbd4896b441cf06 (tree) |
|---|---|
| 时间 | 2016-10-03 00:32:40 |
| 作者 |  LoRd_MuldeR <mulder2@gmx....> |
| Commiter | LoRd_MuldeR |
Some improvements to init_process() function.
include/MUtils/Global.h (diff)
src/Global.cpp (diff)| @@ -76,7 +76,7 @@ namespace MUtils | ||
| 76 | 76 | MUTILS_API const QString& temp_folder(void); |
| 77 | 77 | |
| 78 | 78 | //Process Utils |
| 79 | - MUTILS_API void init_process(QProcess &process, const QString &wokringDir, const bool bReplaceTempDir = true, const QString &extraPath = QString()); | |
| 79 | + MUTILS_API void init_process(QProcess &process, const QString &wokringDir, const bool bReplaceTempDir = true, const QStringList *const extraPaths = NULL); | |
| 80 | 80 | |
| 81 | 81 | //Random |
| 82 | 82 | MUTILS_API void seed_rand(void); |
| @@ -37,6 +37,7 @@ | ||
| 37 | 37 | #include <QProcess> |
| 38 | 38 | #include <QTextCodec> |
| 39 | 39 | #include <QPair> |
| 40 | +#include <QListIterator> | |
| 40 | 41 | |
| 41 | 42 | //CRT |
| 42 | 43 | #include <cstdlib> |
| @@ -391,7 +392,7 @@ static void prependToPath(QProcessEnvironment &env, const QString &value) | ||
| 391 | 392 | env.insert(PATH, path.isEmpty() ? value : QString("%1;%2").arg(value, path)); |
| 392 | 393 | } |
| 393 | 394 | |
| 394 | -void MUtils::init_process(QProcess &process, const QString &wokringDir, const bool bReplaceTempDir, const QString &extraPath) | |
| 395 | +void MUtils::init_process(QProcess &process, const QString &wokringDir, const bool bReplaceTempDir, const QStringList *const extraPaths) | |
| 395 | 396 | { |
| 396 | 397 | //Environment variable names |
| 397 | 398 | static const char *const s_envvar_names_temp[] = |
| @@ -427,9 +428,14 @@ void MUtils::init_process(QProcess &process, const QString &wokringDir, const bo | ||
| 427 | 428 | |
| 428 | 429 | //Setup PATH variable |
| 429 | 430 | prependToPath(env, tempDir); |
| 430 | - if (!extraPath.isEmpty()) | |
| 431 | + if (extraPaths && (!extraPaths->isEmpty())) | |
| 431 | 432 | { |
| 432 | - prependToPath(env, QDir::toNativeSeparators(extraPath)); | |
| 433 | + QListIterator<QString> iter(*extraPaths); | |
| 434 | + iter.toBack(); | |
| 435 | + while (iter.hasPrevious()) | |
| 436 | + { | |
| 437 | + prependToPath(env, QDir::toNativeSeparators(iter.previous())); | |
| 438 | + } | |
| 433 | 439 | } |
| 434 | 440 | |
| 435 | 441 | //Setup QPorcess object |
Fork