1 files changed, 8 insertions, 8 deletions

diff --git a/src/basket.cpp b/src/basket.cpp
index 79abb4b..488fd80 100644
--- a/src/basket.cpp
+++ b/src/basket.cpp
@@ -179,7 +179,7 @@ TQValueList<Note*> NoteSelection::parentGroups()
 		// For each tqparent groups of the note:
 		for (Note *note = node->note->parentNote(); note; note = note->parentNote())
 			// Add it (if it was not already in the list):
-			if (!note->isColumn() && !groups.tqcontains(note))
+			if (!note->isColumn() && !groups.contains(note))
 				groups.append(note);
 
 	return groups;
@@ -1505,7 +1505,7 @@ void Basket::contentsMousePressEvent(TQMouseEvent *event)
 		if (zone == Note::Handle || zone == Note::Group || (zone == Note::GroupExpander && (controlPressed || shiftPressed))) {
 			Note *end = clicked;
 			if (clicked->isGroup() && shiftPressed) {
-				if (clicked->tqcontains(m_startOfShiftSelectionNote)) {
+				if (clicked->contains(m_startOfShiftSelectionNote)) {
 					m_startOfShiftSelectionNote = clicked->firstRealChild();
 					end = clicked->lastRealChild();
 				} else if (clicked->firstRealChild()->isAfter(m_startOfShiftSelectionNote))
@@ -1904,7 +1904,7 @@ void Basket::contentsDragMoveEvent(TQDragMoveEvent *event)
 	}
 
 /*	Note *hoveredNote = noteAt(event->pos().x(), event->pos().y());
-	if ( (isColumnsLayout() && !hoveredNote) || (draggedNotes().tqcontains(hoveredNote)) ) {
+	if ( (isColumnsLayout() && !hoveredNote) || (draggedNotes().contains(hoveredNote)) ) {
 		event->acceptAction(false);
 		event->accept(false);
 	} else
@@ -2683,7 +2683,7 @@ void Basket::doHoverEffects(const TQPoint &pos)
 	// Ending the drag INSIDE the basket area will make NO hoverEffects() because m_underMouse is false.
 	// User need to leave the area and re-enter it to get effects.
 	// This hack solve that by dismissing the m_underMouse variable:
-	bool underMouse = Global::bnpView->currentBasket() == this && TQRect(contentsX(), contentsY(), visibleWidth(), visibleHeight()).tqcontains(pos);
+	bool underMouse = Global::bnpView->currentBasket() == this && TQRect(contentsX(), contentsY(), visibleWidth(), visibleHeight()).contains(pos);
 
 	// Don't do hover effects when a popup menu is opened.
 	// Primarily because the basket area will only receive mouseEnterEvent and mouveLeaveEvent.
@@ -2807,7 +2807,7 @@ void Basket::maybeTip(const TQPoint &pos)
 		TQRect itRect;
 		for (TQValueList<TQRect>::iterator it = m_blankAreas.begin(); it != m_blankAreas.end(); ++it) {
 			itRect = TQRect(0, 0, visibleWidth(), visibleHeight()).intersect(*it);
-			if (itRect.tqcontains(contentPos)) {
+			if (itRect.contains(contentPos)) {
 				rect = itRect;
 				rect.moveLeft(rect.left() - contentsX());
 				rect.moveTop( rect.top()  - contentsY());
@@ -2949,7 +2949,7 @@ Note* Basket::noteAt(int x, int y)
 	while (note) {
 		possibleNote = note->noteAt(x, y);
 		if (possibleNote) {
-			if (draggedNotes().tqcontains(possibleNote))
+			if (draggedNotes().contains(possibleNote))
 				return 0;
 			else
 				return possibleNote;
@@ -5130,7 +5130,7 @@ void Basket::removeWatchedFile(const TQString &fullPath)
 
 void Basket::watchedFileModified(const TQString &fullPath)
 {
-	if (!m_modifiedFiles.tqcontains(fullPath))
+	if (!m_modifiedFiles.contains(fullPath))
 		m_modifiedFiles.append(fullPath);
 	// If a big file is saved by an application, notifications are send several times.
 	// We wait they are not sent anymore to considere the file complete!
@@ -5594,7 +5594,7 @@ void Basket::computeInsertPlace(const TQPoint &cursorPosition)
 	// Code for rectangular notes :
 	/*TQRect globalRect = it->rect();
 	globalRect.moveTopLeft(it->pos() + contentsY());
-	if ( globalRect.tqcontains(curPos) ) {
+	if ( globalRect.contains(curPos) ) {
 		it->doInterestingThing();
 	}*/
 }