Changed the generation of the gpg key and location to utf8.

The existing gpg keys and locations with umlauts are now shown wrong. The changes are not backward compatible.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4460 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2011-07-17 23:07:29 +00:00
parent 7d4b8288ca
commit 8d4a4db027
32 changed files with 103 additions and 118 deletions

View file

@ -391,7 +391,7 @@ QString FlatStyle_RDM::computeDirectoryPath(const DirDetails& details) const
do
{
#endif
dir = QString::fromStdString(det.name)+"/"+dir ;
dir = QString::fromUtf8(det.name.c_str())+"/"+dir ;
#ifdef SHOW_TOTAL_PATH
if(!requestDirDetails(det.parent,det,flags))
@ -411,7 +411,7 @@ QVariant FlatStyle_RDM::displayRole(const DirDetails& details,int coln) const
case 0: return QString::fromUtf8(details.name.c_str());
case 1: return misc::friendlyUnit(details.count);
case 2: return misc::userFriendlyDuration(details.age);
case 3: return QString::fromStdString(rsPeers->getPeerName(details.id));
case 3: return QString::fromUtf8(rsPeers->getPeerName(details.id).c_str());
case 4: return computeDirectoryPath(details);
default:
return QVariant() ;
@ -497,7 +497,7 @@ QVariant FlatStyle_RDM::sortRole(const QModelIndex& index,const DirDetails& deta
case 0: return QString::fromUtf8(details.name.c_str());
case 1: return (qulonglong) details.count;
case 2: return details.age;
case 3: return QString::fromStdString(rsPeers->getPeerName(details.id));
case 3: return QString::fromUtf8(rsPeers->getPeerName(details.id).c_str());
case 4: return _ref_entries[index.row()].second ;
}
}