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

are actually used.

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit 5cb3ed2e545a03815cdd04ab8666b605a71c44b4)

1 files changed, 36 insertions, 17 deletions

diff --git a/tdeabc/vcard/include/VCardNValue.h b/tdeabc/vcard/include/VCardNValue.h
index 9db37fbbc..cd15c6b53 100644
--- a/tdeabc/vcard/include/VCardNValue.h
+++ b/tdeabc/vcard/include/VCardNValue.h
@@ -31,24 +31,43 @@ namespace VCARD
 
 class KVCARD_EXPORT NValue : public Value
 {
-#include "NValue-generated.h"
-	NValue *clone();
-
-	TQCString family()	{ parse(); return family_;	}
-	TQCString given()	{ parse(); return given_;	}
-	TQCString middle()	{ parse(); return middle_;	}
-	TQCString prefix()	{ parse(); return prefix_;	}
-	TQCString suffix()	{ parse(); return suffix_;	}
-
-	void setFamily	(const TQCString & s) { family_	= s; assembled_ = false; }
-	void setGiven	(const TQCString & s) { given_	= s; assembled_ = false; }
-	void setMiddle	(const TQCString & s) { middle_	= s; assembled_ = false; }
-	void setPrefix	(const TQCString & s) { prefix_	= s; assembled_ = false; }
-	void setSuffix	(const TQCString & s) { suffix_	= s; assembled_ = false; }
-	
+	public:
+		NValue();
+		NValue(const NValue&);
+		NValue(const TQCString&);
+		NValue & operator = (NValue&);
+		NValue & operator = (const TQCString&);
+		bool operator ==(NValue&);
+		bool operator !=(NValue& x) {return !(*this==x);}
+		bool operator ==(const TQCString& s) {NValue a(s);return(*this==a);} 
+		bool operator != (const TQCString& s) {return !(*this == s);}
+
+		virtual ~NValue();
+		void parse() {if(!parsed_) _parse();parsed_=true;assembled_=false;}
+
+		void assemble() {if(assembled_) return;parse();_assemble();assembled_=true;}
+
+		void _parse();
+		void _assemble();
+		const char * className() const { return "NValue"; }
+
+		NValue *clone();
+
+		TQCString family()	{ parse(); return family_;	}
+		TQCString given()	{ parse(); return given_;	}
+		TQCString middle()	{ parse(); return middle_;	}
+		TQCString prefix()	{ parse(); return prefix_;	}
+		TQCString suffix()	{ parse(); return suffix_;	}
+
+		void setFamily	(const TQCString & s) { family_	= s; assembled_ = false; }
+		void setGiven	(const TQCString & s) { given_	= s; assembled_ = false; }
+		void setMiddle	(const TQCString & s) { middle_	= s; assembled_ = false; }
+		void setPrefix	(const TQCString & s) { prefix_	= s; assembled_ = false; }
+		void setSuffix	(const TQCString & s) { suffix_	= s; assembled_ = false; }
+
 	private:
-	
-	TQCString family_, given_, middle_, prefix_, suffix_;
+
+		TQCString family_, given_, middle_, prefix_, suffix_;
 };
 
 }