(UniXML): небольшие исправления

configure.ac

@@ -274,9 +274,12 @@ AC_SUBST(COV_CFLAGS)
 AM_CONDITIONAL(HAVE_COVERAGE, test ${buildgcov} = true)
 AM_CONDITIONAL(HAVE_TESTS, test ${buildtests} = true)
 
+# -Weffc++
+CXX_EXTRA_FLAGS="-Wnon-virtual-dtor -Wctor-dtor-privacy -Woverloaded-virtual"
+
 # export
 LDFLAGS="${OMNI_LIBS} ${XML_LIBS} ${SIGC_LIBS} ${COV_LIBS}"
-CXXFLAGS="-pedantic -Wall -funsigned-char -std=c++11 -g -D_GNU_SOURCE ${OMNI_CFLAGS} ${XML_CFLAGS} ${SIGC_CFLAGS} ${COV_CFLAGS} -I\$(top_builddir)/include -Wnon-virtual-dtor -Wctor-dtor-privacy -Woverloaded-virtual "
+CXXFLAGS="-pedantic -Wall -funsigned-char -std=c++11 -g -D_GNU_SOURCE ${OMNI_CFLAGS} ${XML_CFLAGS} ${SIGC_CFLAGS} ${COV_CFLAGS} -I\$(top_builddir)/include $CXX_EXTRA_FLAGS"
 
 AC_SUBST(LDFLAGS)
 AC_SUBST(CXXFLAGS)

include/ObjectIndex.h

@@ -66,7 +66,7 @@ namespace UniSetTypes
 			void initLocalNode( const UniSetTypes::ObjectId nodeid );
 
 		protected:
-			std::string nmLocalNode;    // для оптимизации
+			std::string nmLocalNode={""};    // поле для оптимизации получения LocalNode
 
 		private:
 

include/UniXML.h

@@ -44,7 +44,7 @@ class UniXML_iterator:
 		UniXML_iterator(xmlNode* node) :
 			curNode(node)
 		{}
-		UniXML_iterator() {}
+		UniXML_iterator():curNode(0) {}
 
 		std::string getProp2( const std::string& name, const std::string& defval = "" );
 		std::string getProp( const std::string& name );
@@ -89,16 +89,16 @@ class UniXML_iterator:
 		}
 #endif
 		// Перейти к следующему узлу
-		UniXML_iterator operator+(int);
-		UniXML_iterator operator++(int);
-		UniXML_iterator operator+=(int);
-		UniXML_iterator operator++();
+		UniXML_iterator& operator+(int);
+		UniXML_iterator& operator++(int);
+		UniXML_iterator& operator+=(int);
+		UniXML_iterator& operator++();
 
 		// Перейти к предыдущему узлу
-		UniXML_iterator operator-(int);
-		UniXML_iterator operator--(int);
-		UniXML_iterator operator--();
-		UniXML_iterator operator-=(int);
+		UniXML_iterator& operator-(int);
+		UniXML_iterator& operator--(int);
+		UniXML_iterator& operator--();
+		UniXML_iterator& operator-=(int);
 
 		/*! Перейти на один уровень выше
 		    \note Если перейти не удалось, итератор остаётся указывать на прежний узел

src/Various/UniXML.cc

@@ -552,22 +552,22 @@ xmlNode* UniXML_iterator::findX( xmlNode* root, const std::string& searchnode, b
 	return NULL;
 }
 // -------------------------------------------------------------------------
-UniXML_iterator UniXML_iterator::operator++()
+UniXML_iterator& UniXML_iterator::operator++()
 {
 	return (*this) + 1;
 }
 // -------------------------------------------------------------------------
-UniXML_iterator UniXML_iterator::operator++(int)
+UniXML_iterator& UniXML_iterator::operator++(int)
 {
 	return (*this) + 1;
 }
 // -------------------------------------------------------------------------
-UniXML_iterator UniXML_iterator::operator+=(int s)
+UniXML_iterator& UniXML_iterator::operator+=(int s)
 {
 	return (*this) + s;
 }
 // -------------------------------------------------------------------------
-UniXML_iterator UniXML_iterator::operator+(int step)
+UniXML_iterator& UniXML_iterator::operator+(int step)
 {
 	int i = 0;
 
@@ -587,23 +587,23 @@ UniXML_iterator UniXML_iterator::operator+(int step)
 	return *this;
 }
 // -------------------------------------------------------------------------
-UniXML_iterator UniXML_iterator::operator--(int)
+UniXML_iterator& UniXML_iterator::operator--(int)
 {
 	return (*this) - 1;
 }
 
-UniXML_iterator UniXML_iterator::operator--()
+UniXML_iterator& UniXML_iterator::operator--()
 {
 	return (*this) - 1;
 }
 
-UniXML_iterator UniXML_iterator::operator-=(int s)
+UniXML_iterator& UniXML_iterator::operator-=(int s)
 {
 	return (*this) - s;
 }
 // -------------------------------------------------------------------------
 
-UniXML_iterator UniXML_iterator::operator-(int step)
+UniXML_iterator& UniXML_iterator::operator-(int step)
 {
 	int i = 0;