aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGravatar Alexey Sokolov2016-04-23 21:22:04 +0100
committerGravatar Alexey Sokolov2016-04-29 23:48:35 +0100
commitb1a8a94e954620a937e686206717f1a7d2c64719 (patch)
treeb5c50dbe6207cf24a64c59cd7e5a03330ce4a0e2 /src
parentKviIrcConnectionRequestQueue: typo fix in file type (diff)
downloadKVIrc-b1a8a94e954620a937e686206717f1a7d2c64719.tar.gz
KVIrc-b1a8a94e954620a937e686206717f1a7d2c64719.tar.bz2
KVIrc-b1a8a94e954620a937e686206717f1a7d2c64719.zip
Protect several hand-crafted blocks from clang-format
Diffstat (limited to 'src')
-rw-r--r--src/kvilib/core/KviCString.cpp2
-rw-r--r--src/kvilib/ext/KviConfigurationFile.cpp2
-rw-r--r--src/kvilib/ext/KviRuntimeInfo.cpp2
-rw-r--r--src/kvilib/locale/KviLocale.cpp2
-rw-r--r--src/kvirc/kvs/parser/KviKvsParser_expression.cpp2
-rw-r--r--src/kvirc/sparser/KviIrcServerParser_tables.cpp4
-rw-r--r--src/kvirc/ui/KviIrcView_getTextLine.cpp2
-rw-r--r--src/modules/addon/AddonFunctions.cpp2
-rw-r--r--src/modules/dcc/requests.cpp2
-rw-r--r--src/modules/options/OptionsDialog.cpp2
-rw-r--r--src/modules/theme/ThemeFunctions.cpp4
11 files changed, 26 insertions, 0 deletions
diff --git a/src/kvilib/core/KviCString.cpp b/src/kvilib/core/KviCString.cpp
index ec7257165..e6c1208e3 100644
--- a/src/kvilib/core/KviCString.cpp
+++ b/src/kvilib/core/KviCString.cpp
@@ -1990,6 +1990,7 @@ KviCString & KviCString::hexEncodeWhiteSpace()
{
static unsigned char ascii_jump_table[256]=
{
+ // clang-format off
// 000 001 002 003 004 005 006 007 008 009 010 011 012 013 014 015
// NUL SOH STX ETX EOT ENQ ACK BEL BS HT LF VT FF CR SO SI
1 ,1 ,1 ,1 ,1 ,1 ,1 ,1 ,1 ,1 ,1 ,1 ,1 ,1 ,1 ,1 ,
@@ -2038,6 +2039,7 @@ KviCString & KviCString::hexEncodeWhiteSpace()
// 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255
// � � � � � � � �
0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0
+ // clang-format on
};
return hexEncodeWithTable(ascii_jump_table);
diff --git a/src/kvilib/ext/KviConfigurationFile.cpp b/src/kvilib/ext/KviConfigurationFile.cpp
index 2ea967f46..09b1cfbfd 100644
--- a/src/kvilib/ext/KviConfigurationFile.cpp
+++ b/src/kvilib/ext/KviConfigurationFile.cpp
@@ -451,6 +451,7 @@ bool KviConfigurationFile::save()
{
static unsigned char encode_table[256]=
{
+ // clang-format off
// 000 001 002 003 004 005 006 007 008 009 010 011 012 013 014 015
// NUL SOH STX ETX EOT ENQ ACK BEL BS HT LF VT FF CR SO SI
1 ,1 ,1 ,1 ,1 ,1 ,1 ,1 ,1 ,1 ,1 ,1 ,1 ,1 ,1 ,1 ,
@@ -499,6 +500,7 @@ bool KviConfigurationFile::save()
// 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255
// � � � � � � � �
0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0
+ // clang-format on
};
diff --git a/src/kvilib/ext/KviRuntimeInfo.cpp b/src/kvilib/ext/KviRuntimeInfo.cpp
index 1df3f8d48..e10668d62 100644
--- a/src/kvilib/ext/KviRuntimeInfo.cpp
+++ b/src/kvilib/ext/KviRuntimeInfo.cpp
@@ -68,6 +68,7 @@ typedef BOOL (WINAPI *PGETPRODUCTINFO)(DWORD,DWORD,DWORD,DWORD,PDWORD);
// the grace period, this parameter is set to
// PRODUCT_UNLICENSED (0xABCDABCD).
+// clang-format off
#define PRODUCT_UNDEFINED 0x00000000
#define PRODUCT_ULTIMATE 0x00000001
@@ -192,6 +193,7 @@ typedef BOOL (WINAPI *PGETPRODUCTINFO)(DWORD,DWORD,DWORD,DWORD,PDWORD);
#define PRODUCT_ENTERPRISE_S_N_EVALUATION 0x00000082
#define PRODUCT_UNLICENSED 0xABCDABCD
+// clang-format on
static QString queryWinInfo(QueryInfo info)
{
diff --git a/src/kvilib/locale/KviLocale.cpp b/src/kvilib/locale/KviLocale.cpp
index 758402089..e4261b858 100644
--- a/src/kvilib/locale/KviLocale.cpp
+++ b/src/kvilib/locale/KviLocale.cpp
@@ -315,6 +315,7 @@ static const char * encoding_groups[] =
static KviLocale::EncodingDescription supported_encodings[] =
{
+// clang-format off
// Unicode
{ "UTF-8" , 0 , 0 , 0, "8-bit Unicode" },
// West European
@@ -463,6 +464,7 @@ static KviLocale::EncodingDescription supported_encodings[] =
{ "UTF-8 [CP-949]" , 1 , 1 , 7, "Unicode - Korean Codepage" },
#endif
{ 0 , 0 , 0 , 0 , 0 }
+// clang-format on
};
KviLocale * KviLocale::m_pSelf = NULL;
diff --git a/src/kvirc/kvs/parser/KviKvsParser_expression.cpp b/src/kvirc/kvs/parser/KviKvsParser_expression.cpp
index 8230eee72..76a4e661a 100644
--- a/src/kvirc/kvs/parser/KviKvsParser_expression.cpp
+++ b/src/kvirc/kvs/parser/KviKvsParser_expression.cpp
@@ -218,6 +218,7 @@ KviKvsTreeNodeExpressionBinaryOperator * KviKvsParser::parseExpressionBinaryOper
static unsigned char binary_operator_initial_char[256]=
{
+ // clang-format off
// 000 001 002 003 004 005 006 007 008 009 010 011 012 013 014 015
// NUL SOH STX ETX EOT ENQ ACK BEL BS HT LF VT FF CR SO SI
0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,
@@ -266,6 +267,7 @@ static unsigned char binary_operator_initial_char[256]=
// 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255
// � � � � � � � �
0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0
+ // clang-format on
};
diff --git a/src/kvirc/sparser/KviIrcServerParser_tables.cpp b/src/kvirc/sparser/KviIrcServerParser_tables.cpp
index b545fc634..1e1a9c376 100644
--- a/src/kvirc/sparser/KviIrcServerParser_tables.cpp
+++ b/src/kvirc/sparser/KviIrcServerParser_tables.cpp
@@ -29,6 +29,7 @@
KviLiteralMessageParseStruct KviIrcServerParser::m_literalParseProcTable[]=
{
+ // clang-format off
{ "ACCOUNT" , PTM(parseLiteralAccount) },
{ "AUTHENTICATE" , PTM(parseLiteralAuthenticate) },
{ "AWAY" , PTM(parseLiteralAway) },
@@ -49,6 +50,7 @@ KviLiteralMessageParseStruct KviIrcServerParser::m_literalParseProcTable[]=
{ "TOPIC" , PTM(parseLiteralTopic) },
{ "WALLOPS" , PTM(parseLiteralWallops) },
{ 0 , 0 }
+ // clang-format on
};
#define REQ(f) parseCtcpRequest##f
@@ -56,6 +58,7 @@ KviLiteralMessageParseStruct KviIrcServerParser::m_literalParseProcTable[]=
KviCtcpMessageParseStruct KviIrcServerParser::m_ctcpParseProcTable[]=
{
+ // clang-format off
{ "ACTION" , PTM(REQ(Action)) , PTM(REQ(Action)) , 0 },
{ "AVATAR" , PTM(REQ(Avatar)) , PTM(RPL(Avatar)) , 0 },
{ "CLIENTINFO" , PTM(REQ(Clientinfo)) , PTM(RPL(Generic)) , 0 },
@@ -71,6 +74,7 @@ KviCtcpMessageParseStruct KviIrcServerParser::m_ctcpParseProcTable[]=
{ "VERSION" , PTM(REQ(Version)) , PTM(RPL(Generic)) , 0 },
{ "XDCC" , PTM(REQ(Dcc)) , PTM(REQ(Dcc)) , 0 },
{ 0 , 0 , 0 , 0 }
+ // clang-format on
};
#undef REQ
diff --git a/src/kvirc/ui/KviIrcView_getTextLine.cpp b/src/kvirc/ui/KviIrcView_getTextLine.cpp
index 4cb4ab51a..bfc772953 100644
--- a/src/kvirc/ui/KviIrcView_getTextLine.cpp
+++ b/src/kvirc/ui/KviIrcView_getTextLine.cpp
@@ -354,6 +354,7 @@ const kvi_wchar_t * KviIrcView::getTextLine(
static void * char_to_check_jump_table[256]=
{
+ // clang-format off
&&found_end_of_buffer ,0 ,&&found_mirc_escape ,&&found_color_escape ,
0 ,0 ,0 ,0 ,
0 ,0 ,&&found_end_of_line ,0 ,
@@ -418,6 +419,7 @@ const kvi_wchar_t * KviIrcView::getTextLine(
0 ,0 ,0 ,0 ,
0 ,0 ,0 ,0 ,
0 ,0 ,0 ,0 // 240-255
+ // clang-format on
};
if(KVI_OPTION_BOOL(KviOption_boolIrcViewUrlHighlighting) || KVI_OPTION_BOOL(KviOption_boolDrawEmoticons))
diff --git a/src/modules/addon/AddonFunctions.cpp b/src/modules/addon/AddonFunctions.cpp
index 2bc7a0d91..192e0d8ac 100644
--- a/src/modules/addon/AddonFunctions.cpp
+++ b/src/modules/addon/AddonFunctions.cpp
@@ -158,6 +158,7 @@ namespace AddonFunctions
}
+ // clang-format off
hd.szHtmlText = QString(
"<html bgcolor=\"#ffffff\">" \
"<body bgcolor=\"#ffffff\">" \
@@ -183,6 +184,7 @@ namespace AddonFunctions
"<br>" \
"</body>" \
"</html>").arg(szPackageName,szPackageVersion,szPackageDescription,szAuthor,szPackageAuthor,szCreatedAt,szPackageDate,szCreatedWith,szPackageApplication).arg(szWarnings);
+ // clang-format on
hd.addImageResource("addon_dialog_pack_image",pix);
hd.addHtmlResource("addon_dialog_main",hd.szHtmlText);
diff --git a/src/modules/dcc/requests.cpp b/src/modules/dcc/requests.cpp
index a719175d1..b86e23528 100644
--- a/src/modules/dcc/requests.cpp
+++ b/src/modules/dcc/requests.cpp
@@ -1178,6 +1178,7 @@ typedef struct _dccParseProcEntry
static dccParseProcEntry dccParseProcTable[KVI_NUM_KNOWN_DCC_TYPES]=
{
+ // clang-format off
{ "CHAT" , dccModuleParseDccChat },
{ "SCHAT" , dccModuleParseDccChat },
{ "SEND" , dccModuleParseDccSend },
@@ -1206,6 +1207,7 @@ static dccParseProcEntry dccParseProcTable[KVI_NUM_KNOWN_DCC_TYPES]=
{ "CANVAS" , dccModuleParseDccCanvas },
{ "VOICE" , dccModuleParseDccVoice },
{ "VIDEO" , dccModuleParseDccVideo }
+ // clang-format on
};
diff --git a/src/modules/options/OptionsDialog.cpp b/src/modules/options/OptionsDialog.cpp
index 8da8fa63c..e924bfa93 100644
--- a/src/modules/options/OptionsDialog.cpp
+++ b/src/modules/options/OptionsDialog.cpp
@@ -134,6 +134,7 @@ OptionsDialog::OptionsDialog(QWidget * par,const QString &szGroup,bool bModal)
"or \"<b>Cancel</b>\" to discard them. Clicking \"<b>Apply</b>\" will commit your " \
"changes without closing the window.","options");
+ // clang-format off
QString szFrontText = QString(
"<table width=\"100%\" height=\"100%\" valign=\"top\" align=\"center\" cellpadding=\"4\">" \
"<tr>" \
@@ -158,6 +159,7 @@ OptionsDialog::OptionsDialog(QWidget * par,const QString &szGroup,bool bModal)
"</tr>" \
"</table>"
).arg(szDialogTitle, szDialog, szInfoTips, szOkCancelButtons);
+ // clang-format on
QString szCaption = szDialogTitle + " - KVIrc";
setWindowTitle(szCaption);
diff --git a/src/modules/theme/ThemeFunctions.cpp b/src/modules/theme/ThemeFunctions.cpp
index 52a429021..c49c08437 100644
--- a/src/modules/theme/ThemeFunctions.cpp
+++ b/src/modules/theme/ThemeFunctions.cpp
@@ -235,6 +235,7 @@ namespace ThemeFunctions
QString szShowDetails = __tr2qs_ctx("Show Details","theme");
+ // clang-format off
hd.szHtmlText = QString(
"<html bgcolor=\"#ffffff\">" \
"<body bgcolor=\"#ffffff\">" \
@@ -263,6 +264,7 @@ namespace ThemeFunctions
"</center></p>" \
"</body>" \
"</html>").arg(szPackageName,szPackageVersion,szPackageDescription,szAuthor,szPackageAuthor,szCreatedAt,szPackageDate,szCreatedOn,szPackageApplication).arg(szWarnings,szShowDetails);
+ // clang-format on
hd.addImageResource("theme_dialog_pack_image",pix);
hd.addHtmlResource("theme_dialog_details",szDetails);
@@ -335,6 +337,7 @@ namespace ThemeFunctions
szScreenshot = "";
}
+ // clang-format off
szBuffer = QString(
"<p><center>" \
"<h2>%1 %2</h2>" \
@@ -354,6 +357,7 @@ namespace ThemeFunctions
"%13: %14<br>" \
"</font>" \
"</center></p>").arg(szThemeName,szThemeVersion,szScreenshot,szThemeDescription,szAuthor,szThemeAuthor,szCreatedAt,szThemeDate,szCreatedOn).arg(szThemeApplication,szThemeEngineVersion,szThemeThemeEngineVersion,szSubdirectory,szThemeSubdirectory);
+ // clang-format on
}
bool makeKVIrcScreenshot(const QString &szSavePngFilePath,bool bMaximizeFrame)