tdeabc/vcard: integrated "generated" partial header files into the place where they

are actually used.

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

1 files changed, 46 insertions, 29 deletions

diff --git a/tdeabc/vcard/include/VCardAdrValue.h b/tdeabc/vcard/include/VCardAdrValue.h
index 94ed93aee..7325c10c5 100644
--- a/tdeabc/vcard/include/VCardAdrValue.h
+++ b/tdeabc/vcard/include/VCardAdrValue.h
@@ -32,39 +32,56 @@ namespace VCARD
 
 class KVCARD_EXPORT AdrValue : public Value
 {
-	
-#include "AdrValue-generated.h"
-	
-	AdrValue *clone();
-	
-	void setPOBox(const TQCString & s)
-	{ poBox_ = s; assembled_ = false; }
-	
-	void setExtAddress(const TQCString & s)
-	{ extAddress_ = s; assembled_ = false; }
+	public:
+		AdrValue();
+		AdrValue(const AdrValue&);
+		AdrValue(const TQCString&);
+		AdrValue & operator = (AdrValue&);
+		AdrValue & operator = (const TQCString&);
+		bool operator ==(AdrValue&);
+		bool operator !=(AdrValue& x) {return !(*this==x);}
+		bool operator ==(const TQCString& s) {AdrValue a(s);return(*this==a);} 
+		bool operator != (const TQCString& s) {return !(*this == s);}
 
-	void setStreet(const TQCString & s)
-	{ street_ = s; assembled_ = false; }
+		virtual ~AdrValue();
+		void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
 
-	void setLocality(const TQCString & s)
-	{ locality_ = s; assembled_ = false; }
+		void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
 
-	void setRegion(const TQCString & s)
-	{ region_ = s; assembled_ = false; }
+		void _parse();
+		void _assemble();
+		const char * className() const { return "AdrValue"; }
 
-	void setPostCode(const TQCString & s)
-	{ postCode_ = s; assembled_ = false; }
-	
-	void setCountryName(const TQCString & s)
-	{ countryName_ = s; assembled_ = false; }
-	
-	TQCString poBox()	{ parse(); return poBox_;	}
-	TQCString extAddress()	{ parse(); return extAddress_;	}
-	TQCString street()	{ parse(); return street_;	}
-	TQCString locality()	{ parse(); return locality_;	}
-	TQCString region()	{ parse(); return region_;	}
-	TQCString postCode()	{ parse(); return postCode_;	}
-	TQCString countryName()	{ parse(); return countryName_;	}
+		AdrValue *clone();
+
+		void setPOBox(const TQCString & s)
+		{ poBox_ = s; assembled_ = false; }
+
+		void setExtAddress(const TQCString & s)
+		{ extAddress_ = s; assembled_ = false; }
+
+		void setStreet(const TQCString & s)
+		{ street_ = s; assembled_ = false; }
+
+		void setLocality(const TQCString & s)
+		{ locality_ = s; assembled_ = false; }
+
+		void setRegion(const TQCString & s)
+		{ region_ = s; assembled_ = false; }
+
+		void setPostCode(const TQCString & s)
+		{ postCode_ = s; assembled_ = false; }
+
+		void setCountryName(const TQCString & s)
+		{ countryName_ = s; assembled_ = false; }
+
+		TQCString poBox()	{ parse(); return poBox_;	}
+		TQCString extAddress()	{ parse(); return extAddress_;	}
+		TQCString street()	{ parse(); return street_;	}
+		TQCString locality()	{ parse(); return locality_;	}
+		TQCString region()	{ parse(); return region_;	}
+		TQCString postCode()	{ parse(); return postCode_;	}
+		TQCString countryName()	{ parse(); return countryName_;	}
 	
 	private: