KviOptions: formatting + indenting + spaces cleanup

+ removal of ancient commented out code

2 files changed, 14 insertions, 50 deletions

diff --git a/src/kvirc/kernel/KviOptions.cpp b/src/kvirc/kernel/KviOptions.cpp
index 1eb837f50..354e64c68 100644
--- a/src/kvirc/kernel/KviOptions.cpp
+++ b/src/kvirc/kernel/KviOptions.cpp
@@ -529,7 +529,6 @@ KviColorOption g_colorOptionsTable[KVI_NUM_COLOR_OPTIONS]=
 	COLOR_OPTION("IrcViewMarkLine",40,40,40,255,KviOption_sectFlagIrcView)
 };
 
-
 #define IC_COLOR_OPTION(_num,_red,_green,_blue) \
 	KviColorOption( \
 		KVI_ICCOLOR_OPTIONS_PREFIX _num, \
@@ -568,20 +567,6 @@ KviPixmapOption g_pixmapOptionsTable[KVI_NUM_PIXMAP_OPTIONS]=
 	PIXMAP_OPTION("NotifierBackground",KviOption_sectFlagNotifier | KviOption_groupTheme)
 };
 
-//#define INT_OPTION(_name,_value,_flags)
-//	{
-//		KVI_INT_OPTIONS_PREFIX _name,
-//		_value,
-//		_flags
-//	}
-//
-//KviIntOption g_intOptionsTable[KVI_NUM_INT_OPTIONS]=
-//{
-//	INT_OPTION("IrcViewMaxBufferSize",KVI_IRCVIEW_MAX_LINES,KviOption_sectFlagIrcView),
-//	INT_OPTION("IrcViewTollTipTimeoutInMsec",1800,KviOption_sectFlagIrcView),
-//	INT_OPTION("IrcViewToolTipHideTimeoutInMsec",10000,KviOption_sectFlagIrcView)
-//};
-
 #define UINT_OPTION(_name,_value,_flags) \
 	KviUIntOption( \
 		KVI_UINT_OPTIONS_PREFIX _name, \
@@ -732,8 +717,6 @@ KviFontOption g_fontOptionsTable[KVI_NUM_FONT_OPTIONS]=
 		KviOption_sectFlagMsgType | KviOption_groupTheme \
 	)
 
-
-
 // FIXME: #warning "FIX THE ICONS HERE!!!"
 
 KviMessageTypeSettingsOption g_msgtypeOptionsTable[KVI_NUM_MSGTYPE_OPTIONS]=
@@ -966,7 +949,8 @@ void KviApplication::saveOptions()
 	if(!cfg.ensureWritable())
 	{
 		QMessageBox::warning(0, __tr2qs("Warning While Writing Configuration - KVIrc"),
-			__tr2qs("I can't write to the main configuration file:\n\t%1\nPlease ensure the directory exists and that you have the proper permissions before continuing, or else any custom configuration will be lost.").arg(buffer)
+			__tr2qs("I can't write to the main configuration file:\n\t%1\nPlease ensure the directory exists and that you have the proper permissions before continuing, " \
+				"or else any custom configuration will be lost.").arg(buffer)
 		);
 	}
 	int i;
@@ -980,28 +964,33 @@ void KviApplication::saveOptions()
 
 	WRITE_OPTIONS(KVI_NUM_RECT_OPTIONS,g_rectOptionsTable)
 	WRITE_OPTIONS(KVI_NUM_BOOL_OPTIONS,g_boolOptionsTable)
+
 		for(i=0;i<KVI_NUM_STRING_OPTIONS;i++)
 		{
 			if(g_stringOptionsTable[i].flags & KviOption_encodePath)
 				KviStringConversion::encodePath(g_stringOptionsTable[i].option);
 		}
+
 	WRITE_OPTIONS(KVI_NUM_STRING_OPTIONS,g_stringOptionsTable)
-		for(i=0;i<KVI_NUM_STRING_OPTIONS;i++)
+	for(i=0;i<KVI_NUM_STRING_OPTIONS;i++)
 		{
 			if(g_stringOptionsTable[i].flags & KviOption_encodePath)
 				KviStringConversion::decodePath(g_stringOptionsTable[i].option);
 		}
+
 	WRITE_OPTIONS(KVI_NUM_COLOR_OPTIONS,g_colorOptionsTable)
 
 	WRITE_OPTIONS(KVI_NUM_PIXMAP_OPTIONS,g_pixmapOptionsTable)
 	WRITE_OPTIONS(KVI_NUM_UINT_OPTIONS,g_uintOptionsTable)
 	WRITE_OPTIONS(KVI_NUM_FONT_OPTIONS,g_fontOptionsTable)
 	WRITE_OPTIONS(KVI_NUM_MSGTYPE_OPTIONS,g_msgtypeOptionsTable)
+
 	for(i=0;i<KVI_NUM_STRINGLIST_OPTIONS;i++)
 		{
 			if(g_stringlistOptionsTable[i].flags & KviOption_encodePath)
 				KviStringConversion::encodePath(g_stringlistOptionsTable[i].option);
 		}
+
 	WRITE_OPTIONS(KVI_NUM_STRINGLIST_OPTIONS,g_stringlistOptionsTable)
 	for(i=0;i<KVI_NUM_STRINGLIST_OPTIONS;i++)
 	{
@@ -1014,7 +1003,6 @@ void KviApplication::saveOptions()
 	#undef WRITE_OPTIONS
 }
 
-
 #undef WRITE_OPTIONS
 
 #define WRITE_OPTIONS(_num,_table) \
@@ -1293,7 +1281,6 @@ void KviApplication::listAvailableOptions(KviWindow *wnd)
 //using namespace KviStringConversion;
 bool KviApplication::getOptionString(const QString &optName,QString &buffer)
 {
-
 	#define GET_OPTION_STRING(__numOpt,__table,__prefix,__prefixLen) \
 		if(KviQString::equalCIN(optName,__prefix,__prefixLen)) \
 		{ \
@@ -1309,7 +1296,6 @@ bool KviApplication::getOptionString(const QString &optName,QString &buffer)
 		}
 
 	// WARNING : stringlist prefix must go BEFORE the string prefix (otherwise it will match)
-
 	GET_OPTION_STRING(KVI_NUM_BOOL_OPTIONS,g_boolOptionsTable,KVI_BOOL_OPTIONS_PREFIX,KVI_BOOL_OPTIONS_PREFIX_LEN)
 	GET_OPTION_STRING(KVI_NUM_RECT_OPTIONS,g_rectOptionsTable,KVI_BOOL_OPTIONS_PREFIX,KVI_BOOL_OPTIONS_PREFIX_LEN)
 	GET_OPTION_STRING(KVI_NUM_STRINGLIST_OPTIONS,g_stringlistOptionsTable,KVI_STRINGLIST_OPTIONS_PREFIX,KVI_STRINGLIST_OPTIONS_PREFIX_LEN)
@@ -1385,6 +1371,7 @@ void KviApplication::optionResetUpdate(int flags)
 		emit updateNotifier();
 	}
 }
+
 bool KviApplication::setOptionValue(const QString &optName,const QString &value)
 {
 	if (!setCommonOptionValue(optName,value))
diff --git a/src/kvirc/kernel/KviOptions.h b/src/kvirc/kernel/KviOptions.h
index b3484e22a..5684bbccf 100644
--- a/src/kvirc/kernel/KviOptions.h
+++ b/src/kvirc/kernel/KviOptions.h
@@ -38,8 +38,6 @@
 #include <QStringList>
 
 // option structures
-
-
 #define DECLARE_OPTION_STRUCT(_cname,_type) \
 	class _cname \
 	{ \
@@ -75,7 +73,6 @@ DECLARE_OPTION_STRUCT(KviStringListOption,QStringList)
 #define KVI_COLOR_OWN			254
 
 // option entry indexes
-
 #define KVI_RECT_OPTIONS_PREFIX "rect"
 #define KVI_RECT_OPTIONS_PREFIX_LEN 4
 
@@ -87,8 +84,6 @@ DECLARE_OPTION_STRUCT(KviStringListOption,QStringList)
 
 #define KVI_NUM_RECT_OPTIONS 3
 
-
-
 #define KVI_BOOL_OPTIONS_PREFIX "bool"
 #define KVI_BOOL_OPTIONS_PREFIX_LEN 4
 
@@ -437,7 +432,6 @@ DECLARE_OPTION_STRUCT(KviStringListOption,QStringList)
 #define KVI_NUM_STRING_OPTIONS 61
 
 
-
 #define KVI_STRINGLIST_OPTIONS_PREFIX "stringlist"
 #define KVI_STRINGLIST_OPTIONS_PREFIX_LEN 10
 
@@ -454,7 +448,6 @@ DECLARE_OPTION_STRUCT(KviStringListOption,QStringList)
 #define KVI_NUM_STRINGLIST_OPTIONS 9
 
 
-
 #define KVI_COLOR_OPTIONS_PREFIX "color"
 #define KVI_COLOR_OPTIONS_PREFIX_LEN 5
 
@@ -512,7 +505,6 @@ DECLARE_OPTION_STRUCT(KviStringListOption,QStringList)
 #define KVI_NUM_COLOR_OPTIONS 50
 
 
-
 #define KVI_PIXMAP_OPTIONS_PREFIX "pixmap"
 #define KVI_PIXMAP_OPTIONS_PREFIX_LEN 6
 
@@ -530,8 +522,6 @@ DECLARE_OPTION_STRUCT(KviStringListOption,QStringList)
 #define KVI_NUM_PIXMAP_OPTIONS 10
 
 
-
-
 #define KVI_UINT_OPTIONS_PREFIX "uint"
 #define KVI_UINT_OPTIONS_PREFIX_LEN 4
 
@@ -626,6 +616,7 @@ DECLARE_OPTION_STRUCT(KviStringListOption,QStringList)
 
 #define KVI_NUM_UINT_OPTIONS 83
 
+
 namespace KviIdentdOutputMode {
 	enum Mode {
 		Quiet = 0,
@@ -634,7 +625,6 @@ namespace KviIdentdOutputMode {
 	};
 }
 
-
 #define KVI_FONT_OPTIONS_PREFIX "font"
 #define KVI_FONT_OPTIONS_PREFIX_LEN 4
 
@@ -651,8 +641,6 @@ namespace KviIdentdOutputMode {
 #define KVI_NUM_FONT_OPTIONS 9
 
 
-
-
 #define KVI_ICCOLOR_OPTIONS_PREFIX "iccolor"
 #define KVI_ICCOLOR_OPTIONS_PREFIX_LEN 7
 
@@ -660,14 +648,12 @@ namespace KviIdentdOutputMode {
 
 
 // indices declared in kvi_out.h
-
 #define KVI_MSGTYPE_OPTIONS_PREFIX "msgtype"
 #define KVI_MSGTYPE_OPTIONS_PREFIX_LEN 7
 
 #define KVI_NUM_MSGTYPE_OPTIONS 144
 
 
-
 #define KVI_MIRCCOLOR_OPTIONS_PREFIX "mirccolor"
 #define KVI_MIRCCOLOR_OPTIONS_PREFIX_LEN 9
 
@@ -701,9 +687,7 @@ extern KVIRC_API KviStringListOption g_stringlistOptionsTable[KVI_NUM_STRINGLIST
 #define KVI_OPTION_STRINGLIST(_idx)  g_stringlistOptionsTable[_idx].option
 #define KVI_OPTION_ICCOLOR(_idx)     g_iccolorOptionsTable[_idx].option
 
-
 // Verbosity constants
-
 #define KVI_VERBOSITY_LEVEL_MUTE 0
 #define KVI_VERBOSITY_LEVEL_QUIET 1
 #define KVI_VERBOSITY_LEVEL_NORMAL 2
@@ -715,20 +699,16 @@ extern KVIRC_API KviStringListOption g_stringlistOptionsTable[KVI_NUM_STRINGLIST
 #define _OUTPUT_QUIET (KVI_OPTION_UINT(KviOption_uintOutputVerbosityLevel) <= KVI_VERBOSITY_LEVEL_QUIET)
 #define _OUTPUT_MUTE (KVI_OPTION_UINT(KviOption_uintOutputVerbosityLevel) <= KVI_VERBOSITY_LEVEL_MUTE)
 
-	#define START_TABLE_BOLD_ROW "<tr><td style=\"background-color: rgb(48,48,48); font-weight: bold; color: rgb(255,255,255); padding-left: 5px; padding-right: 5px;\">"
-	#define END_TABLE_BOLD_ROW "</td></tr>"
-
-	#define START_TABLE_NORMAL_ROW "<tr><td>"
-
-	#define SET_ANTI_ALIASING(p) (p).setRenderHint(QPainter::TextAntialiasing);
+#define START_TABLE_BOLD_ROW "<tr><td style=\"background-color: rgb(48,48,48); font-weight: bold; color: rgb(255,255,255); padding-left: 5px; padding-right: 5px;\">"
+#define END_TABLE_BOLD_ROW "</td></tr>"
+#define START_TABLE_NORMAL_ROW "<tr><td>"
 
+#define SET_ANTI_ALIASING(p) (p).setRenderHint(QPainter::TextAntialiasing);
 
 #define KVI_RECENT_CHANNELS_SEPARATOR ":"
 
 #if defined(_KVI_OPTIONS_CPP_) || defined(_WANT_OPTION_FLAGS_)
-
 	// flag definitions
-
 	// section of the config file (rightmost 8 bits)
 	#define KviOption_sectFlagNone 0
 	#define KviOption_sectFlagFrame 1
@@ -767,8 +747,6 @@ extern KVIRC_API KviStringListOption g_stringlistOptionsTable[KVI_NUM_STRINGLIST
 
 	#define KviOption_groupMask (255 << 8)
 
-
-
 	// actions to take when an option is set
 	#define KviOption_resetNone 0
 	#define KviOption_resetUpdateNotifier (1 << 16)
@@ -786,7 +764,6 @@ extern KVIRC_API KviStringListOption g_stringlistOptionsTable[KVI_NUM_STRINGLIST
 
 	//for file paths
 	#define KviOption_encodePath (1 << 25)
-
 #endif
 
 #endif //_KVI_OPTIONS_H_