second round of misc compilation noise reduction

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

4 files changed, 38 insertions, 37 deletions

diff --git a/src/modules/notifier/libkvinotifier.cpp b/src/modules/notifier/libkvinotifier.cpp
index 5a64a63d4..33b2e3cc6 100644
--- a/src/modules/notifier/libkvinotifier.cpp
+++ b/src/modules/notifier/libkvinotifier.cpp
@@ -54,7 +54,7 @@ kvi_time_t g_tNotifierDisabledUntil = 0;
 	@description:
 		Adds a message to the notifier window.
 		The notifier window is shown (if not already visible)
-		unless the -q switch is present. 
+		unless the -q switch is present.
 		The new message becomes the current message of the notifier
 		unless the user is already typing in the input window
 		and the typed message would be directed to a different window.
@@ -72,7 +72,7 @@ kvi_time_t g_tNotifierDisabledUntil = 0;
 	@switches:
 		!sw: -n | --noanim
 		Do not animate
-		!sw: -w | --windowid 
+		!sw: -w | --windowid
 		Causes the message gets attacched to the specified window and
 		the user is able to type commands in that window after
 		showing up the notifier input. If the "=<window_id>" part
@@ -90,7 +90,7 @@ kvi_time_t g_tNotifierDisabledUntil = 0;
 		Obviously -n has no meaning if -q is used.[br]
 		!sw: -t | --timeout
 		Set the message lifetime to <timeout>
-		Obviously this option has no meaning if the window is not going to be shown. 
+		Obviously this option has no meaning if the window is not going to be shown.
 		The timeout may be overriddent by new messages but only in the future.
 		If the timeout expires and is not overridden by any new message
 		then the window will be automatically hidden.
@@ -121,12 +121,12 @@ static bool notifier_kvs_cmd_message(KviKvsModuleCommandCall * c)
 
 	if(!g_pNotifierWindow)
 		g_pNotifierWindow = new KviNotifierWindow();
-		
+
 	QString szIco="";
 	QString szWnd="";
-	
+
 	KviWindow * pWnd = c->window();
-	
+
 	if(c->hasSwitch('w',"window_id"))
 	{
 		c->switches()->getAsStringIfExisting('w',"window_id",szWnd);
@@ -244,7 +244,7 @@ static bool notifier_kvs_cmd_show(KviKvsModuleCommandCall * c)
 		There is also a global option that allows forcibly disabling
 		the notifier forever, this option could be overridden with [cmd]option[/cmd]
 		instead.. but again [b]DON'T do it[/b] :)[br]
-		
+
 */
 
 static bool notifier_kvs_fnc_isEnabled(KviKvsModuleFunctionCall * c)
@@ -260,7 +260,7 @@ static bool notifier_kvs_fnc_isEnabled(KviKvsModuleFunctionCall * c)
 
 static bool notifier_module_init(KviModule * m)
 {
-	
+
 	KVSM_REGISTER_SIMPLE_COMMAND(m,"message",notifier_kvs_cmd_message);
 	KVSM_REGISTER_SIMPLE_COMMAND(m,"show",notifier_kvs_cmd_show);
 	KVSM_REGISTER_SIMPLE_COMMAND(m,"hide",notifier_kvs_cmd_hide);
@@ -269,7 +269,7 @@ static bool notifier_module_init(KviModule * m)
 	return true;
 }
 
-static bool notifier_module_cleanup(KviModule *m)
+static bool notifier_module_cleanup(KviModule *)
 {
 	if(g_pNotifierWindow)
 	{
@@ -279,7 +279,7 @@ static bool notifier_module_cleanup(KviModule *m)
 	return true;
 }
 
-static bool notifier_module_can_unload(KviModule *m)
+static bool notifier_module_can_unload(KviModule *)
 {
 	return (!g_pNotifierWindow);
 }
diff --git a/src/modules/notifier/notifierwindow.cpp b/src/modules/notifier/notifierwindow.cpp
index 34765055d..f53058d61 100644
--- a/src/modules/notifier/notifierwindow.cpp
+++ b/src/modules/notifier/notifierwindow.cpp
@@ -345,6 +345,8 @@ void KviNotifierWindow::doShow(bool bDoAnimate)
 				startAutoHideTimer();
 			}
 		break;
+		default:
+		break;
 	}
 }
 
@@ -511,16 +513,18 @@ void KviNotifierWindow::doHide(bool bDoAnimate)
 			#endif
 		}
 		break;
+		default:
+		break;
 	}
 }
 
-void KviNotifierWindow::showEvent(QShowEvent *e)
+void KviNotifierWindow::showEvent(QShowEvent *)
 {
 	computeRect();
 	setGeometry(m_wndRect); // w_win = w_wndRect
 }
 
-void KviNotifierWindow::hideEvent(QHideEvent * e)
+void KviNotifierWindow::hideEvent(QHideEvent *)
 {
 	if (m_bCrashShowWorkAround) return;
 	stopBlinkTimer();
@@ -625,7 +629,7 @@ static void blend_images(QImage &buffer,QImage &background,QImage &foreground,do
 	}
 }
 
-void KviNotifierWindow::paintEvent(QPaintEvent * e)
+void KviNotifierWindow::paintEvent(QPaintEvent *)
 {
 
 	redrawWindow();
@@ -1080,7 +1084,7 @@ bool KviNotifierWindow::checkResizing(QPoint e)
 	return m_bResizing;
 }
 
-void KviNotifierWindow::resize(QPoint p, bool up)
+void KviNotifierWindow::resize(QPoint , bool)
 {
 	//QPoint aux = mapToGlobal(p);
 
@@ -1169,7 +1173,7 @@ inline void KviNotifierWindow::setCursor(int cur)
 		if(QApplication::overrideCursor()) QApplication::restoreOverrideCursor();
 }
 
-void KviNotifierWindow::enterEvent(QEvent * e)
+void KviNotifierWindow::enterEvent(QEvent *)
 {
 	if(!m_pShowHideTimer) {
 		m_pShowHideTimer = new QTimer();
@@ -1179,7 +1183,7 @@ void KviNotifierWindow::enterEvent(QEvent * e)
 	m_pShowHideTimer->start(40);
 }
 
-void KviNotifierWindow::leaveEvent(QEvent * e)
+void KviNotifierWindow::leaveEvent(QEvent *)
 {
 	// Leaving the widget area, restore default cursor
 	m_pWndBorder->resetIcons();
diff --git a/src/modules/notifier/notifierwindowbody.cpp b/src/modules/notifier/notifierwindowbody.cpp
index f14e7ccc7..9beaad336 100644
--- a/src/modules/notifier/notifierwindowbody.cpp
+++ b/src/modules/notifier/notifierwindowbody.cpp
@@ -72,7 +72,7 @@ void KviNotifierWindowBody::loadImages()
 		m_pixIconPrev_clicked = *p;
 
 	m_pixIconPrev = m_pixIconPrev_off;
-	
+
 	if((p = g_pIconManager->getPixmap("notifier_icon_body_next_off.png")))
 		m_pixIconNext_off = *p;
 	if((p = g_pIconManager->getPixmap("notifier_icon_body_next_on.png")))
@@ -90,13 +90,13 @@ void KviNotifierWindowBody::loadImages()
 		m_pixIconWrite_clicked = *p;
 
 	m_pixIconWrite = m_pixIconWrite_off;
-	
+
 	needToRedraw();
-	
+
 	m_prevIconState = WDG_ICON_OFF;
 	m_nextIconState = WDG_ICON_OFF;
 	m_writeIconState = WDG_ICON_OFF;
-	
+
 }
 
 void KviNotifierWindowBody::setWidth(int w)
@@ -121,18 +121,18 @@ void KviNotifierWindowBody::recalculatePositions()
 	m_rctWriteIcon.setX(m_textRect.x()+m_textRect.width());
 	m_rctWriteIcon.setY(m_pnt.y()+m_textRect.height()-m_pixIconWrite.height());
 	m_rctWriteIcon.setWidth(m_pixIconWrite.width());
-	m_rctWriteIcon.setHeight(m_pixIconWrite.height());	
+	m_rctWriteIcon.setHeight(m_pixIconWrite.height());
 
 	m_rctPrevIcon.setX(m_textRect.x()+m_textRect.width());
 	m_rctPrevIcon.setY(m_pnt.y()+2); //FIXME: Maybe the spacing should be calculated?
 	m_rctPrevIcon.setWidth(m_pixIconPrev.width());
 	m_rctPrevIcon.setHeight(m_pixIconPrev.height());
-	
+
 	m_rctNextIcon.setX(m_textRect.x()+m_textRect.width());
 	m_rctNextIcon.setY(m_pnt.y()+m_textRect.height()-m_pixIconNext.height()-m_pixIconWrite.height());
 	m_rctNextIcon.setWidth(m_pixIconNext.width());
 	m_rctNextIcon.setHeight(m_pixIconNext.height());
-	
+
 	needToRedraw();
 }
 
@@ -145,7 +145,7 @@ void KviNotifierWindowBody::setPrevIcon(int state)
 				case WDG_ICON_OFF: m_pixIconPrev = m_pixIconPrev_off; break;
 				case WDG_ICON_CLICKED: m_pixIconPrev = m_pixIconPrev_clicked; break;
 			};
-	
+
 			m_prevIconState=state;
 			needToRedraw();
 		}
@@ -160,7 +160,7 @@ void KviNotifierWindowBody::setNextIcon(int state)
 				case WDG_ICON_OFF: m_pixIconNext = m_pixIconNext_off; break;
 				case WDG_ICON_CLICKED: m_pixIconNext = m_pixIconNext_clicked; break;
 			};
-	
+
 			needToRedraw();
 			m_nextIconState=state;
 		}
@@ -174,7 +174,7 @@ void KviNotifierWindowBody::setWriteIcon(int state)
 				case WDG_ICON_ON: m_pixIconWrite = m_pixIconWrite_on; break;
 				case WDG_ICON_OFF: m_pixIconWrite = m_pixIconWrite_off; break;
 				case WDG_ICON_CLICKED: m_pixIconWrite = m_pixIconWrite_clicked; break;};
-	
+
 			needToRedraw();
 			m_writeIconState=state;
 		}
@@ -183,23 +183,23 @@ void KviNotifierWindowBody::setWriteIcon(int state)
 void KviNotifierWindowBody::draw(QPainter * p)
 {
 	if (m_bNeedToRedraw) {
-	
+
 		p->fillRect(QRect(m_pnt,m_rct.size()),m_mac_bkgColor);
-		
+
 		// Autotiled borders
 		p->drawTiledPixmap(m_pnt.x(), m_pnt.y(), m_pixSX.width(), m_rct.height() - m_pixDWNSX.height() - m_pixKVIrcSX.height(), m_pixSX);
 		p->drawTiledPixmap(m_pnt.x() + m_rct.width() - m_pixDX.width(), m_pnt.y(),m_pixDX.width(), m_rct.height() - m_pixDWNDX.height(), m_pixDX);
 		p->drawTiledPixmap(m_pnt.x() + m_pixKVIrcDWN.width() + m_pixDWNSX.width(), m_pnt.y() + m_rct.height() - m_pixDWN.height(),  m_rct.width() - m_pixKVIrcDWN.width() - m_pixDWNSX.width() - m_pixDWNDX.width(), m_pixDWN.height(), m_pixDWN);
-	
+
 		// Bottom corners
 		p->drawPixmap(m_pnt.x(), m_pnt.y() + m_rct.height() - m_pixDWNSX.height(), m_pixDWNSX);
 		p->drawPixmap(m_pnt.x() + m_rct.width() - m_pixDWNSX.width(), m_pnt.y() + m_rct.height() - m_pixDWNDX.height(), m_pixDWNDX);
-		
+
 		// KVIrc image
 		p->drawPixmap(m_pnt.x(), m_pnt.y() + m_rct.height() - m_pixKVIrcSX.height() - m_pixDWNSX.height(), m_pixKVIrcSX);
 		p->drawPixmap(m_pnt.x() + m_pixKVIrcSX.width(), m_pnt.y() + m_rct.height() - m_pixKVIrcDWN.height(), m_pixKVIrcDWN);
 		p->drawPixmap(m_pnt.x() + m_pixKVIrcSX.width(), m_pnt.y() + m_rct.height() - m_pixKVIrc.height() - m_pixKVIrcDWN.height(), m_pixKVIrc, 0, 0, m_pixKVIrc.width(), m_pixKVIrc.height());
-		
+
 		// Draw Icons
 		p->drawPixmap(m_rctPrevIcon.x(), m_rctPrevIcon.y(), m_pixIconPrev);
 		p->drawPixmap(m_rctNextIcon.x(), m_rctNextIcon.y(), m_pixIconNext);
@@ -209,17 +209,17 @@ void KviNotifierWindowBody::draw(QPainter * p)
 	}
 }
 
-void KviNotifierWindowBody::mouseMoveEvent(QMouseEvent * e)
+void KviNotifierWindowBody::mouseMoveEvent(QMouseEvent *)
 {
 
 }
 
-void KviNotifierWindowBody::mousePressEvent(QMouseEvent * e)
+void KviNotifierWindowBody::mousePressEvent(QMouseEvent *)
 {
 
 }
 
-void KviNotifierWindowBody::mouseReleaseEvent(QMouseEvent * e)
+void KviNotifierWindowBody::mouseReleaseEvent(QMouseEvent *)
 {
 
 }
diff --git a/src/modules/notifier/notifierwindowtabs.cpp b/src/modules/notifier/notifierwindowtabs.cpp
index 1069f565c..2d8a749e5 100644
--- a/src/modules/notifier/notifierwindowtabs.cpp
+++ b/src/modules/notifier/notifierwindowtabs.cpp
@@ -546,9 +546,6 @@ void KviNotifierWindowTabs::draw(QPainter * p)
 
 	int closeIcon_X = m_rct.width() - m_rctCloseTabIcon.width();
 	int nextIcon_X = closeIcon_X  - m_pixIconTabNext_out.width();
-	int prevIcon_X = m_rct.x();
-
-	int tmpTabsWidth = 0;
 
 	m_pPainter->drawPixmap(0,0,m_pixSX);
 	m_pPainter->drawPixmap(m_rct.width()-m_pixDX.width(),0,m_pixDX);