replace PIConfig::Entry operators to functions

src_main/io_devices/piconfig.h

@@ -263,43 +263,43 @@ public:
 
 
 		//! Convertion to boolean
-		operator bool() {return _value.toBool();}
+		bool toBool() const {return _value.toBool();}
 
 		//! Convertion to char
-		operator char() {return (_value.isEmpty() ? 0 : _value[0].toAscii());}
+		char toChar() const {return (_value.isEmpty() ? 0 : _value[0].toAscii());}
 
 		//! Convertion to short
-		operator short() {return _value.toShort();}
+		short toShort() const {return _value.toShort();}
 
 		//! Convertion to int
-		operator int() {return _value.toInt();}
+		int toInt() const {return _value.toInt();}
 
 		//! Convertion to long
-		operator long() {return _value.toLong();}
+		long toLong() const {return _value.toLong();}
 
 		//! Convertion to uchar
-		operator uchar() {return _value.toInt();}
+		uchar toUChar() const {return _value.toInt();}
 
 		//! Convertion to ushort
-		operator ushort() {return _value.toShort();}
+		ushort toUShort() const {return _value.toShort();}
 
 		//! Convertion to uint
-		operator uint() {return _value.toInt();}
+		uint toUInt() const {return _value.toInt();}
 
 		//! Convertion to ulong
-		operator ulong() {return _value.toLong();}
+		ulong toULong() const {return _value.toLong();}
 
 		//! Convertion to float
-		operator float() {return _value.toFloat();}
+		float toFloat() const {return _value.toFloat();}
 
 		//! Convertion to double
-		operator double() {return _value.toDouble();}
+		double toDouble() const {return _value.toDouble();}
 
 		//! Convertion to PIString
-		operator PIString() {return _value;}
+		PIString toString() const {return _value;}
 
 		//! Convertion to PIStringList
-		operator PIStringList() {return _value.split("%|%");}
+		PIStringList toStringList() const {return _value.split("%|%");}
 
 	private:
 		typedef PIConfig::Entry * EntryPtr;
@@ -443,7 +443,7 @@ public:
 	int entryIndex(const PIString & name);
 
 	PIString getName(uint number) {return entryByIndex(number)._name;}
-	PIString getValue(uint number) {return entryByIndex(number)._value;}
+	PIString getValueByIndex(uint number) {return entryByIndex(number)._value;}
 	PIChar getType(uint number) {return entryByIndex(number)._type[0];}
 	PIString getComment(uint number) {return entryByIndex(number)._comment;}
 
@@ -525,15 +525,15 @@ inline PICout operator <<(PICout s, const PIConfig::Entry & v) {s << v.value();
  * from configuration file in implementation \a PIIODevice::configureDevice() function */
 template<typename T>
 T readDeviceSetting(const PIString & name, const T & def, const PIConfig::Entry * em, const PIConfig::Entry * ep) {
+	PIVariant v = PIVariant::fromValue<T>(T());
 	if (ep != 0) {
-		T ret;
 		bool ex;
-		ret = ep->getValue(name, def, &ex);
-		if (!ex) ret = em->getValue(name, def);
-		return ret;
+		v.setValueFromString(ep->getValue(name, def, &ex).toString());
+		if (!ex) v.setValueFromString(em->getValue(name, def).toString());
+		return v.value<T>();
 	}
-	return em->getValue(name, def);
-
+	v.setValueFromString(em->getValue(name, def).toString());
+	return v.value<T>();
 }
 
 #endif // PICONFIG_H