applied patch main-unusedparam.patch see #1510

build_num

@@ -1 +1 @@
-#define BUILD_NUM 2967
+#define BUILD_NUM 2968

src/antlr/BaseAST.hpp

@@ -137,12 +137,12 @@ public:
 	}
 
 	/// Set the token text for this node
-	virtual void setText(const ANTLR_USE_NAMESPACE(std)string& txt)
+	virtual void setText(const ANTLR_USE_NAMESPACE(std)string& /*UNUSED txt */)
 	{
 	}
 
 	/// Set the token type for this node
-	virtual void setType(int type)
+	virtual void setType(int /*UNUSED type */)
 	{
 	}
 

src/compiler_lib/CompilerDriver.cpp

@@ -977,7 +977,7 @@ void CompilerDriver::populateClusterElements(Cluster *cluster, Firewall *fw)
  *   addresses of the firewalls (perhaps this restriction can be
  *   lifted? Was originally implemented by Secunet folks like this)
  */
-void CompilerDriver::copyFailoverInterface(Cluster *cluster,
+void CompilerDriver::copyFailoverInterface(Cluster * /*UNUSED cluster */,
                                            Firewall *fw,
                                            FailoverClusterGroup *cluster_group,
                                            Interface *iface)

src/compiler_lib/procurveInterfaces.cpp

@@ -73,7 +73,7 @@ bool procurveInterfaces::parseVlan(
  * in common and can not be verified.
  */
 bool procurveInterfaces::isValidVlanInterfaceName(const QString &subint_name,
-                                                  const QString &parent_name,
+                                                  const QString & /*UNUSED parent_name */,
                                                   QString &err)
 {
     if (!looksLikeVlanInterface(subint_name))
@@ -100,23 +100,23 @@ bool procurveInterfaces::isValidVlanInterfaceName(const QString &subint_name,
 
 /*
  * many switch ports can be part of the same vlan. It would be ideal
- * if I could make interface objects that represent siwtch ports a
+ * if I could make interface objects that represent switch ports as
  * subinterfaces of a vlan interface. Unfortunately this is reverse of
  * our normal model, where vlans are subinterfaces of ethernet
  * interface objects. Until I figure this out, there will be no
  * restrictions on ProCurve interface objects.
  */
-bool procurveInterfaces::validateInterface(FWObject *target,
-                                           FWObject *intf,
-                                           bool check_types,
-                                           QString &err)
+bool procurveInterfaces::validateInterface(FWObject * /*UNUSED target */,
+                                           FWObject * /*UNUSED intf */,
+                                           bool  /*UNUSED check_types */,
+                                           QString & /*UNUSED err */)
 {
     return true;
 }
 
-bool procurveInterfaces::validateInterface(FWObject *target,
-                                           const QString &interface_name,
-                                           QString &err)
+bool procurveInterfaces::validateInterface(FWObject * /*UNUSED target */,
+                                           const QString & /*UNUSED interface_name */,
+                                           QString & /*UNUSED err */)
 {
     return true;
 }

src/gui/AutocompletedComboBox.cpp

@@ -38,7 +38,7 @@ AutocompletedComboBox::AutocompletedComboBox(QWidget* parent)
     connect(&timer, SIGNAL(timeout ()), this, SLOT(addWord()));
 }
 
-void AutocompletedComboBox::filterUpdate(QString text)
+void AutocompletedComboBox::filterUpdate(QString /*UNUSED text */)
 {
     timer.stop();
     timer.start(1000);

src/gui/CompilerOutputPanel.cpp

@@ -222,7 +222,7 @@ void CompilerOutputPanel::closeEvent(QCloseEvent *)
 {
 }
 
-void CompilerOutputPanel::resizeEvent ( QResizeEvent * event )
+void CompilerOutputPanel::resizeEvent ( QResizeEvent * /*UNUSED event */ )
 {
     this->m_widget->compiler_output_panel->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOn);
     this->m_widget->compiler_output_panel->setVerticalScrollBar(new QScrollBar());

src/gui/ObjectManipulator_slots.cpp

@@ -244,7 +244,7 @@ void ObjectManipulator::duplicateObj(QAction *action)
  * Note: this slot gets controlwhen user presses "Delete" key in
  * addition to menu items activation
  */
-void ObjectManipulator::delObj(QUndoCommand* macro)
+void ObjectManipulator::delObj(QUndoCommand* /* UNUSED macro */)
 {
     if (fwbdebug)
         qDebug("ObjectManipulator::delObj selected %d objects ",