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, 34 insertions, 34 deletions

diff --git a/src/notecontent.cpp b/src/notecontent.cpp
index d83b1bc..2e07a15 100644
--- a/src/notecontent.cpp
+++ b/src/notecontent.cpp
@@ -80,10 +80,10 @@
 
 const int NoteContent::FEEDBACK_DARKING = 105;
 
-NoteContent::NoteContent(Note *tqparent, const TQString &fileName)
- : m_note(tqparent)
+NoteContent::NoteContent(Note *parent, const TQString &fileName)
+ : m_note(parent)
 {
-	tqparent->setContent(this);
+	parent->setContent(this);
 	setFileName(fileName);
 }
 
@@ -498,8 +498,8 @@ TQPixmap UnknownContent::feedbackPixmap(int width, int height)
 /** class TextContent:
  */
 
-TextContent::TextContent(Note *tqparent, const TQString &fileName, bool lazyLoad)
- : NoteContent(tqparent, fileName), m_simpleRichText(0)
+TextContent::TextContent(Note *parent, const TQString &fileName, bool lazyLoad)
+ : NoteContent(parent, fileName), m_simpleRichText(0)
 {
 	basket()->addWatchedFile(fullPath());
 	loadFromFile(lazyLoad);
@@ -607,8 +607,8 @@ void TextContent::exportToHTML(HTMLExporter *exporter, int indent)
 /** class HtmlContent:
  */
 
-HtmlContent::HtmlContent(Note *tqparent, const TQString &fileName, bool lazyLoad)
- : NoteContent(tqparent, fileName), m_simpleRichText(0)
+HtmlContent::HtmlContent(Note *parent, const TQString &fileName, bool lazyLoad)
+ : NoteContent(parent, fileName), m_simpleRichText(0)
 {
 	basket()->addWatchedFile(fullPath());
 	loadFromFile(lazyLoad);
@@ -716,8 +716,8 @@ void HtmlContent::exportToHTML(HTMLExporter *exporter, int indent)
 /** class ImageContent:
  */
 
-ImageContent::ImageContent(Note *tqparent, const TQString &fileName, bool lazyLoad)
- : NoteContent(tqparent, fileName), m_format(0)
+ImageContent::ImageContent(Note *parent, const TQString &fileName, bool lazyLoad)
+ : NoteContent(parent, fileName), m_format(0)
 {
 	basket()->addWatchedFile(fullPath());
 	loadFromFile(lazyLoad);
@@ -854,8 +854,8 @@ void ImageContent::exportToHTML(HTMLExporter *exporter, int /*indent*/)
 
 int AnimationContent::INVALID_STATUS = -100;
 
-AnimationContent::AnimationContent(Note *tqparent, const TQString &fileName, bool lazyLoad)
- : NoteContent(tqparent, fileName), m_oldtqStatus(INVALID_STATUS)
+AnimationContent::AnimationContent(Note *parent, const TQString &fileName, bool lazyLoad)
+ : NoteContent(parent, fileName), m_oldtqStatus(INVALID_STATUS)
 {
 	basket()->addWatchedFile(fullPath());
 	loadFromFile(lazyLoad);
@@ -991,8 +991,8 @@ void AnimationContent::exportToHTML(HTMLExporter *exporter, int /*indent*/)
 /** class FileContent:
  */
 
-FileContent::FileContent(Note *tqparent, const TQString &fileName)
- : NoteContent(tqparent, fileName), m_previewJob(0)
+FileContent::FileContent(Note *parent, const TQString &fileName)
+ : NoteContent(parent, fileName), m_previewJob(0)
 {
 	basket()->addWatchedFile(fullPath());
 	setFileName(fileName); // FIXME: TO THAT HERE BECAUSE NoteContent() constructor seems to don't be able to call virtual methods???
@@ -1150,8 +1150,8 @@ void FileContent::exportToHTML(HTMLExporter *exporter, int indent)
 /** class SoundContent:
  */
 
-SoundContent::SoundContent(Note *tqparent, const TQString &fileName)
- : FileContent(tqparent, fileName)
+SoundContent::SoundContent(Note *parent, const TQString &fileName)
+ : FileContent(parent, fileName)
 {
 	setFileName(fileName); // FIXME: TO THAT HERE BECAUSE NoteContent() constructor seems to don't be able to call virtual methods???
 }
@@ -1209,8 +1209,8 @@ TQString SoundContent::messageWhenOpenning(OpenMessage where)
 /** class LinkContent:
  */
 
-LinkContent::LinkContent(Note *tqparent, const KURL &url, const TQString &title, const TQString &icon, bool autoTitle, bool autoIcon)
- : NoteContent(tqparent), m_previewJob(0)
+LinkContent::LinkContent(Note *parent, const KURL &url, const TQString &title, const TQString &icon, bool autoTitle, bool autoIcon)
+ : NoteContent(parent), m_previewJob(0)
 {
 	setLink(url, title, icon, autoTitle, autoIcon);
 }
@@ -1394,8 +1394,8 @@ void LinkContent::exportToHTML(HTMLExporter *exporter, int indent)
 /** class LauncherContent:
  */
 
-LauncherContent::LauncherContent(Note *tqparent, const TQString &fileName)
- : NoteContent(tqparent, fileName)
+LauncherContent::LauncherContent(Note *parent, const TQString &fileName)
+ : NoteContent(parent, fileName)
 {
 	basket()->addWatchedFile(fullPath());
 	loadFromFile(/*lazyLoad=*/false);
@@ -1513,8 +1513,8 @@ void LauncherContent::exportToHTML(HTMLExporter *exporter, int indent)
 
 const int ColorContent::RECT_MARGIN = 2;
 
-ColorContent::ColorContent(Note *tqparent, const TQColor &color)
- : NoteContent(tqparent)
+ColorContent::ColorContent(Note *parent, const TQColor &color)
+ : NoteContent(parent)
 {
 	setColor(color);
 }
@@ -1795,8 +1795,8 @@ void ColorContent::exportToHTML(HTMLExporter *exporter, int /*indent*/)
 
 const int UnknownContent::DECORATION_MARGIN = 2;
 
-UnknownContent::UnknownContent(Note *tqparent, const TQString &fileName)
- : NoteContent(tqparent, fileName)
+UnknownContent::UnknownContent(Note *parent, const TQString &fileName)
+ : NoteContent(parent, fileName)
 {
 	basket()->addWatchedFile(fullPath());
 	loadFromFile(/*lazyLoad=*/false);
@@ -1913,23 +1913,23 @@ void UnknownContent::exportToHTML(HTMLExporter *exporter, int indent)
 
 
 
-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)
 {
-	if        (lowerTypeName == "text")      new TextContent(      tqparent, content.text(), lazyLoad );
-	else if   (lowerTypeName == "html")      new HtmlContent(      tqparent, content.text(), lazyLoad );
-	else if   (lowerTypeName == "image")     new ImageContent(     tqparent, content.text(), lazyLoad );
-	else if   (lowerTypeName == "animation") new AnimationContent( tqparent, content.text(), lazyLoad );
-	else if   (lowerTypeName == "sound")     new SoundContent(     tqparent, content.text()           );
-	else if   (lowerTypeName == "file")      new FileContent(      tqparent, content.text()           );
+	if        (lowerTypeName == "text")      new TextContent(      parent, content.text(), lazyLoad );
+	else if   (lowerTypeName == "html")      new HtmlContent(      parent, content.text(), lazyLoad );
+	else if   (lowerTypeName == "image")     new ImageContent(     parent, content.text(), lazyLoad );
+	else if   (lowerTypeName == "animation") new AnimationContent( parent, content.text(), lazyLoad );
+	else if   (lowerTypeName == "sound")     new SoundContent(     parent, content.text()           );
+	else if   (lowerTypeName == "file")      new FileContent(      parent, content.text()           );
 	else if   (lowerTypeName == "link") {
 		bool autoTitle = content.attribute("title") == content.text();
 		bool autoIcon  = content.attribute("icon")  == NoteFactory::iconForURL(KURL(content.text()));
 		autoTitle = XMLWork::trueOrFalse( content.attribute("autoTitle"), autoTitle);
 		autoIcon  = XMLWork::trueOrFalse( content.attribute("autoIcon"),  autoIcon );
-		new LinkContent( tqparent, KURL(content.text()), content.attribute("title"), content.attribute("icon"), autoTitle, autoIcon );
-	} else if (lowerTypeName == "launcher")  new LauncherContent(  tqparent, content.text()         );
-	else if   (lowerTypeName == "color")     new ColorContent(     tqparent, TQColor(content.text()) );
-	else if   (lowerTypeName == "unknown")   new UnknownContent(   tqparent, content.text()         );
+		new LinkContent( parent, KURL(content.text()), content.attribute("title"), content.attribute("icon"), autoTitle, autoIcon );
+	} else if (lowerTypeName == "launcher")  new LauncherContent(  parent, content.text()         );
+	else if   (lowerTypeName == "color")     new ColorContent(     parent, TQColor(content.text()) );
+	else if   (lowerTypeName == "unknown")   new UnknownContent(   parent, content.text()         );
 }
 
 #include "notecontent.moc"