Change auto_ptr to shared_ptr with c++11

Avoid warnings

diff --git a/vv/vvReadState.h b/vv/vvReadState.h
index a34c464cfa2bd17a7e0063ba5c54ee7ab50da967..b10a2cbacb31e9212a7d95ea12aaa4e450fd83b9 100644 (file)
--- a/vv/vvReadState.h
+++ b/vv/vvReadState.h
@@ -29,8 +29,13 @@ protected:
   std::string ReadVector(int index);
   std::string ReadLink();
 
+#if __cplusplus > 199711L
+  std::shared_ptr<QXmlStreamReader> m_XmlReader;
+  std::shared_ptr<QFile> m_File;
+#else
   std::auto_ptr<QXmlStreamReader> m_XmlReader;
   std::auto_ptr<QFile> m_File;
+#endif
   vvMainWindow* m_Window;
   int m_TreeItemCount;
   int m_NumImages;

diff --git a/vv/vvSaveState.h b/vv/vvSaveState.h
index 4f96c063e15a61e413fa1bbb531422111603ff6f..8085e25b697fa44d9c88ddf84c3987336d23faf4 100644 (file)
--- a/vv/vvSaveState.h
+++ b/vv/vvSaveState.h
@@ -30,8 +30,13 @@ protected:
   void SaveVector(const QTreeWidgetItem* item);
   void SaveLink(const vvSlicerManager* slicerManager);
 
+#if __cplusplus > 199711L
+  std::shared_ptr<QXmlStreamWriter> m_XmlWriter;
+  std::shared_ptr<QFile> m_File;
+#else
   std::auto_ptr<QXmlStreamWriter> m_XmlWriter;
   std::auto_ptr<QFile> m_File;
+#endif
   vvMainWindow* m_Window;
 };
 

diff --git a/vv/vvToolBaseBase.cxx b/vv/vvToolBaseBase.cxx
index 544bc5e4e133bb26a8251036abe5afacf41f8301..c71a2167ecdb0e73a2e12e3b3d4511edaf465bbf 100644 (file)
--- a/vv/vvToolBaseBase.cxx
+++ b/vv/vvToolBaseBase.cxx
@@ -20,7 +20,11 @@
 #include "vvToolBaseBase.h"
 
 //------------------------------------------------------------------------------
-void vvToolBaseBase::SaveState(std::auto_ptr<QXmlStreamWriter> & m_XmlWriter) 
+#if __cplusplus > 199711L
+void vvToolBaseBase::SaveState(std::shared_ptr<QXmlStreamWriter> & m_XmlWriter)
+#else
+void vvToolBaseBase::SaveState(std::auto_ptr<QXmlStreamWriter> & m_XmlWriter)
+#endif
 { 
   std::cerr << "SaveState not implemented for this tool." << std::endl; 
 }

diff --git a/vv/vvToolBaseBase.h b/vv/vvToolBaseBase.h
index fa93d14d7e8085588c11d30aa69d0c139621a2b4..9c76bb125bfbd4aba518bda40e903ce3e1b2ee77 100644 (file)
--- a/vv/vvToolBaseBase.h
+++ b/vv/vvToolBaseBase.h
@@ -32,8 +32,11 @@ public:
     std::vector<vvToolBaseBase*> & v = mCreator->GetListOfTool();
     v.erase(std::find(v.begin(), v.end(), this));
   };
-  
+#if __cplusplus > 199711L
+  virtual void SaveState(std::shared_ptr<QXmlStreamWriter> & m_XmlWriter);
+#else
   virtual void SaveState(std::auto_ptr<QXmlStreamWriter> & m_XmlWriter);
+#endif
   virtual void InitializeNewTool(bool ReadStateFlag);   
   void SetCreator(vvToolCreatorBase * m) { mCreator = m; }
   void SetXmlReader(QXmlStreamReader * r, int index) { m_XmlReader = r; mImageIndex = index;}  

diff --git a/vv/vvToolCreatorBase.h b/vv/vvToolCreatorBase.h
index b2c942fa5a65db646fb280f5636aea0568183f60..5ade4a4a0d27042d69519e8ac658bdb09663d0ed 100644 (file)
--- a/vv/vvToolCreatorBase.h
+++ b/vv/vvToolCreatorBase.h
@@ -35,7 +35,7 @@ class vvToolCreatorBase: public QObject {
   public:
 
   vvToolCreatorBase(QString name);
-  virtual ~vvToolCreatorBase() {;}  
+  virtual ~vvToolCreatorBase() {}
   virtual void InsertToolInMenu(vvMainWindowBase * m);
   virtual void InsertToolInContextMenu();
   template<class ToolType> void CreateTool();
@@ -55,7 +55,11 @@ class vvToolCreatorBase: public QObject {
   bool mUseContextMenu;
   QMenu * mToolMenu;
   std::vector<QAction*> mListOfActions;
+#if __cplusplus > 199711L
+  std::shared_ptr<QXmlStreamReader> m_XmlReader;
+#else
   std::auto_ptr<QXmlStreamReader> m_XmlReader;
+#endif
   bool mReadStateFlag;
   int mImageIndex;
 

diff --git a/vv/vvToolROIManager.cxx b/vv/vvToolROIManager.cxx
index 791db06f8922e537dc45409373bbf6884b49468d..4c2832e0ced363bbc1d1cfe995f47a86700f8872 100644 (file)
--- a/vv/vvToolROIManager.cxx
+++ b/vv/vvToolROIManager.cxx
@@ -865,7 +865,11 @@ void vvToolROIManager::ReloadCurrentROI()
 
 
 //------------------------------------------------------------------------------
+#if __cplusplus > 199711L
+void  vvToolROIManager::SaveState(std::shared_ptr<QXmlStreamWriter> & m_XmlWriter)
+#else
 void  vvToolROIManager::SaveState(std::auto_ptr<QXmlStreamWriter> & m_XmlWriter)
+#endif
 { 
   // Get index of the image
   int n = mMainWindow->GetSlicerManagers().size();

diff --git a/vv/vvToolROIManager.h b/vv/vvToolROIManager.h
index fdf68a6d107e1a22a3a8cd254f79efd8a1a56786..db630c641b059c4838a376d7bdfdf380a70d4fd5 100644 (file)
--- a/vv/vvToolROIManager.h
+++ b/vv/vvToolROIManager.h
@@ -51,7 +51,11 @@ class vvToolROIManager:
   void AddImage(vvImage * binaryImage, std::string name, std::string filename, double BG, bool m_modeBG=true);
   void UpdateAllContours();
   void UpdateAllROIStatus();
+#if __cplusplus > 199711L
+  virtual void SaveState(std::shared_ptr<QXmlStreamWriter> & m_XmlWriter);
+#else
   virtual void SaveState(std::auto_ptr<QXmlStreamWriter> & m_XmlWriter);
+#endif
   virtual void InitializeNewTool(bool ReadStateFlag);
 
   public slots: