[X2Go-Commits] [x2goclient] 09/09: onmainwindow.cpp: Fix some QMessageBox usages. There are many more places that need fixing...

[git-admin at x2go.org]

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

x2go pushed a commit to branch feature/cleanup
in repository x2goclient.

commit 8a2a1cf9b665090b74c21879732730e5cc0d6c33
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Mon Feb 16 04:14:58 2015 +0100

    onmainwindow.cpp: Fix some QMessageBox usages. There are many more places that need fixing...
---
 debian/changelog     |    2 ++
 src/onmainwindow.cpp |   20 ++++++++++++--------
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index aac7d27..0323025 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -214,6 +214,8 @@ x2goclient (4.0.3.2-0x2go1) UNRELEASED; urgency=medium
     - Enable -O2 in debug mode. Otherwise, debug mode would test different
       execution paths than release mode.
     - Add new UNUSED() macro to x2goutils.h and silence compiler warnings.
+    - Fix some QMessageBox usages. There are many more places that need
+      fixing...
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Thu, 27 Nov 2014 12:01:43 +0100
 
diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp
index 487118f..d9685cf 100644
--- a/src/onmainwindow.cpp
+++ b/src/onmainwindow.cpp
@@ -2879,8 +2879,9 @@ void ONMainWindow::slotSshServerAuthError ( int error, QString sshMessage, SshMa
                     "Somebody might be eavesdropping on you.\n"
                     "For security reasons, it is recommended to stop the connection.\n"
                     "Do you want to terminate the connection?\n" );
-        if ( !QMessageBox::warning( 0, tr( "Host key verification failed" ),
-                                    errMsg, tr( "Yes" ), tr( "No" ) ) != 0)
+        if (QMessageBox::warning (0, tr ("Host key verification failed"),
+                                  errMsg, QMessageBox::Yes | QMessageBox::No,
+                                  QMessageBox::No) == QMessageBox::Yes)
         {
             connection->writeKnownHosts(false);
             connection->wait();
@@ -2906,8 +2907,9 @@ void ONMainWindow::slotSshServerAuthError ( int error, QString sshMessage, SshMa
                     "confuse your client into thinking the key does not exist. \n"
                     "For security reasons, it is recommended to stop the connection.\n"
                     "Do you want to terminate the connection?\n");
-        if ( !QMessageBox::warning( 0, tr( "Host key verification failed" ),
-                                    errMsg, tr( "Yes" ), tr( "No" ) ) != 0)
+        if (QMessageBox::warning (0, tr ("Host key verification failed"),
+                                  errMsg, QMessageBox::Yes | QMessageBox::No,
+                                  QMessageBox::No) == QMessageBox::Yes)
         {
             connection->writeKnownHosts(false);
             connection->wait();
@@ -2948,7 +2950,9 @@ void ONMainWindow::slotSshServerAuthError ( int error, QString sshMessage, SshMa
         break;
     }
 
-    if ( QMessageBox::warning ( this, tr ( "Host key verification failed" ),errMsg,tr ( "Yes" ), tr ( "No" ) ) !=0 )
+    if (QMessageBox::warning (this, tr ("Host key verification failed"),
+                              errMsg, QMessageBox::Yes | QMessageBox::No,
+                              QMessageBox::No) == QMessageBox::No)
     {
         connection->writeKnownHosts(false);
         connection->wait();
@@ -2990,9 +2994,9 @@ void ONMainWindow::slotSshUserAuthError ( QString error )
         trayQuit();
     }
 
-    QMessageBox::critical ( 0l,tr ( "Authentication failed" ),error,
-                            QMessageBox::Ok,
-                            QMessageBox::NoButton );
+    QMessageBox::critical (0l, tr ("Authentication failed"),
+                           error, QMessageBox::Ok,
+                           QMessageBox::NoButton);
     setEnabled ( true );
     passForm->setEnabled ( true );
     slotShowPassForm();

--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git