rename the following methods:

tqparent parent
tqmask mask


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/basket@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 12 insertions, 12 deletions

diff --git a/src/notecontent.h b/src/notecontent.h
index 54eebd5..40bb1d9 100644
--- a/src/notecontent.h
+++ b/src/notecontent.h
@@ -65,7 +65,7 @@ class NoteContent // TODO: Mark some methods as const!             and some (lik
 {
   public:
 	// Constructor and destructor:
-	NoteContent(Note *tqparent, const TQString &fileName = "");              /// << Constructor. Inherited notes should call it to initialize the tqparent note.
+	NoteContent(Note *parent, const TQString &fileName = "");              /// << Constructor. Inherited notes should call it to initialize the parent note.
 	virtual ~NoteContent()                                             {} /// << Virtual destructor. Reimplement it if you should destroy some data your custom types.
 	// Simple Abstract Generic Methods:
 	virtual NoteType::Id type()                                      = 0; /// << @return the internal number that identify that note type.
@@ -147,7 +147,7 @@ class TextContent : public NoteContent
 {
   public:
 	// Constructor and destructor:
-	TextContent(Note *tqparent, const TQString &fileName, bool lazyLoad = false);
+	TextContent(Note *parent, const TQString &fileName, bool lazyLoad = false);
 	~TextContent();
 	// Simple Generic Methods:
 	NoteType::Id type();
@@ -190,7 +190,7 @@ class HtmlContent : public NoteContent
 {
   public:
 	// Constructor and destructor:
-	HtmlContent(Note *tqparent, const TQString &fileName, bool lazyLoad = false);
+	HtmlContent(Note *parent, const TQString &fileName, bool lazyLoad = false);
 	~HtmlContent();
 	// Simple Generic Methods:
 	NoteType::Id type();
@@ -234,7 +234,7 @@ class ImageContent : public NoteContent
 {
   public:
 	// Constructor and destructor:
-	ImageContent(Note *tqparent, const TQString &fileName, bool lazyLoad = false);
+	ImageContent(Note *parent, const TQString &fileName, bool lazyLoad = false);
 	// Simple Generic Methods:
 	NoteType::Id type();
 	TQString typeName();
@@ -279,7 +279,7 @@ class AnimationContent : public TQObject, public NoteContent // TQObject to be a
   TQ_OBJECT
   public:
 	// Constructor and destructor:
-	AnimationContent(Note *tqparent, const TQString &fileName, bool lazyLoad = false);
+	AnimationContent(Note *parent, const TQString &fileName, bool lazyLoad = false);
 	// Simple Generic Methods:
 	NoteType::Id type();
 	TQString typeName();
@@ -328,7 +328,7 @@ class FileContent : public TQObject, public NoteContent
   TQ_OBJECT
   public:
 	// Constructor and destructor:
-	FileContent(Note *tqparent, const TQString &fileName);
+	FileContent(Note *parent, const TQString &fileName);
 	// Simple Generic Methods:
 	NoteType::Id type();
 	TQString typeName();
@@ -382,7 +382,7 @@ class SoundContent : public FileContent // A sound is a file with just a bit dif
   TQ_OBJECT
   public:
 	// Constructor and destructor:
-	SoundContent(Note *tqparent, const TQString &fileName);
+	SoundContent(Note *parent, const TQString &fileName);
 	// Simple Generic Methods:
 	NoteType::Id type();
 	TQString typeName();
@@ -414,7 +414,7 @@ class LinkContent : public TQObject, public NoteContent
   TQ_OBJECT
   public:
 	// Constructor and destructor:
-	LinkContent(Note *tqparent, const KURL &url, const TQString &title, const TQString &icon, bool autoTitle, bool autoIcon);
+	LinkContent(Note *parent, const KURL &url, const TQString &title, const TQString &icon, bool autoTitle, bool autoIcon);
 	// Simple Generic Methods:
 	NoteType::Id type();
 	TQString typeName();
@@ -478,7 +478,7 @@ class LauncherContent : public NoteContent
 {
   public:
 	// Constructor and destructor:
-	LauncherContent(Note *tqparent, const TQString &fileName);
+	LauncherContent(Note *parent, const TQString &fileName);
 	// Simple Generic Methods:
 	NoteType::Id type();
 	TQString typeName();
@@ -528,7 +528,7 @@ class ColorContent : public NoteContent
 {
   public:
 	// Constructor and destructor:
-	ColorContent(Note *tqparent, const TQColor &color);
+	ColorContent(Note *parent, const TQColor &color);
 	// Simple Generic Methods:
 	NoteType::Id type();
 	TQString typeName();
@@ -568,7 +568,7 @@ class UnknownContent : public NoteContent
 {
   public:
 	// Constructor and destructor:
-	UnknownContent(Note *tqparent, const TQString &fileName);
+	UnknownContent(Note *parent, const TQString &fileName);
 	// Simple Generic Methods:
 	NoteType::Id type();
 	TQString typeName();
@@ -602,6 +602,6 @@ class UnknownContent : public NoteContent
 	static const int DECORATION_MARGIN;
 };
 
-void NoteFactory__loadNode(const TQDomElement &content, const TQString &lowerTypeName, Note *tqparent, bool lazyLoad);
+void NoteFactory__loadNode(const TQDomElement &content, const TQString &lowerTypeName, Note *parent, bool lazyLoad);
 
 #endif // NOTECONTENT_H