From fce2e05019e89f8640f8f56c2baaa27336a47486 Mon Sep 17 00:00:00 2001 From: kostas Date: Wed, 29 Jul 2015 18:31:39 +0000 Subject: [PATCH] Fixed warnings on Unix build FossilOrigin-Name: abdefeaa2bae5e084735797b7f18aa4d738a8b56 --- manifest | 14 +++++++------- manifest.uuid | 2 +- src/Utils.cpp | 6 ++++++ 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/manifest b/manifest index 84cc962..5760680 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fixed\sissue\swith\sFossil's\sdefault\sremote-url\swith\spassword\spreventing\scommits -D 2015-07-29T09:20:59.161 +C Fixed\swarnings\son\sUnix\sbuild\n +D 2015-07-29T18:31:39.376 F .travis.yml 77966888a81c4ceee1fcc79bce842c9667ad8a35 F debian/changelog eb4304dfcb6bb66850ec740838090eb50ce1249b F debian/compat b6abd567fa79cbe0196d093a067271361dc6ca8b @@ -238,7 +238,7 @@ F src/Settings.cpp 258d3f466f6a125ce2b8519d6d57a312cbc44a3f F src/Settings.h 0a10b0b83fe804bdc7dac58eed06b5b6ee422055 F src/SettingsDialog.cpp 55fac64ae4f779c01c6e18911fe97c55fd396939 F src/SettingsDialog.h 5eb3ae2cbb00ab5544e1889860f5376f69fe47cd -F src/Utils.cpp 567bf2ba68ee0d6fbad39000fcecd1aaa04168b8 +F src/Utils.cpp 84dab142439845a15dc6a6e8586dc5470ebdd59b F src/Utils.h c6341ee49a8fc35f215facb196d70bf9b1f2fc0f F src/Workspace.cpp 8bcbfcda28f3ae8244c29b5f2b6e6eae171bf6ca F src/Workspace.h 842c195cf830422f2066c7190156e7c8b82a93a1 @@ -254,7 +254,7 @@ F ui/MainWindow.ui 10181826a25056ed5aba2b23a7d110159be7c043 F ui/RemoteDialog.ui 95a4750d972ed8c49bb10b95db91ff16cfe2dd0b F ui/RevisionDialog.ui 27c3b98c665fec014a50cbf3352c0627f75e68cd F ui/SettingsDialog.ui 47b9a31e28ad523f14a1c4cd361270b6babbdf7d -P a9115a3369a7897bfc665f2a9614f61dbec80493 -R 0b86dfc90894774cb210e244de86ff36 -U Kostas -Z 23676bb827ec6890b4c74e5d68d03e04 +P c16b5a89043d313fdee1e645edf9d2d3f1600d0f +R 04fb563dae3462d2e92eff6fa7e596bd +U kostas +Z 1034f996a15f28a044a6917038a8e7f3 diff --git a/manifest.uuid b/manifest.uuid index 44bdd09..5c1c1d9 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -c16b5a89043d313fdee1e645edf9d2d3f1600d0f \ No newline at end of file +abdefeaa2bae5e084735797b7f18aa4d738a8b56 \ No newline at end of file diff --git a/src/Utils.cpp b/src/Utils.cpp index d18dca6..5cd595d 100644 --- a/src/Utils.cpp +++ b/src/Utils.cpp @@ -404,6 +404,8 @@ bool KeychainSet(QObject *parent, const QUrl &url, QSettings &settings) #ifdef Q_OS_WIN settings.beginGroup("Keychain"); job.setSettings(&settings); +#else + Q_UNUSED(settings) #endif job.connect( &job, SIGNAL(finished(QKeychain::Job*)), &loop, SLOT(quit()) ); @@ -430,6 +432,8 @@ bool KeychainGet(QObject *parent, QUrl &url, QSettings &settings) #ifdef Q_OS_WIN settings.beginGroup("Keychain"); job.setSettings(&settings); +#else + Q_UNUSED(settings) #endif job.connect( &job, SIGNAL(finished(QKeychain::Job*)), &loop, SLOT(quit())); @@ -461,6 +465,8 @@ bool KeychainDelete(QObject* parent, const QUrl& url, QSettings &settings) #ifdef Q_OS_WIN settings.beginGroup("Keychain"); job.setSettings(&settings); +#else + Q_UNUSED(settings) #endif job.connect( &job, SIGNAL(finished(QKeychain::Job*)), &loop, SLOT(quit()));