- 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

11 files changed, 24 insertions, 24 deletions

diff --git a/src/modules/options/OptionsDialog.cpp b/src/modules/options/OptionsDialog.cpp
index 3e1debd49..5806005f8 100644
--- a/src/modules/options/OptionsDialog.cpp
+++ b/src/modules/options/OptionsDialog.cpp
@@ -393,7 +393,7 @@ bool OptionsDialog::recursiveSearch(OptionsDialogTreeWidgetItem * pItem,const QS
 		for(int j=0;j<lKeywords.count() && !bFoundSomethingHere;j++)
 			if(szInstanceKeywords.at(i).contains(lKeywords.at(j),Qt::CaseInsensitive))
 				bFoundSomethingHere = true;
-	
+
 	if(bFoundSomethingHere)
 	{
 		pItem->setForeground(0, Qt::yellow);
diff --git a/src/modules/options/OptionsWidgetContainer.cpp b/src/modules/options/OptionsWidgetContainer.cpp
index 24fc7e528..353811eae 100644
--- a/src/modules/options/OptionsWidgetContainer.cpp
+++ b/src/modules/options/OptionsWidgetContainer.cpp
@@ -86,7 +86,7 @@ void OptionsWidgetContainer::childEvent(QChildEvent * e)
 			m_pOptionsWidget = NULL;
 		}
 	}
-	
+
 	QWidget::childEvent(e);
 }
 
diff --git a/src/modules/options/OptionsWidget_channel.cpp b/src/modules/options/OptionsWidget_channel.cpp
index c3bfd7b9f..06edc0421 100644
--- a/src/modules/options/OptionsWidget_channel.cpp
+++ b/src/modules/options/OptionsWidget_channel.cpp
@@ -120,7 +120,7 @@ OptionsWidget_channelAdvanced::OptionsWidget_channelAdvanced(QWidget * pParent)
 	KviUIntSelector *u = addUIntSelector(g,__tr2qs_ctx("Minimum delay between two channel requests:","options"),KviOption_uintOnJoinRequestsDelay,0,10,1);
 	u->setSuffix(__tr2qs_ctx(" sec","options"));
 	mergeTip(u,__tr2qs_ctx("<center>This is an artificial delay for the channel requests made on join.<br>You may increase it if your server complains about flooding when joining many channels at once.<br>Minimum value: <b>0 secs</b><br>Maximum value: <b>10 secs</b></center>","options"));
-	
+
 	addBoolSelector(g,__tr2qs_ctx("Do not send /WHO request","options"),KviOption_boolDisableWhoRequestOnJoin);
 	addBoolSelector(g,__tr2qs_ctx("Do not request ban list","options"),KviOption_boolDisableBanListRequestOnJoin);
 	addBoolSelector(g,__tr2qs_ctx("Do not request ban exception list","options"),KviOption_boolDisableBanExceptionListRequestOnJoin);
diff --git a/src/modules/options/OptionsWidget_ircOutput.cpp b/src/modules/options/OptionsWidget_ircOutput.cpp
index be69cdfb4..28b62ca18 100644
--- a/src/modules/options/OptionsWidget_ircOutput.cpp
+++ b/src/modules/options/OptionsWidget_ircOutput.cpp
@@ -54,7 +54,7 @@ OptionsWidget_ircOutput::OptionsWidget_ircOutput(QWidget * pParent)
 	if(KVI_OPTION_UINT(KviOption_uintOutputVerbosityLevel) > KVI_VERBOSITY_LEVEL_PARANOIC)
 		KVI_OPTION_UINT(KviOption_uintOutputVerbosityLevel) = KVI_VERBOSITY_LEVEL_NORMAL;
 	m_pVerbosityCombo->setCurrentIndex(KVI_OPTION_UINT(KviOption_uintOutputVerbosityLevel));
-	
+
 	pLabel = new QLabel(__tr2qs_ctx("Datetime format","options"),this);
 	addWidgetToLayout(pLabel,0,1,0,1);
 
@@ -63,7 +63,7 @@ OptionsWidget_ircOutput::OptionsWidget_ircOutput(QWidget * pParent)
 	m_pDatetimeCombo->addItem(__tr2qs_ctx("ISO 8601 format","options"));
 	m_pDatetimeCombo->addItem(__tr2qs_ctx("System locale format","options"));
 	addWidgetToLayout(m_pDatetimeCombo,1,1,1,1);
-	
+
 	m_pDatetimeCombo->setCurrentIndex(KVI_OPTION_UINT(KviOption_uintOutputDatetimeFormat));
 
 	KviTalGroupBox * pGroup = addGroupBox(0,2,1,2,Qt::Horizontal,__tr2qs_ctx("Show in active window","options"));
@@ -102,7 +102,7 @@ void OptionsWidget_ircOutput::commit()
 		iIdx = KVI_VERBOSITY_LEVEL_NORMAL;
 	}
 	KVI_OPTION_UINT(KviOption_uintOutputVerbosityLevel) = iIdx;
-	
+
 	KVI_OPTION_UINT(KviOption_uintOutputDatetimeFormat) = m_pDatetimeCombo->currentIndex();
 }
 
diff --git a/src/modules/options/OptionsWidget_ircView.cpp b/src/modules/options/OptionsWidget_ircView.cpp
index 7fb56fc48..e62e6f430 100644
--- a/src/modules/options/OptionsWidget_ircView.cpp
+++ b/src/modules/options/OptionsWidget_ircView.cpp
@@ -167,7 +167,7 @@ OptionsWidget_ircViewFeatures::OptionsWidget_ircViewFeatures(QWidget * parent)
 	addBoolSelector(pGroup,__tr2qs_ctx("Nick links","options"),KviOption_boolEnableNickLinkToolTip);
 	addBoolSelector(pGroup,__tr2qs_ctx("Channel links","options"),KviOption_boolEnableChannelLinkToolTip);
 	addBoolSelector(pGroup,__tr2qs_ctx("Escape sequences","options"),KviOption_boolEnableEscapeLinkToolTip);
-	
+
 	addRowSpacer(0,14,0,14);
 }
 
diff --git a/src/modules/options/OptionsWidget_logging.cpp b/src/modules/options/OptionsWidget_logging.cpp
index 97d9c9978..f529d1789 100644
--- a/src/modules/options/OptionsWidget_logging.cpp
+++ b/src/modules/options/OptionsWidget_logging.cpp
@@ -46,7 +46,7 @@ OptionsWidget_logging::OptionsWidget_logging(QWidget * parent)
 	QWidget * w = addDirectorySelector(0,1,0,1,__tr2qs_ctx("Save logs to folder:","options"),KviOption_stringLogsPath);
 	mergeTip(w, __tr2qs_ctx("<center>This is the base log directory:<br>" \
 			"all the log files will be saved inside this directory</center>","options"));
-	
+
 	w = addStringSelector(0,2,0,2,__tr2qs_ctx("Dynamic subfolder:","options"),KviOption_stringLogsDynamicPath);
 	mergeTip(w, __tr2qs_ctx("<center>You can specify a subdirectory where log files will be saved:" \
 			"use kvs code to create dynamic subfolders.</center>","options"));
diff --git a/src/modules/options/OptionsWidget_notifier.cpp b/src/modules/options/OptionsWidget_notifier.cpp
index a83eb558c..280f2e774 100644
--- a/src/modules/options/OptionsWidget_notifier.cpp
+++ b/src/modules/options/OptionsWidget_notifier.cpp
@@ -163,7 +163,7 @@ OptionsWidget_notifier::OptionsWidget_notifier(QWidget * parent)
 		"Note that KDE's notifier isn't flexible and \"tabbed\" like KVIrc's","options");
 	szTip += "</center>";
 	mergeTip(m_pKdeNotifier,szTip);
-	
+
 	m_pKdeNotifier->setEnabled(KVI_OPTION_BOOL(KviOption_boolEnableNotifier));
 	connect(b,SIGNAL(toggled(bool)),m_pKdeNotifier,SLOT(setEnabled(bool)));
 	connect(m_pKdeNotifier,SIGNAL(toggled(bool)),this,SLOT(toggleNotifierProtocol(bool)));
@@ -205,7 +205,7 @@ OptionsWidget_notifier::OptionsWidget_notifier(QWidget * parent)
 		"your game from fullscreen to window mode.","options");
 	szTip += "</center>";
 	mergeTip(b2,szTip);
-	
+
 	b2->setEnabled(KVI_OPTION_BOOL(KviOption_boolEnableNotifier));
 	QObject::connect(b,SIGNAL(toggled(bool)),b2,SLOT(setEnabled(bool)));
 
@@ -219,7 +219,7 @@ OptionsWidget_notifier::OptionsWidget_notifier(QWidget * parent)
 	QObject::connect(b,SIGNAL(toggled(bool)),b2,SLOT(setEnabled(bool)));
 
 	iRow++;
-	
+
 	b2 = addBoolSelector(0,iRow,0,iRow,__tr2qs_ctx("Enable notifier window fade effect","options"),KviOption_boolNotifierFading);
 
 	b2->setEnabled(KVI_OPTION_BOOL(KviOption_boolEnableNotifier));
diff --git a/src/modules/options/OptionsWidget_servers.cpp b/src/modules/options/OptionsWidget_servers.cpp
index e83a72b49..bc247d567 100644
--- a/src/modules/options/OptionsWidget_servers.cpp
+++ b/src/modules/options/OptionsWidget_servers.cpp
@@ -1609,7 +1609,7 @@ void OptionsWidget_servers::fillServerList()
 		KviPointerList<KviIrcServer> * sl = r->serverList();
 		bool bCurrent = r->name() == g_pServerDataBase->currentNetworkName().toUtf8().data();
 		net->setExpanded(bCurrent);
-	
+
 		for(KviIrcServer * s = sl->first();s;s = sl->next())
 		{
 			srv = new IrcServerOptionsTreeWidgetItem(net,*(g_pIconManager->getSmallIcon(KviIconManager::Server)),s);
@@ -1693,7 +1693,7 @@ void OptionsWidget_servers::filterTextEdited(const QString &)
 	for (int i=0;i<m_pTreeWidget->topLevelItemCount();i++)
 	{
 		network = (IrcServerOptionsTreeWidgetItem *) m_pTreeWidget->topLevelItem(i);
-		if(network->m_pNetworkData->name().contains(szFilter, Qt::CaseInsensitive) || 
+		if(network->m_pNetworkData->name().contains(szFilter, Qt::CaseInsensitive) ||
 				network->m_pNetworkData->description().contains(szFilter, Qt::CaseInsensitive))
 		{
 			network->setHidden(false);
@@ -1706,7 +1706,7 @@ void OptionsWidget_servers::filterTextEdited(const QString &)
 			}
 		} else {
 			uint uServers=0;
-			
+
 			IrcServerOptionsTreeWidgetItem * ch;
 			for (int j=0;j<network->childCount();j++)
 			{
@@ -1714,7 +1714,7 @@ void OptionsWidget_servers::filterTextEdited(const QString &)
 				ch=(IrcServerOptionsTreeWidgetItem *)network->child(j);
 				if(ch->m_pServerData)
 				{
-					if(ch->m_pServerData->hostName().contains(szFilter, Qt::CaseInsensitive) || 
+					if(ch->m_pServerData->hostName().contains(szFilter, Qt::CaseInsensitive) ||
 						ch->m_pServerData->description().contains(szFilter, Qt::CaseInsensitive))
 							bHidden=false;
 				}
diff --git a/src/modules/options/OptionsWidget_servers.h b/src/modules/options/OptionsWidget_servers.h
index c23851ded..bb38ec65a 100644
--- a/src/modules/options/OptionsWidget_servers.h
+++ b/src/modules/options/OptionsWidget_servers.h
@@ -64,7 +64,7 @@ public:
 	{
 		return m_pServerData;
 	}
-	
+
 	KviIrcNetwork * networkData() const
 	{
 		return m_pNetworkData;
diff --git a/src/modules/options/OptionsWidget_sound.cpp b/src/modules/options/OptionsWidget_sound.cpp
index 3b8b6d306..3eeeefaf1 100644
--- a/src/modules/options/OptionsWidget_sound.cpp
+++ b/src/modules/options/OptionsWidget_sound.cpp
@@ -155,14 +155,14 @@ void OptionsWidget_soundGeneral::showEvent(QShowEvent *)
 		return;
 	// We fill these boxes only before the first show since the soundFillBox()
 	// is likely to trigger sound system-detection which may take time...
-	
+
 	g_pApp->setOverrideCursor(Qt::WaitCursor);
-	
+
 	soundFillBox();
 	mediaFillBox();
-	
+
 	g_pApp->restoreOverrideCursor();
-	
+
 	m_bFirstShow = false;
 }
 
@@ -177,7 +177,7 @@ void OptionsWidget_soundGeneral::soundTest()
 		return; // doh
 
 	QString szFileName;
-	
+
 	if(!g_pApp->findAudioFile(szFileName,QString::fromUtf8("jingle.wav")))
 	{
 		qDebug("Can't find the jingle.wav file: was it shipped with your kvirc installation?");
diff --git a/src/modules/options/OptionsWidget_textIcons.cpp b/src/modules/options/OptionsWidget_textIcons.cpp
index a7d4225e1..07dcdeec0 100644
--- a/src/modules/options/OptionsWidget_textIcons.cpp
+++ b/src/modules/options/OptionsWidget_textIcons.cpp
@@ -110,7 +110,7 @@ OptionsWidget_textIcons::OptionsWidget_textIcons(QWidget * parent)
 
 	connect(m_pTable,SIGNAL(itemSelectionChanged()),this,SLOT(itemSelectionChanged()));
 	connect(m_pTable,SIGNAL(currentItemChanged(QTableWidgetItem *, QTableWidgetItem *)),this,SLOT(currentItemChanged(QTableWidgetItem *, QTableWidgetItem *)));
-	
+
 	fillTable();
 }
 
@@ -128,7 +128,7 @@ void OptionsWidget_textIcons::fillTable()
 	header.append(__tr2qs("Emoticon"));
 	m_pTable->setHorizontalHeaderLabels(header);
 	m_pTable->setRowCount(g_pTextIconManager->textIconDict()->count());
-	
+
 	int idx = 0;
 	QTableWidgetItem *item0;
 	TextIconTableItem *item1;
@@ -148,7 +148,7 @@ void OptionsWidget_textIcons::fillTable()
 		++idx;
 		++it;
 	}
-	
+
 	// disable the delete button
 	m_pDel->setEnabled(false);
 }