Merge pull request #85 from hasselmm/nitpicks

Some minor fixes that reduce compiler warnings

CMakeLists.txt

@@ -150,7 +150,7 @@ if(UNIX AND NOT APPLE AND NOT ANDROID)
     list(APPEND qtkeychain_LIBRARIES ${QTDBUS_LIBRARIES} )
 endif()
 
-QT_WRAP_CPP(qtkeychain_MOC_OUTFILES keychain.h keychain_p.h)
+QT_WRAP_CPP(qtkeychain_MOC_OUTFILES keychain.h keychain_p.h gnomekeyring_p.h)
 
 set(qtkeychain_TR_FILES
       translations/qtkeychain_de.ts

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,

gnomekeyring_p.h

@@ -4,6 +4,8 @@
 #include <QLibrary>
 
 class GnomeKeyring : private QLibrary {
+    Q_OBJECT
+
 public:
     enum Result {
         RESULT_OK,

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;
         }