Utils: Introduce a FilePath constructor from char arrays

Similar to QT_RESTRICTED_CAST_FROM_ASCII to avoid the need for
decorations in user code.

At the same time, drop some convenience constructors and functions
in CommandLine and Icon essentially serving the same purpose.

Change-Id: Ida4e5ac19c2da0a4298a97b2a8e1511d56bbb79d
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2021-08-10 16:19:02 +02:00
parent 98cba6e50c
commit 7c28c4f744
109 changed files with 452 additions and 483 deletions

View File

@@ -73,24 +73,21 @@
Very large progress indicator that can be used to cover large parts of a UI.
*/
namespace {
namespace Utils {
static QString imageFileNameForIndicatorSize(Utils::ProgressIndicatorSize size)
static FilePath imageFileNameForIndicatorSize(ProgressIndicatorSize size)
{
switch (size) {
case Utils::ProgressIndicatorSize::Large:
return QLatin1String(":/utils/images/progressindicator_big.png");
case Utils::ProgressIndicatorSize::Medium:
return QLatin1String(":/utils/images/progressindicator_medium.png");
case Utils::ProgressIndicatorSize::Small:
case ProgressIndicatorSize::Large:
return ":/utils/images/progressindicator_big.png";
case ProgressIndicatorSize::Medium:
return ":/utils/images/progressindicator_medium.png";
case ProgressIndicatorSize::Small:
default:
return QLatin1String(":/utils/images/progressindicator_small.png");
return ":/utils/images/progressindicator_small.png";
}
}
} // namespace
namespace Utils {
/*!
Constructs a progress indicator painter for the indicator \a size.