Re #6000. Fixing compiler warnings

mantidproject · Feb 14, 2014 · 405e714 · 405e714
1 parent f526772
commit 405e714
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 12 deletions.
diff --git a/Code/Mantid/MantidQt/MantidWidgets/inc/MantidQtMantidWidgets/StringEditorFactory.h b/Code/Mantid/MantidQt/MantidWidgets/inc/MantidQtMantidWidgets/StringEditorFactory.h
@@ -10,9 +10,10 @@ class StringEditorFactory : public QtAbstractEditorFactory<QtStringPropertyManag
 public:
   StringEditorFactory(QObject *parent = 0): QtAbstractEditorFactory<QtStringPropertyManager>(parent){}
 protected:
-  void connectPropertyManager(QtStringPropertyManager *manager);
+  using QtAbstractEditorFactoryBase::createEditor; // Avoid Intel compiler warning
+  void connectPropertyManager(QtStringPropertyManager *){}
   QWidget *createEditor(QtStringPropertyManager *manager, QtProperty *property,QWidget *parent);
-  void disconnectPropertyManager(QtStringPropertyManager *manager);
+  void disconnectPropertyManager(QtStringPropertyManager *){}
 };
 
 class StringEditor: public QLineEdit

diff --git a/Code/Mantid/MantidQt/MantidWidgets/inc/MantidQtMantidWidgets/WorkspaceEditorFactory.h b/Code/Mantid/MantidQt/MantidWidgets/inc/MantidQtMantidWidgets/WorkspaceEditorFactory.h
@@ -15,9 +15,10 @@ class WorkspaceEditorFactory : public QtAbstractEditorFactory<QtStringPropertyMa
 public:
   WorkspaceEditorFactory(QObject *parent = 0): QtAbstractEditorFactory<QtStringPropertyManager>(parent){}
 protected:
-  void connectPropertyManager(QtStringPropertyManager *manager){}
+  using QtAbstractEditorFactoryBase::createEditor; // Avoid Intel compiler warning
+  void connectPropertyManager(QtStringPropertyManager *){}
   QWidget *createEditor(QtStringPropertyManager *manager, QtProperty *property,QWidget *parent);
-  void disconnectPropertyManager(QtStringPropertyManager *manager){}
+  void disconnectPropertyManager(QtStringPropertyManager *){}
 };
 
 class WorkspaceEditor: public WorkspaceSelector

diff --git a/Code/Mantid/MantidQt/MantidWidgets/src/StringEditorFactory.cpp b/Code/Mantid/MantidQt/MantidWidgets/src/StringEditorFactory.cpp
@@ -1,18 +1,10 @@
 #include "MantidQtMantidWidgets/StringEditorFactory.h"
 
-void StringEditorFactory::connectPropertyManager(QtStringPropertyManager *)
-{
-}
-
 QWidget* StringEditorFactory::createEditor(QtStringPropertyManager *, QtProperty *property,QWidget *parent)
 {
   return new StringEditor(property,parent);
 }
 
-void StringEditorFactory::disconnectPropertyManager(QtStringPropertyManager *)
-{
-}
-
 StringEditor::StringEditor(QtProperty *property, QWidget *parent):QLineEdit(parent),m_property(property)
 {
   connect(this,SIGNAL(editingFinished()),this,SLOT(updateProperty()));