More work on the context module and some QT4 port in trunk: no longer use Q3PtrList but also leave the client code untouched

git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@1071 17fca916-40b9-46aa-a4ea-0a15b648b75c

2 files changed, 13 insertions, 23 deletions

diff --git a/src/modules/notifier/notifierwindowtabs.cpp b/src/modules/notifier/notifierwindowtabs.cpp
index 3b778ecc1..cca66d387 100644
--- a/src/modules/notifier/notifierwindowtabs.cpp
+++ b/src/modules/notifier/notifierwindowtabs.cpp
@@ -371,17 +371,17 @@ void KviNotifierWindowTabs::prev()
 	if(!m_pTabFocused)return;
 
 	KviNotifierWindowTab * tab;
-	QPtrListIterator<KviNotifierWindowTab> tabIterator (m_tabPtrList);
+	KviPtrListIterator<KviNotifierWindowTab> tabIterator (m_tabPtrList);
 
 	tab = m_tabMap[m_pTabFocused->wnd()];
 	
-	tabIterator.atFirst();
+	tabIterator.moveFirst();
 	
 	while ((tabIterator.current()) != tab) {
 		++tabIterator;
 	}
 	
-	if (!tabIterator.atFirst()) {
+	if (!tabIterator.moveFirst()) {
 		--tabIterator;
 		tab = tabIterator.current();
 		setFocusOn(tab);
@@ -394,15 +394,15 @@ void KviNotifierWindowTabs::next()
 	if(!m_pTabFocused)return;
 	
 	KviNotifierWindowTab * tab;
-	QPtrListIterator<KviNotifierWindowTab> tabIterator (m_tabPtrList);
+	KviPtrListIterator<KviNotifierWindowTab> tabIterator (m_tabPtrList);
 
 	tab = m_tabMap[m_pTabFocused->wnd()];
-	tabIterator.atFirst();
+	tabIterator.moveFirst();
 	while ((tabIterator.current()) != tab) {
 		++tabIterator;
 	}
 	
-	if (!tabIterator.atLast()) {
+	if (!tabIterator.moveLast()) {
 		++tabIterator;
 		tab = tabIterator.current();
 		setFocusOn(tab);
@@ -514,9 +514,7 @@ void KviNotifierWindowTabs::setFocusOn(KviNotifierWindowTab * tab)
 	m_pTabFocused = tab;
 	if(m_pTabFocused)m_pTabFocused->setFocused();
 
-	if (m_lastVisitedTabPtrList.containsRef(tab)) {
-		m_lastVisitedTabPtrList.removeRef(tab);
-	}
+	m_lastVisitedTabPtrList.removeRef(tab);
 	
 	m_lastVisitedTabPtrList.insert(0, tab);
 
@@ -554,14 +552,14 @@ void KviNotifierWindowTabs::draw(QPainter * p)
 	m_pPainter->drawPixmap(m_rct.width()-m_pixDX.width(),0,m_pixDX);
 	m_pPainter->drawTiledPixmap(m_pixSX.width(),0,m_rct.width()-m_pixSX.width()-m_pixDX.width(),m_rct.height(),m_pixBKG);
 
-	QPtrListIterator<KviNotifierWindowTab> tabIterator (m_tabPtrList);
+	KviPtrListIterator<KviNotifierWindowTab> tabIterator (m_tabPtrList);
 	
 	//m_tabPtrList.findRef(m_tabMap[m_pTabFocused->wnd()]);
 
 //	QMap<KviWindow *, KviNotifierWindowTab *>::Iterator tab;
 	KviNotifierWindowTab * tab;
 	//for (tab = m_tabMap.begin(); tab != m_tabMap.end() && !isBigger; tab++ )
-	tabIterator.toFirst();
+	tabIterator.moveFirst();
 	
 	int i = 0;
 	while(m_iTabToStartFrom!=i) {
@@ -694,9 +692,9 @@ void KviNotifierWindowTabs::closeTab(KviWindow * pWnd, KviNotifierWindowTab * pT
 	} else {
 	
 		if (m_lastVisitedTabPtrList.count()) {
-			m_pTabFocused = m_lastVisitedTabPtrList.getFirst();
+			m_pTabFocused = m_lastVisitedTabPtrList.first();
 		} else {
-			m_pTabFocused = m_tabPtrList.getLast();
+			m_pTabFocused = m_tabPtrList.last();
 		}
 			
 		m_pTabFocused->setFocused(true);
diff --git a/src/modules/notifier/notifierwindowtabs.h b/src/modules/notifier/notifierwindowtabs.h
index 221a834ed..8b92eb091 100644
--- a/src/modules/notifier/notifierwindowtabs.h
+++ b/src/modules/notifier/notifierwindowtabs.h
@@ -37,14 +37,6 @@
 
 #include "notifiermessage.h"
 
-#ifdef COMPILE_USE_QT4
-	#define QPtrList Q3PtrList
-	#define QPtrListIterator Q3PtrListIterator
-	#include <q3ptrlist.h>
-#else
-	#include <qptrlist.h>
-	//#include <qptrlistiterator.h>
-#endif
 
 class QPainter;
 class KviWindow;
@@ -149,8 +141,8 @@ private:
 	QPoint	m_pnt;
 
 	QMap<KviWindow *, KviNotifierWindowTab *> m_tabMap;
-	QPtrList<KviNotifierWindowTab> m_tabPtrList;
-	QPtrList<KviNotifierWindowTab> m_lastVisitedTabPtrList;
+	KviPtrList<KviNotifierWindowTab> m_tabPtrList;
+	KviPtrList<KviNotifierWindowTab> m_lastVisitedTabPtrList;
 	
 	QFont * m_pFocusedFont;
 	QFont * m_pUnfocusedFont;