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

Revert StripControls implementation (#850)

Browse Source 
This reverts commits 27d78795a7 and
f27109f1b4. It was decided that the
functionality is provided by a separate module instead, to avoid
unnecessarily bloating the core.
This commit is contained in:
J-P Nurmi
2015-03-04 09:41:52 +01:00
parent a67f929b7d
commit a5b4a29c00
8 changed files with 1 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/znc/Chan.h
-6
View File
@@ -120,8 +120,6 @@ public:
void SetDefaultModes(const CString& s) { m_sDefaultModes = s; }
void SetAutoClearChanBuffer(bool b);
void InheritAutoClearChanBuffer(bool b);
void SetStripControls(bool b);
void InheritStripControls(bool b);
void SetDetached(bool b = true) { m_bDetached = b; }
void SetInConfig(bool b);
void SetCreationDate(unsigned long u) { m_ulCreationDate = u; }
@@ -149,14 +147,12 @@ public:
size_t GetNickCount() const { return m_msNicks.size(); }
bool AutoClearChanBuffer() const { return m_bAutoClearChanBuffer; }
bool IsDetached() const { return m_bDetached; }
bool StripControls() const { return m_bStripControls; }
bool InConfig() const { return m_bInConfig; }
unsigned long GetCreationDate() const { return m_ulCreationDate; }
bool IsDisabled() const { return m_bDisabled; }
unsigned int GetJoinTries() const { return m_uJoinTries; }
bool HasBufferCountSet() const { return m_bHasBufferCountSet; }
bool HasAutoClearChanBufferSet() const { return m_bHasAutoClearChanBufferSet; }
bool HasStripControlsSet() const { return m_bHasStripControlsSet; }
// !Getters
private:
protected:
@@ -167,8 +163,6 @@ protected:
bool m_bDisabled;
bool m_bHasBufferCountSet;
bool m_bHasAutoClearChanBufferSet;
bool m_bStripControls;
bool m_bHasStripControlsSet;
CString m_sName;
CString m_sKey;
CString m_sTopic;
include/znc/IRCNetwork.h
-4
View File
@@ -131,9 +131,6 @@ public:
void SetIRCConnectEnabled(bool b);
bool GetIRCConnectEnabled() const { return m_bIRCConnectEnabled; }
void SetStripControls(bool b);
bool StripControls() const { return m_bStripControls; }
CIRCSock* GetIRCSock() { return m_pIRCSock; }
const CIRCSock* GetIRCSock() const { return m_pIRCSock; }
const CString& GetIRCServer() const;
@@ -227,7 +224,6 @@ protected:
CString m_sChanPrefixes;
bool m_bIRCConnectEnabled;
bool m_bStripControls;
CString m_sIRCServer;
std::vector<CServer*> m_vServers;
size_t m_uServerIdx; ///< Index in m_vServers of our current server + 1