4 files changed, 17 insertions, 15 deletions
diff --git a/goo/JpegWriter.h b/goo/JpegWriter.h
index b2ce2541..cd0a9fc9 100644
--- a/goo/JpegWriter.h
+++ b/goo/JpegWriter.h
@@ -40,6 +40,9 @@ public:
   JpegWriter(Format format = RGB);
   ~JpegWriter() override;
 
+  JpegWriter(const JpegWriter &other) = delete;
+  JpegWriter& operator=(const JpegWriter &other) = delete;
+
   void setQuality(int quality);
   void setProgressive(bool progressive);
   void setOptimize(bool optimize);
@@ -52,9 +55,6 @@ public:
   bool supportCMYK() override;
 
 private:
-  JpegWriter(const JpegWriter &other);
-  JpegWriter& operator=(const JpegWriter &other);
-
   JpegWriterPrivate *priv;
 };
 
diff --git a/goo/PNGWriter.h b/goo/PNGWriter.h
index 0e0153e3..c9792cac 100644
--- a/goo/PNGWriter.h
+++ b/goo/PNGWriter.h
@@ -39,6 +39,9 @@ public:
   PNGWriter(Format format = RGB);
   ~PNGWriter() override;
 
+  PNGWriter(const PNGWriter &other) = delete;
+  PNGWriter& operator=(const PNGWriter &other) = delete;
+
   void setICCProfile(const char *name, unsigned char *data, int size);
   void setSRGBProfile();
 
@@ -51,9 +54,6 @@ public:
   bool close() override;
 
 private:
-  PNGWriter(const PNGWriter &other);
-  PNGWriter& operator=(const PNGWriter &other);
-
   PNGWriterPrivate *priv;
 };
 
diff --git a/goo/TiffWriter.h b/goo/TiffWriter.h
index b0f5ae5b..743f7cee 100644
--- a/goo/TiffWriter.h
+++ b/goo/TiffWriter.h
@@ -38,6 +38,9 @@ public:
   TiffWriter(Format format = RGB);
   ~TiffWriter() override;
 
+  TiffWriter(const TiffWriter &other) = delete;
+  TiffWriter& operator=(const TiffWriter &other) = delete;
+
   void setCompressionString(const char *compressionStringArg);
 
   bool init(FILE *openedFile, int width, int height, int hDPI, int vDPI) override;
@@ -50,9 +53,6 @@ public:
   bool close() override;
 
 private:
-  TiffWriter(const TiffWriter &other);
-  TiffWriter& operator=(const TiffWriter &other);
-
   TiffWriterPrivate *priv;
 };
 
diff --git a/goo/gdir.h b/goo/gdir.h
index dd766def..dfd5ebca 100644
--- a/goo/gdir.h
+++ b/goo/gdir.h
@@ -48,14 +48,15 @@ public:
 
   GDirEntry(const char *dirPath, const char *nameA, bool doStat);
   ~GDirEntry();
+
+  GDirEntry(const GDirEntry &other) = delete;
+  GDirEntry& operator=(const GDirEntry &other) = delete;
+
   const GooString *getName() const { return name; }
   const GooString *getFullPath() const { return fullPath; }
   bool isDir() const { return dir; }
 
 private:
-  GDirEntry(const GDirEntry &other);
-  GDirEntry& operator=(const GDirEntry &other);
-
   GooString *name;		// dir/file name
   GooString *fullPath;
   bool dir;			// is it a directory?
@@ -66,13 +67,14 @@ public:
 
   GDir(const char *name, bool doStatA = true);
   ~GDir();
+
+  GDir(const GDir &other) = delete;
+  GDir& operator=(const GDir &other) = delete;
+
   GDirEntry *getNextEntry();
   void rewind();
 
 private:
-  GDir(const GDir &other);
-  GDir& operator=(const GDir &other);
-
   GooString *path;		// directory path
   bool doStat;			// call stat() for each entry?
 #if defined(_WIN32)