Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

Signed-off-by: Michele Calgaro <[email protected]>
(cherry picked from commit bea15ca3009c2f8505bfa10445c1dc2fc43a4ffe)

1 files changed, 60 insertions, 60 deletions

diff --git a/src/basket.cpp b/src/basket.cpp
index f6f76d7..75dc8ca 100644
--- a/src/basket.cpp
+++ b/src/basket.cpp
@@ -202,13 +202,13 @@ DecoratedBasket::DecoratedBasket(TQWidget *parent, const TQString &folderName, c
 	m_filter->setShown(true);
 	m_basket->setFocus(); // To avoid the filter bar have focus on load
 
-	connect( m_filter, TQT_SIGNAL(newFilter(const FilterData&)), m_basket, TQT_SLOT(newFilter(const FilterData&)) );
-	connect( m_filter, TQT_SIGNAL(escapePressed()),              m_basket, TQT_SLOT(cancelFilter())               );
-	connect( m_filter, TQT_SIGNAL(returnPressed()),              m_basket, TQT_SLOT(validateFilter())             );
+	connect( m_filter, TQ_SIGNAL(newFilter(const FilterData&)), m_basket, TQ_SLOT(newFilter(const FilterData&)) );
+	connect( m_filter, TQ_SIGNAL(escapePressed()),              m_basket, TQ_SLOT(cancelFilter())               );
+	connect( m_filter, TQ_SIGNAL(returnPressed()),              m_basket, TQ_SLOT(validateFilter())             );
 
-	connect( m_basket, TQT_SIGNAL(postMessage(const TQString&)),      Global::bnpView, TQT_SLOT(postStatusbarMessage(const TQString&)) );
-	connect( m_basket, TQT_SIGNAL(setStatusBarText(const TQString&)), Global::bnpView, TQT_SLOT(setStatusBarHint(const TQString&))     );
-	connect( m_basket, TQT_SIGNAL(resetStatusBarText()),             Global::bnpView, TQT_SLOT(updateStatusBarHint())                );
+	connect( m_basket, TQ_SIGNAL(postMessage(const TQString&)),      Global::bnpView, TQ_SLOT(postStatusbarMessage(const TQString&)) );
+	connect( m_basket, TQ_SIGNAL(setStatusBarText(const TQString&)), Global::bnpView, TQ_SLOT(setStatusBarHint(const TQString&))     );
+	connect( m_basket, TQ_SIGNAL(resetStatusBarText()),             Global::bnpView, TQ_SLOT(updateStatusBarHint())                );
 }
 
 DecoratedBasket::~DecoratedBasket()
@@ -1124,7 +1124,7 @@ void Basket::aboutToBeActivated()
 		setFocusedNote(0); // So that during the focusInEvent that will come shortly, the FIRST note is focused.
 
 		if (Settings::playAnimations() && !decoration()->filterBar()->filterData().isFiltering && Global::bnpView->currentBasket() == this) // No animation when filtering all!
-			animateLoad();//TQTimer::singleShot( 0, this, TQT_SLOT(animateLoad()) );
+			animateLoad();//TQTimer::singleShot( 0, this, TQ_SLOT(animateLoad()) );
 
 		m_finishLoadOnFirstShow = false;
 	}
@@ -1216,7 +1216,7 @@ void Basket::load()
 	focusANote();
 
 	if (Settings::playAnimations() && !decoration()->filterBar()->filterData().isFiltering && Global::bnpView->currentBasket() == this) // No animation when filtering all!
-		animateLoad();//TQTimer::singleShot( 0, this, TQT_SLOT(animateLoad()) );
+		animateLoad();//TQTimer::singleShot( 0, this, TQ_SLOT(animateLoad()) );
 	else
 		m_loaded = true;
 	enableActions();
@@ -1232,7 +1232,7 @@ void Basket::filterAgain(bool andEnsureVisible/* = true*/)
 
 void Basket::filterAgainDelayed()
 {
-	TQTimer::singleShot( 0, this, TQT_SLOT(filterAgain()) );
+	TQTimer::singleShot( 0, this, TQ_SLOT(filterAgain()) );
 }
 
 void Basket::newFilter(const FilterData &data, bool andEnsureVisible/* = true*/)
@@ -1308,7 +1308,7 @@ void Basket::setShortcut(TDEShortcut shortcut, int action)
 	m_shortcutAction = action;
 
 	if (action > 0)
-		Global::globalAccel->insert(sAction, m_action->text(), /*whatsThis=*/"", m_action->shortcut(), TDEShortcut(), this, TQT_SLOT(activatedShortcut()), /*configurable=*/false);
+		Global::globalAccel->insert(sAction, m_action->text(), /*whatsThis=*/"", m_action->shortcut(), TDEShortcut(), this, TQ_SLOT(activatedShortcut()), /*configurable=*/false);
 	Global::globalAccel->updateConnections();
 }
 
@@ -1357,7 +1357,7 @@ Basket::Basket(TQWidget *parent, const TQString &folderName)
    m_finishLoadOnFirstShow(false), m_relayoutOnNextShow(false)
 {
 	TQString sAction = "local_basket_activate_" + folderName;
-	m_action = new TDEAction("FAKE TEXT", "FAKE ICON", TDEShortcut(), this, TQT_SLOT(activatedShortcut()), Global::bnpView->actionCollection(), sAction.utf8());
+	m_action = new TDEAction("FAKE TEXT", "FAKE ICON", TDEShortcut(), this, TQ_SLOT(activatedShortcut()), Global::bnpView->actionCollection(), sAction.utf8());
 	m_action->setShortcutConfigurable(false); // We do it in the basket properties dialog (and keep it in sync with the global one)
 
 	if (!m_folderName.endsWith("/"))
@@ -1378,17 +1378,17 @@ Basket::Basket(TQWidget *parent, const TQString &folderName)
 
 	// File Watcher:
 	m_watcher = new KDirWatch(this);
-	connect( m_watcher,       TQT_SIGNAL(dirty(const TQString&)),   this, TQT_SLOT(watchedFileModified(const TQString&)) );
-	connect( m_watcher,       TQT_SIGNAL(deleted(const TQString&)), this, TQT_SLOT(watchedFileDeleted(const TQString&))  );
-	connect( &m_watcherTimer, TQT_SIGNAL(timeout()),               this, TQT_SLOT(updateModifiedNotes())               );
+	connect( m_watcher,       TQ_SIGNAL(dirty(const TQString&)),   this, TQ_SLOT(watchedFileModified(const TQString&)) );
+	connect( m_watcher,       TQ_SIGNAL(deleted(const TQString&)), this, TQ_SLOT(watchedFileDeleted(const TQString&))  );
+	connect( &m_watcherTimer, TQ_SIGNAL(timeout()),               this, TQ_SLOT(updateModifiedNotes())               );
 
 	// Various Connections:
-	connect( &m_animationTimer,           TQT_SIGNAL(timeout()),   this, TQT_SLOT(animateObjects())            );
-	connect( &m_autoScrollSelectionTimer, TQT_SIGNAL(timeout()),   this, TQT_SLOT(doAutoScrollSelection())     );
-	connect( &m_timerCountsChanged,       TQT_SIGNAL(timeout()),   this, TQT_SLOT(countsChangedTimeOut())      );
-	connect( &m_inactivityAutoSaveTimer,  TQT_SIGNAL(timeout()),   this, TQT_SLOT(inactivityAutoSaveTimeout()) );
-	connect( &m_inactivityAutoLockTimer,  TQT_SIGNAL(timeout()),   this, TQT_SLOT(inactivityAutoLockTimeout()) );
-	connect( this, TQT_SIGNAL(contentsMoving(int, int)), this, TQT_SLOT(contentsMoved()) );
+	connect( &m_animationTimer,           TQ_SIGNAL(timeout()),   this, TQ_SLOT(animateObjects())            );
+	connect( &m_autoScrollSelectionTimer, TQ_SIGNAL(timeout()),   this, TQ_SLOT(doAutoScrollSelection())     );
+	connect( &m_timerCountsChanged,       TQ_SIGNAL(timeout()),   this, TQ_SLOT(countsChangedTimeOut())      );
+	connect( &m_inactivityAutoSaveTimer,  TQ_SIGNAL(timeout()),   this, TQ_SLOT(inactivityAutoSaveTimeout()) );
+	connect( &m_inactivityAutoLockTimer,  TQ_SIGNAL(timeout()),   this, TQ_SLOT(inactivityAutoLockTimeout()) );
+	connect( this, TQ_SIGNAL(contentsMoving(int, int)), this, TQ_SLOT(contentsMoved()) );
 #ifdef HAVE_LIBGPGME
 	m_gpg = new KGpgMe();
 #endif
@@ -1398,7 +1398,7 @@ Basket::Basket(TQWidget *parent, const TQString &folderName)
 void Basket::contentsMoved()
 {
 	// This slot is called BEFORE the content move, so we delay the hover effects:
-	TQTimer::singleShot(0, this, TQT_SLOT(doHoverEffects()));
+	TQTimer::singleShot(0, this, TQ_SLOT(doHoverEffects()));
 }
 
 void Basket::enterEvent(TQEvent *)
@@ -1443,7 +1443,7 @@ void Basket::contentsMousePressEvent(TQMouseEvent *event)
 	// the interface flicker by showing the focused rectangle (as the basket gets focus)
 	// and immediatly removing it (because the popup menu now have focus).
 	if (!isDuringEdit())
-		TQTimer::singleShot(0, this, TQT_SLOT(setFocusIfNotInPopupMenu()));
+		TQTimer::singleShot(0, this, TQ_SLOT(setFocusIfNotInPopupMenu()));
 
 	// Convenient variables:
 	bool controlPressed = event->stateAfter() & TQt::ControlButton;
@@ -1587,10 +1587,10 @@ void Basket::contentsMousePressEvent(TQMouseEvent *event)
 			menu->removeItem(/*id=*/120);
 		menu->insertTitle((zone == Note::TopGroup || zone == Note::BottomGroup ? i18n("The verb (Group New Note)", "Group") : i18n("The verb (Insert New Note)", "Insert")), /*id=*/120, /*index=*/0);
 		setInsertPopupMenu();
-		connect( menu, TQT_SIGNAL(aboutToHide()),  this, TQT_SLOT(delayedCancelInsertPopupMenu()) );
-		connect( menu, TQT_SIGNAL(aboutToHide()),  this, TQT_SLOT(unlockHovering())               );
-		connect( menu, TQT_SIGNAL(aboutToHide()),  this, TQT_SLOT(disableNextClick())             );
-		connect( menu, TQT_SIGNAL(aboutToHide()),  this, TQT_SLOT(hideInsertPopupMenu())          );
+		connect( menu, TQ_SIGNAL(aboutToHide()),  this, TQ_SLOT(delayedCancelInsertPopupMenu()) );
+		connect( menu, TQ_SIGNAL(aboutToHide()),  this, TQ_SLOT(unlockHovering())               );
+		connect( menu, TQ_SIGNAL(aboutToHide()),  this, TQ_SLOT(disableNextClick())             );
+		connect( menu, TQ_SIGNAL(aboutToHide()),  this, TQ_SLOT(hideInsertPopupMenu())          );
 		doHoverEffects(clicked, zone); // In the case where another popup menu was open, we should do that manually!
 		m_lockedHovering = true;
 		menu->exec(TQCursor::pos());
@@ -1609,8 +1609,8 @@ void Basket::contentsMousePressEvent(TQMouseEvent *event)
 		}
 		m_startOfShiftSelectionNote = (clicked->isGroup() ? clicked->firstRealChild() : clicked);
 		TQPopupMenu* menu = Global::bnpView->popupMenu("note_popup");
-		connect( menu, TQT_SIGNAL(aboutToHide()),  this, TQT_SLOT(unlockHovering())   );
-		connect( menu, TQT_SIGNAL(aboutToHide()),  this, TQT_SLOT(disableNextClick()) );
+		connect( menu, TQ_SIGNAL(aboutToHide()),  this, TQ_SLOT(unlockHovering())   );
+		connect( menu, TQ_SIGNAL(aboutToHide()),  this, TQ_SLOT(disableNextClick()) );
 		doHoverEffects(clicked, zone); // In the case where another popup menu was open, we should do that manually!
 		m_lockedHovering = true;
 		menu->exec(TQCursor::pos());
@@ -1690,7 +1690,7 @@ void Basket::contentsMousePressEvent(TQMouseEvent *event)
 
 void Basket::delayedCancelInsertPopupMenu()
 {
-	TQTimer::singleShot( 0, this, TQT_SLOT(cancelInsertPopupMenu()) );
+	TQTimer::singleShot( 0, this, TQ_SLOT(cancelInsertPopupMenu()) );
 }
 
 void Basket::contentsContextMenuEvent(TQContextMenuEvent *event)
@@ -1700,9 +1700,9 @@ void Basket::contentsContextMenuEvent(TQContextMenuEvent *event)
 			TQRect basketRect( mapToGlobal(TQPoint(0,0)), size() );
 			TQPopupMenu *menu = Global::bnpView->popupMenu("insert_popup");
 			setInsertPopupMenu();
-			connect( menu, TQT_SIGNAL(aboutToHide()),  this, TQT_SLOT(delayedCancelInsertPopupMenu()) );
-			connect( menu, TQT_SIGNAL(aboutToHide()),  this, TQT_SLOT(unlockHovering())               );
-			connect( menu, TQT_SIGNAL(aboutToHide()),  this, TQT_SLOT(disableNextClick())             );
+			connect( menu, TQ_SIGNAL(aboutToHide()),  this, TQ_SLOT(delayedCancelInsertPopupMenu()) );
+			connect( menu, TQ_SIGNAL(aboutToHide()),  this, TQ_SLOT(unlockHovering())               );
+			connect( menu, TQ_SIGNAL(aboutToHide()),  this, TQ_SLOT(disableNextClick())             );
 			removeInserter();
 			m_lockedHovering = true;
 			PopupMenu::execAtRectCenter(*menu, basketRect); // Popup at center or the basket
@@ -1713,8 +1713,8 @@ void Basket::contentsContextMenuEvent(TQContextMenuEvent *event)
 			m_startOfShiftSelectionNote = (m_focusedNote->isGroup() ? m_focusedNote->firstRealChild() : m_focusedNote);
 			// Popup at bottom (or top) of the focused note, if visible :
 			TQPopupMenu *menu = Global::bnpView->popupMenu("note_popup");
-			connect( menu, TQT_SIGNAL(aboutToHide()),  this, TQT_SLOT(unlockHovering())   );
-			connect( menu, TQT_SIGNAL(aboutToHide()),  this, TQT_SLOT(disableNextClick()) );
+			connect( menu, TQ_SIGNAL(aboutToHide()),  this, TQ_SLOT(unlockHovering())   );
+			connect( menu, TQ_SIGNAL(aboutToHide()),  this, TQ_SLOT(disableNextClick()) );
 			doHoverEffects(m_focusedNote, Note::Content); // In the case where another popup menu was open, we should do that manually!
 			m_lockedHovering = true;
 			PopupMenu::execAtRectBottom(*menu, noteVisibleRect(m_focusedNote), true);
@@ -2147,7 +2147,7 @@ void Basket::resetInsertionData()
 
 void Basket::hideInsertPopupMenu()
 {
-	TQTimer::singleShot( 50/*ms*/, this, TQT_SLOT(timeoutHideInsertPopupMenu()) );
+	TQTimer::singleShot( 50/*ms*/, this, TQ_SLOT(timeoutHideInsertPopupMenu()) );
 }
 
 void Basket::timeoutHideInsertPopupMenu()
@@ -3041,7 +3041,7 @@ TQColor alphaBlendColors(const TQColor &bgColor, const TQColor &fgColor, const i
 
 void Basket::unlock()
 {
-	TQTimer::singleShot( 0, this, TQT_SLOT(load()) );
+	TQTimer::singleShot( 0, this, TQ_SLOT(load()) );
 }
 
 void Basket::inactivityAutoLockTimeout()
@@ -3055,7 +3055,7 @@ void Basket::drawContents(TQPainter *painter, int clipX, int clipY, int clipWidt
 	if (!m_loadingLaunched)
 	{
 		if(!m_locked)
-			TQTimer::singleShot( 0, this, TQT_SLOT(load()) );
+			TQTimer::singleShot( 0, this, TQ_SLOT(load()) );
 		else {
 			Global::bnpView->notesStateChanged(); // Show "Locked" instead of "Loading..." in the statusbar
 		}
@@ -3079,7 +3079,7 @@ void Basket::drawContents(TQPainter *painter, int clipX, int clipY, int clipWidt
 			m_button = new TQPushButton( m_decryptBox, "button" );
 			m_button->setText( i18n( "&Unlock" ) );
 			layout->addWidget( m_button, 1, 2 );
-			connect( m_button, TQT_SIGNAL( clicked() ), this, TQT_SLOT( unlock() ) );
+			connect( m_button, TQ_SIGNAL( clicked() ), this, TQ_SLOT( unlock() ) );
 #endif
 			TQLabel* label = new TQLabel( m_decryptBox, "label" );
 			TQString text = "<b>" + i18n("Password protected basket.") + "</b><br/>";
@@ -3410,9 +3410,9 @@ void Basket::popupEmblemMenu(Note *note, int emblemNumber)
 	if (sequenceOnDelete)
 		menu.setAccel(sequence, 1);
 
-	connect( &menu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(toggledStateInMenu(int)) );
-	connect( &menu, TQT_SIGNAL(aboutToHide()),  this, TQT_SLOT(unlockHovering())        );
-	connect( &menu, TQT_SIGNAL(aboutToHide()),  this, TQT_SLOT(disableNextClick())      );
+	connect( &menu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(toggledStateInMenu(int)) );
+	connect( &menu, TQ_SIGNAL(aboutToHide()),  this, TQ_SLOT(unlockHovering())        );
+	connect( &menu, TQ_SIGNAL(aboutToHide()),  this, TQ_SLOT(disableNextClick())      );
 
 	m_lockedHovering = true;
 	menu.exec(TQCursor::pos());
@@ -3516,9 +3516,9 @@ void Basket::popupTagsMenu(Note *note)
 // 	if (!selectedNotesHaveTags())//note->states().isEmpty())
 // 		menu.setItemEnabled(2, false);
 //
-// 	connect( &menu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(toggledTagInMenu(int)) );
-// 	connect( &menu, TQT_SIGNAL(aboutToHide()),  this, TQT_SLOT(unlockHovering())      );
-// 	connect( &menu, TQT_SIGNAL(aboutToHide()),  this, TQT_SLOT(disableNextClick())    );
+// 	connect( &menu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(toggledTagInMenu(int)) );
+// 	connect( &menu, TQ_SIGNAL(aboutToHide()),  this, TQ_SLOT(unlockHovering())      );
+// 	connect( &menu, TQ_SIGNAL(aboutToHide()),  this, TQ_SLOT(disableNextClick())    );
 
 	Global::bnpView->populateTagsMenu(menu, note);
 
@@ -3835,7 +3835,7 @@ void Basket::editorCursorPositionChanged()
 void Basket::closeEditorDelayed()
 {
 	setFocus();
-	TQTimer::singleShot( 0, this, TQT_SLOT(closeEditor()) );
+	TQTimer::singleShot( 0, this, TQ_SLOT(closeEditor()) );
 }
 
 bool Basket::closeEditor()
@@ -3847,13 +3847,13 @@ bool Basket::closeEditor()
 		return true;
 
 	if (m_redirectEditActions) {
-		disconnect( m_editor->widget(), TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(selectionChangedInEditor()) );
+		disconnect( m_editor->widget(), TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(selectionChangedInEditor()) );
 		if (m_editor->textEdit()) {
-			disconnect( m_editor->textEdit(), TQT_SIGNAL(textChanged()),               this, TQT_SLOT(selectionChangedInEditor()) );
-			disconnect( m_editor->textEdit(), TQT_SIGNAL(textChanged()),               this, TQT_SLOT(contentChangedInEditor())   );
+			disconnect( m_editor->textEdit(), TQ_SIGNAL(textChanged()),               this, TQ_SLOT(selectionChangedInEditor()) );
+			disconnect( m_editor->textEdit(), TQ_SIGNAL(textChanged()),               this, TQ_SLOT(contentChangedInEditor())   );
 		} else if (m_editor->lineEdit()) {
-			disconnect( m_editor->lineEdit(), TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(selectionChangedInEditor()) );
-			disconnect( m_editor->lineEdit(), TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(contentChangedInEditor())   );
+			disconnect( m_editor->lineEdit(), TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(selectionChangedInEditor()) );
+			disconnect( m_editor->lineEdit(), TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(contentChangedInEditor())   );
 		}
 	}
 	m_editor->widget()->disconnect();
@@ -4033,7 +4033,7 @@ void Basket::noteEdit(Note *note, bool justAdded, const TQPoint &clickedPoint) /
 	}
 
 	if (justAdded && isFiltering()) {
-		TQTimer::singleShot( 0, this, TQT_SLOT(showEditedNoteWhileFiltering()) );
+		TQTimer::singleShot( 0, this, TQ_SLOT(showEditedNoteWhileFiltering()) );
 	}
 
 	doHoverEffects(note, Note::Content); // Be sure (in the case Edit was triggered by menu or Enter key...): better feedback!
@@ -4053,24 +4053,24 @@ void Basket::noteEdit(Note *note, bool justAdded, const TQPoint &clickedPoint) /
 		placeEditorAndEnsureVisible(); //       placeEditor(); // FIXME: After?
 		m_redirectEditActions = m_editor->lineEdit() || m_editor->textEdit();
 		if (m_redirectEditActions) {
-			connect( m_editor->widget(), TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(selectionChangedInEditor()) );
+			connect( m_editor->widget(), TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(selectionChangedInEditor()) );
 			// In case there is NO text, "Select All" is disabled. But if the user press a key the there is now a text:
 			// selection has not changed but "Select All" should be re-enabled:
 			if (m_editor->textEdit()) {
-				connect( m_editor->textEdit(), TQT_SIGNAL(textChanged()),               this, TQT_SLOT(selectionChangedInEditor()) );
-				connect( m_editor->textEdit(), TQT_SIGNAL(textChanged()),               this, TQT_SLOT(contentChangedInEditor())   );
+				connect( m_editor->textEdit(), TQ_SIGNAL(textChanged()),               this, TQ_SLOT(selectionChangedInEditor()) );
+				connect( m_editor->textEdit(), TQ_SIGNAL(textChanged()),               this, TQ_SLOT(contentChangedInEditor())   );
 			} else if (m_editor->lineEdit()) {
-				connect( m_editor->lineEdit(), TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(selectionChangedInEditor()) );
-				connect( m_editor->lineEdit(), TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(contentChangedInEditor())   );
+				connect( m_editor->lineEdit(), TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(selectionChangedInEditor()) );
+				connect( m_editor->lineEdit(), TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(contentChangedInEditor())   );
 			}
 		}
 		m_editor->widget()->show();
 		//m_editor->widget()->raise();
 		m_editor->widget()->setFocus();
-		connect( m_editor, TQT_SIGNAL(askValidation()),            this, TQT_SLOT(closeEditorDelayed())       );
-		connect( m_editor, TQT_SIGNAL(mouseEnteredEditorWidget()), this, TQT_SLOT(mouseEnteredEditorWidget()) );
+		connect( m_editor, TQ_SIGNAL(askValidation()),            this, TQ_SLOT(closeEditorDelayed())       );
+		connect( m_editor, TQ_SIGNAL(mouseEnteredEditorWidget()), this, TQ_SLOT(mouseEnteredEditorWidget()) );
 		if (m_editor->textEdit()) {
-			connect( m_editor->textEdit(), TQT_SIGNAL(textChanged()), this, TQT_SLOT(placeEditorAndEnsureVisible()) );
+			connect( m_editor->textEdit(), TQ_SIGNAL(textChanged()), this, TQ_SLOT(placeEditorAndEnsureVisible()) );
 			if (clickedPoint != TQPoint()) {
 				TQPoint pos(clickedPoint.x() - note->x() - note->contentX() + m_editor->textEdit()->frameWidth() + 4   - m_editor->textEdit()->frameWidth(),
 				           clickedPoint.y() - note->y()   - m_editor->textEdit()->frameWidth());
@@ -5106,7 +5106,7 @@ void Basket::focusInEvent(TQFocusEvent*)
 	// Focus cannot be get with Tab when locked, but a click can focus the basket!
 	if (isLocked()) {
 		if (m_button)
-			TQTimer::singleShot( 0, m_button, TQT_SLOT(setFocus()) );
+			TQTimer::singleShot( 0, m_button, TQ_SLOT(setFocus()) );
 	} else
 		focusANote();      // hasFocus() is true at this stage, note will be focused
 }