applied further patches for #996

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

8 files changed, 27 insertions, 47 deletions

diff --git a/src/modules/options/dialog.cpp b/src/modules/options/dialog.cpp
index 9d0d293c3..81c0ead77 100644
--- a/src/modules/options/dialog.cpp
+++ b/src/modules/options/dialog.cpp
@@ -414,12 +414,11 @@ void KviOptionsDialog::search(const QStringList &lKeywords)
 {
 	m_pTreeWidget->setUpdatesEnabled(false);
 
-	bool bFoundSomethingInside = false;
 	int count=m_pTreeWidget->topLevelItemCount();
 	for (int i=0;i<count;i++)
 	{
 		KviOptionsTreeWidgetItem * pChild = (KviOptionsTreeWidgetItem *)m_pTreeWidget->topLevelItem(i);
-		bFoundSomethingInside = recursiveSearch(pChild,lKeywords);
+		recursiveSearch(pChild,lKeywords);
 	}
 	m_pTreeWidget->setUpdatesEnabled(true);
 	m_pTreeWidget->update();
diff --git a/src/modules/options/optw_ctcp.cpp b/src/modules/options/optw_ctcp.cpp
index 7b1307e6a..c53b34b6f 100644
--- a/src/modules/options/optw_ctcp.cpp
+++ b/src/modules/options/optw_ctcp.cpp
@@ -36,8 +36,7 @@ KviCtcpOptionsWidget::KviCtcpOptionsWidget(QWidget * parent)
 
 	createLayout();
 
-	QLabel * l;
-	l = addLabel(0,0,0,0,__tr2qs_ctx("<center><b>Settings for CTCP.</b></center>"\
+	addLabel(0,0,0,0,__tr2qs_ctx("<center><b>Settings for CTCP.</b></center>"\
 		"<p>The <b>Client-To-Client Protocol</b> (CTCP) " \
 		"is used to transmit special control messages over an IRC connection. " \
 		"These messages can request information from clients or negotiate file transfers." \
diff --git a/src/modules/options/optw_dcc.cpp b/src/modules/options/optw_dcc.cpp
index 0ada5ad12..c92756d00 100644
--- a/src/modules/options/optw_dcc.cpp
+++ b/src/modules/options/optw_dcc.cpp
@@ -311,24 +311,23 @@ KviDccChatOptionsWidget::KviDccChatOptionsWidget(QWidget * parent)
 	createLayout();
 
 	KviTalGroupBox * g = addGroupBox(0,0,0,0,Qt::Horizontal,__tr2qs_ctx("On Chat Request","options"));
-	KviBoolSelector * b = addBoolSelector(g,__tr2qs_ctx("Automatically accept","options"),KviOption_boolAutoAcceptDccChat);
-	b = addBoolSelector(g,__tr2qs_ctx("Open minimized when auto-accepted","options"),KviOption_boolCreateMinimizedDccChatWhenAutoAccepted,!KVI_OPTION_BOOL(KviOption_boolCreateMinimizedDccChat));
+	addBoolSelector(g,__tr2qs_ctx("Automatically accept","options"),KviOption_boolAutoAcceptDccChat);
 
-	KviBoolSelector * b1 = addBoolSelector(0,1,0,1,__tr2qs_ctx("Always open as minimized","options"),KviOption_boolCreateMinimizedDccChat);
+	KviBoolSelector * b1 = addBoolSelector(g,__tr2qs_ctx("Open minimized when auto-accepted","options"),KviOption_boolCreateMinimizedDccChatWhenAutoAccepted,!KVI_OPTION_BOOL(KviOption_boolCreateMinimizedDccChat));
 
-	connect(b1,SIGNAL(toggled(bool)),b,SLOT(setNotEnabled(bool)));
+	KviBoolSelector * b2 = addBoolSelector(0,1,0,1,__tr2qs_ctx("Always open as minimized","options"),KviOption_boolCreateMinimizedDccChat);
 
-	KviBoolSelector * b2;
+	connect(b2,SIGNAL(toggled(bool)),b1,SLOT(setNotEnabled(bool)));
 
 #if (defined(COMPILE_ON_WINDOWS) || defined(COMPILE_KDE_SUPPORT) || defined(COMPILE_ON_MINGW))
 	b2 = addBoolSelector(0,2,0,2,__tr2qs_ctx("Flash system taskbar on new dcc chat message","options"),KviOption_boolFlashDccChatWindowOnNewMessages);
-		mergeTip(b,
+		mergeTip(b2,
 			__tr2qs_ctx("<center>This option causes the system taskbar entry for KVIrc to flash when a new dcc chat message " \
 				"is received and the KVIrc window is not the active.</center>","options"));
 #endif
 
 	b2 = addBoolSelector(0,3,0,3, __tr2qs_ctx("Popup notifier on new dcc chat message","options"),KviOption_boolPopupNotifierOnNewDccChatMessages);
-	mergeTip(b,
+	mergeTip(b2,
 		__tr2qs_ctx("<center>This option causes a small notifier window to pop up " \
 			"in the low right corner of the screen when a new message is received " \
 			"and the KVIrc window is not active.</center>","options"));
diff --git a/src/modules/options/optw_generalopt.cpp b/src/modules/options/optw_generalopt.cpp
index 40d0cb320..b5cd4998b 100644
--- a/src/modules/options/optw_generalopt.cpp
+++ b/src/modules/options/optw_generalopt.cpp
@@ -35,8 +35,7 @@ KviGeneralOptOptionsWidget::KviGeneralOptOptionsWidget(QWidget * parent)
 	setObjectName("generalopt_options_widget");
 	createLayout();
 
-	QLabel * l;
-	l = addLabel(0,0,4,0,__tr2qs_ctx("This section contains the general client options<br>"\
+	addLabel(0,0,4,0,__tr2qs_ctx("This section contains the general client options<br>"\
 		"<p>like<b> sound, mediafiles, URL handler </b> etc... " \
 		"</p>","options"));
 	addAdvancedButton(4,1,4,1);
diff --git a/src/modules/options/optw_mediatypes.cpp b/src/modules/options/optw_mediatypes.cpp
index a095364e4..429a80936 100644
--- a/src/modules/options/optw_mediatypes.cpp
+++ b/src/modules/options/optw_mediatypes.cpp
@@ -83,43 +83,36 @@ KviMediaTypesOptionsWidget::KviMediaTypesOptionsWidget(QWidget * parent)
 	connect(m_pTreeWidget,SIGNAL(currentItemChanged(QTreeWidgetItem *,QTreeWidgetItem *)),this,SLOT(currentItemChanged(QTreeWidgetItem *,QTreeWidgetItem *)));
 
 	layout()->addWidget(m_pTreeWidget,0,0,1,3);
-//	layout()->addMultiCellWidget(m_pTreeWidget,0,0,0,2);
 
 	QLabel * l = new QLabel(__tr2qs_ctx("Description:","options"),this);
 	layout()->addWidget(l,1,0);
 	m_pDescription = new QLineEdit(this);
 	layout()->addWidget(m_pDescription,1,1,1,2);
-//	layout()->addMultiCellWidget(m_pDescription,1,1,1,2);
 
 	l = new QLabel(__tr2qs_ctx("MIME type:","options"),this);
 	layout()->addWidget(l,2,0);
 	m_pIanaType = new QLineEdit(this);
 	layout()->addWidget(m_pIanaType,2,1,1,2);
-//	layout()->addMultiCellWidget(m_pIanaType,2,2,1,2);
 
 	l = new QLabel(__tr2qs_ctx("File pattern:","options"),this);
 	layout()->addWidget(l,3,0);
 	m_pFileMask = new QLineEdit(this);
 	layout()->addWidget(m_pFileMask,3,1,1,2);
-//	layout()->addMultiCellWidget(m_pFileMask,3,3,1,2);
 
 	l = new QLabel(__tr2qs_ctx("Magic bytes:","options"),this);
 	layout()->addWidget(l,4,0);
 	m_pMagicBytes = new QLineEdit(this);
 	layout()->addWidget(m_pMagicBytes,4,1,1,2);
-//	layout()->addMultiCellWidget(m_pMagicBytes,4,4,1,2);
 
 	l = new QLabel(__tr2qs_ctx("Save path:","options"),this);
 	layout()->addWidget(l,5,0);
 	m_pSavePath = new QLineEdit(this);
 	layout()->addWidget(m_pSavePath,5,1,1,2);
-//	layout()->addMultiCellWidget(m_pSavePath,5,5,1,2);
 
 	l = new QLabel(__tr2qs_ctx("Local open command:","options"),this);
 	layout()->addWidget(l,6,0);
 	m_pCommandline = new QLineEdit(this);
 	layout()->addWidget(m_pCommandline,6,1,1,2);
-//	layout()->addMultiCellWidget(m_pCommandline,6,6,1,2);
 	mergeTip(m_pCommandline,__tr2qs_ctx("<center>This field contains the command to execute to open a local file.<br>" \
 		"<tt>$0</tt> is used in place of the filename</center>","options"));
 
@@ -127,7 +120,6 @@ KviMediaTypesOptionsWidget::KviMediaTypesOptionsWidget(QWidget * parent)
 	layout()->addWidget(l,7,0);
 	m_pRemoteExecCommandline = new QLineEdit(this);
 	layout()->addWidget(m_pRemoteExecCommandline,7,1,1,2);
-//	layout()->addMultiCellWidget(m_pRemoteExecCommandline,7,7,1,2);
 	mergeTip(m_pRemoteExecCommandline,__tr2qs_ctx("<center>This field contains the command to execute when automatically opening a received file.<br>" \
 		"<tt>$0</tt> is used in place of the filename</center>","options"));
 
@@ -135,12 +127,10 @@ KviMediaTypesOptionsWidget::KviMediaTypesOptionsWidget(QWidget * parent)
 	layout()->addWidget(l,8,0);
 	m_pIcon = new QLineEdit(this);
 	layout()->addWidget(m_pIcon,8,1,1,2);
-//	layout()->addMultiCellWidget(m_pIcon,8,8,1,2);
 
 	QFrame * f = new QFrame(this);
 	f->setFrameStyle(QFrame::Sunken | QFrame::HLine);
 	layout()->addWidget(f,9,0,1,3);
-//	layout()->addMultiCellWidget(f,9,9,0,2);
 
 	QPushButton * b = new QPushButton(__tr2qs_ctx("&New","options"),this);
 	connect(b,SIGNAL(clicked()),this,SLOT(newMediaType()));
@@ -168,11 +158,10 @@ void KviMediaTypesOptionsWidget::fillTreeWidget()
 	m_pTreeWidget->clear();
 	g_pMediaManager->lock();
 	KviPointerList<KviMediaType> * l = g_pMediaManager->mediaTypeList();
-	KviMediaTypeTreeWidgetItem * it;
+
 	for(KviMediaType * t = l->first();t;t = l->next())
-	{
-		it = new KviMediaTypeTreeWidgetItem(m_pTreeWidget,t);
-	}
+		new KviMediaTypeTreeWidgetItem(m_pTreeWidget,t);
+
 	g_pMediaManager->unlock();
 	enableOrDisable();
 }
diff --git a/src/modules/options/optw_messages.cpp b/src/modules/options/optw_messages.cpp
index 477d5ef76..4f5a71a80 100644
--- a/src/modules/options/optw_messages.cpp
+++ b/src/modules/options/optw_messages.cpp
@@ -359,7 +359,7 @@ KviMessageColorsOptionsWidget::KviMessageColorsOptionsWidget(QWidget * parent)
 	KviTalVBox * box = new KviTalVBox(this);
 	addWidgetToLayout(box,3,0,3,0);
 
-	QLabel * l = new QLabel(__tr2qs_ctx("Background:","options"),box);
+	new QLabel(__tr2qs_ctx("Background:","options"),box);
 
 	m_pBackListWidget = new KviTalListWidget(box);
 	m_pBackListWidget->setMaximumWidth(150);
@@ -372,7 +372,7 @@ KviMessageColorsOptionsWidget::KviMessageColorsOptionsWidget(QWidget * parent)
 		m_pBackItems[i] = new KviMessageColorListWidgetItem(m_pBackListWidget,i);
 	}
 
-	l = new QLabel(__tr2qs_ctx("Foreground:","options"),box);
+	new QLabel(__tr2qs_ctx("Foreground:","options"),box);
 
 	m_pForeListWidget = new KviTalListWidget(box);
 	m_pForeListWidget->setMaximumWidth(150);
@@ -384,16 +384,16 @@ KviMessageColorsOptionsWidget::KviMessageColorsOptionsWidget(QWidget * parent)
 		m_pForeItems[i] = new KviMessageColorListWidgetItem(m_pForeListWidget,i);
 	}
 
-	l = new QLabel(__tr2qs_ctx("Alert level:","options"),box);
+	new QLabel(__tr2qs_ctx("Alert level:","options"),box);
 
 	m_pLevelListWidget = new KviTalListWidget(box);
 	m_pLevelListWidget->setMaximumWidth(150);
-	KviTalListWidgetText * lbt;
+
 	for(i=0;i<6;i++)
 	{
 		QString tmpn;
 		tmpn.setNum(i);
-		lbt = new KviTalListWidgetText(m_pLevelListWidget,tmpn);
+		new KviTalListWidgetText(m_pLevelListWidget,tmpn);
 	}
 
 	m_pIconButton = new QToolButton(box);
@@ -415,12 +415,8 @@ KviMessageColorsOptionsWidget::KviMessageColorsOptionsWidget(QWidget * parent)
 	connect(b,SIGNAL(clicked()),this,SLOT(save()));
 
 
-	KviMessageListWidgetItem * it;
-
 	for(i=0;i<KVI_NUM_MSGTYPE_OPTIONS;i++)
-	{
-		it = new KviMessageListWidgetItem(m_pListView,i);
-	}
+		new KviMessageListWidgetItem(m_pListView,i);
 
 	layout()->setRowStretch(0,1);
 	layout()->setColumnStretch(0,1);
diff --git a/src/modules/options/optw_tools.cpp b/src/modules/options/optw_tools.cpp
index 6015e5aff..acf6afecc 100644
--- a/src/modules/options/optw_tools.cpp
+++ b/src/modules/options/optw_tools.cpp
@@ -36,8 +36,7 @@ KviToolsOptionsWidget::KviToolsOptionsWidget(QWidget * parent)
 	setObjectName("tools_options_widget");
 	createLayout();
 
-	QLabel * l;
-	l = addLabel(0,0,0,0,__tr2qs_ctx("This section contains irc tools<br>"\
+	addLabel(0,0,0,0,__tr2qs_ctx("This section contains irc tools<br>"\
 		"<p>like<b> away, lag and logging system. </b> " \
 		"</p>","options"));
 
diff --git a/src/modules/options/optw_userlist.cpp b/src/modules/options/optw_userlist.cpp
index 63efeea97..c38371bed 100644
--- a/src/modules/options/optw_userlist.cpp
+++ b/src/modules/options/optw_userlist.cpp
@@ -229,14 +229,14 @@ KviUserListFeaturesOptionsWidget::KviUserListFeaturesOptionsWidget(QWidget * par
 {
 	createLayout();
 
-	KviBoolSelector *b = addBoolSelector(0,0,0,0,__tr2qs_ctx("Show gender icons","options"),KviOption_boolDrawGenderIcons);
-	b = addBoolSelector(0,1,0,1,__tr2qs_ctx("Show user channel icons","options"),KviOption_boolShowUserChannelIcons);
-	b = addBoolSelector(0,2,0,2,__tr2qs_ctx("Show user channel activity indicator","options"),KviOption_boolShowUserChannelState);
-	b = addBoolSelector(0,3,0,3,__tr2qs_ctx("Show label with userlist stats","options"),KviOption_boolShowUserListStatisticLabel);
-	b = addBoolSelector(0,4,0,4,__tr2qs_ctx("Enable user tooltips","options"),KviOption_boolShowUserListViewToolTips);
-	b = addBoolSelector(0,5,0,5,__tr2qs_ctx("Show avatars in userlist","options"),KviOption_boolShowAvatarsInUserlist);
-	b = addBoolSelector(0,6,0,6,__tr2qs_ctx("Enable animated avatars","options"),KviOption_boolEnableAnimatedAvatars);
-	b = addBoolSelector(0,7,0,7,__tr2qs_ctx("Place nicks starting with non-alpha chars (such as _COOL_BOY_) after the normal nicks","options"),KviOption_boolPlaceNickWithNonAlphaCharsAtEnd);
+	addBoolSelector(0,0,0,0,__tr2qs_ctx("Show gender icons","options"),KviOption_boolDrawGenderIcons);
+	addBoolSelector(0,1,0,1,__tr2qs_ctx("Show user channel icons","options"),KviOption_boolShowUserChannelIcons);
+	addBoolSelector(0,2,0,2,__tr2qs_ctx("Show user channel activity indicator","options"),KviOption_boolShowUserChannelState);
+	addBoolSelector(0,3,0,3,__tr2qs_ctx("Show label with userlist stats","options"),KviOption_boolShowUserListStatisticLabel);
+	addBoolSelector(0,4,0,4,__tr2qs_ctx("Enable user tooltips","options"),KviOption_boolShowUserListViewToolTips);
+	addBoolSelector(0,5,0,5,__tr2qs_ctx("Show avatars in userlist","options"),KviOption_boolShowAvatarsInUserlist);
+	addBoolSelector(0,6,0,6,__tr2qs_ctx("Enable animated avatars","options"),KviOption_boolEnableAnimatedAvatars);
+	addBoolSelector(0,7,0,7,__tr2qs_ctx("Place nicks starting with non-alpha chars (such as _COOL_BOY_) after the normal nicks","options"),KviOption_boolPlaceNickWithNonAlphaCharsAtEnd);
 
 	addRowSpacer(0,8,0,8);
 }