modernize C++: use equals delete

src/Base/Builder3D.h

@@ -613,8 +613,10 @@ public:
 private:
     void increaseIndent();
     void decreaseIndent();
-    InventorBuilder (const InventorBuilder&);
-    void operator = (const InventorBuilder&);
+
+public:
+    InventorBuilder (const InventorBuilder&) = delete;
+    void operator = (const InventorBuilder&) = delete;
 
 private:
     std::ostream& result;

src/Base/Handle.cpp

@@ -76,7 +76,7 @@ int Handled::getRefCount() const
     return static_cast<int>(*_lRefCount);
 }
 
-const Handled& Handled::operator = (const Handled&)
+Handled& Handled::operator = (const Handled&)
 {
     // we must not assign _lRefCount
     return *this;

src/Base/Handle.h

@@ -153,10 +153,11 @@ public:
     int unrefNoDelete() const;
 
     int getRefCount() const;
-    const Handled& operator = (const Handled&);
+    Handled& operator = (const Handled&);
 
-private:
-    Handled(const Handled&);
+    Handled(const Handled&) = delete;
+    Handled(Handled&&) = delete;
+    Handled& operator = (Handled&&) = delete;
 
 private:
     QAtomicInt* _lRefCount;

src/Base/InputSource.cpp

@@ -104,9 +104,9 @@ struct StdInputStream::TextCodec
 
 StdInputStream::StdInputStream( std::istream& Stream, XERCES_CPP_NAMESPACE_QUALIFIER MemoryManager* const manager )
   : stream(Stream)
-  , fMemoryManager(manager)
   , codec(new TextCodec)
 {
+    (void)manager;
 }
 
 

src/Base/InputSource.h

@@ -54,13 +54,13 @@ public :
   XMLSize_t readBytes( XMLByte* const toFill, const XMLSize_t maxToRead ) override;
   const XMLCh* getContentType() const override {return nullptr;}
 
-private :
   // -----------------------------------------------------------------------
   //  Unimplemented constructors and operators
   // -----------------------------------------------------------------------
-  StdInputStream(const StdInputStream&);
-  StdInputStream& operator=(const StdInputStream&);
+  StdInputStream(const StdInputStream&) = delete;
+  StdInputStream& operator=(const StdInputStream&) = delete;
 
+private :
   // -----------------------------------------------------------------------
   //  Private data members
   //
@@ -69,7 +69,6 @@ private :
   //      per platform.
   // -----------------------------------------------------------------------
   std::istream            &stream;
-  XERCES_CPP_NAMESPACE_QUALIFIER MemoryManager* const    fMemoryManager;
   struct TextCodec;
   std::unique_ptr<TextCodec> codec;
 };
@@ -83,10 +82,10 @@ public :
 
   XERCES_CPP_NAMESPACE_QUALIFIER BinInputStream* makeStream() const override;
 
-private:
-  StdInputSource(const StdInputSource&);
-  StdInputSource& operator=(const StdInputSource&);
+  StdInputSource(const StdInputSource&) = delete;
+  StdInputSource& operator=(const StdInputSource&) = delete;
 
+private:
   std::istream   &stream;
 };
 

src/Base/Parameter.cpp

@@ -133,10 +133,9 @@ public:
         return fWhatToShow;
     }
 
-private:
     // unimplemented copy ctor and assignment operator
     DOMPrintFilter(const DOMPrintFilter&) = delete;
-    DOMPrintFilter & operator = (const DOMPrintFilter&);
+    DOMPrintFilter & operator = (const DOMPrintFilter&) = delete;
 
    ShowType fWhatToShow;
 };

src/Base/Sequencer.h

@@ -370,9 +370,8 @@ public:
     void setProgress(size_t);
     bool wasCanceled() const;
 
-private:
-    SequencerLauncher(const SequencerLauncher&);
-    void operator=(const SequencerLauncher&);
+    SequencerLauncher(const SequencerLauncher&) = delete;
+    void operator=(const SequencerLauncher&) = delete;
 };
 
 /** Access to the only SequencerBase instance */

src/Base/Stream.h

@@ -81,9 +81,8 @@ public:
     OutputStream& operator << (float f);
     OutputStream& operator << (double d);
 
-private:
-    OutputStream (const OutputStream&);
-    void operator = (const OutputStream&);
+    OutputStream (const OutputStream&) = delete;
+    void operator = (const OutputStream&) = delete;
 
 private:
     std::ostream& _out;
@@ -117,9 +116,8 @@ public:
         return !_in.eof();
     }
 
-private:
-    InputStream (const InputStream&);
-    void operator = (const InputStream&);
+    InputStream (const InputStream&) = delete;
+    void operator = (const InputStream&) = delete;
 
 private:
     std::istream& _in;
@@ -149,9 +147,9 @@ protected:
         std::ios_base::openmode which =
             std::ios::in | std::ios::out) override;
 
-private:
-    ByteArrayOStreambuf(const ByteArrayOStreambuf&);
-    ByteArrayOStreambuf& operator=(const ByteArrayOStreambuf&);
+public:
+    ByteArrayOStreambuf(const ByteArrayOStreambuf&) = delete;
+    ByteArrayOStreambuf& operator=(const ByteArrayOStreambuf&) = delete;
 
 private:
     QBuffer* _buffer;
@@ -180,9 +178,9 @@ protected:
     pos_type seekpos(std::streambuf::pos_type pos,
         std::ios_base::openmode which =
             std::ios::in | std::ios::out) override;
-private:
-    ByteArrayIStreambuf(const ByteArrayIStreambuf&);
-    ByteArrayIStreambuf& operator=(const ByteArrayIStreambuf&);
+public:
+    ByteArrayIStreambuf(const ByteArrayIStreambuf&) = delete;
+    ByteArrayIStreambuf& operator=(const ByteArrayIStreambuf&) = delete;
 
 private:
     const QByteArray& _buffer;
@@ -210,9 +208,9 @@ protected:
     pos_type seekpos(std::streambuf::pos_type sp,
         std::ios_base::openmode which =
             std::ios::in | std::ios::out) override;
-private:
-    IODeviceOStreambuf(const IODeviceOStreambuf&);
-    IODeviceOStreambuf& operator=(const IODeviceOStreambuf&);
+public:
+    IODeviceOStreambuf(const IODeviceOStreambuf&) = delete;
+    IODeviceOStreambuf& operator=(const IODeviceOStreambuf&) = delete;
 
 protected:
     QIODevice* device;
@@ -238,9 +236,9 @@ protected:
     pos_type seekpos(std::streambuf::pos_type sp,
         std::ios_base::openmode which =
             std::ios::in | std::ios::out) override;
-private:
-    IODeviceIStreambuf(const IODeviceIStreambuf&);
-    IODeviceIStreambuf& operator=(const IODeviceIStreambuf&);
+public:
+    IODeviceIStreambuf(const IODeviceIStreambuf&) = delete;
+    IODeviceIStreambuf& operator=(const IODeviceIStreambuf&) = delete;
 
 protected:
     QIODevice* device;
@@ -286,9 +284,9 @@ private:
     bool flushBuffer();
     bool writeStr(const char* s, std::streamsize num);
 
-private:
-    PyStreambuf(const PyStreambuf&);
-    PyStreambuf& operator=(const PyStreambuf&);
+public:
+    PyStreambuf(const PyStreambuf&) = delete;
+    PyStreambuf& operator=(const PyStreambuf&) = delete;
 
 private:
     PyObject* inp;
@@ -316,9 +314,9 @@ protected:
         std::ios_base::openmode which =
             std::ios::in | std::ios::out) override;
 
-private:
-    Streambuf(const Streambuf&);
-    Streambuf& operator=(const Streambuf&);
+public:
+    Streambuf(const Streambuf&) = delete;
+    Streambuf& operator=(const Streambuf&) = delete;
 
 private:
     std::string::const_iterator _beg;

src/Base/Writer.h

@@ -156,10 +156,11 @@ protected:
     bool forceXML;
     int fileVersion;
 
-private:
-    Writer(const Writer&);
-    Writer& operator=(const Writer&);
+public:
+    Writer(const Writer&) = delete;
+    Writer& operator=(const Writer&) = delete;
 
+private:
     std::unique_ptr<std::ostream> CharStream;
 };