← Back to branch summary

~fboucault/unity-2d/a11y_lens_navigation_bar

« back to all changes in this revision

Viewing changes to libunity-2d-private/src/indicatorsmanager.cpp

  • Committer: Tarmac
  • Author(s): Florian Boucault
  • Date: 2011-09-05 06:16:42 UTC
  • mfrom: (694.1.2 dash_encoding_global_fix)
  • Revision ID: tarmac-20110905061642-1eisu4e1nr7mojev
[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.

Show diffs side-by-side

added added

removed removed

Lines of Context:
libunity-2d-private/src/indicatorsmanager.cpp
23
23
 
24
24
// Local
25
25
#include <debug_p.h>
26
 
#include <global.h>
27
26
#include <indicatorentrywidget.h>
28
27
 
29
28
// Qt
35
34
#include <X11/Xlib.h>
36
35
 
37
36
using namespace unity::indicator;
38
 
using namespace Unity2d;
39
37
 
40
38
IndicatorsManager::IndicatorsManager(QObject* parent)
41
39
: QObject(parent)
169
167
        }
170
168
    }
171
169
    if (!widget) {
172
 
        UQ_WARNING << "Could not find a widget for IndicatorEntry with id" <<
173
 
            QStringFromUtf8StdString(entryId);
 
170
        UQ_WARNING << "Could not find a widget for IndicatorEntry with id" << QString::fromStdString(entryId);
174
171
        return;
175
172
    }
176
173
    widget->showMenu(Qt::NoButton);