more code clean

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

1 files changed, 17 insertions, 27 deletions

diff --git a/src/modules/options/optw_lag.cpp b/src/modules/options/optw_lag.cpp
index 30b1ab0b3..30e1f9907 100644
--- a/src/modules/options/optw_lag.cpp
+++ b/src/modules/options/optw_lag.cpp
@@ -23,13 +23,11 @@
 
 #include "optw_lag.h"
 
-#include <qlayout.h>
-#include "kvi_tal_tooltip.h"
-
 #include "kvi_options.h"
 #include "kvi_locale.h"
+#include "kvi_tal_tooltip.h"
 
-//#warning "Info tips"
+#include <QLayout>
 
 
 KviLagOptionsWidget::KviLagOptionsWidget(QWidget * parent)
@@ -38,40 +36,32 @@ KviLagOptionsWidget::KviLagOptionsWidget(QWidget * parent)
 	createLayout(3,1);
 
 	KviBoolSelector * pUse = addBoolSelector(0,0,0,0, __tr2qs_ctx("Enable lag meter","options"), KviOption_boolUseLagMeterEngine);
-#ifdef COMPILE_INFO_TIPS
-    mergeTip(pUse,__tr2qs_ctx("<center>This enables the lag meter engine, which checks at regular intervals how much lag (latency) the server has.</center>","options"));
-#endif
-    KviTalGroupBox *g = addGroupBox(0,1,0,1,1,Qt::Horizontal,__tr2qs_ctx("Configuration","options"),KVI_OPTION_BOOL(KviOption_boolUseLagMeterEngine));
-    KviUIntSelector * pInterval = addUIntSelector(g, __tr2qs_ctx("Lag meter heartbeat:","options"),KviOption_uintLagMeterHeartbeat,2000,10000,5000,KVI_OPTION_BOOL(KviOption_boolUseLagMeterEngine));
-    pInterval->setSuffix(__tr2qs_ctx(" msec","options"));
-#ifdef COMPILE_INFO_TIPS
-    mergeTip(pInterval,
+	mergeTip(pUse,__tr2qs_ctx("<center>This enables the lag meter engine, which checks at regular intervals how much lag (latency) the server has.</center>","options"));
+	KviTalGroupBox *g = addGroupBox(0,1,0,1,1,Qt::Horizontal,__tr2qs_ctx("Configuration","options"),KVI_OPTION_BOOL(KviOption_boolUseLagMeterEngine));
+	KviUIntSelector * pInterval = addUIntSelector(g, __tr2qs_ctx("Lag meter heartbeat:","options"),KviOption_uintLagMeterHeartbeat,2000,10000,5000,KVI_OPTION_BOOL(KviOption_boolUseLagMeterEngine));
+	pInterval->setSuffix(__tr2qs_ctx(" msec","options"));
+	mergeTip(pInterval,
 		__tr2qs_ctx("<center>This option allows you to set the lag meter heartbeat interval.<br>" \
 			"The lower the heartbeat interval the higher will be the accuracy of the lag check " \
 			"but also higher cpu usage and data traffic to the server.<br>" \
 			"Please note that this is NOT the interval between pings sent to the server: " \
 			"the pings (if any) will be sent really less often. " \
 			"5000 is a reasonable value.</center>","options"));
-#endif
-    connect(pUse,SIGNAL(toggled(bool)),pInterval,SLOT(setEnabled(bool)));
-
-    KviUIntSelector * pAlarm = addUIntSelector(g, __tr2qs_ctx("Trigger event if lag exceeds:","options"), KviOption_uintLagAlarmTime,5000,1000000,30000, KVI_OPTION_BOOL(KviOption_boolUseLagMeterEngine));
-    pAlarm->setSuffix(__tr2qs_ctx(" msec","options"));
-#ifdef COMPILE_INFO_TIPS
+	connect(pUse,SIGNAL(toggled(bool)),pInterval,SLOT(setEnabled(bool)));
+	
+	KviUIntSelector * pAlarm = addUIntSelector(g, __tr2qs_ctx("Trigger event if lag exceeds:","options"), KviOption_uintLagAlarmTime,5000,1000000,30000, KVI_OPTION_BOOL(KviOption_boolUseLagMeterEngine));
+	pAlarm->setSuffix(__tr2qs_ctx(" msec","options"));
 	mergeTip(pAlarm,__tr2qs_ctx("<center>This option controls the threshold for the " \
 			"OnLagAlarmTimeUp and OnLagAlarmTimeDown events. When the lag goes above " \
 			"the threshold OnLagAlarmTimeUp will be triggered and when the lag falls " \
 			"back below the threshold then OnLagAlarmTimeDown will be triggered</center>","options"));
-#endif
-    connect(pUse,SIGNAL(toggled(bool)),pAlarm,SLOT(setEnabled(bool)));
-
-    KviBoolSelector * pShow = addBoolSelector(g, __tr2qs_ctx("Show lag in IRC context display","options"), KviOption_boolShowLagOnContextDisplay, KVI_OPTION_BOOL(KviOption_boolUseLagMeterEngine));
-#ifdef COMPILE_INFO_TIPS
-    mergeTip(pShow,__tr2qs_ctx("<center>This makes the IRC context display applet show the current lag after the user's nickname (in seconds)</center>","options"));
-#endif
+	connect(pUse,SIGNAL(toggled(bool)),pAlarm,SLOT(setEnabled(bool)));
+	
+	KviBoolSelector * pShow = addBoolSelector(g, __tr2qs_ctx("Show lag in IRC context display","options"), KviOption_boolShowLagOnContextDisplay, KVI_OPTION_BOOL(KviOption_boolUseLagMeterEngine));
+	mergeTip(pShow,__tr2qs_ctx("<center>This makes the IRC context display applet show the current lag after the user's nickname (in seconds)</center>","options"));
 
-    connect(pUse,SIGNAL(toggled(bool)),pShow,SLOT(setEnabled(bool)));
-    connect(pUse,SIGNAL(toggled(bool)),g,SLOT(setEnabled(bool)));
+	connect(pUse,SIGNAL(toggled(bool)),pShow,SLOT(setEnabled(bool)));
+	connect(pUse,SIGNAL(toggled(bool)),g,SLOT(setEnabled(bool)));
 
 	addRowSpacer(0,2,0,2);