瀏覽代碼

Fix warning "delete-non-virtual-dtor-warnings" gcc-47 warnings

See issue #207
Jean-Christophe Fillion-Robin 13 年之前
父節點
當前提交
6b0da75ee6

+ 5 - 0
Libs/Core/Testing/Cpp/ctkSingletonTestHelper.cpp

@@ -51,6 +51,11 @@ ctkSingletonTestHelper::ctkSingletonTestHelper() : d_ptr(new ctkSingletonTestHel
 }
 
 //-----------------------------------------------------------------------------
+ctkSingletonTestHelper::~ctkSingletonTestHelper()
+{
+}
+
+//-----------------------------------------------------------------------------
 ctkSingletonTestHelper* ctkSingletonTestHelper::instance()
 {
   return Self::Instance;

+ 3 - 2
Libs/Core/Testing/Cpp/ctkSingletonTestHelper.h

@@ -33,8 +33,6 @@ class ctkSingletonTestHelperPrivate;
 class ctkSingletonTestHelper
 {
 public:
-  ctkSingletonTestHelper();
-  
   static ctkSingletonTestHelper* instance();
   
   // Add singleton method here ...
@@ -42,6 +40,9 @@ public:
   int northFaceCount()const;
   
 protected:
+  ctkSingletonTestHelper();
+  virtual ~ctkSingletonTestHelper();
+  
   CTK_SINGLETON_DECLARE(ctkSingletonTestHelper);
   QScopedPointer<ctkSingletonTestHelperPrivate> d_ptr;
   

+ 1 - 0
Libs/Core/ctkAbstractFactory.h

@@ -44,6 +44,7 @@ class ctkAbstractFactoryItem
 public:
   //explicit ctkAbstractFactoryItem();
   ctkAbstractFactoryItem();
+  virtual ~ctkAbstractFactoryItem();
 
   virtual bool load() = 0;
 

+ 6 - 0
Libs/Core/ctkAbstractFactory.tpp

@@ -40,6 +40,12 @@ ctkAbstractFactoryItem<BaseClassType>::ctkAbstractFactoryItem()
 
 //----------------------------------------------------------------------------
 template<typename BaseClassType>
+ctkAbstractFactoryItem<BaseClassType>::~ctkAbstractFactoryItem()
+{
+}
+
+//----------------------------------------------------------------------------
+template<typename BaseClassType>
 QStringList ctkAbstractFactoryItem<BaseClassType>::instantiateErrorStrings()const
 {
   return this->InstantiateErrorStrings;

+ 10 - 0
Libs/Visualization/VTK/Core/ctkVTKObjectEventsObserver.cpp

@@ -57,6 +57,16 @@ void ctkVTKConnectionFactory::setInstance(ctkVTKConnectionFactory* newInstance)
 }
 
 //-----------------------------------------------------------------------------
+ctkVTKConnectionFactory::ctkVTKConnectionFactory()
+{
+}
+
+//-----------------------------------------------------------------------------
+ctkVTKConnectionFactory::~ctkVTKConnectionFactory()
+{
+}
+
+//-----------------------------------------------------------------------------
 ctkVTKConnection* ctkVTKConnectionFactory::createConnection(ctkVTKObjectEventsObserver* parent)const
 {
   return new ctkVTKConnection(parent);

+ 2 - 0
Libs/Visualization/VTK/Core/ctkVTKObjectEventsObserver.h

@@ -54,6 +54,8 @@ public:
 
   virtual ctkVTKConnection* createConnection(ctkVTKObjectEventsObserver*)const;
 protected:
+  ctkVTKConnectionFactory();
+  virtual ~ctkVTKConnectionFactory();
   CTK_SINGLETON_DECLARE(ctkVTKConnectionFactory)
 };
 CTK_SINGLETON_DECLARE_INITIALIZER(CTK_VISUALIZATION_VTK_CORE_EXPORT, ctkVTKConnectionFactory)

+ 6 - 0
Libs/Widgets/ctkThumbnailLabel.cpp

@@ -45,6 +45,7 @@ public:
 
   // Constructor
   ctkThumbnailLabelPrivate(ctkThumbnailLabel* parent);
+  virtual ~ctkThumbnailLabelPrivate();
 
   virtual void setupUi(QWidget* widget);
 
@@ -75,6 +76,11 @@ ctkThumbnailLabelPrivate::ctkThumbnailLabelPrivate(ctkThumbnailLabel* parent)
 }
 
 //----------------------------------------------------------------------------
+ctkThumbnailLabelPrivate::~ctkThumbnailLabelPrivate()
+{
+}
+
+//----------------------------------------------------------------------------
 void ctkThumbnailLabelPrivate::setupUi(QWidget* widget)
 {
   Q_Q(ctkThumbnailLabel);