git.iko.soy/unity8
on xenial help sign in
Rename icon string conversion method, use QLatin1String
commit0781bdc75440959a7f6edba013bfbdf1a14d88f9 authorMichal Hruby <michal.mhr@gmail.com> dateFri 6 Sep 2013, 09:19 (13 years ago) parent9e3d77f
6 files changed+12−12
compare with xenial
unifiedsplit
plugins/Unity/applicationpreview.cpp+1−1 plugins/Unity/categoryresults.cpp+1−1 plugins/Unity/iconutils.cpp+7−7 plugins/Unity/iconutils.h+1−1 plugins/Unity/preview.cpp+1−1 plugins/Unity/socialpreview.cpp+1−1
plugins/Unity/applicationpreview.cpp+1−1
@@ -63,7 +63,7 @@ QString ApplicationPreview::appIcon() const
6363{
6464 if (m_unityAppPreview) {
6565 auto giconString = g_icon_to_string(m_unityAppPreview->app_icon());
66− QString result(convertIconString(QString::fromUtf8(giconString)));
66+ QString result(gIconToDeclarativeImageProviderString(QString::fromUtf8(giconString)));
6767 g_free(giconString);
6868 return result;
6969 } else {
plugins/Unity/categoryresults.cpp+1−1
@@ -79,7 +79,7 @@ CategoryResults::data(const QModelIndex& index, int role) const
7979 return DeeListModel::data(index, ResultsColumn::URI);
8080 case RoleIconHint: {
8181 QString giconString(DeeListModel::data(index, ResultsColumn::ICON_HINT).toString());
82− return QVariant::fromValue(convertIconString(giconString));
82+ return QVariant::fromValue(gIconToDeclarativeImageProviderString(giconString));
8383 }
8484 case RoleCategory:
8585 return DeeListModel::data(index, ResultsColumn::CATEGORY);
plugins/Unity/iconutils.cpp+7−7
@@ -25,16 +25,16 @@
2525
2626#define BASE_THEME_ICON_URI "image://theme/"
2727
28−QString convertIconString(QString const &giconString)
28+QString gIconToDeclarativeImageProviderString(QString const &giconString)
2929{
3030 if (giconString.isEmpty()) return giconString;
3131
32− if (giconString.startsWith('/') || giconString.startsWith(QString("http")) ||
33− giconString.startsWith(QString("file:"))) {
32+ if (giconString.startsWith('/') || giconString.startsWith(QLatin1String("http")) ||
33+ giconString.startsWith(QLatin1String("file:"))) {
3434 return giconString;
3535 }
3636
37− if (!giconString.startsWith(QString(". "))) {
37+ if (!giconString.startsWith(QLatin1String(". "))) {
3838 // must be a themed icon
3939 QString themedIcon(BASE_THEME_ICON_URI);
4040 themedIcon.append(giconString);
@@ -42,13 +42,13 @@ QString convertIconString(QString const &giconString)
4242 }
4343
4444 // special case annotated icon
45− if (giconString.startsWith(". UnityProtocolAnnotatedIcon ")) {
45+ if (giconString.startsWith(QLatin1String(". UnityProtocolAnnotatedIcon "))) {
4646 QString annotatedIcon;
4747 QString serializedData(QUrl::fromPercentEncoding(giconString.mid(29).toUtf8()));
4848 GVariant *variant = g_variant_parse(G_VARIANT_TYPE_VARDICT, serializedData.toUtf8().constData(), NULL, NULL, NULL);
4949 gchar *baseUri;
5050 if (variant != NULL && g_variant_lookup(variant, "base-icon", "&s", &baseUri)) {
51− annotatedIcon = convertIconString(QString(baseUri));
51+ annotatedIcon = gIconToDeclarativeImageProviderString(QString(baseUri));
5252 // FIXME: enclose in image://annotated/... once unity supports that
5353 }
5454 if (variant != NULL) g_variant_unref(variant);
@@ -72,7 +72,7 @@ QString convertIconString(QString const &giconString)
7272 const char* const *iconNames = g_themed_icon_get_names(G_THEMED_ICON(icon));
7373 if (iconNames != NULL) {
7474 for (const char * const *iter = iconNames; *iter != NULL; ++iter) {
75− list << QString(*iter);
75+ list << QLatin1String(*iter);
7676 }
7777 }
7878 themedIcon.append(list.join(QString(",")));
plugins/Unity/iconutils.h+1−1
@@ -22,6 +22,6 @@
2222
2323#include <QString>
2424
25−QString convertIconString(QString const &giconString);
25+QString gIconToDeclarativeImageProviderString(QString const &giconString);
2626
2727#endif
plugins/Unity/preview.cpp+1−1
@@ -104,7 +104,7 @@ QString Preview::image() const
104104{
105105 if (m_unityPreview) {
106106 auto giconString = g_icon_to_string(m_unityPreview->image());
107− QString result(convertIconString(QString::fromUtf8(giconString)));
107+ QString result(gIconToDeclarativeImageProviderString(QString::fromUtf8(giconString)));
108108 g_free(giconString);
109109 return result;
110110 } else {
plugins/Unity/socialpreview.cpp+1−1
@@ -53,7 +53,7 @@ QString SocialPreview::avatar() const
5353{
5454 if (m_unitySocialPreview) {
5555 auto giconString = g_icon_to_string(m_unitySocialPreview->avatar());
56− QString result(convertIconString(QString::fromUtf8(giconString)));
56+ QString result(gIconToDeclarativeImageProviderString(QString::fromUtf8(giconString)));
5757 g_free(giconString);
5858 return result;
5959 } else {