status-im
/
qtkeychain
mirror of https://github.com/status-im/qtkeychain.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #85 from hasselmm/nitpicks 

Some minor fixes that reduce compiler warnings
This commit is contained in:
Frank Osterfeld 2016-08-12 10:27:22 +02:00 committed by GitHub
parent 895efaf027 ddc4b8e7c6
commit ce41cfb639
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -150,7 +150,7 @@ if(UNIX AND NOT APPLE AND NOT ANDROID)
list(APPEND qtkeychain_LIBRARIES ${QTDBUS_LIBRARIES} ) list(APPEND qtkeychain_LIBRARIES ${QTDBUS_LIBRARIES} )
endif() 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 set(qtkeychain_TR_FILES
translations/qtkeychain_de.ts translations/qtkeychain_de.ts

2
gnomekeyring.cpp
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,

2
gnomekeyring_p.h
View File

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

6
keychain_unix.cpp
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;
} }