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

diff --git a/src/noteedit.cpp b/src/noteedit.cpp
index 1727164..e47933a 100644
--- a/src/noteedit.cpp
+++ b/src/noteedit.cpp
@@ -67,43 +67,43 @@ Note* NoteEditor::note()
 	return m_noteContent->note();
 }
 
-NoteEditor* NoteEditor::editNoteContent(NoteContent *noteContent, TQWidget *tqparent)
+NoteEditor* NoteEditor::editNoteContent(NoteContent *noteContent, TQWidget *parent)
 {
 	TextContent *textContent = dynamic_cast<TextContent*>(noteContent);
 	if (textContent)
-		return new TextEditor(textContent, tqparent);
+		return new TextEditor(textContent, parent);
 
 	HtmlContent *htmlContent = dynamic_cast<HtmlContent*>(noteContent);
 	if (htmlContent)
-		return new HtmlEditor(htmlContent, tqparent);
+		return new HtmlEditor(htmlContent, parent);
 
 	ImageContent *imageContent = dynamic_cast<ImageContent*>(noteContent);
 	if (imageContent)
-		return new ImageEditor(imageContent, tqparent);
+		return new ImageEditor(imageContent, parent);
 
 	AnimationContent *animationContent = dynamic_cast<AnimationContent*>(noteContent);
 	if (animationContent)
-		return new AnimationEditor(animationContent, tqparent);
+		return new AnimationEditor(animationContent, parent);
 
 	FileContent *fileContent = dynamic_cast<FileContent*>(noteContent); // Same for SoundContent
 	if (fileContent)
-		return new FileEditor(fileContent, tqparent);
+		return new FileEditor(fileContent, parent);
 
 	LinkContent *linkContent = dynamic_cast<LinkContent*>(noteContent);
 	if (linkContent)
-		return new LinkEditor(linkContent, tqparent);
+		return new LinkEditor(linkContent, parent);
 
 	LauncherContent *launcherContent = dynamic_cast<LauncherContent*>(noteContent);
 	if (launcherContent)
-		return new LauncherEditor(launcherContent, tqparent);
+		return new LauncherEditor(launcherContent, parent);
 
 	ColorContent *colorContent = dynamic_cast<ColorContent*>(noteContent);
 	if (colorContent)
-		return new ColorEditor(colorContent, tqparent);
+		return new ColorEditor(colorContent, parent);
 
 	UnknownContent *unknownContent = dynamic_cast<UnknownContent*>(noteContent);
 	if (unknownContent)
-		return new UnknownEditor(unknownContent, tqparent);
+		return new UnknownEditor(unknownContent, parent);
 
 	return 0;
 }
@@ -128,10 +128,10 @@ void NoteEditor::setInlineEditor(TQWidget *inlineEditor)
 
 /** class TextEditor: */
 
-TextEditor::TextEditor(TextContent *textContent, TQWidget *tqparent)
+TextEditor::TextEditor(TextContent *textContent, TQWidget *parent)
  : NoteEditor(textContent), m_textContent(textContent)
 {
-	FocusedTextEdit *textEdit = new FocusedTextEdit(/*disableUpdatesOnKeyPress=*/true, tqparent);
+	FocusedTextEdit *textEdit = new FocusedTextEdit(/*disableUpdatesOnKeyPress=*/true, parent);
 	textEdit->setLineWidth(0);
 	textEdit->setMidLineWidth(0);
 	textEdit->setTextFormat(TQt::PlainText);
@@ -199,10 +199,10 @@ void TextEditor::validate()
 
 /** class HtmlEditor: */
 
-HtmlEditor::HtmlEditor(HtmlContent *htmlContent, TQWidget *tqparent)
+HtmlEditor::HtmlEditor(HtmlContent *htmlContent, TQWidget *parent)
  : NoteEditor(htmlContent), m_htmlContent(htmlContent)
 {
-	FocusedTextEdit *textEdit = new FocusedTextEdit(/*disableUpdatesOnKeyPress=*/true, tqparent);
+	FocusedTextEdit *textEdit = new FocusedTextEdit(/*disableUpdatesOnKeyPress=*/true, parent);
 	textEdit->setLineWidth(0);
 	textEdit->setMidLineWidth(0);
 	textEdit->setTextFormat(TQt::RichText);
@@ -290,7 +290,7 @@ void HtmlEditor::cursorPositionChanged()
 
 void HtmlEditor::textChanged()
 {
-	// The following is a workaround for an aptqparent TQt bug.
+	// The following is a workaround for an apparent TQt bug.
 	// When I start typing in a textEdit, the undo&redo actions are not enabled until I click
 	// or move the cursor - probably, the signal undoAvailable() is not emitted.
 	// So, I had to intervene and do that manually.
@@ -378,10 +378,10 @@ void HtmlEditor::validate()
 
 /** class ImageEditor: */
 
-ImageEditor::ImageEditor(ImageContent *imageContent, TQWidget *tqparent)
+ImageEditor::ImageEditor(ImageContent *imageContent, TQWidget *parent)
  : NoteEditor(imageContent)
 {
-	int choice = KMessageBox::questionYesNo(tqparent, i18n(
+	int choice = KMessageBox::questionYesNo(parent, i18n(
 		"Images can not be edited here at the moment (the next version of BasKet Note Pads will include an image editor).\n"
 		"Do you want to open it with an application that understand it?"),
 		i18n("Edit Image Note"),
@@ -394,10 +394,10 @@ ImageEditor::ImageEditor(ImageContent *imageContent, TQWidget *tqparent)
 
 /** class AnimationEditor: */
 
-AnimationEditor::AnimationEditor(AnimationContent *animationContent, TQWidget *tqparent)
+AnimationEditor::AnimationEditor(AnimationContent *animationContent, TQWidget *parent)
  : NoteEditor(animationContent)
 {
-	int choice = KMessageBox::questionYesNo(tqparent, i18n(
+	int choice = KMessageBox::questionYesNo(parent, i18n(
 		"This animated image can not be edited here.\n"
 		"Do you want to open it with an application that understands it?"),
 		i18n("Edit Animation Note"),
@@ -410,10 +410,10 @@ AnimationEditor::AnimationEditor(AnimationContent *animationContent, TQWidget *t
 
 /** class FileEditor: */
 
-FileEditor::FileEditor(FileContent *fileContent, TQWidget *tqparent)
+FileEditor::FileEditor(FileContent *fileContent, TQWidget *parent)
  : NoteEditor(fileContent), m_fileContent(fileContent)
 {
-	FocusedLineEdit *lineEdit = new FocusedLineEdit(tqparent);
+	FocusedLineEdit *lineEdit = new FocusedLineEdit(parent);
 	lineEdit->setLineWidth(0);
 	lineEdit->setMidLineWidth(0);
 	lineEdit->setPaletteBackgroundColor(note()->backgroundColor());
@@ -448,10 +448,10 @@ void FileEditor::validate()
 
 /** class LinkEditor: */
 
-LinkEditor::LinkEditor(LinkContent *linkContent, TQWidget *tqparent)
+LinkEditor::LinkEditor(LinkContent *linkContent, TQWidget *parent)
  : NoteEditor(linkContent)
 {
-	LinkEditDialog dialog(linkContent, tqparent);
+	LinkEditDialog dialog(linkContent, parent);
 	if (dialog.exec() == TQDialog::Rejected)
 		cancel();
 	if (linkContent->url().isEmpty() && linkContent->title().isEmpty())
@@ -460,10 +460,10 @@ LinkEditor::LinkEditor(LinkContent *linkContent, TQWidget *tqparent)
 
 /** class LauncherEditor: */
 
-LauncherEditor::LauncherEditor(LauncherContent *launcherContent, TQWidget *tqparent)
+LauncherEditor::LauncherEditor(LauncherContent *launcherContent, TQWidget *parent)
  : NoteEditor(launcherContent)
 {
-	LauncherEditDialog dialog(launcherContent, tqparent);
+	LauncherEditDialog dialog(launcherContent, parent);
 	if (dialog.exec() == TQDialog::Rejected)
 		cancel();
 	if (launcherContent->name().isEmpty() && launcherContent->exec().isEmpty())
@@ -472,10 +472,10 @@ LauncherEditor::LauncherEditor(LauncherContent *launcherContent, TQWidget *tqpar
 
 /** class ColorEditor: */
 
-ColorEditor::ColorEditor(ColorContent *colorContent, TQWidget *tqparent)
+ColorEditor::ColorEditor(ColorContent *colorContent, TQWidget *parent)
  : NoteEditor(colorContent)
 {
-	KColorDialog dialog(tqparent, /*name=*/"EditColor", /*modal=*/true);
+	KColorDialog dialog(parent, /*name=*/"EditColor", /*modal=*/true);
 	dialog.setColor(colorContent->color());
 	dialog.setCaption(i18n("Edit Color Note"));
 	if (dialog.exec() == TQDialog::Accepted) {
@@ -488,7 +488,7 @@ ColorEditor::ColorEditor(ColorContent *colorContent, TQWidget *tqparent)
 
 	/* This code don't allow to set a caption to the dialog:
 	TQColor color = colorContent()->color();
-	if (KColorDialog::getColor(color, tqparent) == TQDialog::Accepted && color != m_color) {
+	if (KColorDialog::getColor(color, parent) == TQDialog::Accepted && color != m_color) {
 		colorContent()->setColor(color);
 		setEdited();
 	}*/
@@ -496,10 +496,10 @@ ColorEditor::ColorEditor(ColorContent *colorContent, TQWidget *tqparent)
 
 /** class UnknownEditor: */
 
-UnknownEditor::UnknownEditor(UnknownContent *unknownContent, TQWidget *tqparent)
+UnknownEditor::UnknownEditor(UnknownContent *unknownContent, TQWidget *parent)
  : NoteEditor(unknownContent)
 {
-	KMessageBox::information(tqparent, i18n(
+	KMessageBox::information(parent, i18n(
 		"The type of this note is unknown and can not be edited here.\n"
 		"You however can drag or copy the note into an application that understands it."),
 		i18n("Edit Unknown Note"));
@@ -510,8 +510,8 @@ UnknownEditor::UnknownEditor(UnknownContent *unknownContent, TQWidget *tqparent)
 
 /** class DebuggedLineEdit: */
 
-DebuggedLineEdit::DebuggedLineEdit(const TQString &text, TQWidget *tqparent)
- : TQLineEdit(text, tqparent)
+DebuggedLineEdit::DebuggedLineEdit(const TQString &text, TQWidget *parent)
+ : TQLineEdit(text, parent)
 {
 }
 
@@ -530,9 +530,9 @@ void DebuggedLineEdit::keyPressEvent(TQKeyEvent *event)
 
 /** class LinkEditDialog: */
 
-LinkEditDialog::LinkEditDialog(LinkContent *contentNote, TQWidget *tqparent/*, TQKeyEvent *ke*/)
+LinkEditDialog::LinkEditDialog(LinkContent *contentNote, TQWidget *parent/*, TQKeyEvent *ke*/)
  : KDialogBase(KDialogBase::Plain, i18n("Edit Link Note"), KDialogBase::Ok | KDialogBase::Cancel,
-               KDialogBase::Ok, tqparent, /*name=*/"EditLink", /*modal=*/true, /*separator=*/true),
+               KDialogBase::Ok, parent, /*name=*/"EditLink", /*modal=*/true, /*separator=*/true),
    m_noteContent(contentNote)
 {
 	TQWidget     *page   = plainPage();
@@ -689,9 +689,9 @@ void LinkEditDialog::slotOk()
 
 /** class LauncherEditDialog: */
 
-LauncherEditDialog::LauncherEditDialog(LauncherContent *contentNote, TQWidget *tqparent)
+LauncherEditDialog::LauncherEditDialog(LauncherContent *contentNote, TQWidget *parent)
  : KDialogBase(KDialogBase::Plain, i18n("Edit Launcher Note"), KDialogBase::Ok | KDialogBase::Cancel,
-               KDialogBase::Ok, tqparent, /*name=*/"EditLauncher", /*modal=*/true, /*separator=*/true),
+               KDialogBase::Ok, parent, /*name=*/"EditLauncher", /*modal=*/true, /*separator=*/true),
    m_noteContent(contentNote)
 {
 	TQWidget     *page   = plainPage();