git.iko.soy/unity8
on xenial help sign in
Rename icon string conversion method, use QLatin1String
0781bdcMichal Hruby
plugins/Unity/applicationpreview.cpp+1−1
compare with xenial
unifiedsplit
@@ -63,7 +63,7 @@ QString ApplicationPreview::appIcon() const
63{
63{
64 if (m_unityAppPreview) {
64 if (m_unityAppPreview) {
65 auto giconString = g_icon_to_string(m_unityAppPreview->app_icon());
65 auto giconString = g_icon_to_string(m_unityAppPreview->app_icon());
66− QString result(convertIconString(QString::fromUtf8(giconString)));
66+ QString result(gIconToDeclarativeImageProviderString(QString::fromUtf8(giconString)));
67 g_free(giconString);
67 g_free(giconString);
68 return result;
68 return result;
69 } else {
69 } else {
plugins/Unity/categoryresults.cpp+1−1
@@ -79,7 +79,7 @@ CategoryResults::data(const QModelIndex& index, int role) const
79 return DeeListModel::data(index, ResultsColumn::URI);
79 return DeeListModel::data(index, ResultsColumn::URI);
80 case RoleIconHint: {
80 case RoleIconHint: {
81 QString giconString(DeeListModel::data(index, ResultsColumn::ICON_HINT).toString());
81 QString giconString(DeeListModel::data(index, ResultsColumn::ICON_HINT).toString());
82− return QVariant::fromValue(convertIconString(giconString));
82+ return QVariant::fromValue(gIconToDeclarativeImageProviderString(giconString));
83 }
83 }
84 case RoleCategory:
84 case RoleCategory:
85 return DeeListModel::data(index, ResultsColumn::CATEGORY);
85 return DeeListModel::data(index, ResultsColumn::CATEGORY);
plugins/Unity/iconutils.cpp+7−7
@@ -25,16 +25,16 @@
25
25
26#define BASE_THEME_ICON_URI "image://theme/"
26#define BASE_THEME_ICON_URI "image://theme/"
27
27
28−QString convertIconString(QString const &giconString)
28+QString gIconToDeclarativeImageProviderString(QString const &giconString)
29{
29{
30 if (giconString.isEmpty()) return giconString;
30 if (giconString.isEmpty()) return giconString;
31
31
32− if (giconString.startsWith('/') || giconString.startsWith(QString("http")) ||
32+ if (giconString.startsWith('/') || giconString.startsWith(QLatin1String("http")) ||
33− giconString.startsWith(QString("file:"))) {
33+ giconString.startsWith(QLatin1String("file:"))) {
34 return giconString;
34 return giconString;
35 }
35 }
36
36
37− if (!giconString.startsWith(QString(". "))) {
37+ if (!giconString.startsWith(QLatin1String(". "))) {
38 // must be a themed icon
38 // must be a themed icon
39 QString themedIcon(BASE_THEME_ICON_URI);
39 QString themedIcon(BASE_THEME_ICON_URI);
40 themedIcon.append(giconString);
40 themedIcon.append(giconString);
@@ -42,13 +42,13 @@ QString convertIconString(QString const &giconString)
42 }
42 }
43
43
44 // special case annotated icon
44 // special case annotated icon
45− if (giconString.startsWith(". UnityProtocolAnnotatedIcon ")) {
45+ if (giconString.startsWith(QLatin1String(". UnityProtocolAnnotatedIcon "))) {
46 QString annotatedIcon;
46 QString annotatedIcon;
47 QString serializedData(QUrl::fromPercentEncoding(giconString.mid(29).toUtf8()));
47 QString serializedData(QUrl::fromPercentEncoding(giconString.mid(29).toUtf8()));
48 GVariant *variant = g_variant_parse(G_VARIANT_TYPE_VARDICT, serializedData.toUtf8().constData(), NULL, NULL, NULL);
48 GVariant *variant = g_variant_parse(G_VARIANT_TYPE_VARDICT, serializedData.toUtf8().constData(), NULL, NULL, NULL);
49 gchar *baseUri;
49 gchar *baseUri;
50 if (variant != NULL && g_variant_lookup(variant, "base-icon", "&s", &baseUri)) {
50 if (variant != NULL && g_variant_lookup(variant, "base-icon", "&s", &baseUri)) {
51− annotatedIcon = convertIconString(QString(baseUri));
51+ annotatedIcon = gIconToDeclarativeImageProviderString(QString(baseUri));
52 // FIXME: enclose in image://annotated/... once unity supports that
52 // FIXME: enclose in image://annotated/... once unity supports that
53 }
53 }
54 if (variant != NULL) g_variant_unref(variant);
54 if (variant != NULL) g_variant_unref(variant);
@@ -72,7 +72,7 @@ QString convertIconString(QString const &giconString)
72 const char* const *iconNames = g_themed_icon_get_names(G_THEMED_ICON(icon));
72 const char* const *iconNames = g_themed_icon_get_names(G_THEMED_ICON(icon));
73 if (iconNames != NULL) {
73 if (iconNames != NULL) {
74 for (const char * const *iter = iconNames; *iter != NULL; ++iter) {
74 for (const char * const *iter = iconNames; *iter != NULL; ++iter) {
75− list << QString(*iter);
75+ list << QLatin1String(*iter);
76 }
76 }
77 }
77 }
78 themedIcon.append(list.join(QString(",")));
78 themedIcon.append(list.join(QString(",")));
plugins/Unity/iconutils.h+1−1
@@ -22,6 +22,6 @@
22
22
23#include <QString>
23#include <QString>
24
24
25−QString convertIconString(QString const &giconString);
25+QString gIconToDeclarativeImageProviderString(QString const &giconString);
26
26
27#endif
27#endif
plugins/Unity/preview.cpp+1−1
@@ -104,7 +104,7 @@ QString Preview::image() const
104{
104{
105 if (m_unityPreview) {
105 if (m_unityPreview) {
106 auto giconString = g_icon_to_string(m_unityPreview->image());
106 auto giconString = g_icon_to_string(m_unityPreview->image());
107− QString result(convertIconString(QString::fromUtf8(giconString)));
107+ QString result(gIconToDeclarativeImageProviderString(QString::fromUtf8(giconString)));
108 g_free(giconString);
108 g_free(giconString);
109 return result;
109 return result;
110 } else {
110 } else {
plugins/Unity/socialpreview.cpp+1−1
@@ -53,7 +53,7 @@ QString SocialPreview::avatar() const
53{
53{
54 if (m_unitySocialPreview) {
54 if (m_unitySocialPreview) {
55 auto giconString = g_icon_to_string(m_unitySocialPreview->avatar());
55 auto giconString = g_icon_to_string(m_unitySocialPreview->avatar());
56− QString result(convertIconString(QString::fromUtf8(giconString)));
56+ QString result(gIconToDeclarativeImageProviderString(QString::fromUtf8(giconString)));
57 g_free(giconString);
57 g_free(giconString);
58 return result;
58 return result;
59 } else {
59 } else {