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

diff --git a/src/notedrag.cpp b/src/notedrag.cpp
index b177e68..87d0a07 100644
--- a/src/notedrag.cpp
+++ b/src/notedrag.cpp
@@ -65,7 +65,7 @@ TQDragObject* NoteDrag::dragObject(NoteSelection *noteList, bool cutting, TQWidg
 		TQDataStream stream(&buffer);
 		// First append a pointer to the basket:
 		stream << (TQ_UINT64)(noteList->firstStacked()->note->basket());
-		// Then a list of pointers to all notes, and tqparent groups:
+		// Then a list of pointers to all notes, and parent groups:
 		for (NoteSelection *node = noteList->firstStacked(); node; node = node->nextStacked())
 			stream << (TQ_UINT64)(node->note);
 		TQValueList<Note*> groups = noteList->parentGroups();
@@ -378,7 +378,7 @@ Basket* NoteDrag::basketOf(TQMimeSource *source)
 	TQBuffer buffer(source->tqencodedData(NOTE_MIME_STRING));
 	if (buffer.open(IO_ReadOnly)) {
 		TQDataStream stream(&buffer);
-		// Get the tqparent basket:
+		// Get the parent basket:
 		TQ_UINT64 basketPointer;
 		stream >> (TQ_UINT64&)basketPointer;
 		return (Basket*)basketPointer;
@@ -391,7 +391,7 @@ TQValueList<Note*> NoteDrag::notesOf(TQMimeSource *source)
 	TQBuffer buffer(source->tqencodedData(NOTE_MIME_STRING));
 	if (buffer.open(IO_ReadOnly)) {
 		TQDataStream stream(&buffer);
-		// Get the tqparent basket:
+		// Get the parent basket:
 		TQ_UINT64 basketPointer;
 		stream >> (TQ_UINT64&)basketPointer;
 		// Get the note list:
@@ -408,12 +408,12 @@ TQValueList<Note*> NoteDrag::notesOf(TQMimeSource *source)
 		return TQValueList<Note*>();
 }
 
-Note* NoteDrag::decode(TQMimeSource *source, Basket *tqparent, bool moveFiles, bool moveNotes)
+Note* NoteDrag::decode(TQMimeSource *source, Basket *parent, bool moveFiles, bool moveNotes)
 {
 	TQBuffer buffer(source->tqencodedData(NOTE_MIME_STRING));
 	if (buffer.open(IO_ReadOnly)) {
 		TQDataStream stream(&buffer);
-		// Get the tqparent basket:
+		// Get the parent basket:
 		TQ_UINT64 basketPointer;
 		stream >> (TQ_UINT64&)basketPointer;
 		Basket *basket = (Basket*)basketPointer;
@@ -426,7 +426,7 @@ Note* NoteDrag::decode(TQMimeSource *source, Basket *tqparent, bool moveFiles, b
 				notes.append((Note*)notePointer);
 		} while (notePointer);
 		// Decode the note hierarchy:
-		Note *hierarchy = decodeHierarchy(stream, tqparent, moveFiles, moveNotes, basket);
+		Note *hierarchy = decodeHierarchy(stream, parent, moveFiles, moveNotes, basket);
 		// In case we moved notes from one basket to another, save the source basket where notes were removed:
 		basket->filterAgainDelayed(); // Delayed, because if a note is moved to the same basket, the note is not at its
 		basket->save();               //  new position yet, and the call to ensureNoteVisible would make the interface flicker!!
@@ -435,7 +435,7 @@ Note* NoteDrag::decode(TQMimeSource *source, Basket *tqparent, bool moveFiles, b
 		return 0;
 }
 
-Note* NoteDrag::decodeHierarchy(TQDataStream &stream, Basket *tqparent, bool moveFiles, bool moveNotes, Basket *originalBasket)
+Note* NoteDrag::decodeHierarchy(TQDataStream &stream, Basket *parent, bool moveFiles, bool moveNotes, Basket *originalBasket)
 {
 	TQ_UINT64  notePointer;
 	TQ_UINT64  type;
@@ -457,7 +457,7 @@ Note* NoteDrag::decodeHierarchy(TQDataStream &stream, Basket *tqparent, bool mov
 		TQ_UINT64 groupWidth;
 		stream >> type >> groupWidth;
 		if (type == NoteType::Group) {
-			note = new Note(tqparent);
+			note = new Note(parent);
 			note->setGroupWidth(groupWidth);
 			TQ_UINT64 isFolded;
 			stream >> isFolded;
@@ -468,7 +468,7 @@ Note* NoteDrag::decodeHierarchy(TQDataStream &stream, Basket *tqparent, bool mov
 				note->setY(oldNote->y()); // We just set the position of the copied group so the animation seems as if the group is the same as (or a copy of) the old.
 				note->setHeight(oldNote->height()); // Idem: the only use of Note::setHeight()
 			}
-			Note* childs = decodeHierarchy(stream, tqparent, moveFiles, moveNotes, originalBasket);
+			Note* childs = decodeHierarchy(stream, parent, moveFiles, moveNotes, originalBasket);
 			if (childs) {
 				for (Note *n = childs; n; n = n->next())
 					n->setParentNote(note);
@@ -479,21 +479,21 @@ Note* NoteDrag::decodeHierarchy(TQDataStream &stream, Basket *tqparent, bool mov
 			if (moveNotes) {
 				originalBasket->unplugNote(oldNote);
 				note = oldNote;
-				if (note->basket() != tqparent) {
-					TQString newFileName = NoteFactory::createFileForNewNote(tqparent, "", fileName);
+				if (note->basket() != parent) {
+					TQString newFileName = NoteFactory::createFileForNewNote(parent, "", fileName);
 					note->content()->setFileName(newFileName);
-					KIO::FileCopyJob *copyJob = KIO::file_move(KURL(fullPath), KURL(tqparent->fullPath() + newFileName),
+					KIO::FileCopyJob *copyJob = KIO::file_move(KURL(fullPath), KURL(parent->fullPath() + newFileName),
 					                                           /*perms=*/-1, /*override=*/true, /*resume=*/false, /*showProgressInfo=*/false);
-					tqparent->connect( copyJob, TQT_SIGNAL(result(KIO::Job *)),
-					                 tqparent,  TQT_SLOT(slotCopyingDone2(KIO::Job *)) );
+					parent->connect( copyJob, TQT_SIGNAL(result(KIO::Job *)),
+					                 parent,  TQT_SLOT(slotCopyingDone2(KIO::Job *)) );
 				}
 				note->setGroupWidth(groupWidth);
 				note->setParentNote(0);
 				note->setPrev(0);
 				note->setNext(0);
-				note->setParentBasket(tqparent);
+				note->setParentBasket(parent);
 				NoteFactory::consumeContent(stream, (NoteType::Id)type);
-			} else if ( (note = NoteFactory::decodeContent(stream, (NoteType::Id)type, tqparent)) ) {
+			} else if ( (note = NoteFactory::decodeContent(stream, (NoteType::Id)type, parent)) ) {
 				note->setGroupWidth(groupWidth);
 				note->setAddedDate(addedDate);
 				note->setLastModificationDate(lastModificationDate);
@@ -501,17 +501,17 @@ Note* NoteDrag::decodeHierarchy(TQDataStream &stream, Basket *tqparent, bool mov
 				// Here we are CREATING a new EMPTY file, so the name is RESERVED
 				// (while dropping several files at once a filename cannot be used by two of them).
 				// Later on, file_copy/file_move will copy/move the file to the new location.
-				TQString newFileName = NoteFactory::createFileForNewNote(tqparent, "", fileName);
-				note = NoteFactory::loadFile(newFileName, (NoteType::Id)type, tqparent);
+				TQString newFileName = NoteFactory::createFileForNewNote(parent, "", fileName);
+				note = NoteFactory::loadFile(newFileName, (NoteType::Id)type, parent);
 				KIO::FileCopyJob *copyJob;
 				if (moveFiles)
-					copyJob = KIO::file_move(KURL(fullPath), KURL(tqparent->fullPath() + newFileName),
+					copyJob = KIO::file_move(KURL(fullPath), KURL(parent->fullPath() + newFileName),
 					                         /*perms=*/-1, /*override=*/true, /*resume=*/false, /*showProgressInfo=*/false);
 				else
-					copyJob = KIO::file_copy(KURL(fullPath), KURL(tqparent->fullPath() + newFileName),
+					copyJob = KIO::file_copy(KURL(fullPath), KURL(parent->fullPath() + newFileName),
 					                         /*perms=*/-1, /*override=*/true, /*resume=*/false, /*showProgressInfo=*/false);
-				tqparent->connect( copyJob, TQT_SIGNAL(result(KIO::Job *)),
-				                 tqparent,  TQT_SLOT(slotCopyingDone2(KIO::Job *)) );
+				parent->connect( copyJob, TQT_SIGNAL(result(KIO::Job *)),
+				                 parent,  TQT_SLOT(slotCopyingDone2(KIO::Job *)) );
 				note->setGroupWidth(groupWidth);
 				note->setAddedDate(addedDate);
 				note->setLastModificationDate(lastModificationDate);