Build fixes for disabled implicit string casts

This commit is contained in:
Mathias Hasselmann 2016-08-09 12:51:30 +02:00
parent bdb0732e6f
commit bd936d6030
2 changed files with 4 additions and 4 deletions

View File

@ -63,7 +63,7 @@ GnomeKeyring::gpointer GnomeKeyring::delete_network_password( const gchar* user,
} }
GnomeKeyring::GnomeKeyring() GnomeKeyring::GnomeKeyring()
: QLibrary("gnome-keyring", 0) : QLibrary(QLatin1String("gnome-keyring"), 0)
{ {
static const PasswordSchema schema = { static const PasswordSchema schema = {
ITEM_NETWORK_PASSWORD, ITEM_NETWORK_PASSWORD,

View File

@ -44,7 +44,7 @@ enum DesktopEnvironment {
// licensed under BSD, see base/nix/xdg_util.cc // licensed under BSD, see base/nix/xdg_util.cc
static DesktopEnvironment getKdeVersion() { static DesktopEnvironment getKdeVersion() {
QString value = qgetenv("KDE_SESSION_VERSION"); QByteArray value = qgetenv("KDE_SESSION_VERSION");
if ( value == "5" ) { if ( value == "5" ) {
return DesktopEnv_Plasma5; return DesktopEnv_Plasma5;
} else if (value == "4" ) { } else if (value == "4" ) {
@ -371,11 +371,11 @@ void WritePasswordJobPrivate::scheduledStart() {
switch(mode) { switch(mode) {
case JobPrivate::Text: case JobPrivate::Text:
type = "plaintext"; type = QLatin1String("plaintext");
password = data; password = data;
break; break;
default: default:
type = "base64"; type = QLatin1String("base64");
password = data.toBase64(); password = data.toBase64();
break; break;
} }