more code clean

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

5 files changed, 49 insertions, 76 deletions

diff --git a/src/modules/logview/libkvilogview.cpp b/src/modules/logview/libkvilogview.cpp
index 7f81da977..f6c03d335 100644
--- a/src/modules/logview/libkvilogview.cpp
+++ b/src/modules/logview/libkvilogview.cpp
@@ -24,9 +24,7 @@
 #include "logviewmdiwindow.h"
 
 #include "kvi_config.h"
-
 #include "kvi_module.h"
-
 #include "kvi_frame.h"
 #include "kvi_iconmanager.h"
 #include "kvi_locale.h"
@@ -62,7 +60,7 @@ KviLogViewMDIWindow        * g_pLogViewWindow = 0;
 // ============================================
 
 static bool logview_kvs_cmd_open(KviKvsModuleCommandCall * c)
-{ 
+{
 	KviModuleExtensionDescriptor * d = c->module()->findExtensionDescriptor("tool",LOGVIEW_MODULE_EXTENSION_NAME);
 	if(d)
 	{
@@ -122,7 +120,6 @@ static KviModuleExtension * logview_extension_alloc(KviModuleExtensionAllocStruc
 	return g_pLogViewWindow;
 }
 
-
 static bool logview_module_init(KviModule * m)
 {
 	g_pLogViewWindow = 0;
@@ -160,7 +157,7 @@ static bool logview_module_can_unload(KviModule *m)
 
 KVIRC_MODULE(
 	"KVIrc Log Viewer Widget",
-	"1.0.0",
+	"4.0.0",
 	"Juanjo Alvarez <juanjux@yahoo.es>",
 	"An structured log file viewer",
 	logview_module_init,
diff --git a/src/modules/logview/logviewmdiwindow.cpp b/src/modules/logview/logviewmdiwindow.cpp
index 1e029a538..e7368c11b 100644
--- a/src/modules/logview/logviewmdiwindow.cpp
+++ b/src/modules/logview/logviewmdiwindow.cpp
@@ -22,6 +22,7 @@
 
 #include "logviewmdiwindow.h"
 #include "logviewwidget.h"
+
 #include "kvi_iconmanager.h"
 #include "kvi_locale.h"
 #include "kvi_module.h"
@@ -32,34 +33,30 @@
 #include "kvi_qcstring.h"
 #include "kvi_app.h"
 #include "kvi_fileutils.h"
-#ifdef COMPILE_USE_QT4
-	#include <q3progressdialog.h>
-#else
-	#include <qprogressdialog.h> 
-#endif
 #include "kvi_valuelist.h"
 #include "kvi_accel.h"
-#include <qpixmap.h>
-#include <qsplitter.h>
-#include <qtoolbutton.h>
+#include "kvi_styled_controls.h"
 #include "kvi_tal_listview.h"
-#include <qfileinfo.h>
-#include <qdir.h>
 #include "kvi_tal_popupmenu.h"
-#include <qcursor.h>
-#include <qlayout.h>
-#include <qpushbutton.h>
-
 
+#include <q3progressdialog.h>
+#include <QPixmap>
+#include <QSplitter>
+#include <QToolButton>
+#include <QFileInfo>
+#include <QDir>
+#include <QCursor>
+#include <QLayout>
+#include <QPushButton>
+#include <QTextCodec>
+#include <QDateTimeEdit>
+#include <QLineEdit>
+#include <QLabel>
 
 #ifdef COMPILE_ZLIB_SUPPORT
 	#include <zlib.h>
 #endif
-#include <qtextcodec.h>
-#include "kvi_styled_controls.h"
-#include <qdatetimeedit.h>
-#include <qlineedit.h>
-#include <qlabel.h>
+
 
 extern KviLogViewMDIWindow * g_pLogViewWindow;
 
@@ -68,11 +65,8 @@ KviLogViewMDIWindow::KviLogViewMDIWindow(KviModuleExtensionDescriptor * d,KviFra
 {
 	g_pLogViewWindow = this;
 //	m_pLogViewWidget = new KviLogViewWidget(this);
-	#ifdef COMPILE_USE_QT4
+
 	m_pSplitter = new QSplitter(Qt::Horizontal,this,"main_splitter");
-#else
-	m_pSplitter = new QSplitter(QSplitter::Horizontal,this,"main_splitter");
-#endif
 	m_pTabWidget = new QTabWidget(m_pSplitter);
 	
 	m_pIndexTab  = new KviTalVBox(m_pTabWidget);
@@ -153,11 +147,8 @@ KviLogViewMDIWindow::KviLogViewMDIWindow(KviModuleExtensionDescriptor * d,KviFra
 	layout->addWidget(w,11,1);
 
 	m_pIrcView = new KviIrcView(m_pSplitter,g_pFrame,this);
-#ifdef COMPILE_USE_QT4
 	m_pIrcView->setFocusPolicy(Qt::ClickFocus);
-#else
-		m_pIrcView->setFocusPolicy(QWidget::ClickFocus);
-#endif
+
 	KviValueList<int> li;
 	li.append(110);
 	li.append(width()-110);
@@ -170,15 +161,14 @@ KviLogViewMDIWindow::KviLogViewMDIWindow(KviModuleExtensionDescriptor * d,KviFra
 	setupItemList();
 	KviAccel *a = new KviAccel( this );
         a->connectItem( a->insertItem(Qt::Key_F+Qt::CTRL),
-                        m_pIrcView,
-                        SLOT(toggleToolWidget()) );
+				m_pIrcView,
+				SLOT(toggleToolWidget()) );
 }
 
 
-
 KviLogViewMDIWindow::~KviLogViewMDIWindow()
 {
-    g_pLogViewWindow = 0;
+	g_pLogViewWindow = 0;
 }
 
 void KviLogViewMDIWindow::applyFilter()
@@ -186,13 +176,11 @@ void KviLogViewMDIWindow::applyFilter()
 	setupItemList();
 }
 
-
 QPixmap * KviLogViewMDIWindow::myIconPtr()
 {
-    return g_pIconManager->getSmallIcon(KVI_SMALLICON_LOG);
+	return g_pIconManager->getSmallIcon(KVI_SMALLICON_LOG);
 }
 
-
 void KviLogViewMDIWindow::resizeEvent(QResizeEvent *e)
 {
 	m_pSplitter->setGeometry(0,0,width(),height());
@@ -250,16 +238,9 @@ void KviLogViewMDIWindow::setupItemList()
 	QDate toDate   = m_pToDateEdit->date();
 
 	QString textBuffer;
-#ifdef COMPILE_USE_QT4
 	Q3ProgressDialog progress( __tr2qs_ctx("Filtering files...","logview"),
 		__tr2qs_ctx("Abort filtering","logview"), m_logList.count(),
-                          this, "progress", TRUE );
-#else
-	QProgressDialog progress( __tr2qs_ctx("Filtering files...","logview"),
-		__tr2qs_ctx("Abort filtering","logview"), m_logList.count(),
-                          this, "progress", TRUE );
-#endif
-
+				this, "progress", TRUE );
 
 	int i=0;
 	for(pFile=m_logList.first();pFile;pFile=m_logList.next())
@@ -328,10 +309,10 @@ void KviLogViewMDIWindow::cacheFileList()
 	m_pFileNames.sort();
 	QString szFname;
 
-    for(QStringList::Iterator it = m_pFileNames.begin(); it != m_pFileNames.end(); ++it)
-    {
-        szFname=(*it);
-        QFileInfo fi(szFname);
+	for(QStringList::Iterator it = m_pFileNames.begin(); it != m_pFileNames.end(); ++it)
+	{
+		szFname=(*it);
+		QFileInfo fi(szFname);
 		if(fi.extension(false)=="gz" || fi.extension(false)=="log")
 			m_logList.append(new KviLogFile(szFname));
 	}
@@ -366,11 +347,11 @@ void KviLogViewMDIWindow::itemSelected(KviTalListViewItem * it)
 
 QStringList KviLogViewMDIWindow::getFileNames()
 {
-    QString logPath;
-    g_pApp->getLocalKvircDirectory(logPath,KviApp::Log);
-    QString qPath(logPath);
-    QDir logDir(qPath);
-    return logDir.entryList();
+	QString logPath;
+	g_pApp->getLocalKvircDirectory(logPath,KviApp::Log);
+	QString qPath(logPath);
+	QDir logDir(qPath);
+	return logDir.entryList();
 }
 
 void KviLogViewMDIWindow::rightButtonClicked ( KviTalListViewItem * it, const QPoint &, int )
@@ -477,4 +458,3 @@ void KviLogFile::getText(QString & text,const QString& logDir){
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
 #include "logviewmdiwindow.moc"
 #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
-
diff --git a/src/modules/logview/logviewmdiwindow.h b/src/modules/logview/logviewmdiwindow.h
index 95fb855aa..a8e4ee6ea 100644
--- a/src/modules/logview/logviewmdiwindow.h
+++ b/src/modules/logview/logviewmdiwindow.h
@@ -25,19 +25,20 @@
 #include "kvi_settings.h"
 #include "kvi_window.h"
 #include "kvi_moduleextension.h"
-
 #include "kvi_tal_vbox.h"
 #include "kvi_tal_listview.h"
 #include "kvi_pointerlist.h"
-#include <qtabwidget.h>
-#include <qdatetime.h> 
 
-class KviTalListView;
+#include <QTabWidget>
+#include <QDateTime>
+
 class QStringList;
-class KviLogViewWidget;
 class QCheckBox;
 class QLineEdit;
 class QDateEdit;
+class KviTalListView;
+class KviLogViewWidget;
+
 
 class KviLogFile {
 
@@ -122,4 +123,3 @@ protected slots:
 };
 
 #endif //_LOGVIEWMDIWINDOW_H_
-
diff --git a/src/modules/logview/logviewwidget.cpp b/src/modules/logview/logviewwidget.cpp
index f4218ac14..9c308b33c 100644
--- a/src/modules/logview/logviewwidget.cpp
+++ b/src/modules/logview/logviewwidget.cpp
@@ -22,24 +22,24 @@
 
 #include "logviewwidget.h"
 
-#include <qsplitter.h>
-#include <qlayout.h>
-#include <qdir.h>
-
 //#include "kvi_debug.h"
 #include "kvi_locale.h"
 #include "kvi_iconmanager.h"
 #include "kvi_app.h"
-
 #include "kvi_qstring.h"
+
+#include <QSplitter>
+#include <QLayout>
+#include <QDir>
+#include <QTextCodec>
+
 #ifdef COMPILE_ZLIB_SUPPORT
 	#include <zlib.h>
 #endif
-#include <qtextcodec.h>
+
 
 const QPixmap * KviLogListViewItemType::pixmap(int col) const 
 {
-	
 	switch(m_type)
 	{
 		case KviLogFile::Channel:
@@ -76,4 +76,3 @@ QString KviLogListViewItemType::text(int col) const
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
 #include "logviewwidget.moc"
 #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
-
diff --git a/src/modules/logview/logviewwidget.h b/src/modules/logview/logviewwidget.h
index 0cbd4069f..b4a77d879 100644
--- a/src/modules/logview/logviewwidget.h
+++ b/src/modules/logview/logviewwidget.h
@@ -23,13 +23,12 @@
 //   Inc. ,59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 //
 
-#include "kvi_window.h"
-#include "kvi_scripteditor.h"
 #include "logviewmdiwindow.h"
 
+#include "kvi_window.h"
+#include "kvi_scripteditor.h"
 #include "kvi_tal_listview.h"
 
-
 class KviScriptEditor;
 
 class KviLogListViewItem : public KviTalListViewItem
@@ -81,6 +80,4 @@ public:
 	virtual QString text(int col) const { return m_pFileData->date().toString("dd.MM.yyyy"); };
 };
 
-
 #endif
-