diff options
| author | George Hazan <ghazan@miranda.im> | 2018-11-07 21:32:59 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2018-11-07 21:33:07 +0300 |
| commit | 08e2f2b731c2a696b1c23edd1ac0e911c2336dba (patch) | |
| tree | 239fd9453b487e6590d05e1d688b140879b2ecbb /plugins/IEView/src/HTMLBuilder.cpp | |
| parent | 140598d6c6061678f54c65acb2059ebc7b6b9aa7 (diff) | |
IEView: double settings set removed
Diffstat (limited to 'plugins/IEView/src/HTMLBuilder.cpp')
| -rw-r--r-- | plugins/IEView/src/HTMLBuilder.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/plugins/IEView/src/HTMLBuilder.cpp b/plugins/IEView/src/HTMLBuilder.cpp index 67f501e30a..7d0c7a278d 100644 --- a/plugins/IEView/src/HTMLBuilder.cpp +++ b/plugins/IEView/src/HTMLBuilder.cpp @@ -53,7 +53,7 @@ bool HTMLBuilder::encode(MCONTACT hContact, const char *proto, const wchar_t *te }
level++;
case 1:
- if ((Options::getGeneralFlags()&Options::GENERAL_ENABLE_BBCODES) && (flags & ENF_BBCODES)) {
+ if ((Options::generalFlags & Options::GENERAL_ENABLE_BBCODES) && (flags & ENF_BBCODES)) {
token = TextToken::tokenizeBBCodes(text);
break;
}
@@ -62,7 +62,7 @@ bool HTMLBuilder::encode(MCONTACT hContact, const char *proto, const wchar_t *te token = TextToken::tokenizeLinks(text);
break;
case 3:
- if ((flags & ENF_SMILEYS) || ((Options::getGeneralFlags() & Options::GENERAL_SMILEYINNAMES) && (flags & ENF_NAMESMILEYS)))
+ if ((flags & ENF_SMILEYS) || ((Options::generalFlags & Options::GENERAL_SMILEYINNAMES) && (flags & ENF_NAMESMILEYS)))
token = TextToken::tokenizeSmileys(hContact, proto, text, isSent);
break;
}
@@ -343,7 +343,7 @@ ProtocolSettings* HTMLBuilder::getSRMMProtocolSettings(const char *protocolName) {
ProtocolSettings *protoSettings = Options::getProtocolSettings(protocolName);
if (protoSettings == nullptr || !protoSettings->isSRMMEnable())
- protoSettings = Options::getProtocolSettings();
+ protoSettings = Options::getDefaultSettings();
return protoSettings;
}
@@ -357,7 +357,7 @@ ProtocolSettings* HTMLBuilder::getHistoryProtocolSettings(const char *protocolNa {
ProtocolSettings *protoSettings = Options::getProtocolSettings(protocolName);
if (protoSettings == nullptr || !protoSettings->isHistoryEnable())
- protoSettings = Options::getProtocolSettings();
+ protoSettings = Options::getDefaultSettings();
return protoSettings;
}
@@ -367,14 +367,14 @@ ProtocolSettings* HTMLBuilder::getHistoryProtocolSettings(MCONTACT hContact) if (hContact != NULL)
return getHistoryProtocolSettings(ptrA(getRealProto(hContact)));
- return Options::getProtocolSettings();
+ return Options::getDefaultSettings();
}
ProtocolSettings* HTMLBuilder::getChatProtocolSettings(const char *protocolName)
{
ProtocolSettings *protoSettings = Options::getProtocolSettings(protocolName);
if (protoSettings == nullptr || !protoSettings->isChatEnable())
- protoSettings = Options::getProtocolSettings();
+ protoSettings = Options::getDefaultSettings();
return protoSettings;
}
|