code clean

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

12 files changed, 158 insertions, 218 deletions

diff --git a/src/modules/notifier/libkvinotifier.cpp b/src/modules/notifier/libkvinotifier.cpp
index e513f439f..7a14610ab 100644
--- a/src/modules/notifier/libkvinotifier.cpp
+++ b/src/modules/notifier/libkvinotifier.cpp
@@ -21,12 +21,10 @@
 //
 //==================================================================================
 
-#include "kvi_module.h"
-
-
 #include "notifierwindow.h"
 #include "notifiermessage.h"
 
+#include "kvi_module.h"
 #include "kvi_kvs_variant.h"
 #include "kvi_app.h"
 #include "kvi_frame.h"
@@ -36,7 +34,7 @@
 #include "kvi_time.h"
 #include "kvi_options.h"
 
-#include <qsplitter.h>
+#include <QSplitter>
 
 KviNotifierWindow * g_pNotifierWindow = 0;
 kvi_time_t g_tNotifierDisabledUntil = 0;
@@ -312,9 +310,9 @@ static bool notifier_module_ctrl(KviModule *,const char *operation,void *param)
 
 KVIRC_MODULE(
 	"Notifier",
-	"2.0.0",
+	"4.0.0",
 	"Copyright (C) 2005:\n" \
-	"  Iacopo Palazzi (iakko at siena dot linux dot it)",
+	"	Iacopo Palazzi (iakko at siena dot linux dot it)",
 	"KVIrc Client - Taskbar Notifier",
 	notifier_module_init,
 	notifier_module_can_unload,
diff --git a/src/modules/notifier/notifiermessage.cpp b/src/modules/notifier/notifiermessage.cpp
index cc7af2391..e9e1dd7d0 100644
--- a/src/modules/notifier/notifiermessage.cpp
+++ b/src/modules/notifier/notifiermessage.cpp
@@ -29,7 +29,6 @@
 #include "kvi_config.h"
 #include "kvi_app.h"
 #include "kvi_window.h"
-
 #include "kvi_locale.h"
 #include "kvi_frame.h"
 #include "kvi_mirccntrl.h"
@@ -45,18 +44,14 @@
 #endif
 */
 
-#include <qapplication.h>
-#include <qpainter.h>
-#include <qimage.h>
-#include <qdesktopwidget.h>
-#include <qtooltip.h>
+#include <QApplication>
+#include <QPainter>
+#include <QImage>
+#include <QDesktopWidget>
+#include <QToolTip>
+#include <q3popupmenu.h>
+#define QPopupMenu Q3PopupMenu
 
-#ifdef COMPILE_USE_QT4
-	#define QPopupMenu Q3PopupMenu
-	#include <q3popupmenu.h>
-#else
-	#include <qpopupmenu.h>
-#endif
 
 extern kvi_time_t g_tNotifierDisabledUntil;
 
@@ -104,4 +99,3 @@ void KviNotifierMessage::setHistoric()
 	increase_transparency(tmp,out,2);
 	m_pImage->convertFromImage(tmp);
 }
-
diff --git a/src/modules/notifier/notifiermessage.h b/src/modules/notifier/notifiermessage.h
index c7b337315..645b6c062 100644
--- a/src/modules/notifier/notifiermessage.h
+++ b/src/modules/notifier/notifiermessage.h
@@ -27,34 +27,27 @@
 
 
 #include "kvi_settings.h"
-
-#include <qwidget.h>
-#include <qrect.h>
-#include <qtimer.h>
-#include <qpixmap.h>
-#include <qimage.h>
-#include <qfont.h>
-#include <qcolor.h>
-#include <qlineedit.h>
-
 #include "kvi_qstring.h"
 #include "kvi_pointerlist.h"
 #include "kvi_time.h"
 
-#ifdef COMPILE_USE_QT4
-	#define QSimpleRichText Q3SimpleRichText
-	#define QPopupMenu Q3PopupMenu
-	#include <q3popupmenu.h>
-	#include <q3simplerichtext.h>
-#else
-	#include <qsimplerichtext.h>
-#endif
+#include <QWidget>
+#include <QRect>
+#include <QTimer>
+#include <QPixmap>
+#include <QImage>
+#include <QFont>
+#include <QColor>
+#include <QLineEdit>
+#include <q3popupmenu.h>
+#include <q3simplerichtext.h>
+#define QSimpleRichText Q3SimpleRichText
+#define QPopupMenu Q3PopupMenu
 
+class QPopupMenu;
 class KviWindow;
 class KviNotifierWindow;
 
-class QPopupMenu;
-
 class KviNotifierMessage
 {
 	friend class KviNotifierWindow;
diff --git a/src/modules/notifier/notifierwindow.cpp b/src/modules/notifier/notifierwindow.cpp
index f997d018b..f177b8f98 100644
--- a/src/modules/notifier/notifierwindow.cpp
+++ b/src/modules/notifier/notifierwindow.cpp
@@ -23,46 +23,36 @@
 //==================================================================================
 #include "kvi_settings.h"
 
-#ifdef COMPILE_USE_QT4
-	#define QPopupMenu Q3PopupMenu
-	#define QSimpleRichText Q3SimpleRichText
-
-	#include <q3popupmenu.h>
-	#include <q3simplerichtext.h>
-#else
-	#include <qpopupmenu.h>
-	#include <qsimplerichtext.h>
-#endif
-
-	#include <qpainter.h>
-
 #include "notifiermessage.h"
 #include "notifierwindow.h"
+#include "notifierwindowbody.h"
+#include "notifierwindowborder.h"
+#include "notifierwindowprogressbar.h"
+#include "notifierwindowtabs.h"
 
 #include "kvi_iconmanager.h"
 #include "kvi_config.h"
 #include "kvi_app.h"
 #include "kvi_window.h"
-
 #include "kvi_locale.h"
 #include "kvi_frame.h"
 #include "kvi_mirccntrl.h"
 #include "kvi_options.h"
 #include "kvi_userinput.h"
 
-#include <qapplication.h>
-#include <qimage.h>
-#include <qdesktopwidget.h>
-#include <qtooltip.h>
-#include <qevent.h>
-#include <qpen.h>
-#include <qfontmetrics.h>    
-#include <qregexp.h> 
-
-#include "notifierwindowbody.h"
-#include "notifierwindowborder.h"
-#include "notifierwindowprogressbar.h"
-#include "notifierwindowtabs.h"
+#include <QApplication>
+#include <QImage>
+#include <QDesktopWidget>
+#include <QToolTip>
+#include <QEvent>
+#include <QPen>
+#include <QFontMetrics>
+#include <QRegExp>
+#include <QPainter>
+#include <q3popupmenu.h>
+#include <q3simplerichtext.h>
+#define QPopupMenu Q3PopupMenu
+#define QSimpleRichText Q3SimpleRichText
 
 extern KviNotifierWindow * g_pNotifierWindow;
 
@@ -83,7 +73,6 @@ KviNotifierWindow::KviNotifierWindow()
 			Qt::WStyle_StaysOnTop)
 #endif
 {
-
 	g_pNotifierWindow = this;
 
 	m_eState = Hidden;
@@ -127,11 +116,7 @@ KviNotifierWindow::KviNotifierWindow()
 	if(m_iInputHeight < 10)m_iInputHeight = 10;
 
 	setBackgroundMode(Qt::NoBackground);
-#ifdef COMPILE_USE_QT4
 	setFocusPolicy(Qt::NoFocus);
-#else
-	setFocusPolicy(QWidget::NoFocus);
-#endif
 	setMouseTracking(true);
 	//setCursor(m_cursor);
 	
@@ -201,7 +186,8 @@ KviNotifierWindow::~KviNotifierWindow()
 	delete m_pWndBody;
 }
 
-int KviNotifierWindow::countTabs() {
+int KviNotifierWindow::countTabs()
+{
 	return m_pWndTabs->count();
 }
 
@@ -215,7 +201,6 @@ void KviNotifierWindow::reloadImages()
 	m_pWndBorder->resize(m_pixBackground.size());
 }
 
-
 void KviNotifierWindow::addMessage(KviWindow * pWnd,const QString &szImageId,const QString &szText,unsigned int uMessageTime)
 {
 	QPixmap * pIcon;
@@ -256,9 +241,10 @@ void KviNotifierWindow::addMessage(KviWindow * pWnd,const QString &szImageId,con
 }
 	
 
-int KviNotifierWindow::textWidth() {
+int KviNotifierWindow::textWidth()
+{
 	return m_pWndBody->textRect().width() - 20;
-};
+}
 
 void KviNotifierWindow::stopShowHideTimer()
 {
@@ -344,14 +330,14 @@ void KviNotifierWindow::doShow(bool bDoAnimate)
 				m_dOpacity = OPACITY_STEP;
 				m_eState = Showing;
 				m_bCrashShowWorkAround=true;
-				#if defined(COMPILE_USE_QT4) && (defined(COMPILE_ON_WINDOWS) || defined(Q_OS_MACX)) 
+				#if (defined(COMPILE_ON_WINDOWS) || defined(Q_OS_MACX))
 				setWindowOpacity(m_dOpacity);
-				#endif	
+				#endif
 				show();
-				#if defined(COMPILE_USE_QT4) && (defined(COMPILE_ON_WINDOWS) || defined(Q_OS_MACX)) 
-				m_pShowHideTimer->start(40);
+				#if (defined(COMPILE_ON_WINDOWS) || defined(Q_OS_MACX))
+					m_pShowHideTimer->start(40);
 				#else
-				m_pShowHideTimer->start(100);
+					m_pShowHideTimer->start(100);
 				#endif
 				computeRect();
 				m_bCrashShowWorkAround=false;
@@ -377,9 +363,7 @@ bool KviNotifierWindow::shouldHideIfMainWindowGotAttention()
 	return t->window()->hasAttention();
 }
 
-
 void KviNotifierWindow::heartbeat()
-
 {
 	bool bIncreasing;
 	double targetOpacity = 0; //qt4
@@ -401,18 +385,12 @@ void KviNotifierWindow::heartbeat()
 				m_eState = Hiding;
 			} else {
 				m_dOpacity += OPACITY_STEP;
-#ifdef COMPILE_USE_QT4
 				targetOpacity = isActiveWindow() ? KVI_OPTION_UINT(KviOption_uintNotifierActiveTransparency) : KVI_OPTION_UINT(KviOption_uintNotifierInactiveTransparency);
 
 				targetOpacity/=100;
 				if(m_dOpacity >= targetOpacity)
 				{
 					m_dOpacity = targetOpacity;
-#else
-				if(m_dOpacity >= 1.0)
-				{
-					m_dOpacity = 1.0;
-#endif
 					m_eState = Visible;
 					stopShowHideTimer();
 					startBlinking();
@@ -421,14 +399,13 @@ void KviNotifierWindow::heartbeat()
 
 				if(!isVisible())show(); //!!!
 				if(m_pLineEdit->isVisible())m_pLineEdit->hide();
-				#if defined(COMPILE_USE_QT4) && (defined(COMPILE_ON_WINDOWS) || defined(Q_OS_MACX)) 
-				setWindowOpacity(m_dOpacity);
+				#if (defined(COMPILE_ON_WINDOWS) || defined(Q_OS_MACX))
+					setWindowOpacity(m_dOpacity);
 				#endif
 				update();
 
 			}
 		break;
-#ifdef COMPILE_USE_QT4
 		case FocusingOn:
 			targetOpacity = KVI_OPTION_UINT(KviOption_uintNotifierActiveTransparency);
 			targetOpacity/=100;
@@ -463,10 +440,9 @@ void KviNotifierWindow::heartbeat()
 
 			setWindowOpacity(m_dOpacity);
 			break;
-#endif
 		case Hiding:
 			m_dOpacity -= OPACITY_STEP;
-			#if defined(COMPILE_USE_QT4) && (defined(COMPILE_ON_WINDOWS) || defined(Q_OS_MACX)) 
+			#if (defined(COMPILE_ON_WINDOWS) || defined(Q_OS_MACX))
 				setWindowOpacity(m_dOpacity);
 			#endif
 			if(m_pLineEdit->isVisible())m_pLineEdit->hide();
@@ -530,16 +506,14 @@ void KviNotifierWindow::doHide(bool bDoAnimate)
 			connect(m_pShowHideTimer,SIGNAL(timeout()),this,SLOT(heartbeat()));
 			m_dOpacity = 1.0 - OPACITY_STEP;
 			m_eState = Hiding;
-			#if defined(COMPILE_USE_QT4) && (defined(COMPILE_ON_WINDOWS) || defined(Q_OS_MACX)) 
-			setWindowOpacity(m_dOpacity);
-			update();
-			m_pShowHideTimer->start(40);
+			#if (defined(COMPILE_ON_WINDOWS) || defined(Q_OS_MACX))
+				setWindowOpacity(m_dOpacity);
+				update();
+				m_pShowHideTimer->start(40);
 			#else
-			update();		
-			m_pShowHideTimer->start(100);
+				update();
+				m_pShowHideTimer->start(100);
 			#endif
-			
-
 		}
 		break;
 	}
@@ -549,7 +523,6 @@ void KviNotifierWindow::showEvent(QShowEvent *e)
 {
 	computeRect();
 	setGeometry(m_wndRect); // w_win = w_wndRect
-	
 }
 
 void KviNotifierWindow::hideEvent(QHideEvent * e)
@@ -568,7 +541,6 @@ void KviNotifierWindow::startBlinking()
 {
 	stopBlinkTimer();
 	m_bBlinkOn = false;
-	
 
 	if(!KVI_OPTION_BOOL(KviOption_boolDisableNotifierFlashing))
 	{
@@ -623,7 +595,7 @@ void KviNotifierWindow::blink()
 			return;
 		}
 	}
-	update(); 
+	update();
 }
 
 void KviNotifierWindow::markAllMessagesAsHistoric()
@@ -632,7 +604,6 @@ void KviNotifierWindow::markAllMessagesAsHistoric()
 	m_pWndTabs->markAllMessagesAsHistoric();
 }
 
-
 static void blend_images(QImage &buffer,QImage &background,QImage &foreground,double dValue)
 {
 	for(int y = 0;y < buffer.height();y++)
@@ -676,7 +647,7 @@ void KviNotifierWindow::paintEvent(QPaintEvent * e)
 	{
 			QPainter px(this);
 	
-	#if defined(COMPILE_USE_QT4) && (defined(COMPILE_ON_WINDOWS) || defined(Q_OS_MACX))
+	#if (defined(COMPILE_ON_WINDOWS) || defined(Q_OS_MACX))
 		px.drawPixmap(0,0,m_pixForeground);
 	#else
 		QImage temp_image = m_pixForeground.convertToImage();
@@ -685,12 +656,8 @@ void KviNotifierWindow::paintEvent(QPaintEvent * e)
 	#endif
 		px.end();
 	} else {
-#ifdef COMPILE_USE_QT4
 		QPainter px(this);
 		px.drawPixmap(0,0,m_pixForeground);
-#else
-		bitBlt(this,QPoint(0,0),&m_pixForeground);
-#endif
 	}
 }
 
@@ -778,7 +745,6 @@ void KviNotifierWindow::redrawText()
 
 void KviNotifierWindow::mouseMoveEvent(QMouseEvent * e)
 {
-
 	//debug ("move on x,y: %d,%d", e->pos().x(), e->pos().y());
 
 	if (!m_bLeftButtonIsPressed) {
@@ -816,8 +782,7 @@ void KviNotifierWindow::mouseMoveEvent(QMouseEvent * e)
 		/* ### END ### */
 		
 sartelo:
-		
-		update();
+	update();
 	
 	}
 
@@ -844,7 +809,6 @@ sartelo:
 
 void KviNotifierWindow::mousePressEvent(QMouseEvent * e)
 {
-
 	// stop blinking first of all :)
 	bool bWasBlinkOn = m_bBlinkOn;
 	m_bBlinkOn = false;
@@ -1008,9 +972,7 @@ void KviNotifierWindow::keyPressEvent(QKeyEvent * e)
 
 void KviNotifierWindow::keyReleaseEvent(QKeyEvent * e)
 {
-	if (e->key()==Qt::Key_Shift) {
-		m_bKeyShiftPressed = false;
-	}
+	if (e->key()==Qt::Key_Shift) m_bKeyShiftPressed = false;
 }
 
 void KviNotifierWindow::delayedRaise(KviWindow * pWnd)
@@ -1107,9 +1069,7 @@ bool KviNotifierWindow::checkResizing(QPoint e)
 		}
 	}
 	return m_bResizing;
-};
-
-
+}
 
 void KviNotifierWindow::resize(QPoint p, bool up)
 {
@@ -1190,7 +1150,8 @@ void KviNotifierWindow::redrawWindow()
 	
 }
 
-inline void KviNotifierWindow::setCursor(int cur) {
+inline void KviNotifierWindow::setCursor(int cur)
+{
 	if (m_cursor.shape() != cur) {
 		if(QApplication::overrideCursor()) QApplication::restoreOverrideCursor();
 		m_cursor.setShape((Qt::CursorShape)cur);
@@ -1201,14 +1162,12 @@ inline void KviNotifierWindow::setCursor(int cur) {
 
 void KviNotifierWindow::enterEvent(QEvent * e)
 {
-#ifdef COMPILE_USE_QT4
 	if(!m_pShowHideTimer) {
 		m_pShowHideTimer = new QTimer();
 		connect(m_pShowHideTimer,SIGNAL(timeout()),this,SLOT(heartbeat()));
 	}
 	m_eState = FocusingOn;
 	m_pShowHideTimer->start(40);
-#endif
 }
 
 void KviNotifierWindow::leaveEvent(QEvent * e)
@@ -1216,16 +1175,13 @@ void KviNotifierWindow::leaveEvent(QEvent * e)
 	// Leaving the widget area, restore default cursor
 	m_pWndBorder->resetIcons();
 	m_pWndTabs->resetIcons();
-	if (!m_bResizing)
-		setCursor(-1);
-#ifdef COMPILE_USE_QT4
+	if (!m_bResizing) setCursor(-1);
 	if(!m_pShowHideTimer) {
 		m_pShowHideTimer = new QTimer();
 		connect(m_pShowHideTimer,SIGNAL(timeout()),this,SLOT(heartbeat()));
 	}
 	m_eState = FocusingOff;
 	m_pShowHideTimer->start(40);
-#endif
 }
 
 void KviNotifierWindow::contextPopup(const QPoint &pos)
@@ -1322,7 +1278,6 @@ void KviNotifierWindow::wheelEvent(QWheelEvent * e)
 	else nextButtonClicked();
 }
 
-
 void KviNotifierWindow::prevButtonClicked()
 {
 	KviNotifierWindowTab * tab = m_pWndTabs->currentTab();
@@ -1423,7 +1378,7 @@ void KviNotifierWindow::progressUpdate()
 	QPainter p(this);
 	m_pProgressBar->draw(&p);
 }
+
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
 #include "m_notifierwindow.moc"
 #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
-
diff --git a/src/modules/notifier/notifierwindow.h b/src/modules/notifier/notifierwindow.h
index 27480e25b..0887b2a0b 100644
--- a/src/modules/notifier/notifierwindow.h
+++ b/src/modules/notifier/notifierwindow.h
@@ -24,36 +24,34 @@
 //
 //==================================================================================
 
-#include "kvi_settings.h"
-
-#include <qbitmap.h>
-#include <qcolor.h>
-#include <qcursor.h>
-#include <qdatetime.h> 
-#include <qfont.h>
-#include <qimage.h>
-#include <qlineedit.h>
-#include <qpixmap.h>
-#include <qrect.h>
-#include <qtimer.h>
-#include <qwidget.h>
+#include "notifiersettings.h"
 
+#include "kvi_settings.h"
 #include "kvi_qstring.h"
 #include "kvi_pointerlist.h"
 #include "kvi_time.h"
 
-#include "notifiersettings.h"
+#include <QBitmap>
+#include <QColor>
+#include <QCursor>
+#include <QDateTime>
+#include <QFont>
+#include <QImage>
+#include <QLineEdit>
+#include <QPixmap>
+#include <QRect>
+#include <QTimer>
+#include <QWidget>
 
+class QPainter;
+class QPopupMenu;
 class KviWindow;
 class KviNotifierMessage;
-
 class KviNotifierWindowBody;
 class KviNotifierWindowBorder;
 class KviNotifierWindowProgressBar;
 class KviNotifierWindowTabs;
 
-class QPainter;
-class QPopupMenu;
 
 extern kvi_time_t g_tNotifierDisabledUntil;
 
diff --git a/src/modules/notifier/notifierwindowbody.cpp b/src/modules/notifier/notifierwindowbody.cpp
index a85ea0ac4..d6353fdfc 100644
--- a/src/modules/notifier/notifierwindowbody.cpp
+++ b/src/modules/notifier/notifierwindowbody.cpp
@@ -26,9 +26,9 @@
 
 #include "kvi_iconmanager.h"
 
-#include <qbrush.h>
-#include <qcolor.h>
-#include <qpainter.h>
+#include <QBrush>
+#include <QColor>
+#include <QPainter>
 
 /*
 #ifdef QT3_SUPPORT
@@ -52,7 +52,6 @@ KviNotifierWindowBody::~KviNotifierWindowBody()
 {
 }
 
-
 void KviNotifierWindowBody::loadImages()
 {
 	QPixmap * p;
@@ -158,10 +157,10 @@ void KviNotifierWindowBody::setPrevIcon(int state)
 			m_prevIconState=state;
 			needToRedraw();
 		}
-};
-
-void KviNotifierWindowBody::setNextIcon(int state)	{
+}
 
+void KviNotifierWindowBody::setNextIcon(int state)
+{
 	//if (m_nextIconState==WDG_ICON_OFF && state!=WDG_ICON_OFF)
 		if (m_nextIconState!=state) {
 			switch (state) {
@@ -173,10 +172,10 @@ void KviNotifierWindowBody::setNextIcon(int state)	{
 			needToRedraw();
 			m_nextIconState=state;
 		}
-};
-									
-void KviNotifierWindowBody::setWriteIcon(int state)	{
+}
 
+void KviNotifierWindowBody::setWriteIcon(int state)
+{
 	//if (m_writeIconState==WDG_ICON_OFF && state!=WDG_ICON_OFF)
 		if (m_writeIconState!=state) {
 			switch (state) {
@@ -187,10 +186,10 @@ void KviNotifierWindowBody::setWriteIcon(int state)	{
 			needToRedraw();
 			m_writeIconState=state;
 		}
-};
+}
 
-void KviNotifierWindowBody::draw(QPainter * p) {
-	
+void KviNotifierWindowBody::draw(QPainter * p)
+{
 	if (m_bNeedToRedraw) {
 	
 		p->fillRect(QRect(m_pnt,m_rct.size()),m_mac_bkgColor);
@@ -215,18 +214,20 @@ void KviNotifierWindowBody::draw(QPainter * p) {
 		p->drawPixmap(m_rctWriteIcon.x(), m_rctWriteIcon.y(), m_pixIconWrite);
 
 		m_bNeedToRedraw = false;
-		
 	}
 }
 
-void KviNotifierWindowBody::mouseMoveEvent(QMouseEvent * e) {
+void KviNotifierWindowBody::mouseMoveEvent(QMouseEvent * e)
+{
 
 }
 
-void KviNotifierWindowBody::mousePressEvent(QMouseEvent * e) {
+void KviNotifierWindowBody::mousePressEvent(QMouseEvent * e)
+{
 
 }
 
-void KviNotifierWindowBody::mouseReleaseEvent(QMouseEvent * e) {
+void KviNotifierWindowBody::mouseReleaseEvent(QMouseEvent * e)
+{
 
 }
diff --git a/src/modules/notifier/notifierwindowbody.h b/src/modules/notifier/notifierwindowbody.h
index d2a661c8d..083e17fc8 100644
--- a/src/modules/notifier/notifierwindowbody.h
+++ b/src/modules/notifier/notifierwindowbody.h
@@ -24,20 +24,22 @@
 //
 //=============================================================================
 
-#include <qevent.h>
-#include <qrect.h>
-#include <qpoint.h>
-#include <qpixmap.h>
-
 #include "notifiersettings.h"
 
+#include <QRect>
+#include <QPoint>
+#include <QPixmap>
+#include <QEvent>
+#include <QMouseEvent>
+
+class QPainter;
+
 /*
 #ifdef QT3_SUPPORT
 	#define QPainter Q3Painter
 #endif
 */
 
-class QPainter;
 
 class KviNotifierWindowBody
 {
@@ -137,8 +139,6 @@ public:
 	void mouseMoveEvent(QMouseEvent * e);
 	void mousePressEvent(QMouseEvent * e);
 	void mouseReleaseEvent(QMouseEvent * e);
-	
-	
 
 protected:
 
diff --git a/src/modules/notifier/notifierwindowborder.cpp b/src/modules/notifier/notifierwindowborder.cpp
index 89361654a..85dce649c 100644
--- a/src/modules/notifier/notifierwindowborder.cpp
+++ b/src/modules/notifier/notifierwindowborder.cpp
@@ -24,9 +24,10 @@
 
 #include "notifierwindowborder.h"
 #include "notifierwindowtabs.h"
+
 #include "kvi_iconmanager.h"
 
-#include <qpainter.h>
+#include <QPainter>
 
 KviNotifierWindowBorder::KviNotifierWindowBorder(QSize s)
 {
@@ -38,8 +39,8 @@ KviNotifierWindowBorder::~KviNotifierWindowBorder()
 {
 }
 
-void KviNotifierWindowBorder::loadImages() {
-
+void KviNotifierWindowBorder::loadImages()
+{
 	// Normal Border
 
 	QPixmap * p;
@@ -139,12 +140,14 @@ void KviNotifierWindowBorder::setPics(bool b)
 	}
 }
 
-void KviNotifierWindowBorder::setWidth(int w) {
+void KviNotifierWindowBorder::setWidth(int w)
+{
 	m_iRctWidth = w;
 	recalculatePositions();
 }
 
-void KviNotifierWindowBorder::setHeight(int h) {
+void KviNotifierWindowBorder::setHeight(int h)
+{
 	m_iRctHeight = h;
 	recalculatePositions();
 }
@@ -178,7 +181,8 @@ void KviNotifierWindowBorder::recalculatePositions()
 	m_bNeedToRedraw = true;
 }
 
-void KviNotifierWindowBorder::setCloseIcon(int state) { 
+void KviNotifierWindowBorder::setCloseIcon(int state)
+{
 	m_bNeedToRedraw = true; m_eIconState = state;
 	switch (m_eIconState) {
 			case WDG_ICON_OUT: m_pixIconClose = m_pixIconClose_out; break;
@@ -187,12 +191,13 @@ void KviNotifierWindowBorder::setCloseIcon(int state) {
 	};
 }
 
-void KviNotifierWindowBorder::resetIcons() {
+void KviNotifierWindowBorder::resetIcons()
+{
 	setCloseIcon(WDG_ICON_OUT);
 }
 
-void KviNotifierWindowBorder::draw(QPainter * p, bool b) {
-
+void KviNotifierWindowBorder::draw(QPainter * p, bool b)
+{
 	if (m_bNeedToRedraw) {
 		setPics(b);
 		setCloseIcon(m_eIconState);
@@ -216,5 +221,4 @@ void KviNotifierWindowBorder::draw(QPainter * p, bool b) {
 
 		m_bNeedToRedraw = false;
 	}
-	
 }
diff --git a/src/modules/notifier/notifierwindowborder.h b/src/modules/notifier/notifierwindowborder.h
index d205bed8c..2653f3f06 100644
--- a/src/modules/notifier/notifierwindowborder.h
+++ b/src/modules/notifier/notifierwindowborder.h
@@ -26,9 +26,9 @@
 
 #include "notifiersettings.h"
 
-#include <qsize.h>
-#include <qrect.h>
-#include <qpixmap.h>
+#include <QSize>
+#include <QRect>
+#include <QPixmap>
 
 class QPainter;
 
diff --git a/src/modules/notifier/notifierwindowprogressbar.h b/src/modules/notifier/notifierwindowprogressbar.h
index 674f204cc..55444184a 100644
--- a/src/modules/notifier/notifierwindowprogressbar.h
+++ b/src/modules/notifier/notifierwindowprogressbar.h
@@ -24,8 +24,8 @@
 //
 //=============================================================================
 
-#include <qrect.h>
-#include <qpainter.h>
+#include <QRect>
+#include <QPainter>
 
 class KviNotifierWindowProgressBar
 {
@@ -60,8 +60,6 @@ public:
 	void draw(QPainter *);
 	
 protected:
-
-
 };
 
 #endif //!_NOTIFIERWINDOWPROGRESSBAR_H_
diff --git a/src/modules/notifier/notifierwindowtabs.cpp b/src/modules/notifier/notifierwindowtabs.cpp
index 4ef9b45c9..7a0f78b69 100644
--- a/src/modules/notifier/notifierwindowtabs.cpp
+++ b/src/modules/notifier/notifierwindowtabs.cpp
@@ -22,6 +22,9 @@
 //
 //=============================================================================
 
+#include "notifiermessage.h"
+#include "notifierwindowtabs.h"
+
 #include "kvi_app.h"
 #include "kvi_config.h"
 #include "kvi_qstring.h"
@@ -30,14 +33,12 @@
 #include "kvi_options.h"
 #include "kvi_window.h"
 
-#include <qevent.h>
-#include <qpainter.h>
-#include <qbrush.h>
-#include <qcolor.h>
-#include <qfontmetrics.h>
-
-#include "notifiermessage.h"
-#include "notifierwindowtabs.h"
+#include <QPainter>
+#include <QBrush>
+#include <QColor>
+#include <QFontMetrics>
+#include <QEvent>
+#include <QMouseEvent>
 
 extern KviNotifierWindow * g_pNotifierWindow;
 KviNotifierWindowTabs * g_pTabs;
@@ -171,9 +172,9 @@ int KviNotifierWindowTab::width(bool b) {
 	return width;
 }
 
-// ##################################################################################à
+// #################################################################################
 // ### end of tab object definition class
-// ##################################################################################à
+// #################################################################################
 
 
 KviNotifierWindowTabs::KviNotifierWindowTabs(QRect r)
@@ -274,8 +275,6 @@ void KviNotifierWindowTabs::loadImages()
 
 }
 
-
-
 void KviNotifierWindowTabs::addMessage(KviWindow * pWnd, KviNotifierMessage * message)
 {
 	QString sender = pWnd ? pWnd->windowName() : "----";
@@ -411,7 +410,8 @@ void KviNotifierWindowTabs::next()
 
 }
 
-void KviNotifierWindowTabs::mousePressEvent(QMouseEvent * e) {
+void KviNotifierWindowTabs::mousePressEvent(QMouseEvent * e)
+{
 
 	if (m_bIsOverRightBound && m_rctNextIcon.contains(e->pos())) {
 		return;
@@ -452,7 +452,6 @@ void KviNotifierWindowTabs::mouseMoveEvent(QMouseEvent * e)
 
 void KviNotifierWindowTabs::mouseReleaseEvent(QMouseEvent * e)
 {
-
 	if (m_bIsOverRightBound && m_rctNextIcon.contains(e->pos())) {
 		scrollTabsLeft();
 		return;
@@ -474,21 +473,23 @@ void KviNotifierWindowTabs::mouseReleaseEvent(QMouseEvent * e)
 		
 }
 
-void KviNotifierWindowTabs::scrollTabsLeft() {
+void KviNotifierWindowTabs::scrollTabsLeft()
+{
 	if (m_bIsOverRightBound) {
 		m_iTabToStartFrom++;
 	}
 	needToRedraw();
 	g_pNotifierWindow->update();
-};
+}
 
-void KviNotifierWindowTabs::scrollTabsRight() {
+void KviNotifierWindowTabs::scrollTabsRight()
+{
 	if (m_bIsOverLeftBound) {
 		m_iTabToStartFrom--;
 	}
 	needToRedraw();
 	g_pNotifierWindow->update();
-};
+}
 
 void KviNotifierWindowTabs::setCloseTabIcon(int state)	{
 
@@ -510,7 +511,7 @@ void KviNotifierWindowTabs::resetIcons()
 }
 
 void KviNotifierWindowTabs::setFocusOn(KviNotifierWindowTab * tab)
-{	
+{
 	if(m_pTabFocused)m_pTabFocused->setFocused(false);
 	m_pTabFocused = tab;
 	if(m_pTabFocused)m_pTabFocused->setFocused();
@@ -628,7 +629,6 @@ void KviNotifierWindowTabs::draw(QPainter * p)
 	p->drawPixmap(m_rct.x(), m_rct.y(), *m_pPixmap, 0, 0, m_pPixmap->width(), m_pPixmap->height());
 
 	m_bNeedToRedraw = false;
-	
 }
 
 void KviNotifierWindowTabs::markAllMessagesAsHistoric()
@@ -705,4 +705,3 @@ void KviNotifierWindowTabs::closeTab(KviWindow * pWnd, KviNotifierWindowTab * pT
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
 #include "m_notifierwindowtabs.moc"
 #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
-
diff --git a/src/modules/notifier/notifierwindowtabs.h b/src/modules/notifier/notifierwindowtabs.h
index cc22f9589..38064c9a6 100644
--- a/src/modules/notifier/notifierwindowtabs.h
+++ b/src/modules/notifier/notifierwindowtabs.h
@@ -24,19 +24,19 @@
 //
 //=============================================================================
 
-#include <qfont.h>
-#include <qmap.h>
-#include <qobject.h>
-#include <qpixmap.h>
-#include <qpoint.h>
-#include <qrect.h>
-#include "kvi_settings.h"
-#include "kvi_pointerlist.h"
+#include "notifiermessage.h"
 #include "notifiersettings.h"
 #include "notifierwindow.h"
 
-#include "notifiermessage.h"
+#include "kvi_settings.h"
+#include "kvi_pointerlist.h"
 
+#include <QFont>
+#include <QMap>
+#include <QObject>
+#include <QPixmap>
+#include <QPoint>
+#include <QRect>
 
 class QPainter;
 class KviWindow;