From 7fe9f034d22112e39ffbc19a1819093b79fe9127 Mon Sep 17 00:00:00 2001
From: Fabio Bas
Date: Thu, 11 Feb 2010 19:29:25 +0000
Subject: fix for #703

git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@3956 17fca916-40b9-46aa-a4ea-0a15b648b75c
---
 src/kvirc/ui/kvi_maskeditor.cpp | 12 ------------
 src/kvirc/ui/kvi_maskeditor.h   | 18 +++++++++++++++++-
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/src/kvirc/ui/kvi_maskeditor.cpp b/src/kvirc/ui/kvi_maskeditor.cpp
index 4966f885f..7c47a010f 100644
--- a/src/kvirc/ui/kvi_maskeditor.cpp
+++ b/src/kvirc/ui/kvi_maskeditor.cpp
@@ -64,18 +64,6 @@ KviMaskItem::~KviMaskItem()
 {
 }
 
-int KviMaskItem::compare ( QTreeWidgetItem * i, int col, bool) const
-{
-	if(col==2)
-	{
-		if( ((KviMaskItem*)i)->mask()->uSetAt > m_Mask.uSetAt )  return -1;
-		if( ((KviMaskItem*)i)->mask()->uSetAt == m_Mask.uSetAt ) return  0;
-		if( ((KviMaskItem*)i)->mask()->uSetAt < m_Mask.uSetAt )  return  1;
-	}
-
-	return text(col).localeAwareCompare(i->text(col));
-}
-
 KviMaskInputDialog::KviMaskInputDialog(const QString &szMask,KviMaskEditor* pEditor,KviChannel * pChannel)
 :QDialog(pEditor)
 {
diff --git a/src/kvirc/ui/kvi_maskeditor.h b/src/kvirc/ui/kvi_maskeditor.h
index f59c24579..e62f39569 100644
--- a/src/kvirc/ui/kvi_maskeditor.h
+++ b/src/kvirc/ui/kvi_maskeditor.h
@@ -52,9 +52,25 @@ public:
 	~KviMaskItem();
 
 	KviMaskEntry* mask() { return &m_Mask; };
-	virtual int compare ( QTreeWidgetItem * i, int col, bool ascending ) const;
 protected:
 	KviMaskEntry m_Mask;
+	bool operator<(const QTreeWidgetItem &other)const
+	{
+		// This is the sorting function for KviMaskItem
+		switch(treeWidget()->sortColumn())
+		{
+			case 0:
+				return m_Mask.szMask < ((KviMaskItem *) &other)->mask()->szMask;
+				break;
+			case 1:
+				return m_Mask.szSetBy < ((KviMaskItem*) &other)->mask()->szSetBy;
+				break;
+			case 2:
+				return m_Mask.uSetAt < ((KviMaskItem*) &other)->mask()->uSetAt;
+				break;
+		}
+		return 0; //make compiler happy
+	}
 
 };
 
-- 
cgit v1.3.1-10-gc9f91