more code clean

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

23 files changed, 155 insertions, 307 deletions

diff --git a/src/modules/editor/libkvieditor.cpp b/src/modules/editor/libkvieditor.cpp
index 2e60c651f..955dc75c7 100644
--- a/src/modules/editor/libkvieditor.cpp
+++ b/src/modules/editor/libkvieditor.cpp
@@ -19,11 +19,11 @@
 //   Inc. ,59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 //
 
-#include "kvi_module.h"
+#include "scripteditor.h"
 
+#include "kvi_module.h"
 #include "kvi_window.h"
 
-#include "scripteditor.h"
 
 KviModule * g_pEditorModulePointer = 0;
 
@@ -71,7 +71,7 @@ static bool editor_module_can_unload(KviModule *m)
 
 KVIRC_MODULE(
 	"Editor",                                               // module name
-	"1.0.0",                                                // module version
+	"4.0.0",                                                // module version
 	"Copyright (C) 2000 Szymon Stefanek (pragma at kvirc dot net)", // author & (C)
 	"Text editor extension",
 	editor_module_init,
diff --git a/src/modules/editor/scripteditor.cpp b/src/modules/editor/scripteditor.cpp
index 70237ee07..c2ef699fa 100644
--- a/src/modules/editor/scripteditor.cpp
+++ b/src/modules/editor/scripteditor.cpp
@@ -25,22 +25,6 @@
 
 #include "scripteditor.h"
 
-#include <qlayout.h>
-#include <qtoolbutton.h>
-#include <kvi_tal_groupbox.h>
-#include "kvi_tal_popupmenu.h"
-#include "kvi_tal_scrollview.h"
-#include <qmessagebox.h>
-#include <qtimer.h>
-#ifdef COMPILE_USE_QT4
-	//#define QSyntaxHighlighter Q3SyntaxHighlighter
-#else
-	#include <qobjectlist.h>
-#endif
-#include <qcursor.h>
-#include <qfont.h>
-#include <qrect.h>
-
 #include "kvi_fileutils.h"
 #include "kvi_locale.h"
 #include "kvi_filedialog.h"
@@ -48,20 +32,28 @@
 #include "kvi_config.h"
 #include "kvi_module.h"
 #include "kvi_pointerlist.h"
-//
 #include "kvi_app.h"
 #include "kvi_console.h"
 #include "kvi_window.h"
 #include "kvi_iconmanager.h"
 #include "kvi_kvs_kernel.h"
+#include <kvi_tal_groupbox.h>
+#include "kvi_tal_popupmenu.h"
+#include "kvi_tal_scrollview.h"
 
-#include <qlayout.h>
-
+#include <QLayout>
+#include <QToolButton>
+#include <QMessageBox>
+#include <QTimer>
+#include <QCursor>
+#include <QFont>
+#include <QRect>
+#include <QEvent>
+#include <QKeyEvent>
 
 extern KviPointerList<KviScriptEditorImplementation> * g_pScriptEditorWindowList;
 extern KviModule * g_pEditorModulePointer;
 
-
 static QColor g_clrBackground(255,255,255);
 static QColor g_clrNormalText(0,0,0);
 static QColor g_clrBracket(255,0,0);
@@ -71,7 +63,6 @@ static QColor g_clrKeyword(85,85,255);
 static QColor g_clrVariable(255,0,0);
 static QColor g_clrPunctuation(180,180,0);
 static QColor g_clrFind(0,0,0);
-
 static QFont g_fntNormal("Courier New",8);
 
 KviCompletionBox::KviCompletionBox(QWidget * parent = 0)
@@ -79,11 +70,8 @@ KviCompletionBox::KviCompletionBox(QWidget * parent = 0)
 {
 	setPaletteForegroundColor(QColor(0,0,0));
 	setPaletteBackgroundColor(QColor(255,255,255));
-#ifdef COMPILE_USE_QT4
 	setHScrollBarMode(KviTalListBox::AlwaysOff);
-#else
-	setHScrollBarMode(QScrollView::AlwaysOff);
-#endif
+
 	QFont listfont=font();
 	listfont.setPointSize(8);
 	setFont(listfont);
@@ -241,17 +229,9 @@ KviScriptEditorWidget::~KviScriptEditorWidget()
 
 }
 
-#ifdef COMPILE_USE_QT4
 Q3PopupMenu * KviScriptEditorWidget::createPopupMenu( const QPoint& pos )
-#else
-QPopupMenu * KviScriptEditorWidget::createPopupMenu( const QPoint& pos )
-#endif
 {
-#ifdef COMPILE_USE_QT4
 	Q3PopupMenu *pop=KviTalTextEdit::createPopupMenu(pos);
-#else
-	QPopupMenu *pop=KviTalTextEdit::createPopupMenu(pos);
-#endif
 	pop->insertItem(__tr2qs("Context sensitive help"),this,SLOT(slotHelp()),Qt::CTRL+Qt::Key_H);
 	pop->insertItem(__tr2qs("&Replace"),this,SLOT(slotReplace()),Qt::CTRL+Qt::Key_R);
 	return pop;
@@ -272,12 +252,12 @@ void KviScriptEditorWidget::slotReplace()
 	if(dialog->exec()){};
 
 }
+
 void KviScriptEditorWidget::slotHelp()
 {
 	contextSensitiveHelp();
 }
 
-
 void KviScriptEditorWidget::updateOptions()
 {
 	setPaper(QBrush(g_clrBackground));
@@ -287,12 +267,7 @@ void KviScriptEditorWidget::updateOptions()
 	QPalette p = palette();
 	p.setColor(QColorGroup::Text,g_clrNormalText);
 	setPalette(p);
-	
-#ifdef COMPILE_USE_QT4
 	setTextFormat(Qt::PlainText);
-#else
-	setTextFormat(KviTalTextEdit::PlainText);
-#endif
 	
 	// this will rehighlight everything
 	setText(text()); // an "hack" to ensure Update all in the editor
@@ -474,7 +449,6 @@ bool KviScriptEditorWidget::contextSensitiveHelp() const
 	return true;
 }
 
-
 void KviScriptEditorWidget::getWordOnCursor(QString &buffer,int index) const
 {
 	QRegExp re("[ \t=,\\(\\)\"}{\\[\\]\r\n+-*><;@!]");
@@ -847,9 +821,6 @@ KviScriptEditorImplementation::KviScriptEditorImplementation(QWidget * par)
 	QGridLayout * g = new QGridLayout(this,2,3,0,0);
 
 	m_pFindLineedit = new QLineEdit(" ",this);
-#ifndef COMPILE_USE_QT4
-	m_pFindLineedit->setFrameStyle(QFrame::Sunken | QFrame::Panel);
-#endif
 	m_pFindLineedit->setText("");
 	m_pFindLineedit->setPaletteForegroundColor(g_clrFind);
 
@@ -857,11 +828,7 @@ KviScriptEditorImplementation::KviScriptEditorImplementation(QWidget * par)
 	g->addMultiCellWidget(m_pEditor,0,0,0,3);
 	g->setRowStretch(0,1);
 
-#ifdef COMPILE_USE_QT4
 	QToolButton * b = new QToolButton(Qt::DownArrow,this,"dsa2");
-#else
-	QToolButton * b = new QToolButton(DownArrow,this);
-#endif
 	b->setMinimumWidth(24);
 	g->addWidget(b,1,0);
 
@@ -929,19 +896,22 @@ void KviScriptEditorImplementation::slotFind()
 	emit find(m_pFindLineedit->text());
 
 }
+
 void KviScriptEditorImplementation::slotNextFind(const QString &text)
 {
 //	emit nextFind(const QString &text);
+}
 
-}void KviScriptEditorImplementation::slotInitFind()
+void KviScriptEditorImplementation::slotInitFind()
 {
 	emit initFind();
-
 }
+
 void KviScriptEditorImplementation::slotReplaceAll(const QString &txt,const QString &txt1)
 {
 	emit replaceAll(txt,txt1);
 }
+
 void KviScriptEditorImplementation::saveOptions()
 {
 	QString tmp;
@@ -966,14 +936,11 @@ void KviScriptEditorImplementation::setFocus()
 	m_pEditor->setFocus();
 }
 
-
-
 void KviScriptEditorImplementation::focusInEvent(QFocusEvent *)
 {
 	m_pEditor->setFocus();
 }
 
-
 void KviScriptEditorImplementation::setEnabled(bool bEnabled)
 {
 	QWidget::setEnabled(bEnabled);
@@ -1006,11 +973,7 @@ void KviScriptEditorImplementation::saveToFile()
 void KviScriptEditorImplementation::setText(const KviQCString &txt)
 {
 	m_pEditor->setText(txt.data());
-#ifdef COMPILE_USE_QT4
 	m_pEditor->setTextFormat(Qt::PlainText);
-#else
-	m_pEditor->setTextFormat(KviTalTextEdit::PlainText);
-#endif
 	m_pEditor->moveCursor(KviTalTextEdit::MoveEnd,false);
 	m_pEditor->setModified(false);
 	updateRowColLabel();
@@ -1020,18 +983,16 @@ void KviScriptEditorImplementation::getText(KviQCString &txt)
 {
 	txt = m_pEditor->text();
 }
+
 QLineEdit * KviScriptEditorImplementation::getFindlineedit()
 {
 	return m_pFindLineedit;
 }
+
 void KviScriptEditorImplementation::setText(const QString &txt)
 {
 	m_pEditor->setText(txt);
-#ifdef COMPILE_USE_QT4
 	m_pEditor->setTextFormat(Qt::PlainText);
-#else
-	m_pEditor->setTextFormat(KviTalTextEdit::PlainText);
-#endif
 	m_pEditor->moveCursor(KviTalTextEdit::MoveEnd,false);
 	m_pEditor->setModified(false);
 	updateRowColLabel();
@@ -1041,6 +1002,7 @@ void KviScriptEditorImplementation::getText(QString &txt)
 {
 	txt = m_pEditor->text();
 }
+
 void KviScriptEditorImplementation::setFindText(const QString &txt)
 {
 	m_pFindLineedit->setText(txt);
@@ -1054,7 +1016,6 @@ void KviScriptEditorImplementation::setFindLineeditReadOnly(bool b)
 	
 }
 
-
 void KviScriptEditorImplementation::updateRowColLabel()
 {
 	int iRow,iCol;
@@ -1070,8 +1031,9 @@ void KviScriptEditorImplementation::updateRowColLabel()
 
 QPoint KviScriptEditorImplementation::getCursor()
 {
-		return m_lastCursorPos;
+	return m_lastCursorPos;
 }
+
 void KviScriptEditorImplementation::setCursorPosition(QPoint pos)
 {
 	m_pEditor->setCursorPosition(pos.x(),pos.y());
@@ -1117,8 +1079,9 @@ void KviScriptEditorImplementation::configureColors()
 		saveOptions();
 	}
 }
+
 KviScriptEditorReplaceDialog::KviScriptEditorReplaceDialog( QWidget* parent, const char* name)
-    : QDialog( parent)
+: QDialog( parent)
 {
 	m_pParent=parent;
 	emit initFind();
@@ -1127,43 +1090,26 @@ KviScriptEditorReplaceDialog::KviScriptEditorReplaceDialog( QWidget* parent, con
 	QGridLayout *layout = new QGridLayout( this, 1, 1, 11, 6, "replace layout"); 
  
 	m_pFindlineedit = new QLineEdit( this, "findlineedit" );
-#ifndef COMPILE_USE_QT4
-	m_pFindlineedit->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)0, 0, 0, m_pFindlineedit->sizePolicy().hasHeightForWidth() ) );
-	m_pFindlineedit->setFrameShape( QLineEdit::LineEditPanel );
-	m_pFindlineedit->setFrameShadow( QLineEdit::Sunken );
-#endif
-
 	layout->addMultiCellWidget( m_pFindlineedit, 2, 2, 1, 2 );
 
 	m_pReplacelineedit = new QLineEdit( this, "replacelineedit" );
-#ifndef COMPILE_USE_QT4
-	m_pReplacelineedit->setFrameShape( QLineEdit::LineEditPanel );
-	m_pReplacelineedit->setFrameShadow( QLineEdit::Sunken );
-#endif
 	layout->addMultiCellWidget( m_pReplacelineedit, 3, 3, 1, 2 );
 
-   	m_pFindlineedit->setFocus();
+	m_pFindlineedit->setFocus();
 
-    QLabel *findlabel = new QLabel( this, "findlabel" );
+	QLabel *findlabel = new QLabel( this, "findlabel" );
 	findlabel->setText(tr("Word to Find"));
-#ifndef COMPILE_USE_QT4
-	findlabel->setAutoResize(true);
-#endif
-
 	layout->addWidget( findlabel, 2, 0 );
 
-    QLabel *replacelabel = new QLabel( this, "replacelabel" );
+	QLabel *replacelabel = new QLabel( this, "replacelabel" );
 	replacelabel->setText(tr("Replace with"));
-#ifndef COMPILE_USE_QT4
-	replacelabel->setAutoResize(true);
-#endif
 	layout->addWidget( replacelabel, 3, 0 );
 
-    QPushButton *cancelbutton = new QPushButton( this, "cancelButton" );
+	QPushButton *cancelbutton = new QPushButton( this, "cancelButton" );
 	cancelbutton->setText(tr("&Cancel"));
 	layout->addWidget( cancelbutton, 5, 2 );
 
-    replacebutton = new QPushButton( this, "replacebutton" );
+	replacebutton = new QPushButton( this, "replacebutton" );
 	replacebutton->setText(tr("&Replace"));
 	replacebutton->setEnabled( FALSE );
 	layout->addWidget( replacebutton, 5, 0 );
@@ -1182,16 +1128,11 @@ KviScriptEditorReplaceDialog::KviScriptEditorReplaceDialog( QWidget* parent, con
 	layout->addWidget( replace, 3, 3 );
 	replace->setEnabled(false);
 
-#ifndef COMPILE_USE_QT4
-    clearWState( WState_Polished );
-	setTabOrder(m_pFindlineedit,m_pReplacelineedit);
-#endif
 	// signals and slots connections
 	connect( replacebutton, SIGNAL( clicked() ), this, SLOT( slotReplace() ) );
 	connect( findNext, SIGNAL( clicked() ),this,SLOT( slotNextFind()));
 	connect( cancelbutton, SIGNAL( clicked() ), this, SLOT( reject() ) );
 	connect( m_pFindlineedit, SIGNAL( textChanged(const QString &)), this, SLOT( textChanged(const QString &)));
-
 }
 
 
@@ -1205,6 +1146,7 @@ void KviScriptEditorReplaceDialog::textChanged(const QString &txt)
 	else replacebutton->setEnabled(FALSE);
 
 }
+
 void KviScriptEditorReplaceDialog::slotReplace()
 {
 	QString txt=((KviScriptEditorWidget *)m_pParent)->text();
@@ -1217,7 +1159,6 @@ void KviScriptEditorReplaceDialog::slotReplace()
 	setTabOrder(m_pFindlineedit,m_pReplacelineedit);
 }
 
-
 void KviScriptEditorReplaceDialog::slotNextFind()
 {
 	emit nextFind(m_pFindlineedit->text());
diff --git a/src/modules/editor/scripteditor.h b/src/modules/editor/scripteditor.h
index 0d14ede29..605d2168a 100644
--- a/src/modules/editor/scripteditor.h
+++ b/src/modules/editor/scripteditor.h
@@ -26,20 +26,24 @@
 //=============================================================================
 
 #include "kvi_scripteditor.h"
-
-#include <qlabel.h>
+#include "kvi_pointerlist.h"
+#include "kvi_selectors.h"
+#include "kvi_qcstring.h"
 #include <kvi_tal_textedit.h>
-#include <qsyntaxhighlighter.h>
-#include <qdialog.h>
-#include <qcheckbox.h>
+#include "kvi_tal_popupmenu.h"
 #include "kvi_tal_listbox.h"
-#include <qevent.h> 
-#include "kvi_qcstring.h"
 
-#include "kvi_tal_popupmenu.h"
+#include <QLabel>
+#include <QDialog>
+#include <QCheckBox>
+#include <QEvent>
+
+// FIXME: Qt4 #include <QSyntaxHighlighter>
+#include <q3syntaxhighlighter.h>
+#define QSyntaxHighlighter Q3SyntaxHighlighter
+
+class QTimer;
 
-#include "kvi_pointerlist.h"
-#include "kvi_selectors.h"
 typedef KviPointerList<int> ColumnList;
 
 class KviCompletionBox: public KviTalListBox
@@ -81,22 +85,11 @@ signals:
 protected:
 	virtual void keyPressEvent(QKeyEvent * e);
 	void contentsMousePressEvent(QMouseEvent *);
-#ifdef COMPILE_USE_QT4
 	Q3PopupMenu *createPopupMenu( const QPoint& pos );
-#else
-	QPopupMenu *createPopupMenu( const QPoint& pos );
-#endif
 	QWidget *m_pParent;
 	QString m_szHelp;
-
 };
 
-#ifdef COMPILE_USE_QT4
-	#include <q3syntaxhighlighter.h>
-	#define QSyntaxHighlighter Q3SyntaxHighlighter
-#else
-	#include <qobjectlist.h>
-#endif
 class KviScriptSyntaxHighlighter : public QSyntaxHighlighter
 {
 public:
@@ -121,8 +114,6 @@ protected slots:
 	void okClicked();
 };
 
-class QTimer;
-
 class KviScriptEditorImplementation : public KviScriptEditor
 {
 	Q_OBJECT
diff --git a/src/modules/eventeditor/eventeditor.cpp b/src/modules/eventeditor/eventeditor.cpp
index a9d78c093..e04114122 100644
--- a/src/modules/eventeditor/eventeditor.cpp
+++ b/src/modules/eventeditor/eventeditor.cpp
@@ -36,21 +36,18 @@
 //#include "kvi_eventhandler.h"
 #include "kvi_qstring.h"
 #include "kvi_filedialog.h"
-
 #include "kvi_kvs_eventmanager.h"
-
-#include <qmessagebox.h>
-
-#include <qsplitter.h>
-#include <qlayout.h>
 #include "kvi_tal_vbox.h"
 #include "kvi_tal_popupmenu.h"
-#include <qtooltip.h>
-#include <qpushbutton.h>
-#include <qevent.h>
 
-extern KviEventEditorWindow * g_pEventEditorWindow;
+#include <QMessageBox>
+#include <QSplitter>
+#include <QLayout>
+#include <QToolTip>
+#include <QPushButton>
+#include <QEvent>
 
+extern KviEventEditorWindow * g_pEventEditorWindow;
 
 
 const QPixmap * KviEventListViewItem::pixmap(int col) const
@@ -64,7 +61,6 @@ const QPixmap * KviEventHandlerListViewItem::pixmap(int col) const
 }
 
 
-
 KviEventEditor::KviEventEditor(QWidget * par)
 : QWidget(par,"event_editor")
 {
@@ -327,7 +323,6 @@ void KviEventEditor::showEvent(QShowEvent *e)
 	QWidget::showEvent(e);
 }
 
-
 void KviEventEditor::getExportEventBuffer(QString &buffer,KviEventHandlerListViewItem * it)
 {
 	if(!it->parent())return;
@@ -417,8 +412,6 @@ void KviEventEditor::exportAllEvents()
 }
 
 
-
-
 KviEventEditorWindow::KviEventEditorWindow(KviFrame * lpFrm)
 : KviWindow(KVI_WINDOW_TYPE_SCRIPTEDITOR,lpFrm,"eventeditor",0)
 {
@@ -502,13 +495,11 @@ void KviEventEditorWindow::fillCaptionBuffers()
 	m_szHtmlInactiveCaption += p3;
 }
 
-
 void KviEventEditorWindow::getConfigGroupName(KviStr &szName)
 {
 	szName = "eventeditor";
 }
 
-
 void KviEventEditorWindow::saveProperties(KviConfig *cfg)
 {
 /*
diff --git a/src/modules/eventeditor/eventeditor.h b/src/modules/eventeditor/eventeditor.h
index e9f94ff4d..682386854 100644
--- a/src/modules/eventeditor/eventeditor.h
+++ b/src/modules/eventeditor/eventeditor.h
@@ -24,12 +24,13 @@
 
 #include "kvi_window.h"
 #include "kvi_string.h"
-
-#include <qwidget.h>
 #include "kvi_tal_listview.h"
-#include <qlineedit.h>
+
+#include <QWidget>
+#include <QLineEdit>
 
 class KviScriptEditor;
+class KviTalPopupMenu;
 
 class KviEventListViewItem : public KviTalListViewItem
 {
@@ -61,8 +62,6 @@ public:
 	virtual const QPixmap * pixmap(int col) const;
 };
 
-class KviTalPopupMenu;
-
 class KviEventEditor : public QWidget
 {
 	Q_OBJECT
diff --git a/src/modules/eventeditor/libkvieventeditor.cpp b/src/modules/eventeditor/libkvieventeditor.cpp
index 9113c791f..44ef8e068 100644
--- a/src/modules/eventeditor/libkvieventeditor.cpp
+++ b/src/modules/eventeditor/libkvieventeditor.cpp
@@ -20,12 +20,12 @@
 //   Inc. ,59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 //
 
+#include "eventeditor.h"
+
 #include "kvi_module.h"
 #include "kvi_locale.h"
 #include "kvi_frame.h"
 
-#include "eventeditor.h"
-
 KviEventEditorWindow * g_pEventEditorWindow = 0;
 
 
@@ -78,7 +78,7 @@ static bool eventeditor_module_cleanup(KviModule *m)
 
 KVIRC_MODULE(
 	"EventEditor",                                                 // module name
-	"1.0.0",                                                // module version
+	"4.0.0",                                                // module version
 	"Copyright (C) 2002 Szymon Stefanek (pragma at kvirc dot net)", // author & (C)
 	"Editor for the script events",
 	eventeditor_module_init,
diff --git a/src/modules/ident/libkviident.cpp b/src/modules/ident/libkviident.cpp
index 38afdefb1..4e4265a88 100644
--- a/src/modules/ident/libkviident.cpp
+++ b/src/modules/ident/libkviident.cpp
@@ -20,17 +20,15 @@
 //   Inc. ,59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 //
 
-#include "kvi_module.h"
-
 #include "libkviident.h"
 
+#include "kvi_module.h"
 #include "kvi_socket.h"
 #include "kvi_app.h"
 #include "kvi_out.h"
 #include "kvi_netutils.h"
 #include "kvi_locale.h"
 #include "kvi_window.h"
-
 #include "kvi_options.h"
 #include "kvi_defaults.h"
 
@@ -58,15 +56,15 @@ void startIdentService()
 		usleep(100);
 #endif
 	}
-//	debug("Service started");
+//	qDebug("Service started");
 }
 
 void stopIdentService()
 {
-//	debug("Stopping");
+//	qDebug("Stopping");
 	if(g_pIdentDaemon)delete g_pIdentDaemon;
-    g_pIdentDaemon = 0;
-//	debug("Stopped");
+	g_pIdentDaemon = 0;
+//	qDebug("Stopped");
 }
 
 KviIdentSentinel::KviIdentSentinel()
@@ -145,7 +143,6 @@ KviIdentRequest::~KviIdentRequest()
 }
 
 
-
 KviIdentDaemon::KviIdentDaemon()
 : KviSensitiveThread()
 {
@@ -325,7 +322,6 @@ ipv6_failure:
 
 	for(;;)
 	{
-
 		if(KviThreadEvent * e = dequeueEvent())
 		{
 			// This can be ONLY a terminate event
@@ -509,8 +505,6 @@ ipv6_failure:
 
 	}
 
-
-
 exit_on_request:
 
 	postEvent(g_pIdentSentinel,new KviThreadEvent(KVI_IDENT_THREAD_EVENT_EXITING_ON_REQUEST));
@@ -525,7 +519,7 @@ exit_thread:
 	if(m_sock != KVI_INVALID_SOCKET)kvi_socket_close(m_sock);
 	if(m_sock6 != KVI_INVALID_SOCKET)kvi_socket_close(m_sock6);
 	delete m_pRequestList;
-    m_pRequestList = 0;
+	m_pRequestList = 0;
 
 //	debug("RUN EXITING");
 }
@@ -603,7 +597,7 @@ static bool ident_module_can_unload(KviModule *m)
 
 KVIRC_MODULE(
 	"Ident",                                              // module name
-	"1.0.0",                                                // module version
+	"4.0.0",                                                // module version
 	"Copyright (C) 2001 Szymon Stefanek (pragma at kvirc dot net)", // author & (C)
 	"Ident service",
 	ident_module_init,
@@ -615,4 +609,3 @@ KVIRC_MODULE(
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
 #include "libkviident.moc"
 #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
-
diff --git a/src/modules/ident/libkviident.h b/src/modules/ident/libkviident.h
index 8e8b7d2cd..422a9e517 100644
--- a/src/modules/ident/libkviident.h
+++ b/src/modules/ident/libkviident.h
@@ -27,9 +27,9 @@
 #include "kvi_string.h"
 #include "kvi_time.h"
 #include "kvi_settings.h"
-
 #include "kvi_pointerlist.h"
-#include <qobject.h>
+
+#include <QObject>
 
 class KviIdentRequest
 {
diff --git a/src/modules/iograph/libkviiograph.cpp b/src/modules/iograph/libkviiograph.cpp
index 21d94e75b..6ebe6efae 100644
--- a/src/modules/iograph/libkviiograph.cpp
+++ b/src/modules/iograph/libkviiograph.cpp
@@ -283,7 +283,7 @@ static bool iograph_module_can_unload(KviModule *m)
 
 KVIRC_MODULE(
 	"IOGraph",                                              // module name
-	"1.0.0",                                                // module version
+	"4.0.0",                                                // module version
 	"Copyright (C) 2000 Szymon Stefanek (pragma at kvirc dot net)", // author & (C)
 	"IRC socket traffic monitor",
 	iograph_module_init,
diff --git a/src/modules/lamerizer/libkvilamerizer.cpp b/src/modules/lamerizer/libkvilamerizer.cpp
index 920b0f412..0891aefb7 100644
--- a/src/modules/lamerizer/libkvilamerizer.cpp
+++ b/src/modules/lamerizer/libkvilamerizer.cpp
@@ -265,7 +265,7 @@ static bool lamerizer_module_can_unload(KviModule *)
 // =======================================
 KVIRC_MODULE(
 	"Lamerizer crypt engine",
-	"1.0.1",
+	"4.0.0",
 	"Szymon Stefanek <pragma at kvirc dot net> \n Jan Wagner <istari@kvirc.net>" ,
 	"Exports the lamerizer text transformation engine",
 	lamerizer_module_init ,
@@ -279,4 +279,3 @@ KVIRC_MODULE(
 		#include "libkvilamerizer.moc"
 	#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
 #endif
-
diff --git a/src/modules/language/libkvilanguage.cpp b/src/modules/language/libkvilanguage.cpp
index 7f9eba891..c7ce80a9c 100644
--- a/src/modules/language/libkvilanguage.cpp
+++ b/src/modules/language/libkvilanguage.cpp
@@ -26,7 +26,6 @@
 #include "kvi_app.h"
 
 
-
 static bool language_module_init(KviModule * m)
 {
 	/*
@@ -46,10 +45,9 @@ static bool language_module_cleanup(KviModule *m)
 	return true;
 }
 
-
 KVIRC_MODULE(
 	"Language",                                              // module name
-	"1.0.0",                                                // module version
+	"4.0.0",                                                // module version
 	"Copyright (C) 2004 Szymon Stefanek (pragma at kvirc dot net)", // author & (C)
 	"A simple statistical language/encoding detector",
 	language_module_init,
diff --git a/src/modules/links/libkvilinks.cpp b/src/modules/links/libkvilinks.cpp
index 28c54b04c..cc09c9626 100644
--- a/src/modules/links/libkvilinks.cpp
+++ b/src/modules/links/libkvilinks.cpp
@@ -19,17 +19,14 @@
 //   Inc. ,59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 //
 
-
-#include "kvi_module.h"
-
-
 #include "linkswindow.h"
 
+#include "kvi_module.h"
 #include "kvi_frame.h"
 #include "kvi_window.h"
 #include "kvi_locale.h"
 
-#include <qsplitter.h>
+#include <QSplitter>
 
 KviPointerList<KviLinksWindow> * g_pLinksWindowList = 0;
 
@@ -59,7 +56,6 @@ KviPointerList<KviLinksWindow> * g_pLinksWindowList = 0;
 		To see the internal network server tree you might request LINKS from the gateway server.[br]
 */
 
-
 static bool links_kvs_cmd_open(KviKvsModuleCommandCall * c)
 {
 	
@@ -77,9 +73,6 @@ static bool links_kvs_cmd_open(KviKvsModuleCommandCall * c)
 	return true;
 }
 
-
-
-
 static bool links_module_init(KviModule * m)
 {
 	g_pLinksWindowList = new KviPointerList<KviLinksWindow>;
@@ -106,7 +99,7 @@ static bool links_module_can_unload(KviModule *m)
 
 KVIRC_MODULE(
 	"Links",                                             // 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)
 	"Links window extension",
 	links_module_init,
diff --git a/src/modules/links/linkswindow.cpp b/src/modules/links/linkswindow.cpp
index 854855206..1da1e3e6e 100644
--- a/src/modules/links/linkswindow.cpp
+++ b/src/modules/links/linkswindow.cpp
@@ -32,11 +32,11 @@
 #include "kvi_themedlabel.h"
 #include "kvi_irccontext.h"
 #include "kvi_ircconnection.h"
-
-#include <qsplitter.h>
-#include <qtooltip.h>
 #include "kvi_tal_hbox.h"
-#include <qlabel.h>
+
+#include <QSplitter>
+#include <QToolTip>
+#include <QLabel>
 
 extern KviPointerList<KviLinksWindow> * g_pLinksWindowList;
 
@@ -103,7 +103,6 @@ void KviLinksWindow::getBaseLogFileName(KviStr &buffer)
 	buffer.sprintf("LINKS_%d",console()->ircContextId());
 }
 
-
 void KviLinksWindow::requestLinks()
 {
 	if(m_pConsole->isConnected())
@@ -472,4 +471,3 @@ void KviLinksWindow::applyOptions()
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
 #include "m_linkswindow.moc"
 #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
-
diff --git a/src/modules/links/linkswindow.h b/src/modules/links/linkswindow.h
index 2d65f0fdc..3befc875d 100644
--- a/src/modules/links/linkswindow.h
+++ b/src/modules/links/linkswindow.h
@@ -28,10 +28,10 @@
 #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 <QToolButton>
 
 class KviThemedLabel;
 
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
diff --git a/src/modules/log/libkvilog.cpp b/src/modules/log/libkvilog.cpp
index 0bbf11111..3f3410c29 100644
--- a/src/modules/log/libkvilog.cpp
+++ b/src/modules/log/libkvilog.cpp
@@ -149,7 +149,6 @@ static bool log_kvs_cmd_start(KviKvsModuleCommandCall * c)
 
 static bool log_kvs_cmd_stop(KviKvsModuleCommandCall * c)
 {
-	
 	KviWindow * pWnd = c->window();
 	if(c->hasSwitch('w',"window"))
 	{
@@ -169,8 +168,7 @@ static bool log_kvs_cmd_stop(KviKvsModuleCommandCall * c)
 		}
 	}
 
-	if(pWnd->view())
-		pWnd->view()->stopLogging();
+	if(pWnd->view()) pWnd->view()->stopLogging();
 	return true;
 }
 
@@ -202,7 +200,6 @@ static bool log_kvs_cmd_stop(KviKvsModuleCommandCall * c)
 
 static bool log_kvs_cmd_flush(KviKvsModuleCommandCall * c)
 {
-	
 	KviWindow * pWnd = c->window();
 	if(c->hasSwitch('w',"window"))
 	{
@@ -222,8 +219,7 @@ static bool log_kvs_cmd_flush(KviKvsModuleCommandCall * c)
 		}
 	}
 
-	if(pWnd->view())
-		pWnd->view()->flushLog();
+	if(pWnd->view()) pWnd->view()->flushLog();
 	return true;
 }
 
@@ -259,7 +255,7 @@ static bool log_kvs_cmd_flush(KviKvsModuleCommandCall * c)
 
 static bool log_kvs_fnc_file(KviKvsModuleFunctionCall * c)
 {
-	QString szWindow; 
+	QString szWindow;
 	QString buffer;
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("window id",KVS_PT_STRING,KVS_PF_OPTIONAL,szWindow)
@@ -299,7 +295,7 @@ static bool log_module_cleanup(KviModule *m)
 
 KVIRC_MODULE(
 	"Log",                                                  // module name
-	"1.0.0",                                                // module version
+	"4.0.0",                                                // module version
 	"Copyright (C) 2001 Szymon Stefanek (pragma at kvirc dot net)", // author & (C)
 	"User interface to the logging system for KVIrc",
 	log_module_init,
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
-