more code clean

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

1 files changed, 5 insertions, 54 deletions

diff --git a/src/modules/options/optw_dcc.cpp b/src/modules/options/optw_dcc.cpp
index 26514cd4c..7b9a43ed1 100644
--- a/src/modules/options/optw_dcc.cpp
+++ b/src/modules/options/optw_dcc.cpp
@@ -24,12 +24,11 @@
 
 #include "optw_dcc.h"
 
-#include <qlayout.h>
-
 #include "kvi_options.h"
 #include "kvi_locale.h"
 
-//#warning "Info tips"
+#include <QLayout>
+
 
 KviDccOptionsWidget::KviDccOptionsWidget(QWidget * pParent)
 : KviOptionsWidget(pParent)
@@ -50,11 +49,9 @@ KviDccGeneralOptionsWidget::KviDccGeneralOptionsWidget(QWidget * parent)
 
 	KviBoolSelector * b = addBoolSelector(0,0,0,0,__tr2qs_ctx("Use workaround for firewall","options"),KviOption_boolCantAcceptIncomingDccConnections);
 
-#ifdef COMPILE_INFO_TIPS
 	mergeTip(b,__tr2qs_ctx("<center>Enable this option if you can't accept incoming connections.<br>" \
 			"KVIrc will try to use different methods to send and receive files.<br>" \
 			"Please note that these methods may NOT work when communicating with a non-KVIrc client.</center>","options"));
-#endif
 
 	addRowSpacer(0,1,0,1);
 }
@@ -75,27 +72,21 @@ KviDccAdvancedOptionsWidget::KviDccAdvancedOptionsWidget(QWidget * parent)
 	KviBoolSelector * b = addBoolSelector(g,__tr2qs_ctx("Use user-defined address or network interface","options"),KviOption_boolDccListenOnSpecifiedInterfaceByDefault);
 
 
-#ifdef COMPILE_INFO_TIPS
 	mergeTip(b,__tr2qs_ctx("<center>Enable this option if you are on a multihost machine and want " \
 		"to force one of the available IP addresses to be used for outgoing DCCs.<br>This is especially useful " \
 		"when you use IPv6 and IPv4 addresses.<br>You can force KVIrc to always choose the IPv4 interface.</center>","options"));
-#endif
 
 	KviStringSelector * s = addStringSelector(g,__tr2qs_ctx("Listen on address/interface:","options"),KviOption_stringDccListenDefaultInterface,KVI_OPTION_BOOL(KviOption_boolDccListenOnSpecifiedInterfaceByDefault));
 
-#ifdef COMPILE_INFO_TIPS
 	mergeTip(s,__tr2qs_ctx("<center>This is the IP address or name of the interface to use by default for outgoing DCC transfers.<br>" \
 		"On UNIX systems that support it, you can also specify IPv4 interface names (such as <b>ppp0</b>).<br>" \
 		"If you set it to <b>0.0.0.0</b>, KVIrc will try to use the first available IPv4 interface</center>","options"));
-#endif
 
 	connect(b,SIGNAL(toggled(bool)),s,SLOT(setEnabled(bool)));
 
  	b = addBoolSelector(g,__tr2qs_ctx("Use user-defined port range","options"),KviOption_boolUserDefinedPortRange);
 
-#ifdef COMPILE_INFO_TIPS
 	mergeTip(b,__tr2qs_ctx("<center>Enable this option if you want specify a local port range for DCC.</center>","options"));
-#endif
 
 	KviTalHBox * hb = new KviTalHBox(g);
 	hb->setSpacing(4);
@@ -107,63 +98,46 @@ KviDccAdvancedOptionsWidget::KviDccAdvancedOptionsWidget(QWidget * parent)
 
 	b = addBoolSelector(g,__tr2qs_ctx("Send a fixed address in requests","options"),KviOption_boolDccSendFakeAddressByDefault);
 
-#ifdef COMPILE_INFO_TIPS
 	mergeTip(b,__tr2qs_ctx("<center>Enable this option if you want to always send a fake IP address in your DCC requests.<br>" \
 		"This might be useful if you're behind a router with a static address that does network address translation (NAT) and forwards all or a range of ports.</center>","options"));
-#endif
 
 	s = addStringSelector(g,__tr2qs_ctx("Send address/interface:","options"),KviOption_stringDefaultDccFakeAddress,KVI_OPTION_BOOL(KviOption_boolDccSendFakeAddressByDefault));
 	connect(b,SIGNAL(toggled(bool)),s,SLOT(setEnabled(bool)));
 
-#ifdef COMPILE_INFO_TIPS
 	mergeTip(s,__tr2qs_ctx("<center>This is the fixed address that will be sent with all DCC requests if you enable the option above.</center>","options"));
-#endif
 
 	KviBoolSelector * b2;
-	b2 = addBoolSelector(g,__tr2qs_ctx("Guess address from IRC server if unroutable","options"),
-									KviOption_boolDccGuessIpFromServerWhenLocalIsUnroutable,!KVI_OPTION_BOOL(KviOption_boolDccSendFakeAddressByDefault));
+	b2 = addBoolSelector(g,__tr2qs_ctx("Guess address from IRC server if unroutable","options"),KviOption_boolDccGuessIpFromServerWhenLocalIsUnroutable,!KVI_OPTION_BOOL(KviOption_boolDccSendFakeAddressByDefault));
 	connect(b,SIGNAL(toggled(bool)),b2,SLOT(setNotEnabled(bool)));
 
-#ifdef COMPILE_INFO_TIPS
 	mergeTip(b2,__tr2qs_ctx("<center>You can enable this option if you are behind a router that forwards all or a range of ports.<br>" \
 			"KVIrc will try to guess the IP address to use for DCC by looking up the local hostname as seen " \
 			"by the IRC server you're connected to.<br>This method is an exclusive alternative to the \"fixed address\" above.<br>" \
 			"It might guess the correct address automatically if certain conditions are met (e.g. the IRC server does not mask hostnames).</center>","options"));
-#endif
 
-	b = addBoolSelector(g,__tr2qs_ctx("Use \"broken bouncer hack\" to detect address","options"),
-									KviOption_boolDccBrokenBouncerHack,KVI_OPTION_BOOL(KviOption_boolDccGuessIpFromServerWhenLocalIsUnroutable));
-#ifdef COMPILE_INFO_TIPS
+	b = addBoolSelector(g,__tr2qs_ctx("Use \"broken bouncer hack\" to detect address","options"),KviOption_boolDccBrokenBouncerHack,KVI_OPTION_BOOL(KviOption_boolDccGuessIpFromServerWhenLocalIsUnroutable));
 	mergeTip(b,__tr2qs_ctx("<center>When you're behind a dialup router and also tunneling through a psyBNC bouncer, " \
 				"you can use a bug in the bouncer to force KVIrc to bind the DCC connections to the dialup router's address.<br>" \
 				"It's an ugly hack - use it only if nothing else works.</center>","options"));
-#endif
 									
 	connect(b2,SIGNAL(toggled(bool)),b,SLOT(setEnabled(bool)));
 
-	b = addBoolSelector(0,1,1,1,__tr2qs_ctx("Notify failed DCC handshakes to the remote end","options"),
-									KviOption_boolNotifyFailedDccHandshakes);
-#ifdef COMPILE_INFO_TIPS
+	b = addBoolSelector(0,1,1,1,__tr2qs_ctx("Notify failed DCC handshakes to the remote end","options"),KviOption_boolNotifyFailedDccHandshakes);
 	mergeTip(b,__tr2qs_ctx("<center>If you enable this option, when a DCC request from a remote " \
 					"user can't be satisfied KVIrc will notify him by a CTCP ERRMSG. This is " \
 					"a nice feature so it is a good idea to leave it on unless for some reason " \
 					"you have deactivated the antiflood system: in this case turning off this option " \
 					"might help if you often get attacked by CTCP floods.</center>","options"));
-#endif
 
 	u = addUIntSelector(0,2,1,2,__tr2qs_ctx("Maximum number of DCC sessions","options"),KviOption_uintMaxDccSlots,0,1000,64);
-#ifdef COMPILE_INFO_TIPS
 	mergeTip(u,__tr2qs_ctx("<center>This is the maximum number of concurrent DCC sessions " \
 					"and it includes all the DCC types (send,chat,recv...). " \
 					"KVIrc will refuse the requests when this limit is reached.</center>","options"));
-#endif
 
 	addUIntSelector(0,3,1,3,__tr2qs_ctx("DCC socket timeout:","options"),KviOption_uintDccSocketTimeout,10,65536,180);
 	u->setSuffix(__tr2qs_ctx(" sec","options"));
-#ifdef COMPILE_INFO_TIPS
 	mergeTip(u,__tr2qs_ctx("<center>This is the amount of time that KVIrc will wait for a response before assuming that a DCC has failed " \
 		"because the remote client was unable to connect to our listening socket.</center>","options"));
-#endif
 
 	addRowSpacer(0,4,1,4);
 }
@@ -173,7 +147,6 @@ KviDccAdvancedOptionsWidget::~KviDccAdvancedOptionsWidget()
 }
 
 
-
 ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 
@@ -187,7 +160,6 @@ KviDccSendOptionsWidget::~KviDccSendOptionsWidget()
 }
 
 
-
 KviDccSendGeneralOptionsWidget::KviDccSendGeneralOptionsWidget(QWidget * parent)
 : KviOptionsWidget(parent,"dccsend_options_widget")
 {
@@ -210,11 +182,9 @@ KviDccSendGeneralOptionsWidget::KviDccSendGeneralOptionsWidget(QWidget * parent)
 	addBoolSelector(g,__tr2qs_ctx("Notify completion in console","options"),KviOption_boolNotifyDccSendSuccessInConsole);
 	addBoolSelector(g,__tr2qs_ctx("Notify completion in notifier","options"),KviOption_boolNotifyDccSendSuccessInNotifier);
 	b = addBoolSelector(g,__tr2qs_ctx("Automatically clear transfer","options"),KviOption_boolAutoCloseDccSendOnSuccess);
-#ifdef COMPILE_INFO_TIPS
 	mergeTip(b,
 		__tr2qs_ctx("<center>This option will cause succesfully terminated transfers " \
 				"to be automatically removed from the transfer window.</center>","options"));
-#endif //COMPILE_INFO_TIPS
 
 
 	KviBoolSelector * b1 = addBoolSelector(0,3,0,3,__tr2qs_ctx("Always open transfer window as minimized","options"),KviOption_boolCreateMinimizedDccSend);
@@ -237,27 +207,20 @@ KviDccSendAdvancedOptionsWidget::KviDccSendAdvancedOptionsWidget(QWidget * paren
 
 	KviTalGroupBox * g = addGroupBox(0,0,0,0,1,Qt::Horizontal,__tr2qs_ctx("Bug Compatibility","options"));
 	KviBoolSelector * b = addBoolSelector(g,__tr2qs_ctx("Send ACK for byte 0","options"),KviOption_boolSendZeroAckInDccRecv);
-#ifdef COMPILE_INFO_TIPS
 	mergeTip(b,
 		__tr2qs_ctx("<center>This option causes KVIrc to send a zero-byte acknowledge to kick-start " \
 				"the DCC transfer with some buggy IRC clients.<br>" \
 				"Use it only if your DCC transfers stall just after establishing a connection without sending any data.</center>","options"));
-#endif //COMPILE_INFO_TIPS
 
 	b = addBoolSelector(g,__tr2qs_ctx("Accept broken RESUME (mIRC file.ext)","options"),KviOption_boolAcceptBrokenFileNameDccResumeRequests);
-#ifdef COMPILE_INFO_TIPS
 	mergeTip(b,
 		__tr2qs_ctx("<center>This option causes KVIrc to accept RESUME requests with invalid filenames.<br>" \
 				"Use it if KVIrc fails to accept RESUME requests from other clients (e.g. some versions of mIRC).</center>","options"));
-#endif //COMPILE_INFO_TIPS
 
 	b = addBoolSelector(g,__tr2qs_ctx("Replace spaces with underscores in outgoing filenames","options"),KviOption_boolDCCFileTransferReplaceOutgoingSpacesWithUnderscores);
-#ifdef COMPILE_INFO_TIPS
 	mergeTip(b,
 		__tr2qs_ctx("<center>This option causes KVIrc to replace spaces with underscores in filenames " \
 				"for all the outgoing file transfers. This will fix filename handling with some buggy clients (e.g. some versions of mIRC).","options"));
-#endif //COMPILE_INFO_TIPS
-
 
 	g = addGroupBox(0,1,0,1,1,Qt::Horizontal,__tr2qs_ctx("Limits","options"));
 
@@ -275,55 +238,44 @@ KviDccSendAdvancedOptionsWidget::KviDccSendAdvancedOptionsWidget(QWidget * paren
 
 
 	u = addUIntSelector(g,__tr2qs_ctx("Maximum number of DCC transfers","options"),KviOption_uintMaxDccSendTransfers,0,1000,10);
-#ifdef COMPILE_INFO_TIPS
 	mergeTip(u,__tr2qs_ctx("<center>This is the maximum number of concurrent DCC transfers. " \
 					"KVIrc will refuse the requests when this limit is reached.</center>","options"));
-#endif
 
 	g = addGroupBox(0,2,0,2,1,Qt::Horizontal,__tr2qs_ctx("Tweaks","options"));
 
 	b = addBoolSelector(g,__tr2qs_ctx("Use fast send (send ahead)","options"),KviOption_boolUseFastDccSend);
-#ifdef COMPILE_INFO_TIPS
 	mergeTip(b,
 		__tr2qs_ctx("<center>The \"send ahead\" DCC method allows data to be sent faster by breaking " \
 				"some of the rules of the original DCC SEND protocol specification.<br>" \
 				"Most clients can handle this kind of optimisation so disable it only if you have problems.</center>","options"));
-#endif //COMPILE_INFO_TIPS
 
 	hb = new KviTalHBox(g);
 
 	b = addBoolSelector(hb,__tr2qs_ctx("Force idle step","options"),KviOption_boolDccSendForceIdleStep);
-#ifdef COMPILE_INFO_TIPS
 	mergeTip(b,
 		__tr2qs_ctx("<center>Enable this option when the dcc file transfers " \
 				"tend to block your computer by consuming too much CPU time. " \
 				"When this option is enabled the idle interval below will be " \
 				"forcibly inserted between each sent/received data packet.</center>","options"));
-#endif // COMPILE_INFO_TIPS
 
 	u = addUIntSelector(hb,__tr2qs_ctx("","options"),KviOption_uintDccSendIdleStepInMSec,1,65536,30,KVI_OPTION_BOOL(KviOption_boolDccSendForceIdleStep));
 	connect(b,SIGNAL(toggled(bool)),u,SLOT(setEnabled(bool)));
 	u->setSuffix(__tr2qs_ctx(" msec","options"));
 	
-#ifdef COMPILE_INFO_TIPS
 	mergeTip(u,
 		__tr2qs_ctx("<center>This parameter controls the average delay between two packets sent or received.<br>" \
 				"A smaller interval will cause you to send data faster but will also " \
 				"add load to your CPU, disk and network interface.<br>" \
 				"Reasonable values are from 5 to 50 milliseconds.</center>","options"));
-#endif //COMPILE_INFO_TIPS
 
 	u = addUIntSelector(g,__tr2qs_ctx("Packet size:","options"),KviOption_uintDccSendPacketSize,16,65536,1024);
 	u->setSuffix(__tr2qs_ctx(" bytes","options"));
-#ifdef COMPILE_INFO_TIPS
 	mergeTip(u,
 		__tr2qs_ctx("<center>This parameter controls the packet size used for DCC SEND.<br>" \
 				"With bigger packets you will be probably send data faster, but " \
 				"you will also saturate your bandwidth and in some cases " \
 				"cause more disk activity.<br>" \
 				"Reasonable values are from 512 to 4096 bytes.</center>","options"));
-#endif //COMPILE_INFO_TIPS
-
 
 	addRowSpacer(0,3,0,3);
 
@@ -381,7 +333,6 @@ KviDccVoiceOptionsWidget::KviDccVoiceOptionsWidget(QWidget *p):KviOptionsWidget(
 
 	KviUIntSelector * u = addUIntSelector(0,6,0,6,__tr2qs_ctx("Pre-buffer size:","options"), KviOption_uintDccVoicePreBufferSize, 2048, 65536, 32000);
 	u->setSuffix(" bytes");
-	
 
 	addRowSpacer(0,7,0,7);
 }