Commit e0123e4b authored by Marcel Wiesweg's avatar Marcel Wiesweg
Browse files

Use fromLocal8Bit to convert gphoto2's strings to QString

BUG: 272180
parent 47ec7403
......@@ -175,4 +175,5 @@ BUGFIXES FROM KDE BUGZILLA (alias B.K.O | http://bugs.kde.org):
147 ==> 274660 : Face regognition crashes DK.
148 ==> 274713 : digiKam crashed unexpectedly.
149 ==> 274302 : Search for _two_ keywords with logical "and" fails.
150 ==>
150 ==> 272180 : Camera Device Summary seems to use wrong encoding.
151 ==>
......@@ -1408,7 +1408,7 @@ bool GPCamera::cameraSummary(QString& summary)
// here we need to make sure whitespace and newlines
// are converted to HTML properly
summary.append(Qt::convertFromPlainText(QString(sum.text), Qt::WhiteSpacePre));
summary.append(Qt::convertFromPlainText(QString::fromLocal8Bit(sum.text), Qt::WhiteSpacePre));
delete d->status;
d->status = 0;
......@@ -1441,7 +1441,7 @@ bool GPCamera::cameraManual(QString& manual)
// I guess manual is plain text and not HTML?
// Can't test it. (Michael G. Hansen)
manual = Qt::convertFromPlainText(QString(man.text), Qt::WhiteSpacePre);
manual = Qt::convertFromPlainText(QString::fromLocal8Bit(man.text), Qt::WhiteSpacePre);
delete d->status;
d->status = 0;
......@@ -1474,7 +1474,7 @@ bool GPCamera::cameraAbout(QString& about)
// here we need to make sure whitespace and newlines
// are converted to HTML properly
about = Qt::convertFromPlainText(QString(abt.text), Qt::WhiteSpacePre);
about = Qt::convertFromPlainText(QString::fromLocal8Bit(abt.text), Qt::WhiteSpacePre);
about.append("<br/><br/>To report problems about this driver, please contact "
"the gphoto2 team at:<br/><br/>http://gphoto.org/bugs");
......@@ -1529,7 +1529,7 @@ void GPCamera::getSupportedCameras(int& count, QStringList& clist)
{
gp_abilities_list_get_abilities( abilList, i, &abil );
const char* cname = abil.model;
clist.append( QString( cname ) );
clist.append( QString::fromLocal8Bit( cname ) );
}
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment