Merge lp:~fboucault/unity-2d/dash_encoding_global_fix into lp:unity-2d

[Florian Boucault]

[dash] Fix encoding and decoding of strings coming from and passed to the backend so that searches containing non-ascii characters work.

Reverted revision 677. It was introducing QStringFromUtf8StdString that has
the same result as QString::fromStdString with the codec for C-strings set to UTF-8.

[Florian Boucault (fboucault)]

To ease review, I suggest to look individually at the 2 commits of the submitted branch.

[Alberto Mardegan (mardy)]

Oh! I don't understand why my patch introduced problems with decoding, but anyway your solution is way more clean and less invasive. :-)

review: Approve

=== modified file 'libunity-2d-private/Unity2d/plugin.cpp'
--- libunity-2d-private/Unity2d/plugin.cpp	2011-08-23 17:53:59 +0000
+++ libunity-2d-private/Unity2d/plugin.cpp	2011-09-03 00:42:38 +0000
@@ -73,6 +73,7 @@
 #include <QDeclarativeContext>
 #include <QGraphicsEffect>
 #include <QAbstractListModel>
+#include <QTextCodec>
 
 // QtDee
 #include "deelistmodel.h"
@@ -186,6 +187,15 @@
     /* Configure translations */
     Unity2dTr::init("unity-2d", INSTALL_PREFIX "/share/locale");
     Unity2dTr::qmlInit(engine->rootContext());
+
+    /* Define the charset that Qt assumes C-strings (char *) and std::string to be in.
+       After that definition, using QString::fromStdString and QString::toStdString
+       will properly convert from and to std::string encoded in UTF-8 as it is
+       the case in Unity's shared backend.
+
+       Ref.: http://developer.qt.nokia.com/wiki/QtStrings
+    */
+    QTextCodec::setCodecForCStrings(QTextCodec::codecForName("UTF-8"));
 }
 
 Q_EXPORT_PLUGIN2(Unity2d, Unity2dPlugin);

=== modified file 'libunity-2d-private/src/CMakeLists.txt'
--- libunity-2d-private/src/CMakeLists.txt	2011-08-30 13:40:39 +0000
+++ libunity-2d-private/src/CMakeLists.txt	2011-09-03 00:42:38 +0000
@@ -7,7 +7,6 @@
     debug.cpp
     gconnector.cpp
     gimageutils.cpp
-    global.cpp
     gnomesessionclient.cpp
     keyboardmodifiersmonitor.cpp
     hotkeymonitor.cpp

=== modified file 'libunity-2d-private/src/filter.cpp'
--- libunity-2d-private/src/filter.cpp	2011-08-30 13:40:39 +0000
+++ libunity-2d-private/src/filter.cpp	2011-09-03 00:42:38 +0000
@@ -21,7 +21,6 @@
 #include "filter.h"
 
 // local
-#include "global.h"
 #include "ratingsfilter.h"
 #include "radiooptionfilter.h"
 #include "checkoptionfilter.h"
@@ -37,8 +36,6 @@
 // Qt
 #include <QDebug>
 
-using namespace Unity2d;
-
 Filter::Filter(QObject *parent) :
     QObject(parent)
 {
@@ -47,22 +44,22 @@
 
 QString Filter::id() const
 {
-    return QStringFromUtf8StdString(m_unityFilter->id());
+    return QString::fromStdString(m_unityFilter->id());
 }
 
 QString Filter::name() const
 {
-    return QStringFromUtf8StdString(m_unityFilter->name());
+    return QString::fromStdString(m_unityFilter->name());
 }
 
 QString Filter::iconHint() const
 {
-    return QStringFromUtf8StdString(m_unityFilter->icon_hint());
+    return QString::fromStdString(m_unityFilter->icon_hint());
 }
 
 QString Filter::rendererName() const
 {
-    return QStringFromUtf8StdString(m_unityFilter->renderer_name());
+    return QString::fromStdString(m_unityFilter->renderer_name());
 }
 
 bool Filter::visible() const

=== modified file 'libunity-2d-private/src/filteroption.cpp'
--- libunity-2d-private/src/filteroption.cpp	2011-08-30 13:40:39 +0000
+++ libunity-2d-private/src/filteroption.cpp	2011-09-03 00:42:38 +0000
@@ -20,14 +20,9 @@
 // Self
 #include "filteroption.h"
 
-// libunity-2d-private
-#include "global.h"
-
 // libunity-core
 #include <UnityCore/Filter.h>
 
-using namespace Unity2d;
-
 FilterOption::FilterOption(unity::dash::FilterOption::Ptr unityFilterOption, QObject *parent) :
     QObject(parent), m_unityFilterOption(NULL)
 {
@@ -36,17 +31,17 @@
 
 QString FilterOption::id() const
 {
-    return QStringFromUtf8StdString(m_unityFilterOption->id());
+    return QString::fromStdString(m_unityFilterOption->id());
 }
 
 QString FilterOption::name() const
 {
-    return QStringFromUtf8StdString(m_unityFilterOption->name());
+    return QString::fromStdString(m_unityFilterOption->name());
 }
 
 QString FilterOption::iconHint() const
 {
-    return QStringFromUtf8StdString(m_unityFilterOption->icon_hint());
+    return QString::fromStdString(m_unityFilterOption->icon_hint());
 }
 
 bool FilterOption::active() const

=== removed file 'libunity-2d-private/src/global.cpp'
--- libunity-2d-private/src/global.cpp	2011-08-30 13:40:39 +0000
+++ libunity-2d-private/src/global.cpp	1970-01-01 00:00:00 +0000
@@ -1,31 +0,0 @@
-/*
- * Copyright (C) 2011 Canonical, Ltd.
- *
- * Authors:
- *  Alberto Mardegan <[e-mail]>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-// local
-#include "global.h"
-
-namespace Unity2d {
-
-QString QStringFromUtf8StdString(std::string s)
-{
-    return QString::fromUtf8(s.c_str());
-}
-
-};
-

=== removed file 'libunity-2d-private/src/global.h'
--- libunity-2d-private/src/global.h	2011-08-30 13:40:39 +0000
+++ libunity-2d-private/src/global.h	1970-01-01 00:00:00 +0000
@@ -1,32 +0,0 @@
-/*
- * Copyright (C) 2011 Canonical, Ltd.
- *
- * Authors:
- *  Alberto Mardegan <[e-mail]>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef GLOBAL_H
-#define GLOBAL_H
-
-// Qt
-#include <QString>
-
-namespace Unity2d {
-
-QString QStringFromUtf8StdString(std::string s);
-
-}
-
-#endif // GLOBAL_H

=== modified file 'libunity-2d-private/src/indicatorentrywidget.cpp'
--- libunity-2d-private/src/indicatorentrywidget.cpp	2011-08-30 20:32:45 +0000
+++ libunity-2d-private/src/indicatorentrywidget.cpp	2011-09-03 00:42:38 +0000
@@ -24,7 +24,6 @@
 // Local
 #include <cairoutils.h>
 #include <debug_p.h>
-#include <global.h>
 #include <gscopedpointer.h>
 #include <gimageutils.h>
 #include <panelstyle.h>
@@ -45,7 +44,6 @@
 static const int ICON_SIZE = 22;
 
 using namespace unity::indicator;
-using namespace Unity2d;
 
 IndicatorEntryWidget::IndicatorEntryWidget(const Entry::Ptr& entry)
 : m_entry(entry)
@@ -294,11 +292,11 @@
             UQ_WARNING << "Failed to decode image";
         }
     } else if (type == GTK_IMAGE_ICON_NAME) {
-        QString name = QStringFromUtf8StdString(m_entry->image_data());
+        QString name = QString::fromStdString(m_entry->image_data());
         QIcon icon = QIcon::fromTheme(name);
         pix = icon.pixmap(ICON_SIZE, ICON_SIZE);
     } else if (type == GTK_IMAGE_GICON) {
-        QString name = QStringFromUtf8StdString(m_entry->image_data());
+        QString name = QString::fromStdString(m_entry->image_data());
         QImage image = GImageUtils::imageForIconString(name, ICON_SIZE);
         if (image.isNull()) {
             UQ_WARNING << "Failed to load icon from" << name;

=== modified file 'libunity-2d-private/src/indicatorsmanager.cpp'
--- libunity-2d-private/src/indicatorsmanager.cpp	2011-08-30 13:40:39 +0000
+++ libunity-2d-private/src/indicatorsmanager.cpp	2011-09-03 00:42:38 +0000
@@ -23,7 +23,6 @@
 
 // Local
 #include <debug_p.h>
-#include <global.h>
 #include <indicatorentrywidget.h>
 
 // Qt
@@ -35,7 +34,6 @@
 #include <X11/Xlib.h>
 
 using namespace unity::indicator;
-using namespace Unity2d;
 
 IndicatorsManager::IndicatorsManager(QObject* parent)
 : QObject(parent)
@@ -169,8 +167,7 @@
         }
     }
     if (!widget) {
-        UQ_WARNING << "Could not find a widget for IndicatorEntry with id" <<
-            QStringFromUtf8StdString(entryId);
+        UQ_WARNING << "Could not find a widget for IndicatorEntry with id" << QString::fromStdString(entryId);
         return;
     }
     widget->showMenu(Qt::NoButton);

=== modified file 'libunity-2d-private/src/lens.cpp'
--- libunity-2d-private/src/lens.cpp	2011-09-01 14:15:24 +0000
+++ libunity-2d-private/src/lens.cpp	2011-09-03 00:42:38 +0000
@@ -24,14 +24,11 @@
 #include <debug_p.h>
 #include "launcherapplication.h"
 #include "filters.h"
-#include "global.h"
 
 // Qt
 #include <QUrl>
 #include <QDesktopServices>
 
-using namespace Unity2d;
-
 Lens::Lens(QObject *parent) :
     QObject(parent)
 {
@@ -42,37 +39,37 @@
 
 QString Lens::id() const
 {
-    return QStringFromUtf8StdString(m_unityLens->id());
+    return QString::fromStdString(m_unityLens->id());
 }
 
 QString Lens::dbusName() const
 {
-    return QStringFromUtf8StdString(m_unityLens->dbus_name());
+    return QString::fromStdString(m_unityLens->dbus_name());
 }
 
 QString Lens::dbusPath() const
 {
-    return QStringFromUtf8StdString(m_unityLens->dbus_path());
+    return QString::fromStdString(m_unityLens->dbus_path());
 }
 
 QString Lens::name() const
 {
-    return QStringFromUtf8StdString(m_unityLens->name());
+    return QString::fromStdString(m_unityLens->name());
 }
 
 QString Lens::iconHint() const
 {
-    return QStringFromUtf8StdString(m_unityLens->icon_hint());
+    return QString::fromStdString(m_unityLens->icon_hint());
 }
 
 QString Lens::description() const
 {
-    return QStringFromUtf8StdString(m_unityLens->description());
+    return QString::fromStdString(m_unityLens->description());
 }
 
 QString Lens::searchHint() const
 {
-    return QStringFromUtf8StdString(m_unityLens->search_hint());
+    return QString::fromStdString(m_unityLens->search_hint());
 }
 
 bool Lens::visible() const
@@ -87,7 +84,7 @@
 
 QString Lens::shortcut() const
 {
-    return QStringFromUtf8StdString(m_unityLens->shortcut());
+    return QString::fromStdString(m_unityLens->shortcut());
 }
 
 bool Lens::connected() const
@@ -161,7 +158,7 @@
 void Lens::onActivated(std::string const& uri, unity::dash::HandledType type, unity::dash::Lens::Hints const&)
 {
     if (type == unity::dash::NOT_HANDLED) {
-        fallbackActivate(QStringFromUtf8StdString(uri));
+        fallbackActivate(QString::fromStdString(uri));
     }
 }
 
@@ -219,9 +216,9 @@
 
     m_filters = new Filters(m_unityLens->filters, this);
 
-    m_results->setName(QStringFromUtf8StdString(m_unityLens->results()->swarm_name));
-    m_globalResults->setName(QStringFromUtf8StdString(m_unityLens->global_results()->swarm_name));
-    m_categories->setName(QStringFromUtf8StdString(m_unityLens->categories()->swarm_name));
+    m_results->setName(QString::fromStdString(m_unityLens->results()->swarm_name));
+    m_globalResults->setName(QString::fromStdString(m_unityLens->global_results()->swarm_name));
+    m_categories->setName(QString::fromStdString(m_unityLens->categories()->swarm_name));
 
     /* Property change signals */
     m_unityLens->id.changed.connect(sigc::mem_fun(this, &Lens::idChanged));
@@ -257,32 +254,32 @@
 
 void Lens::onResultsSwarmNameChanged(std::string swarm_name)
 {
-    m_results->setName(QStringFromUtf8StdString(m_unityLens->results()->swarm_name));
+    m_results->setName(QString::fromStdString(m_unityLens->results()->swarm_name));
 }
 
 void Lens::onResultsChanged(unity::dash::Results::Ptr results)
 {
-    m_results->setName(QStringFromUtf8StdString(m_unityLens->results()->swarm_name));
+    m_results->setName(QString::fromStdString(m_unityLens->results()->swarm_name));
 }
 
 void Lens::onGlobalResultsSwarmNameChanged(std::string swarm_name)
 {
-    m_globalResults->setName(QStringFromUtf8StdString(m_unityLens->global_results()->swarm_name));
+    m_globalResults->setName(QString::fromStdString(m_unityLens->global_results()->swarm_name));
 }
 
 void Lens::onGlobalResultsChanged(unity::dash::Results::Ptr global_results)
 {
-    m_globalResults->setName(QStringFromUtf8StdString(m_unityLens->global_results()->swarm_name));
+    m_globalResults->setName(QString::fromStdString(m_unityLens->global_results()->swarm_name));
 }
 
 void Lens::onCategoriesSwarmNameChanged(std::string swarm_name)
 {
-    m_categories->setName(QStringFromUtf8StdString(m_unityLens->categories()->swarm_name));
+    m_categories->setName(QString::fromStdString(m_unityLens->categories()->swarm_name));
 }
 
 void Lens::onCategoriesChanged(unity::dash::Categories::Ptr categories)
 {
-    m_categories->setName(QStringFromUtf8StdString(m_unityLens->categories()->swarm_name));
+    m_categories->setName(QString::fromStdString(m_unityLens->categories()->swarm_name));
 }
 
 #include "lens.moc"

=== modified file 'panel/applets/appname/menubarwidget.cpp'
--- panel/applets/appname/menubarwidget.cpp	2011-08-30 13:40:39 +0000
+++ panel/applets/appname/menubarwidget.cpp	2011-09-03 00:42:38 +0000
@@ -24,15 +24,12 @@
 
 // Local
 #include <debug_p.h>
-#include <global.h>
 #include <indicatorentrywidget.h>
 #include <indicatorsmanager.h>
 
 // Qt
 #include <QHBoxLayout>
 
-using namespace Unity2d;
-
 static const int MENU_ITEM_PADDING = 6;
 
 MenuBarWidget::MenuBarWidget(IndicatorsManager* indicatorsManager, QWidget* parent)
@@ -66,7 +63,7 @@
 
 void MenuBarWidget::onObjectAdded(const unity::indicator::Indicator::Ptr& indicator)
 {
-    QString name = QStringFromUtf8StdString(indicator->name());
+    QString name = QString::fromStdString(indicator->name());
     if (name == "libappmenu.so") {
         indicator->on_entry_added.connect(sigc::mem_fun(this, &MenuBarWidget::onEntryAdded));
     }

=== modified file 'panel/applets/indicator/indicatorapplet.cpp'
--- panel/applets/indicator/indicatorapplet.cpp	2011-08-30 13:40:39 +0000
+++ panel/applets/indicator/indicatorapplet.cpp	2011-09-03 00:42:38 +0000
@@ -23,7 +23,6 @@
 
 // Local
 #include <debug_p.h>
-#include <global.h>
 #include <indicatorsmanager.h>
 #include <indicatorwidget.h>
 #include <unity2dpanel.h>
@@ -32,7 +31,6 @@
 #include <QHBoxLayout>
 
 using namespace unity::indicator;
-using namespace Unity2d;
 
 IndicatorApplet::IndicatorApplet(Unity2dPanel* panel)
 : Unity2d::PanelApplet(panel)
@@ -51,7 +49,7 @@
 
 void IndicatorApplet::onObjectAdded(Indicator::Ptr const& indicator)
 {
-    QString name = QStringFromUtf8StdString(indicator->name());
+    QString name = QString::fromStdString(indicator->name());
     if (name == "libappmenu.so") {
         // appmenu indicator is handled by AppNameApplet
         return;