[Pkg-owncloud-commits] [qtkeychain] 24/63: Build fixes for disabled implicit string casts

[Sandro Knauß]

This is an automated email from the git hooks/post-receive script.

hefee pushed a commit to branch master
in repository qtkeychain.

commit bd936d6030acafcd383c5b4f5ec1e4fdfb051d00
Author: Mathias Hasselmann <mathias.hasselmann at kdab.com>
Date:   Tue Aug 9 12:51:30 2016 +0200

    Build fixes for disabled implicit string casts
---
 gnomekeyring.cpp  | 2 +-
 keychain_unix.cpp | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/gnomekeyring.cpp b/gnomekeyring.cpp
index bf4741b..dd35670 100644
--- a/gnomekeyring.cpp
+++ b/gnomekeyring.cpp
@@ -63,7 +63,7 @@ GnomeKeyring::gpointer GnomeKeyring::delete_network_password( const gchar* user,
 }
 
 GnomeKeyring::GnomeKeyring()
-    : QLibrary("gnome-keyring", 0)
+    : QLibrary(QLatin1String("gnome-keyring"), 0)
 {
     static const PasswordSchema schema = {
         ITEM_NETWORK_PASSWORD,
diff --git a/keychain_unix.cpp b/keychain_unix.cpp
index ae926e8..a364a7c 100644
--- a/keychain_unix.cpp
+++ b/keychain_unix.cpp
@@ -44,7 +44,7 @@ enum DesktopEnvironment {
 // licensed under BSD, see base/nix/xdg_util.cc
 
 static DesktopEnvironment getKdeVersion() {
-    QString value = qgetenv("KDE_SESSION_VERSION");
+    QByteArray value = qgetenv("KDE_SESSION_VERSION");
     if ( value == "5" ) {
         return DesktopEnv_Plasma5;
     } else if (value == "4" ) {
@@ -371,11 +371,11 @@ void WritePasswordJobPrivate::scheduledStart() {
 
         switch(mode) {
         case JobPrivate::Text:
-            type = "plaintext";
+            type = QLatin1String("plaintext");
             password = data;
             break;
         default:
-            type = "base64";
+            type = QLatin1String("base64");
             password = data.toBase64();
             break;
         }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/qtkeychain.git