diff -r c2a05fa925a1 -r 24bfecc949a0 options.cpp
--- a/options.cpp	Fri Dec 08 20:18:56 2006 +0000
+++ b/options.cpp	Thu Nov 08 15:28:03 2007 +0000
@@ -12,12 +12,12 @@
 	name="";
 	sName="";
 	lName="";
-	type=SwitchOption;
+	type=Switch;
 	sarg="";
 	active=false;
 }
 
-Option::Option (const QString &n, const OptionType &t, const QString &s, const QString &l)
+Option::Option (const QString &n, const Type &t, const QString &s, const QString &l)
 {
 	sName="-"+s;
 	lName="--"+l;
@@ -25,7 +25,7 @@
 	name=n;
 }
 
-void Option::set(const QString &n, const OptionType &t, const QString &s, const QString &l)
+void Option::set(const QString &n, const Type &t, const QString &s, const QString &l)
 {
 	sName="-"+s;
 	lName="--"+l;
@@ -36,7 +36,7 @@
 QString Option::getName () { return name; }
 QString Option::getShort () { return sName; }
 QString Option::getLong() { return lName; }
-OptionType Option::getType() { return type; }
+Option::Type Option::getType() { return type; }
 void Option::setArg(const QString& s) { sarg=s; }
 QString Option::getArg() { return sarg; }	
 void Option::setActive() { active=true; }	
@@ -74,7 +74,7 @@
 				{	
 					optlist[j].setActive();
 					isFile=false;
-					if (optlist[j].getType()==StringOption)
+					if (optlist[j].getType()==Option::String)
 					{
 						i++;
 						if (i==arglist.size())
@@ -104,7 +104,7 @@
 	optlist.append (o);
 }
 
-void Options::add (const QString &n, const OptionType &t=SwitchOption, const QString &s="", const QString &l="")
+void Options::add (const QString &n, const Option::Type &t=Option::Switch, const QString &s="", const QString &l="")
 {
 	Option o;
 	o.set (n,t,s,l);