feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Utils: Introduce a FilePath constructor from char arrays

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

65
src/libs/tracing/timelinetheme.cpp
View File

@@ -37,6 +37,8 @@
#include <QQuickImageProvider>
#include <QtQml>
using namespace Utils;
namespace Timeline {
class TimelineImageIconProvider : public QQuickImageProvider
@@ -59,40 +61,35 @@ public:
&& idElements.at(1) == QLatin1String("disabled"))
? QIcon::Disabled : QIcon::Normal;
Utils::Icon icon;
if (iconName == QLatin1String("prev"))
icon = Utils::Icons::PREV_TOOLBAR;
else if (iconName == QLatin1String("next"))
icon = Utils::Icons::NEXT_TOOLBAR;
else if (iconName == QLatin1String("zoom"))
icon = Utils::Icons::ZOOM_TOOLBAR;
else if (iconName == QLatin1String("rangeselection"))
icon = Utils::Icon({{QLatin1String(":/QtCreator/Tracing/ico_rangeselection.png"),
Utils::Theme::IconsBaseColor}});
else if (iconName == QLatin1String("rangeselected"))
icon = Utils::Icon({{QLatin1String(":/QtCreator/Tracing/ico_rangeselected.png"),
Utils::Theme::IconsBaseColor}});
else if (iconName == QLatin1String("selectionmode"))
icon = Utils::Icon({{QLatin1String(":/QtCreator/Tracing/ico_selectionmode.png"),
Utils::Theme::IconsBaseColor}});
else if (iconName == QLatin1String("edit"))
icon = Utils::Icon({{QLatin1String(":/QtCreator/Tracing/ico_edit.png"),
Utils::Theme::IconsBaseColor}});
else if (iconName == QLatin1String("lock_open"))
icon = Utils::Icons::UNLOCKED_TOOLBAR;
else if (iconName == QLatin1String("lock_closed"))
icon = Utils::Icons::LOCKED_TOOLBAR;
else if (iconName == QLatin1String("range_handle"))
icon = Utils::Icon({{QLatin1String(":/QtCreator/Tracing/range_handle.png"),
Utils::Theme::IconsBaseColor}});
else if (iconName == QLatin1String("note"))
icon = Utils::Icons::INFO_TOOLBAR;
else if (iconName == QLatin1String("split"))
icon = Utils::Icons::SPLIT_HORIZONTAL_TOOLBAR;
else if (iconName == QLatin1String("close_split"))
icon = Utils::Icons::CLOSE_SPLIT_TOP;
else if (iconName == QLatin1String("close_window"))
icon = Utils::Icons::CLOSE_TOOLBAR;
Icon icon;
if (iconName == "prev")
icon = Icons::PREV_TOOLBAR;
else if (iconName == "next")
icon = Icons::NEXT_TOOLBAR;
else if (iconName == "zoom")
icon = Icons::ZOOM_TOOLBAR;
else if (iconName == "rangeselection")
icon = Icon({{":/QtCreator/Tracing/ico_rangeselection.png", Theme::IconsBaseColor}});
else if (iconName == "rangeselected")
icon = Icon({{":/QtCreator/Tracing/ico_rangeselected.png", Theme::IconsBaseColor}});
else if (iconName == "selectionmode")
icon = Icon({{":/QtCreator/Tracing/ico_selectionmode.png", Theme::IconsBaseColor}});
else if (iconName == "edit")
icon = Icon({{":/QtCreator/Tracing/ico_edit.png", Theme::IconsBaseColor}});
else if (iconName == "lock_open")
icon = Icons::UNLOCKED_TOOLBAR;
else if (iconName == "lock_closed")
icon = Icons::LOCKED_TOOLBAR;
else if (iconName == "range_handle")
icon = Icon({{":/QtCreator/Tracing/range_handle.png", Theme::IconsBaseColor}});
else if (iconName == "note")
icon = Icons::INFO_TOOLBAR;
else if (iconName == "split")
icon = Icons::SPLIT_HORIZONTAL_TOOLBAR;
else if (iconName == "close_split")
icon = Icons::CLOSE_SPLIT_TOP;
else if (iconName == "close_window")
icon = Icons::CLOSE_TOOLBAR;
const QSize iconSize(16, 16);
const QPixmap result = icon.icon().pixmap(iconSize, iconMode);