KviIrcView: Move to vector

3 files changed, 9 insertions, 13 deletions

diff --git a/src/kvirc/ui/KviIrcView.cpp b/src/kvirc/ui/KviIrcView.cpp
index 5f3e6877d..a201b61cd 100644
--- a/src/kvirc/ui/KviIrcView.cpp
+++ b/src/kvirc/ui/KviIrcView.cpp
@@ -251,9 +251,6 @@ KviIrcView::KviIrcView(QWidget * parent, KviWindow * pWnd)
 
 	m_pWrappedBlockSelectionInfo = new KviIrcViewWrappedBlockSelectionInfo;
 
-	m_pMessagesStoppedWhileSelecting = new KviPointerList<KviIrcViewLine>;
-	m_pMessagesStoppedWhileSelecting->setAutoDelete(false);
-
 	// say qt to avoid erasing on repaint
 	setAutoFillBackground(false);
 
@@ -359,13 +356,10 @@ KviIrcView::~KviIrcView()
 	emptyBuffer(false);
 
 	// the pending ones too!
-	while(KviIrcViewLine * l = m_pMessagesStoppedWhileSelecting->first())
-	{
-		m_pMessagesStoppedWhileSelecting->removeFirst();
+	for(const auto & l : m_pMessagesStoppedWhileSelecting)
 		delete_text_line(l, &m_hAnimatedSmiles);
-	}
 
-	delete m_pMessagesStoppedWhileSelecting;
+	m_pMessagesStoppedWhileSelecting.clear();
 
 	if(m_pFm)
 		delete m_pFm;
@@ -609,7 +603,7 @@ void KviIrcView::appendLine(KviIrcViewLine * ptr, const QDateTime & date, bool b
 		// Do not move the view!
 		// So we append the text line to a temp queue
 		// and then we'll add it when the mouse button is released
-		m_pMessagesStoppedWhileSelecting->append(ptr);
+		m_pMessagesStoppedWhileSelecting.push_back(ptr);
 		return;
 	}
 
diff --git a/src/kvirc/ui/KviIrcView.h b/src/kvirc/ui/KviIrcView.h
index 12bcde0c6..6957b2bf1 100644
--- a/src/kvirc/ui/KviIrcView.h
+++ b/src/kvirc/ui/KviIrcView.h
@@ -26,7 +26,6 @@
 
 #include "kvi_settings.h"
 #include "KviCString.h"
-#include "KviPointerList.h"
 
 #include <QToolButton>
 #include <QWidget>
@@ -34,6 +33,8 @@
 #include <QMultiHash>
 #include <QDateTime>
 
+#include <vector>
+
 class QScrollBar;
 class QLineEdit;
 class QFile;
@@ -134,7 +135,7 @@ private:
 	bool m_bAcceptDrops;
 	int m_iUnprocessedPaintEventRequests;
 	bool m_bPostedPaintEventPending;
-	KviPointerList<KviIrcViewLine> * m_pMessagesStoppedWhileSelecting;
+	std::vector<KviIrcViewLine *> m_pMessagesStoppedWhileSelecting;
 	KviIrcView * m_pMasterView;
 	QFontMetrics * m_pFm; // assume this valid only inside a paint event (may be 0 in other circumstances)
 
diff --git a/src/kvirc/ui/KviIrcView_events.cpp b/src/kvirc/ui/KviIrcView_events.cpp
index 0163e1c12..73a12d5dd 100644
--- a/src/kvirc/ui/KviIrcView_events.cpp
+++ b/src/kvirc/ui/KviIrcView_events.cpp
@@ -692,12 +692,13 @@ void KviIrcView::mouseReleaseEvent(QMouseEvent * e)
 		m_bShiftPressed = false;
 		m_bCtrlPressed = false;
 		// Insert the lines blocked while selecting
-		while(KviIrcViewLine * l = m_pMessagesStoppedWhileSelecting->first())
+		for(const auto & l : m_pMessagesStoppedWhileSelecting)
 		{
-			m_pMessagesStoppedWhileSelecting->removeFirst();
 			QDateTime date = QDateTime::currentDateTime(); // TODO
 			appendLine(l, date, false);
 		}
+
+		m_pMessagesStoppedWhileSelecting.clear();
 		repaint();
 	}
 }