This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch feature/cleanup in repository x2goclient. from 8da0744 x2goclient.pro: enable more debugging if needed: change -g flag to -g3 -ggdb3 -gdwarf-4. new 748df74 macbuild.sh: select stdlib on OS X based on the passed or default SDK value. new e7cb70a macbuild.sh: fix TOP_DIR handling. new 9e9eabf macbuild.sh: switch to BASH interpreter. new 84a0390 macbuild.sh: also accept "FALSE" and "false" as binary values. new 774506f macbuild.sh: fix non-functional redundancy and optical issues. new 8de2160 macbuild.sh: make bundling optional (but enabled by default) via the new BUNDLE environment variable. new 97699ff x2goclient.pro: Enable -O2 in debug mode. new e8b1f51 general: Add new UNUSED() macro to x2goutils.h and silence compiler warnings. Affected files: new 8a2a1cf onmainwindow.cpp: Fix some QMessageBox usages. There are many more places that need fixing... The 9 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 11 +++++ macbuild.sh | 89 +++++++++++++++++++++++-------------- src/appdialog.cpp | 2 + src/cupsprintersettingsdialog.cpp | 7 +-- src/onmainwindow.cpp | 30 ++++++++----- src/sessionmanagedialog.cpp | 4 +- src/sshmasterconnection.cpp | 2 +- src/x2goutils.h | 5 ++- src/xsettingswidget.cpp | 2 + x2goclient.pro | 6 ++- 10 files changed, 107 insertions(+), 51 deletions(-) -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch feature/cleanup in repository x2goclient. commit 748df74d8e30cc9603244ef0386e65487b34ac56 Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Feb 16 03:14:38 2015 +0100 macbuild.sh: select stdlib on OS X based on the passed or default SDK value. --- debian/changelog | 1 + macbuild.sh | 14 +++++++++++++- x2goclient.pro | 4 ++++ 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 87b0930..ce87a34 100644 --- a/debian/changelog +++ b/debian/changelog @@ -205,6 +205,7 @@ x2goclient (4.0.3.2-0x2go1) UNRELEASED; urgency=medium references in x2goclient.pro and macbuild.sh. - Add debug mode selector via DEBUG env variable to macbuild.sh. - Enable more debugging if needed: change -g flag to -g3 -ggdb3 -gdwarf-4. + - Select stdlib on OS X based on the passed or default SDK value. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Thu, 27 Nov 2014 12:01:43 +0100 diff --git a/macbuild.sh b/macbuild.sh index a02e3cb..642f6f3 100755 --- a/macbuild.sh +++ b/macbuild.sh @@ -22,6 +22,17 @@ case "${DEBUG}" in (*) BUILD_MODE="debug";; esac +SDK_MINOR_VERSION="$(/usr/bin/perl -pe 's#.*?10\.(\d+).*?\.sdk$#\1#' <<< "${SDK}")" + +MATCH_NUMBERS='^[0-9]+$' +if [[ "${SDK_MINOR_VERSION}" =~ ${MATCH_NUMBERS} ]]; then + STDLIB="libstdc++" + [ "${SDK_MINOR_VERSION}" -gt "8" ] && STDLIB="libc++" +else + echo "Unable to determine OS X version. Unknown value '${SDK_MINOR_VERSION}'." >&2 + exit 1 +fi + set -e function phase() { @@ -49,7 +60,8 @@ phase "Running qmake" qmake -config "${BUILD_MODE}" -spec macx-g++ "${PROJECT}" \ CONFIG+="x86_64" \ QMAKE_MAC_SDK="${SDK}" \ - QMAKE_MACOSX_DEPLOYMENT_TARGET="${MACOSX_DEPLOYMENT_TARGET}" + QMAKE_MACOSX_DEPLOYMENT_TARGET="${MACOSX_DEPLOYMENT_TARGET}" \ + OSX_STDLIB="${STDLIB}" phase "Running make" make -j2 diff --git a/x2goclient.pro b/x2goclient.pro index 5a195bd..d7adb51 100644 --- a/x2goclient.pro +++ b/x2goclient.pro @@ -186,6 +186,10 @@ x2go_linux_static { macx { message("building $$TARGET with ldap and cups") LIBS += -framework LDAP -lcups -lcrypto -lssl -lz + + !isEmpty(OSX_STDLIB) { + QMAKE_CXXFLAGS += --stdlib=$${OSX_STDLIB} + } } win32-* { message("building $$TARGET for windows without ldap and cups") -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch feature/cleanup in repository x2goclient. commit e7cb70a78fad15da288d213d0f42c98aab8886f5 Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Feb 16 03:17:13 2015 +0100 macbuild.sh: fix TOP_DIR handling. --- debian/changelog | 1 + macbuild.sh | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index ce87a34..528ba32 100644 --- a/debian/changelog +++ b/debian/changelog @@ -206,6 +206,7 @@ x2goclient (4.0.3.2-0x2go1) UNRELEASED; urgency=medium - Add debug mode selector via DEBUG env variable to macbuild.sh. - Enable more debugging if needed: change -g flag to -g3 -ggdb3 -gdwarf-4. - Select stdlib on OS X based on the passed or default SDK value. + - Fix TOP_DIR handling in macbuild.sh. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Thu, 27 Nov 2014 12:01:43 +0100 diff --git a/macbuild.sh b/macbuild.sh index 642f6f3..603088a 100755 --- a/macbuild.sh +++ b/macbuild.sh @@ -1,6 +1,8 @@ #!/bin/sh NAME="x2goclient" -TOP_DIR="${PWD}" + +TOP_DIR="$(dirname "$0")" +[[ "${TOP_DIR}" == /* ]] || TOP_DIR="${PWD}/${TOP_DIR#./}" BUILD_DIR="${TOP_DIR}/build_client" APPBUNDLE="${BUILD_DIR}/${NAME}.app" DMGFILE="${BUILD_DIR}/${NAME}.dmg" -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch feature/cleanup in repository x2goclient. commit 9e9eabf7c142264825c768d6f6e091f899902cf7 Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Feb 16 03:20:15 2015 +0100 macbuild.sh: switch to BASH interpreter. --- debian/changelog | 1 + macbuild.sh | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 528ba32..22f2db3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -207,6 +207,7 @@ x2goclient (4.0.3.2-0x2go1) UNRELEASED; urgency=medium - Enable more debugging if needed: change -g flag to -g3 -ggdb3 -gdwarf-4. - Select stdlib on OS X based on the passed or default SDK value. - Fix TOP_DIR handling in macbuild.sh. + - Switch to BASH interpreter for macbuild.sh. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Thu, 27 Nov 2014 12:01:43 +0100 diff --git a/macbuild.sh b/macbuild.sh index 603088a..921b2a4 100755 --- a/macbuild.sh +++ b/macbuild.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash NAME="x2goclient" TOP_DIR="$(dirname "$0")" -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch feature/cleanup in repository x2goclient. commit 84a03902b16092c47152f9de28e9af1b53f71076 Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Feb 16 03:21:36 2015 +0100 macbuild.sh: also accept "FALSE" and "false" as binary values. --- debian/changelog | 1 + macbuild.sh | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 22f2db3..07158e2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -208,6 +208,7 @@ x2goclient (4.0.3.2-0x2go1) UNRELEASED; urgency=medium - Select stdlib on OS X based on the passed or default SDK value. - Fix TOP_DIR handling in macbuild.sh. - Switch to BASH interpreter for macbuild.sh. + - Also accept "FALSE" and "false" as binary values in macbuild.sh. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Thu, 27 Nov 2014 12:01:43 +0100 diff --git a/macbuild.sh b/macbuild.sh index 921b2a4..ca15cdf 100755 --- a/macbuild.sh +++ b/macbuild.sh @@ -20,7 +20,7 @@ LIBZ="libz.1.dylib" : DEBUG="${DEBUG:-"0"}" case "${DEBUG}" in - ("0"|"no"|""|"No"|"nO"|"NO") BUILD_MODE="release";; + ("0"|"no"|""|"No"|"nO"|"NO"|"false"|"FALSE") BUILD_MODE="release";; (*) BUILD_MODE="debug";; esac -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch feature/cleanup in repository x2goclient. commit 774506f4ce5969601f01afd28ecbd808586d3e34 Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Feb 16 03:22:27 2015 +0100 macbuild.sh: fix non-functional redundancy and optical issues. --- macbuild.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/macbuild.sh b/macbuild.sh index ca15cdf..ffe2d5b 100755 --- a/macbuild.sh +++ b/macbuild.sh @@ -15,9 +15,9 @@ LIBPNG="libpng15.15.dylib" LIBJPEG="libjpeg.9.dylib" LIBZ="libz.1.dylib" -: SDK="${SDK:-"/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk"}" -: MACOSX_DEPLOYMENT_TARGET="${MACOSX_DEPLOYMENT_TARGET:-"10.7"}" -: DEBUG="${DEBUG:-"0"}" +SDK="${SDK:-"/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk"}" +MACOSX_DEPLOYMENT_TARGET="${MACOSX_DEPLOYMENT_TARGET:-"10.7"}" +DEBUG="${DEBUG:-"0"}" case "${DEBUG}" in ("0"|"no"|""|"No"|"nO"|"NO"|"false"|"FALSE") BUILD_MODE="release";; @@ -40,7 +40,7 @@ set -e function phase() { echo echo "***" - echo "*** ${1}…" + echo "*** ${1}..." echo "***" echo } -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch feature/cleanup in repository x2goclient. commit 8de21601beaf48b7ad2b36a3f4fbe114e6765f7a Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Feb 16 03:24:32 2015 +0100 macbuild.sh: make bundling optional (but enabled by default) via the new BUNDLE environment variable. --- debian/changelog | 2 ++ macbuild.sh | 59 +++++++++++++++++++++++++++++++----------------------- 2 files changed, 36 insertions(+), 25 deletions(-) diff --git a/debian/changelog b/debian/changelog index 07158e2..ec6c3a0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -209,6 +209,8 @@ x2goclient (4.0.3.2-0x2go1) UNRELEASED; urgency=medium - Fix TOP_DIR handling in macbuild.sh. - Switch to BASH interpreter for macbuild.sh. - Also accept "FALSE" and "false" as binary values in macbuild.sh. + - Make bundling optional (but enabled by default) via the new BUNDLE + environment variable in macbuild.sh. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Thu, 27 Nov 2014 12:01:43 +0100 diff --git a/macbuild.sh b/macbuild.sh index ffe2d5b..4df34b4 100755 --- a/macbuild.sh +++ b/macbuild.sh @@ -18,12 +18,18 @@ LIBZ="libz.1.dylib" SDK="${SDK:-"/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk"}" MACOSX_DEPLOYMENT_TARGET="${MACOSX_DEPLOYMENT_TARGET:-"10.7"}" DEBUG="${DEBUG:-"0"}" +BUNDLE="${BUNDLE:-"1"}" case "${DEBUG}" in ("0"|"no"|""|"No"|"nO"|"NO"|"false"|"FALSE") BUILD_MODE="release";; (*) BUILD_MODE="debug";; esac +case "${BUNDLE}" in + ("0"|"no"|""|"No"|"nO"|"NO"|"false"|"FALSE") BUNDLE="0";; + (*) BUNDLE="1";; +esac + SDK_MINOR_VERSION="$(/usr/bin/perl -pe 's#.*?10\.(\d+).*?\.sdk$#\1#' <<< "${SDK}")" MATCH_NUMBERS='^[0-9]+$' @@ -71,30 +77,33 @@ make -j2 phase "Copying nxproxy" mkdir -p "${APPBUNDLE}/Contents/exe" cp "${NXPROXY}" "${APPBUNDLE}/Contents/exe" -dylibbundler \ - --fix-file "${APPBUNDLE}/Contents/exe/nxproxy" \ - --bundle-deps \ - --dest-dir "${APPBUNDLE}/Contents/Frameworks" \ - --install-path "@executable_path/../Frameworks/" \ - --create-dir - -phase "Bundling up using macdeployqt" -macdeployqt "${APPBUNDLE}" -verbose=2 - -phase "Creating DMG" -${PKG_DMG} \ - --source "${APPBUNDLE}" \ - --sourcefile \ - --target "${DMGFILE}" \ - --volname "x2goclient" \ - --verbosity 2 \ - --mkdir "/.background" \ - --copy "${TOP_DIR}/res/img/png/macinstaller_background.png:/.background" \ - --copy "${TOP_DIR}/res/osxbundle/macdmg.DS_Store:/.DS_Store" \ - --copy "${TOP_DIR}/LICENSE" \ - --copy "${TOP_DIR}/COPYING" \ - --symlink "/Applications: " \ - --icon "${TOP_DIR}/res/img/icons/x2go-mac.icns" \ - --format "UDBZ" + +if [ "${BUNDLE}" = "1" ]; then + dylibbundler \ + --fix-file "${APPBUNDLE}/Contents/exe/nxproxy" \ + --bundle-deps \ + --dest-dir "${APPBUNDLE}/Contents/Frameworks" \ + --install-path "@executable_path/../Frameworks/" \ + --create-dir + + phase "Bundling up using macdeployqt" + macdeployqt "${APPBUNDLE}" -verbose=2 + + phase "Creating DMG" + ${PKG_DMG} \ + --source "${APPBUNDLE}" \ + --sourcefile \ + --target "${DMGFILE}" \ + --volname "x2goclient" \ + --verbosity 2 \ + --mkdir "/.background" \ + --copy "${TOP_DIR}/res/img/png/macinstaller_background.png:/.background" \ + --copy "${TOP_DIR}/res/osxbundle/macdmg.DS_Store:/.DS_Store" \ + --copy "${TOP_DIR}/LICENSE" \ + --copy "${TOP_DIR}/COPYING" \ + --symlink "/Applications: " \ + --icon "${TOP_DIR}/res/img/icons/x2go-mac.icns" \ + --format "UDBZ" +fi popd -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch feature/cleanup in repository x2goclient. commit 97699ff49f9b7d2925334b8e161b614dd0f86b8c Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Feb 16 03:27:36 2015 +0100 x2goclient.pro: Enable -O2 in debug mode. Otherwise, debug mode would test different execution paths than release mode. --- debian/changelog | 2 ++ x2goclient.pro | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index ec6c3a0..3242490 100644 --- a/debian/changelog +++ b/debian/changelog @@ -211,6 +211,8 @@ x2goclient (4.0.3.2-0x2go1) UNRELEASED; urgency=medium - Also accept "FALSE" and "false" as binary values in macbuild.sh. - Make bundling optional (but enabled by default) via the new BUNDLE environment variable in macbuild.sh. + - Enable -O2 in debug mode. Otherwise, debug mode would test different + execution paths than release mode. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Thu, 27 Nov 2014 12:01:43 +0100 diff --git a/x2goclient.pro b/x2goclient.pro index d7adb51..4c2cdd4 100644 --- a/x2goclient.pro +++ b/x2goclient.pro @@ -211,7 +211,7 @@ PRE_TARGETDEPS += $${TARGET}.app/Contents/Info.plist QMAKE_POST_LINK += /bin/cp -n $${ICON} $${OUT_PWD}/$${TARGET}.app/Contents/Resources/ QMAKE_CXXFLAGS_DEBUG -= -g -QMAKE_CXXFLAGS_DEBUG += -g3 -ggdb3 -gdwarf-4 +QMAKE_CXXFLAGS_DEBUG += -O2 -g3 -ggdb3 -gdwarf-4 plugin { DEFINES += CFGPLUGIN -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch feature/cleanup in repository x2goclient. commit e8b1f512d3de0a3733f09f32f34d021fdfef71d0 Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Feb 16 04:11:58 2015 +0100 general: Add new UNUSED() macro to x2goutils.h and silence compiler warnings. Affected files: - appdialog.cpp - cupsprintersettingsdialog.cpp - onmainwindow.cpp - sessionmanagedialog.cpp - sshmasterconnection.cpp - xsettingswidget.cpp --- debian/changelog | 1 + src/appdialog.cpp | 2 ++ src/cupsprintersettingsdialog.cpp | 7 ++++--- src/onmainwindow.cpp | 10 ++++++++-- src/sessionmanagedialog.cpp | 4 ++-- src/sshmasterconnection.cpp | 2 +- src/x2goutils.h | 5 ++++- src/xsettingswidget.cpp | 2 ++ 8 files changed, 24 insertions(+), 9 deletions(-) diff --git a/debian/changelog b/debian/changelog index 3242490..aac7d27 100644 --- a/debian/changelog +++ b/debian/changelog @@ -213,6 +213,7 @@ x2goclient (4.0.3.2-0x2go1) UNRELEASED; urgency=medium environment variable in macbuild.sh. - 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. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Thu, 27 Nov 2014 12:01:43 +0100 diff --git a/src/appdialog.cpp b/src/appdialog.cpp index 0d2a5f6..f10be8f 100644 --- a/src/appdialog.cpp +++ b/src/appdialog.cpp @@ -152,6 +152,8 @@ void AppDialog::loadApps() other=initTopItem(tr("Other"), QPixmap(":/img/icons/22x22/applications-other.png")); parent=other; break; + default: + break; } QTreeWidgetItem* it; diff --git a/src/cupsprintersettingsdialog.cpp b/src/cupsprintersettingsdialog.cpp index f54bd68..d3a4f13 100644 --- a/src/cupsprintersettingsdialog.cpp +++ b/src/cupsprintersettingsdialog.cpp @@ -17,6 +17,7 @@ #include "cupsprintersettingsdialog.h" #include "cupsprint.h" +#include "x2goutils.h" #ifndef Q_OS_WIN #include <QHeaderView> #include <QMessageBox> @@ -206,9 +207,9 @@ void CUPSPrinterSettingsDialog::setPPDTab() CUPSPrint::printState state; QString stateReason; QString valueName,valueText; - !m_cups->getPrinterInfo ( printer, - info,acceptJobs, - location,model,state,stateReason ) ; + UNUSED (m_cups->getPrinterInfo (printer, + info, acceptJobs, + location, model, state, stateReason)); ui.ppdTree->clear(); diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp index 3f10fc9..487118f 100644 --- a/src/onmainwindow.cpp +++ b/src/onmainwindow.cpp @@ -10703,7 +10703,10 @@ void ONMainWindow::slotChangeKbdLayout(const QString& layout) x2goDebug<<"Running setxkbmap with params: "<<args.join(" "); QProcess::startDetached("setxkbmap",args); -#endif +#else + /* Silence warning. */ + UNUSED (layout); +#endif /* defined (Q_OS_LINUX) */ } void ONMainWindow::initPassDlg() @@ -11436,7 +11439,10 @@ void ONMainWindow::slotPCookieReady ( bool result, #ifdef Q_OS_WIN if ( result ) slotStartParec(); -#endif +#else + /* Silence warning. */ + UNUSED (result); +#endif /* defined (Q_OS_WIN) */ } diff --git a/src/sessionmanagedialog.cpp b/src/sessionmanagedialog.cpp index 49016bf..c88f0f2 100644 --- a/src/sessionmanagedialog.cpp +++ b/src/sessionmanagedialog.cpp @@ -134,8 +134,8 @@ void SessionManageDialog::loadSessions() { sessions->clear(); - const QList<SessionButton*> *sess=par->getSessionExplorer()->getSessionsList(); - const QList<FolderButton*> *folders=par->getSessionExplorer()->getFoldersList(); + /*const QList<SessionButton*> *sess=par->getSessionExplorer()->getSessionsList();*/ + /*const QList<FolderButton*> *folders=par->getSessionExplorer()->getFoldersList();*/ removeSession->setEnabled ( false ); editSession->setEnabled ( false ); diff --git a/src/sshmasterconnection.cpp b/src/sshmasterconnection.cpp index c8669a5..2449cf5 100644 --- a/src/sshmasterconnection.cpp +++ b/src/sshmasterconnection.cpp @@ -304,7 +304,7 @@ void SshMasterConnection::checkReverseTunnelConnections() for(int i=0; i<reverseTunnelRequest.count(); ++i) { ReverseTunnelRequest req=reverseTunnelRequest[i]; - if(req.forwardPort==port) + if (static_cast<int> (req.forwardPort) == port) { #ifdef DEBUG x2goDebug<<"Creating new channel for reverse tunnel "<<port; diff --git a/src/x2goutils.h b/src/x2goutils.h index 912ce2d..21365da 100644 --- a/src/x2goutils.h +++ b/src/x2goutils.h @@ -21,8 +21,11 @@ #include <QString> +#define UNUSED(x) do { (void) x; } while (0) + QString expandHome( QString path ); QString fixup_resource_URIs (const QString res_path); QString wrap_legacy_resource_URIs (const QString res_path); -#endif + +#endif /* !defined (X2GOUTILS_H) */ diff --git a/src/xsettingswidget.cpp b/src/xsettingswidget.cpp index 3ea0c52..842dca3 100644 --- a/src/xsettingswidget.cpp +++ b/src/xsettingswidget.cpp @@ -17,10 +17,12 @@ #include "xsettingswidget.h" #include "x2gosettings.h" +#include "x2goutils.h" #include <QFileDialog> XSettingsWidget::XSettingsWidget(QWidget* parent) { + UNUSED (parent); setupUi(this); X2goSettings st ( "settings" ); -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
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@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@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
-
git-admin＠x2go.org