- massive trailing whitespace cleanup (yes, one of these "you can hate me for that" commits)

- apply patch by d00p: show the correct protocol version instead of just "SSLv3/TLSv1", thanks!
- fix compilation on qt 5.4 on windows

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

5 files changed, 21 insertions, 21 deletions

diff --git a/src/modules/notifier/NotifierMessage.cpp b/src/modules/notifier/NotifierMessage.cpp
index 6dc7977d7..d17aa71b0 100644
--- a/src/modules/notifier/NotifierMessage.cpp
+++ b/src/modules/notifier/NotifierMessage.cpp
@@ -36,7 +36,7 @@ NotifierMessage::NotifierMessage(QPixmap * pPixmap, const QString & szText)
 {
 	m_pLabel0 = 0;
 	m_pLabel1 = 0;
-	
+
 	m_szText=szText;
 	m_pPixmap=pPixmap;
 
@@ -88,8 +88,8 @@ void NotifierMessage::updateGui()
 	m_pLabel1->setFont(KVI_OPTION_FONT(KviOption_fontNotifier));
 	QPalette pal = m_pLabel1->palette();
 	pal.setColor(QPalette::WindowText, KVI_OPTION_COLOR(KviOption_colorNotifierForeground));
-	m_pLabel1->setPalette(pal);	
-	
+	m_pLabel1->setPalette(pal);
+
 	if(bShowImages)
 	{
 		m_pHBox->setStretch(1,99);
diff --git a/src/modules/notifier/NotifierMessage.h b/src/modules/notifier/NotifierMessage.h
index 025e5a11d..9129cdf37 100644
--- a/src/modules/notifier/NotifierMessage.h
+++ b/src/modules/notifier/NotifierMessage.h
@@ -46,7 +46,7 @@ class NotifierMessage : public QWidget
 public:
 	/**
 	* \brief Constructs the NotifierMessage object
-	* \param pPixmap pointer to a message icon, can be null 
+	* \param pPixmap pointer to a message icon, can be null
 	* \param szText const reference to message text in irc format
 	* \return NotifierMessage
 	*/
diff --git a/src/modules/notifier/NotifierWindow.cpp b/src/modules/notifier/NotifierWindow.cpp
index c36997eb1..9029893aa 100644
--- a/src/modules/notifier/NotifierWindow.cpp
+++ b/src/modules/notifier/NotifierWindow.cpp
@@ -163,7 +163,7 @@ void NotifierWindow::updateGui()
 	palette.setColor(m_pLineEdit->foregroundRole(), KVI_OPTION_COLOR(KviOption_colorNotifierForeground));
 	m_pLineEdit->setPalette(palette);
 	m_pLineEdit->setFont(KVI_OPTION_FONT(KviOption_fontNotifier));
-	
+
 	for(int i=0; i<m_pWndTabs->count();++i)
 	{
 		((NotifierWindowTab*)m_pWndTabs->widget(i))->updateGui();
@@ -265,7 +265,7 @@ void NotifierWindow::stopAutoHideTimer()
 
 #if COMPILE_KDE_SUPPORT
 	#include <kwindowsystem.h>
-	
+
 	static bool active_window_is_full_screen()
 	{
 		WId activeId = KWindowSystem::activeWindow();
@@ -274,7 +274,7 @@ void NotifierWindow::stopAutoHideTimer()
 	}
 #else // COMPILE_KDE_SUPPORT
 	#if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)
-		
+
 		static bool active_window_is_full_screen()
 		{
 			HWND hForeground = ::GetForegroundWindow();
@@ -294,13 +294,13 @@ void NotifierWindow::stopAutoHideTimer()
 
 			if((rct.right - rct.left) < GetSystemMetrics(SM_CXSCREEN))
 				return false;
-			
+
 			if((rct.bottom - rct.top) < GetSystemMetrics(SM_CYSCREEN))
 				return false;
 
 			return true;
 		}
-	
+
 	#endif //COMPILE_ON_WINDOWS || COMPILE_ON_MINGW
 #endif // COMPILE_KDE_SUPPORT
 
@@ -636,7 +636,7 @@ void NotifierWindow::paintEvent(QPaintEvent * e)
 			szTitle += "notifier";
 	}
 	pPaint->drawText(m_pWndBorder->titleRect(),Qt::AlignLeft | Qt::AlignVCenter | Qt::TextSingleLine,szTitle);
-	
+
 	delete pPaint;
 	e->ignore();
 }
@@ -712,7 +712,7 @@ void NotifierWindow::mousePressEvent(QMouseEvent * e)
 		update();
 		return;
 	}
-	
+
 	if(m_pWndBorder->captionRect().contains(e->pos()))
 	{
 		if(m_pWndBorder->closeRect().contains(e->pos()))
@@ -933,13 +933,13 @@ void NotifierWindow::leaveEvent(QEvent *)
 	m_pWndBorder->resetIcons();
 	if(!m_bResizing)
 		setCursor(-1);
-	
+
 	if(!m_pShowHideTimer)
 	{
 		m_pShowHideTimer = new QTimer();
 		connect(m_pShowHideTimer,SIGNAL(timeout()),this,SLOT(heartbeat()));
 	}
-	
+
 	if(m_eState!=Hidden)
 	{
 		m_eState = FocusingOff;
@@ -1049,7 +1049,7 @@ void NotifierWindow::showLineEdit(bool bShow)
 		if(!((NotifierWindowTab *)m_pWndTabs->currentWidget())->wnd())
 			return;
 		m_pLineEdit->setToolTip("");
-		
+
 		QString szTip = __tr2qs_ctx("Write text or commands to window","notifier");
 		szTip += " \"";
 		szTip += ((NotifierWindowTab *)m_pWndTabs->currentWidget())->wnd()->plainTextCaption();
diff --git a/src/modules/notifier/NotifierWindowTab.cpp b/src/modules/notifier/NotifierWindowTab.cpp
index 0a9c4329e..41c29cf36 100644
--- a/src/modules/notifier/NotifierWindowTab.cpp
+++ b/src/modules/notifier/NotifierWindowTab.cpp
@@ -221,7 +221,7 @@ void NotifierWindowTab::paintEvent(QPaintEvent * e)
 	#ifdef COMPILE_PSEUDO_TRANSPARENCY
 		}
 	#endif
-	
+
 	delete pPainter;
 	e->ignore();
 }
diff --git a/src/modules/notifier/NotifierWindowTab.h b/src/modules/notifier/NotifierWindowTab.h
index 5a07f387d..be2163e20 100644
--- a/src/modules/notifier/NotifierWindowTab.h
+++ b/src/modules/notifier/NotifierWindowTab.h
@@ -57,7 +57,7 @@ public:
 	* \return NotifierWindowTab
 	*/
 	NotifierWindowTab(KviWindow * pWnd, QTabWidget * pParent);
-	
+
 	/**
 	* \brief Destroys the tab object
 	*/
@@ -75,19 +75,19 @@ public:
 	* \return void
 	*/
 	void appendMessage(NotifierMessage * pMessage);
-	
+
 	/**
 	* \brief Updates the GUI
 	* \return void
 	*/
 	void updateGui();
-	
+
 	/**
 	* \brief Returns the name of the current window
 	* \return QString
 	*/
 	inline QString label() const { return m_szLabel; };
-	
+
 	/**
 	* \brief Returns the pointer of the current window
 	* \return KviWindow *
@@ -103,13 +103,13 @@ private slots:
 	* \return void
 	*/
 	void scrollRangeChanged(int, int);
-	
+
 	/**
 	* \brief Emitted when the window changes its name
 	* \return void
 	*/
 	void labelChanged();
-	
+
 	/**
 	* \brief Emitted when the window is being destroyed
 	* \return void