diff options
| author | George Hazan <george.hazan@gmail.com> | 2013-11-13 19:49:18 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2013-11-13 19:49:18 +0000 |
| commit | d1dec816796849205bd4618edd203d979f2a9c3e (patch) | |
| tree | 1aeb775096ff6b6767ad0816be1d1b2d849abe2e /plugins/SmileyAdd/src | |
| parent | c787c010674abd693f24a8baf4b5242715f615cb (diff) | |
stdcrypt is ready to really encrypt smth
git-svn-id: http://svn.miranda-ng.org/main/trunk@6894 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/SmileyAdd/src')
| -rw-r--r-- | plugins/SmileyAdd/src/smileys.cpp | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/plugins/SmileyAdd/src/smileys.cpp b/plugins/SmileyAdd/src/smileys.cpp index e2595a8dad..4a3fb3af50 100644 --- a/plugins/SmileyAdd/src/smileys.cpp +++ b/plugins/SmileyAdd/src/smileys.cpp @@ -382,19 +382,17 @@ bool SmileyPackType::LoadSmileyFileMSL(CMString& tbuf, bool onlyInfo, CMString& delete m0;
delete otherf;
- if (!onlyInfo)
- {
+ if (!onlyInfo) {
selec.x = 0;
selec.y = 0;
win.x = 0;
win.y = 0;
{
- _TPattern * pat = _TPattern::compile(
+ _TPattern *pat = _TPattern::compile(
_T("^\\s*(Selection|Window)Size\\s*=\\s*(\\d+)\\s*,\\s*(\\d+)"),
_TPattern::MULTILINE_MATCHING);
- _TMatcher * m0 = pat->createTMatcher(tbuf);
- while (m0->findNextMatch())
- {
+ _TMatcher *m0 = pat->createTMatcher(tbuf);
+ while (m0->findNextMatch()) {
POINT tpt;
tpt.x = _ttol(m0->getGroup(2).c_str());
tpt.y = _ttol(m0->getGroup(3).c_str());
@@ -418,7 +416,6 @@ bool SmileyPackType::LoadSmileyFileMSL(CMString& tbuf, bool onlyInfo, CMString& _TPattern::MULTILINE_MATCHING);
_TMatcher * m0 = smiley->createTMatcher(tbuf);
-
SmileyVectorType hiddenSmileys;
unsigned smnum = 0;
@@ -463,8 +460,7 @@ bool SmileyPackType::LoadSmileyFileMSL(CMString& tbuf, bool onlyInfo, CMString& dat->SetText(true);
noerr = true;
}
- else
- noerr = dat->LoadFromResource(resname, iconIndex);
+ else noerr = dat->LoadFromResource(resname, iconIndex);
if (dat->IsHidden())
hiddenSmileys.insert(dat);
|