MNonCopyable - the common class to avoid declaring fake private constructors

6 files changed, 11 insertions, 11 deletions

diff --git a/libs/libjson/src/JSONChildren.h b/libs/libjson/src/JSONChildren.h
index ce697ffd77..04922d9a1b 100644
--- a/libs/libjson/src/JSONChildren.h
+++ b/libs/libjson/src/JSONChildren.h
@@ -120,7 +120,7 @@ public:
 		}

 	private:

 		iteratorKeeper(const iteratorKeeper &);

-		iteratorKeeper & operator = (const iteratorKeeper &);

+		iteratorKeeper & operator=(const iteratorKeeper &);

 

 		jsonChildren * myChildren;

 		JSONNode ** & myPos;

@@ -218,7 +218,7 @@ public:
 JSON_PRIVATE

 	//to make sure it's not copyable

 	jsonChildren(const jsonChildren &);

-	jsonChildren & operator = (const jsonChildren &);

+	jsonChildren & operator=(const jsonChildren &);

 

 	void deleteAll(void);  //implemented in JSONNode.cpp

 	void doerase(JSONNode ** position, json_index_t number);

diff --git a/libs/libjson/src/JSONMemory.h b/libs/libjson/src/JSONMemory.h
index 32e8c3f4ef..28ae563f9f 100644
--- a/libs/libjson/src/JSONMemory.h
+++ b/libs/libjson/src/JSONMemory.h
@@ -119,7 +119,7 @@ class json_auto {
 		T * ptr;

 	private:

 		json_auto(const json_auto &);

-		json_auto & operator = (const json_auto &);

+		json_auto & operator=(const json_auto &);

 };

 

 //Clears a string, if required, frees the memory

diff --git a/libs/libjson/src/JSONNode.h b/libs/libjson/src/JSONNode.h
index 8c48d24dbe..21889ca903 100644
--- a/libs/libjson/src/JSONNode.h
+++ b/libs/libjson/src/JSONNode.h
@@ -158,8 +158,8 @@ public:
 		JSONNode JSON_PTR_LIB pop_back_nocase(const json_string & name_t);

 	#endif

 

-	DECLARE_FOR_ALL_TYPES(JSONNode & operator = )

-	JSONNode & operator = (const JSONNode &);

+	DECLARE_FOR_ALL_TYPES(JSONNode & operator=)

+	JSONNode & operator=(const JSONNode &);

 	DECLARE_FOR_ALL_TYPES_CONST(bool operator ==)

 	DECLARE_FOR_ALL_TYPES_CONST(bool operator !=)

 

@@ -208,7 +208,7 @@ public:
 				inline bool operator >= (const iterator & other) const { return it >= other.it; }

 				inline bool operator < (const iterator & other) const { return it < other.it; }

 				inline bool operator <= (const iterator & other) const { return it <= other.it; }

-				inline iterator & operator = (const iterator & orig){ it = orig.it; return *this; }

+				inline iterator & operator=(const iterator & orig){ it = orig.it; return *this; }

 				iterator (const iterator & orig) : it(orig.it) {}

 			private:

 				JSONNode ** it;

@@ -250,7 +250,7 @@ public:
 				inline bool operator >= (const const_iterator & other) const { return it >= other.it; }

 				inline bool operator < (const const_iterator & other) const { return it < other.it; }

 				inline bool operator <= (const const_iterator & other) const { return it <= other.it; }

-				inline const_iterator & operator = (const const_iterator & orig){ it = orig.it; return *this; }

+				inline const_iterator & operator=(const const_iterator & orig){ it = orig.it; return *this; }

 				const_iterator (const const_iterator & orig) : it(orig.it) {}

 			private:

 				JSONNode ** it;

@@ -293,7 +293,7 @@ public:
 				inline bool operator <= (const reverse_iterator & other) const { return it >= other.it; }

 				inline bool operator > (const reverse_iterator & other) const { return it < other.it; }

 				inline bool operator >= (const reverse_iterator & other) const { return it <= other.it; }

-				inline reverse_iterator & operator = (const reverse_iterator & orig){ it = orig.it; return *this; }

+				inline reverse_iterator & operator=(const reverse_iterator & orig){ it = orig.it; return *this; }

 				reverse_iterator (const reverse_iterator & orig) : it(orig.it) {}

 			private:

 				JSONNode ** it;

@@ -336,7 +336,7 @@ public:
 				inline bool operator <= (const reverse_const_iterator & other) const { return it >= other.it; }

 				inline bool operator > (const reverse_const_iterator & other) const { return it < other.it; }

 				inline bool operator >= (const reverse_const_iterator & other) const { return it <= other.it; }

-				inline reverse_const_iterator & operator = (const reverse_const_iterator & orig){ it = orig.it; return *this; }

+				inline reverse_const_iterator & operator=(const reverse_const_iterator & orig){ it = orig.it; return *this; }

 				reverse_const_iterator (const reverse_const_iterator & orig) : it(orig.it) {}

 			private:

 				JSONNode ** it;

@@ -404,7 +404,7 @@ public:
 					mynode -> unlock(mythread);

 				}

 			private:

-				auto_lock & operator = (const auto_lock &);

+				auto_lock & operator=(const auto_lock &);

 				auto_lock(const auto_lock &);

 				JSONNode * mynode;

 				int mythread;

diff --git a/libs/libjson/src/internalJSONNode.h b/libs/libjson/src/internalJSONNode.h
index 26e279764e..2ad616fbcd 100644
--- a/libs/libjson/src/internalJSONNode.h
+++ b/libs/libjson/src/internalJSONNode.h
@@ -67,7 +67,7 @@ public:
 	internalJSONNode(const json_string & unparsed);

 	internalJSONNode(const json_string & name_t, const json_string & value_t);

 	internalJSONNode(const internalJSONNode & orig);  

-	internalJSONNode & operator = (const internalJSONNode &);

+	internalJSONNode & operator=(const internalJSONNode &);

 	~internalJSONNode(void);

 

 	static internalJSONNode * newInternal(char mytype = JSON_NULL);

diff --git a/libs/win32/mir_app.lib b/libs/win32/mir_app.lib
index 2e610be4ea..774a9af7ca 100644
--- a/libs/win32/mir_app.lib
+++ b/libs/win32/mir_app.lib
diff --git a/libs/win64/mir_app.lib b/libs/win64/mir_app.lib
index 1c82dde576..4f3519a10d 100644
--- a/libs/win64/mir_app.lib
+++ b/libs/win64/mir_app.lib