more code clean

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

3 files changed, 18 insertions, 42 deletions

diff --git a/src/modules/list/libkvilist.cpp b/src/modules/list/libkvilist.cpp
index b5761479b..9941bb404 100644
--- a/src/modules/list/libkvilist.cpp
+++ b/src/modules/list/libkvilist.cpp
@@ -19,17 +19,14 @@
 //   Inc. ,59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 //
 
-
-#include "kvi_module.h"
-
-
 #include "listwindow.h"
 
+#include "kvi_module.h"
 #include "kvi_frame.h"
 #include "kvi_window.h"
 #include "kvi_locale.h"
 
-#include <qsplitter.h>
+#include <QSplitter>
 
 KviPointerList<KviListWindow> * g_pListWindowList = 0;
 
@@ -65,8 +62,6 @@ static bool list_kvs_cmd_open(KviKvsModuleCommandCall * c)
 	return true;
 }
 
-
-
 static bool list_module_init(KviModule * m)
 {
 	g_pListWindowList = new KviPointerList<KviListWindow>;
@@ -80,7 +75,7 @@ static bool list_module_cleanup(KviModule *m)
 {
 	while(g_pListWindowList->first())g_pListWindowList->first()->die();
 	delete g_pListWindowList;
-    g_pListWindowList = 0;
+	g_pListWindowList = 0;
 	return true;
 }
 
@@ -91,7 +86,7 @@ static bool list_module_can_unload(KviModule *m)
 
 KVIRC_MODULE(
 	"List",                                             // module name
-	"1.0.0",                                                // module version
+	"4.0.0",                                                // module version
 	"Copyright (C) 2000-2001 Szymon Stefanek (pragma at kvirc dot net)", // author & (C)
 	"List window extension",
 	list_module_init,
diff --git a/src/modules/list/listwindow.cpp b/src/modules/list/listwindow.cpp
index 4ec8c8721..ce91b35f3 100644
--- a/src/modules/list/listwindow.cpp
+++ b/src/modules/list/listwindow.cpp
@@ -42,16 +42,16 @@
 #include "kvi_topicw.h"
 #include "kvi_config.h"
 #include "kvi_filedialog.h"
-
 #include "kvi_styled_controls.h"
-#include <qtimer.h>
-#include <qpainter.h>
-#include <qfontmetrics.h>
-#include <qsplitter.h>
-#include <qtooltip.h>
-#include <qdatetime.h>
-#include "kvi_tal_hbox.h"
 #include "kvi_msgbox.h"
+#include "kvi_tal_hbox.h"
+
+#include <QTimer>
+#include <QPainter>
+#include <QFontMetrics>
+#include <QSplitter>
+#include <QToolTip>
+#include <QDateTime>
 
 extern KviPointerList<KviListWindow> * g_pListWindowList;
 
@@ -74,7 +74,6 @@ KviChannelListViewItemData::~KviChannelListViewItemData()
 }
 
 
-
 KviChannelListViewItem::KviChannelListViewItem(KviTalListView * v,KviChannelListViewItemData * pData)
 : KviTalListViewItem(v)
 {
@@ -86,11 +85,8 @@ KviChannelListViewItem::~KviChannelListViewItem()
 {
 	delete m_pData;
 }
-#ifdef COMPILE_USE_QT4
+
 int KviChannelListViewItem::width ( const QFontMetrics & fm, const KviTalListView * lv, int column ) const
-#else
-int KviChannelListViewItem::width ( const QFontMetrics & fm, const QListView * lv, int column ) const
-#endif
 {
 	debug("width request");
 	QString szText;
@@ -123,14 +119,7 @@ void KviChannelListViewItem::paintCell(QPainter * p,const QColorGroup &cg,int co
 	int marg = lv->itemMargin();
 	int r = marg;
 
-#ifdef COMPILE_USE_QT4
-
 	p->fillRect( 0, 0, width, height(), cg.brush(lv->viewport()->backgroundRole()) );
-#else
-	const QColorGroup::ColorRole crole = QPalette::backgroundRoleFromMode(lv->viewport()->backgroundMode());
-	
-	p->fillRect( 0, 0, width, height(), cg.brush( crole ) );
-#endif
 
 	if ( isSelected() &&
 		(column == 0 || lv->allColumnsShowFocus()) ) {
@@ -150,7 +139,7 @@ void KviChannelListViewItem::paintCell(QPainter * p,const QColorGroup &cg,int co
 	
 	KviTopicWidget::paintColoredText(p,szText,cg,height(),width);
 }
-	
+
 QString KviChannelListViewItem::key(int col,bool) const
 {
 	switch(col)
@@ -170,7 +159,6 @@ QString KviChannelListViewItem::key(int col,bool) const
 }
 
 
-
 KviListWindow::KviListWindow(KviFrame * lpFrm,KviConsole * lpConsole)
 : KviWindow(KVI_WINDOW_TYPE_LIST,lpFrm,"list",lpConsole) , KviExternalServerDataParser()
 {
@@ -251,7 +239,6 @@ void KviListWindow::getBaseLogFileName(KviStr &buffer)
 	buffer.sprintf("LIST_%d",console()->ircContextId());
 }
 
-
 void KviListWindow::requestList()
 {
 	if(m_pConsole->isConnected())
@@ -465,7 +452,7 @@ void KviListWindow::processData(KviIrcMessage *msg)
 			msg->connection()->decodeText(msg->safeParam(2)),
 			msg->connection()->decodeText(msg->safeTrailing()))
 	);
-       
+
 	if(_OUTPUT_VERBOSE)
 	{
 		QString zzz = msg->connection()->decodeText(msg->allParams());
@@ -535,4 +522,3 @@ void KviListWindow::applyOptions()
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
 #include "listwindow.moc"
 #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
-
diff --git a/src/modules/list/listwindow.h b/src/modules/list/listwindow.h
index 727c246d8..bb4266cf0 100644
--- a/src/modules/list/listwindow.h
+++ b/src/modules/list/listwindow.h
@@ -31,11 +31,11 @@
 #include "kvi_sparser.h"
 #include "kvi_console.h"
 #include "kvi_irccontext.h"
-
 #include "kvi_tal_listview.h"
 #include "kvi_tal_popupmenu.h"
-#include <qtoolbutton.h>
-#include <qlineedit.h>
+
+#include <QToolButton>
+#include <QLineEdit>
 
 class KviThemedLabel;
 
@@ -63,18 +63,13 @@ protected:
 	KviChannelListViewItemData * m_pData;
 public:
 	const QString & channel(){ return m_pData->m_szChan; };
-#ifdef COMPILE_USE_QT4
 	int width ( const QFontMetrics & fm, const KviTalListView * lv, int column ) const;
-#else
-	int width ( const QFontMetrics & fm, const QListView * lv, int column ) const;
-#endif
 protected:
 	virtual void paintCell(QPainter * p,const QColorGroup &cg,int col,int wdth,int align);
 	virtual QString key(int col,bool) const;
 };
 
 
-
 class KviListWindow : public KviWindow, public KviExternalServerDataParser
 {
 	Q_OBJECT