adam/znc
1
0
Fork 0
mirror of https://github.com/znc/znc.git synced 2026-08-07 17:33:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1.6.x'

Browse Source 
Conflicts:
	modules/cyrusauth.cpp
	modules/keepnick.cpp
	modules/notes.cpp
This commit is contained in:
Alexey Sokolov
2015-10-30 14:56:28 +00:00
parent 5e337647b1 096dc5b320
commit 0d8bb7e597
11 changed files with 32 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/q.cpp
+10 -10
View File
@@ -372,11 +372,11 @@ public:
}
private:
bool m_bCloaked;
bool m_bAuthed;
bool m_bRequestedWhoami;
bool m_bRequestedChallenge;
bool m_bCatchResponse;
bool m_bCloaked{};
bool m_bAuthed{};
bool m_bRequestedWhoami{};
bool m_bRequestedChallenge{};
bool m_bCatchResponse{};
MCString m_msChanModes;
void PutQ(const CString& sMessage) {
@@ -590,11 +590,11 @@ private:
/* Settings */
CString m_sUsername;
CString m_sPassword;
bool m_bUseCloakedHost;
bool m_bUseChallenge;
bool m_bRequestPerms;
bool m_bJoinOnInvite;
bool m_bJoinAfterCloaked;
bool m_bUseCloakedHost{};
bool m_bUseChallenge{};
bool m_bRequestPerms{};
bool m_bJoinOnInvite{};
bool m_bJoinAfterCloaked{};
void SetUsername(const CString& sUsername) {
m_sUsername = sUsername;