1 files changed, 15 insertions, 15 deletions

diff --git a/src/modules/notifier/notifierwindowtabs.cpp b/src/modules/notifier/notifierwindowtabs.cpp
index 7455049..9e024d5 100644
--- a/src/modules/notifier/notifierwindowtabs.cpp
+++ b/src/modules/notifier/notifierwindowtabs.cpp
@@ -77,7 +77,7 @@ KviNotifierWindowTab::~KviNotifierWindowTab()
 void KviNotifierWindowTab::setNextMessageAsCurrent()
 {
 	if(!m_pCurrentMessage)return;
-	if(m_pMessageList->tqfindRef(m_pCurrentMessage) == -1)return;
+	if(m_pMessageList->findRef(m_pCurrentMessage) == -1)return;
 	m_pCurrentMessage = m_pMessageList->next();
 	if(!m_pCurrentMessage)m_pCurrentMessage = m_pMessageList->last();
 }
@@ -85,7 +85,7 @@ void KviNotifierWindowTab::setNextMessageAsCurrent()
 void KviNotifierWindowTab::setPrevMessageAsCurrent()
 {
 	if(!m_pCurrentMessage)return;
-	if(!m_pMessageList->tqfindRef(m_pCurrentMessage) == -1)return;
+	if(!m_pMessageList->findRef(m_pCurrentMessage) == -1)return;
 	m_pCurrentMessage = m_pMessageList->prev();
 	if(!m_pCurrentMessage)m_pCurrentMessage = m_pMessageList->first();
 }
@@ -285,7 +285,7 @@ void KviNotifierWindowTabs::addMessage(KviWindow * pWnd, KviNotifierMessage * me
 	// e quindi iterando i tab nuovi possono trovarsi PRIMA dei tab vecchi
 	// il che' confonde un po
 	KviNotifierWindowTab * tab;
-	if (!m_tabMap.tqcontains(pWnd)) {
+	if (!m_tabMap.contains(pWnd)) {
 		m_tabMap.insert(pWnd, tab = new KviNotifierWindowTab(pWnd, sender));
 		m_tabPtrList.append(tab);
 	} else {
@@ -413,26 +413,26 @@ void KviNotifierWindowTabs::next()
 
 void KviNotifierWindowTabs::mousePressEvent(TQMouseEvent * e) {
 
-	if (m_bIsOverRightBound && m_rctNextIcon.tqcontains(e->pos())) {
+	if (m_bIsOverRightBound && m_rctNextIcon.contains(e->pos())) {
 		return;
 	}
 	
-	if (m_bIsOverLeftBound && m_rctPrevIcon.tqcontains(e->pos())) {
+	if (m_bIsOverLeftBound && m_rctPrevIcon.contains(e->pos())) {
 		return;
 	}
 
-	if(m_rctTabs.tqcontains(e->pos()))
+	if(m_rctTabs.contains(e->pos()))
 	{
 		TQMap<KviWindow *, KviNotifierWindowTab *>::Iterator tab;
 		for (tab = m_tabMap.begin(); tab != m_tabMap.end(); tab++ ) {
-			if (tab.data()->rect().tqcontains(e->pos())) {
+			if (tab.data()->rect().contains(e->pos())) {
 				setFocusOn(tab.data());
 				return;
 			}
 		}
 	}
 
-	if (m_rctCloseTabIconHotArea.tqcontains(e->pos())) {
+	if (m_rctCloseTabIconHotArea.contains(e->pos())) {
 		setCloseTabIcon(WDG_ICON_CLICKED);
 		return;
 	}
@@ -441,7 +441,7 @@ void KviNotifierWindowTabs::mousePressEvent(TQMouseEvent * e) {
 
 void KviNotifierWindowTabs::mouseMoveEvent(TQMouseEvent * e)
 {
-	if (m_rctCloseTabIconHotArea.tqcontains(e->pos()))
+	if (m_rctCloseTabIconHotArea.contains(e->pos()))
 	{
 		setCloseTabIcon(WDG_ICON_ON);
 	} else {
@@ -453,19 +453,19 @@ void KviNotifierWindowTabs::mouseMoveEvent(TQMouseEvent * e)
 void KviNotifierWindowTabs::mouseReleaseEvent(TQMouseEvent * e)
 {
 
-	if (m_bIsOverRightBound && m_rctNextIcon.tqcontains(e->pos())) {
+	if (m_bIsOverRightBound && m_rctNextIcon.contains(e->pos())) {
 		scrollTabsLeft();
 		return;
 	}
 	
-	if (m_bIsOverLeftBound && m_rctPrevIcon.tqcontains(e->pos())) {
+	if (m_bIsOverLeftBound && m_rctPrevIcon.contains(e->pos())) {
 		scrollTabsRight();
 		return;
 	}
 
 	if(currentTab())
 	{
-		if (rctCloseTabIconHotArea().tqcontains(e->pos()))
+		if (rctCloseTabIconHotArea().contains(e->pos()))
 		{
 			closeCurrentTab();
 			g_pNotifierWindow->update();
@@ -555,7 +555,7 @@ void KviNotifierWindowTabs::draw(TQPainter * p)
 
 	KviPointerListIterator<KviNotifierWindowTab> tabIterator (m_tabPtrList);
 	
-	//m_tabPtrList.tqfindRef(m_tabMap[m_pTabFocused->wnd()]);
+	//m_tabPtrList.findRef(m_tabMap[m_pTabFocused->wnd()]);
 
 //	TQMap<KviWindow *, KviNotifierWindowTab *>::Iterator tab;
 	KviNotifierWindowTab * tab;
@@ -654,7 +654,7 @@ void KviNotifierWindowTabs::markAllMessagesAsHistoric()
 
 void KviNotifierWindowTabs::closeTab(KviWindow * pWnd)
 {
-	KviNotifierWindowTab * pTab = m_tabMap.tqfind(pWnd).data();
+	KviNotifierWindowTab * pTab = m_tabMap.find(pWnd).data();
 	closeTab(pWnd, pTab);
 }
 
@@ -671,7 +671,7 @@ void KviNotifierWindowTabs::closeCurrentTab()
 	KviNotifierWindowTab * pTab = m_pTabFocused;
 	if (m_tabMap.isEmpty()) return; // Empty??? The World is ending...
 	KviWindow * pWnd = pTab->wnd();
-	if (!m_tabMap.tqcontains(pWnd)) return; // The current tab is not on the map??? Call 911!!
+	if (!m_tabMap.contains(pWnd)) return; // The current tab is not on the map??? Call 911!!
 	// End paranoic stuff, go back to sanity...
 	
 	closeTab(pWnd, pTab);