[X2Go-Commits] [x2goclient] 08/09: general: Add new UNUSED() macro to x2goutils.h and silence compiler warnings. Affected files:
git-admin at x2go.org
git-admin at x2go.org
Mon Feb 16 04:15:33 CET 2015
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 at 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 at 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
More information about the x2go-commits
mailing list