[git] Pinentry - branch, master, updated. pinentry-0.9.7-4-g30aa104

[by Andre Heinecke]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The standard pinentry collection".

The branch, master has been updated
       via  30aa1046afe9a745c918fc1311c1f598c91bf913 (commit)
      from  2f5bfa071ab5eaf86f64404bff448ca29cd0bdb6 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 30aa1046afe9a745c918fc1311c1f598c91bf913
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Fri Mar 4 15:44:26 2016 +0100

    Qt: Fix Windows foreground window hacks for Qt5
    
    * qt/pinentrydialog.cpp: Use Q_OS_WIN instead of Q_WS_WIN
     (SetForegroundWindowEx): Handle new Wid type with casts.
    
    --
    Q_WS_WIN is no longer defined by Qt5

diff --git a/qt/pinentrydialog.cpp b/qt/pinentrydialog.cpp
index 81205ee..1b0d276 100644
--- a/qt/pinentrydialog.cpp
+++ b/qt/pinentrydialog.cpp
@@ -35,7 +35,7 @@
 #include <QPalette>
 #include <QLineEdit>
 
-#ifdef Q_WS_WIN
+#ifdef Q_OS_WIN
 #include <windows.h>
 #endif
 
@@ -51,7 +51,7 @@
    does not always work (e.g. when the ForegroundWindow timeout
    has not expired.
    */
-#ifdef Q_WS_WIN
+#ifdef Q_OS_WIN
 WINBOOL SetForegroundWindowEx( HWND hWnd )
 {
    //Attach foreground window thread to our thread
@@ -75,14 +75,14 @@ void raiseWindow( QWidget* w )
     /* Maybe Qt will become agressive enough one day that
      * this is enough on windows too*/
     w->raise();
-#ifdef Q_WS_WIN
+#ifdef Q_OS_WIN
     /* In the meantime we do our own attention grabbing */
-    if (!SetForegroundWindow (w->winId()) &&
-            !SetForegroundWindowEx (w->winId()))  {
+    if (!SetForegroundWindow ((HWND)w->winId()) &&
+            !SetForegroundWindowEx ((HWND)w->winId()))  {
         OutputDebugString("SetForegroundWindow (ex) failed");
         /* Yet another fallback which will not work on some
          * versions and is not recommended by msdn */
-        if (!ShowWindow (w->winId(), SW_SHOWNORMAL)) {
+        if (!ShowWindow ((HWND)w->winId(), SW_SHOWNORMAL)) {
             OutputDebugString ("ShowWindow failed.");
         }
     }

-----------------------------------------------------------------------

Summary of changes:
 qt/pinentrydialog.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
The standard pinentry collection
http://git.gnupg.org