diff options
Diffstat (limited to 'rbutil/rbutilqt/base/detect.cpp')
-rw-r--r-- | rbutil/rbutilqt/base/detect.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/rbutil/rbutilqt/base/detect.cpp b/rbutil/rbutilqt/base/detect.cpp index df1cf50647..88ffb36723 100644 --- a/rbutil/rbutilqt/base/detect.cpp +++ b/rbutil/rbutilqt/base/detect.cpp | |||
@@ -59,6 +59,7 @@ | |||
59 | #endif | 59 | #endif |
60 | 60 | ||
61 | #include "utils.h" | 61 | #include "utils.h" |
62 | #include "rbsettings.h" | ||
62 | 63 | ||
63 | /** @brief detect permission of user (only Windows at moment). | 64 | /** @brief detect permission of user (only Windows at moment). |
64 | * @return enum userlevel. | 65 | * @return enum userlevel. |
@@ -384,7 +385,7 @@ QString Detect::installedTarget(QString mountpoint) | |||
384 | * @param targetId the targetID to check for. if it is -1 no check is done. | 385 | * @param targetId the targetID to check for. if it is -1 no check is done. |
385 | * @return string with error messages if problems occurred, empty strings if none. | 386 | * @return string with error messages if problems occurred, empty strings if none. |
386 | */ | 387 | */ |
387 | QString Detect::check(RbSettings* settings, bool permission) | 388 | QString Detect::check(bool permission) |
388 | { | 389 | { |
389 | QString text = ""; | 390 | QString text = ""; |
390 | 391 | ||
@@ -401,12 +402,12 @@ QString Detect::check(RbSettings* settings, bool permission) | |||
401 | } | 402 | } |
402 | 403 | ||
403 | // Check TargetId | 404 | // Check TargetId |
404 | QString installed = installedTarget(settings->value(RbSettings::Mountpoint).toString()); | 405 | QString installed = installedTarget(RbSettings::value(RbSettings::Mountpoint).toString()); |
405 | if(!installed.isEmpty() && installed != settings->value(RbSettings::CurConfigureModel).toString()) | 406 | if(!installed.isEmpty() && installed != RbSettings::value(RbSettings::CurConfigureModel).toString()) |
406 | { | 407 | { |
407 | text += QObject::tr("<li>Target mismatch detected.\n" | 408 | text += QObject::tr("<li>Target mismatch detected.\n" |
408 | "Installed target: %1, selected target: %2.</li>") | 409 | "Installed target: %1, selected target: %2.</li>") |
409 | .arg(installed, settings->value(RbSettings::CurPlatformName).toString()); | 410 | .arg(installed, RbSettings::value(RbSettings::CurPlatformName).toString()); |
410 | // FIXME: replace installed by human-friendly name | 411 | // FIXME: replace installed by human-friendly name |
411 | } | 412 | } |
412 | 413 | ||