- naming conflict;

- 64-bit issues;
- warning fixes;
- code cleaning

git-svn-id: http://svn.miranda-ng.org/main/trunk@14987 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

1 files changed, 13 insertions, 12 deletions

diff --git a/protocols/Xfire/src/variablevalue.h b/protocols/Xfire/src/variablevalue.h
index 29e12743cb..190c044667 100644
--- a/protocols/Xfire/src/variablevalue.h
+++ b/protocols/Xfire/src/variablevalue.h
@@ -25,20 +25,22 @@
 
 namespace xfirelib {
 
-	class VariableValue {
+	class VariableValue
+	{
 	public:
 		VariableValue();
 		~VariableValue();
 
 		void setName(std::string name);
 		void setValueLength(int valueLength);
-		void setValue( char * value );
-		void setValue( std::string value );
-		void setValue( const char *value, int valueLength );
-		void setValueFromLong( long value, int bytes );
-		std::string getName();
-		int getValueLength();
-		char* getValue();
+		void setValue(char * value);
+		void setValue(std::string value);
+		void setValue(const char *value, int valueLength);
+		void setValueFromLong(long value, int bytes);
+		
+		__forceinline std::string getName() { return m_name; }
+		__forceinline int getValueLength() { return m_valueLength; }
+		__forceinline char* getValue() { return m_value; }
 
 		int readName(char *packet, int index);
 		int readValue(char *packet, int index, int length = -1, int ignoreZeroAfterLength = 0);
@@ -53,11 +55,10 @@ namespace xfirelib {
 	private:
 		long myPow(int x, int y);
 
-		std::string name;
-		char *value;
-		int valueLength;
+		std::string m_name;
+		char* m_value;
+		int m_valueLength;
 	};
-
 };
 
 #endif