X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fbase%2Fvariable.h;fp=src%2Fbase%2Fvariable.h;h=b0c45950ba4c5d7b541528869d36667c708b3082;hb=16354e0421b316a62c6b9f7b0b4f3b8cf6f06284;hp=68319dd282bbb2d8575359e40ebbbebd4dafadef;hpb=3239ef39dcee08fa6e8cd68cdf2727fc68cc7a8c;p=architektonas

diff --git a/src/base/variable.h b/src/base/variable.h
index 68319dd..b0c4595 100644
--- a/src/base/variable.h
+++ b/src/base/variable.h
@@ -2,7 +2,7 @@
 #define __VARIABLE_H__
 
 #include <QtCore>
-#include "rs.h"
+#include "enums.h"
 #include "vector.h"
 #include "debug.h"
 
@@ -13,7 +13,7 @@
  *
  * @author Andrew Mustun
  */
-class RS_Variable
+class Variable
 {
 	public:
 		typedef struct {
@@ -21,14 +21,14 @@ class RS_Variable
 			int i;
 			double d;
 			Vector v;
-		} RS_VariableContents;
+		} VariableContents;
 
-		RS_Variable();
-		RS_Variable(const Vector & v, int c);
-		RS_Variable(const QString & v, int c);
-		RS_Variable(int v, int c);
-		RS_Variable(double v, int c);
-		virtual ~RS_Variable();
+		Variable();
+		Variable(const Vector & v, int c);
+		Variable(const QString & v, int c);
+		Variable(int v, int c);
+		Variable(double v, int c);
+		virtual ~Variable();
 
 		void setString(const QString & str);
 		void setInt(int i);
@@ -41,10 +41,10 @@ class RS_Variable
 		RS2::VariableType getType();
 		int getCode();
 
-		//friend std::ostream& operator << (std::ostream& os, RS_Variable& v);
+		//friend std::ostream& operator << (std::ostream& os, Variable& v);
 
 	private:
-		RS_VariableContents contents;
+		VariableContents contents;
 		RS2::VariableType type;
 		int code;
 };