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

Use member initialization lists [-Weffc++] (#270)

Browse Source
This commit is contained in:
J-P Nurmi
2015-02-28 21:59:01 +01:00
parent a1165cfcca
commit 6a6bb648d1
26 changed files with 63 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/znc/Buffer.h
+1 -1
View File
@@ -28,7 +28,7 @@ class CClient;
class CBufLine {
public:
CBufLine() { throw 0; } // shouldn't be called, but is needed for compilation
CBufLine() : CBufLine("") { throw 0; } // shouldn't be called, but is needed for compilation
CBufLine(const CString& sFormat, const CString& sText = "", const timeval* ts = nullptr);
~CBufLine();
CString GetLine(const CClient& Client, const MCString& msParams) const;
include/znc/Client.h
+1 -2
View File
@@ -33,8 +33,7 @@ class CClient;
class CAuthBase {
public:
CAuthBase(const CString& sUsername, const CString& sPassword, CZNCSock* pSock) {
SetLoginInfo(sUsername, sPassword, pSock);
CAuthBase(const CString& sUsername, const CString& sPassword, CZNCSock* pSock) : m_sUsername(sUsername), m_sPassword(sPassword), m_pSock(pSock) {
}
virtual ~CAuthBase() {}
include/znc/Config.h
+2
View File
@@ -35,6 +35,8 @@ struct CConfigEntry {
class CConfig {
public:
CConfig() : m_ConfigEntries(), m_SubConfigs() {}
typedef std::map<CString, VCString> EntryMap;
typedef std::map<CString, CConfigEntry> SubConfig;
typedef std::map<CString, SubConfig> SubConfigMap;
include/znc/ExecSock.h
+1 -3
View File
@@ -24,9 +24,7 @@
//! @author imaginos@imaginos.net
class CExecSock : public CZNCSock {
public:
CExecSock() : CZNCSock(0) {
m_iPid = -1;
}
CExecSock() : CZNCSock(0), m_iPid(-1) {}
int Execute(const CString & sExec) {
int iReadFD, iWriteFD;
include/znc/FileUtils.h
+2 -6
View File
@@ -151,15 +151,11 @@ protected:
class CDir : public std::vector<CFile*> {
public:
CDir(const CString& sDir) {
m_bDesc = false;
m_eSortAttr = CFile::FA_Name;
CDir(const CString& sDir) : m_eSortAttr(CFile::FA_Name), m_bDesc(false) {
Fill(sDir);
}
CDir() {
m_bDesc = false;
m_eSortAttr = CFile::FA_Name;
CDir() : m_eSortAttr(CFile::FA_Name), m_bDesc(false) {
}
~CDir() {
include/znc/Listener.h
+8 -8
View File
@@ -32,14 +32,14 @@ public:
ACCEPT_ALL
} EAcceptType;
CListener(unsigned short uPort, const CString& sBindHost, const CString& sURIPrefix, bool bSSL, EAddrType eAddr, EAcceptType eAccept) {
m_uPort = uPort;
m_sBindHost = sBindHost;
m_bSSL = bSSL;
m_eAddr = eAddr;
m_sURIPrefix = sURIPrefix;
m_pListener = nullptr;
m_eAcceptType = eAccept;
CListener(unsigned short uPort, const CString& sBindHost, const CString& sURIPrefix, bool bSSL, EAddrType eAddr, EAcceptType eAccept)
: m_bSSL(bSSL),
m_eAddr(eAddr),
m_uPort(uPort),
m_sBindHost(sBindHost),
m_sURIPrefix(sURIPrefix),
m_pListener(nullptr),
m_eAcceptType(eAccept) {
}
~CListener();
include/znc/Modules.h
+1 -2
View File
@@ -165,8 +165,7 @@ typedef void (*FPTimer_t)(CModule *, CFPTimer *);
class CFPTimer : public CTimer {
public:
CFPTimer(CModule* pModule, unsigned int uInterval, unsigned int uCycles, const CString& sLabel, const CString& sDescription)
: CTimer(pModule, uInterval, uCycles, sLabel, sDescription) {
m_pFBCallback = nullptr;
: CTimer(pModule, uInterval, uCycles, sLabel, sDescription), m_pFBCallback(nullptr) {
}
virtual ~CFPTimer() {}
include/znc/Template.h
+6 -17
View File
@@ -51,9 +51,7 @@ class CTemplate;
class CTemplateOptions {
public:
CTemplateOptions() {
m_eEscapeFrom = CString::EASCII;
m_eEscapeTo = CString::EASCII;
CTemplateOptions() : m_eEscapeFrom(CString::EASCII), m_eEscapeTo(CString::EASCII) {
}
virtual ~CTemplateOptions() {}
@@ -72,13 +70,8 @@ private:
class CTemplateLoopContext {
public:
CTemplateLoopContext(unsigned long uFilePos, const CString& sLoopName, bool bReverse, std::vector<CTemplate*>* pRows) {
m_uFilePosition = uFilePos;
m_sName = sLoopName;
m_uRowIndex = 0;
m_bReverse = bReverse;
m_pvRows = pRows;
m_bHasData = false;
CTemplateLoopContext(unsigned long uFilePos, const CString& sLoopName, bool bReverse, std::vector<CTemplate*>* pRows)
: m_bReverse(bReverse), m_bHasData(false), m_sName(sLoopName), m_uRowIndex(0), m_uFilePosition(uFilePos), m_pvRows(pRows) {
}
virtual ~CTemplateLoopContext() {}
@@ -120,17 +113,13 @@ private:
class CTemplate : public MCString {
public:
CTemplate() : MCString(), m_spOptions(new CTemplateOptions) {
Init();
CTemplate() : CTemplate("") {
}
CTemplate(const CString& sFileName) : MCString(), m_sFileName(sFileName), m_spOptions(new CTemplateOptions) {
Init();
CTemplate(const CString& sFileName) : MCString(), m_pParent(nullptr), m_sFileName(sFileName), m_lsbPaths(), m_mvLoops(), m_vLoopContexts(), m_spOptions(new CTemplateOptions), m_vspTagHandlers() {
}
CTemplate(const std::shared_ptr<CTemplateOptions>& Options, CTemplate* pParent = nullptr) : MCString(), m_spOptions(Options) {
Init();
m_pParent = pParent;
CTemplate(const std::shared_ptr<CTemplateOptions>& Options, CTemplate* pParent = nullptr) : MCString(), m_pParent(pParent), m_sFileName(""), m_lsbPaths(), m_mvLoops(), m_vLoopContexts(), m_spOptions(Options), m_vspTagHandlers() {
}
virtual ~CTemplate();
include/znc/Threads.h
+2 -2
View File
@@ -38,7 +38,7 @@ class CMutex {
public:
friend class CConditionVariable;
CMutex() {
CMutex() : m_mutex() {
int i = pthread_mutex_init(&m_mutex, nullptr);
if (i) {
CUtils::PrintError("Can't initialize mutex: " + CString(strerror(errno)));
@@ -123,7 +123,7 @@ private:
*/
class CConditionVariable {
public:
CConditionVariable() {
CConditionVariable() : m_cond() {
int i = pthread_cond_init(&m_cond, nullptr);
if (i) {
CUtils::PrintError("Can't initialize condition variable: "
include/znc/Utils.h
+3 -6
View File
@@ -100,8 +100,7 @@ public:
EX_Restart
} EType;
CException(EType e) {
m_eType = e;
CException(EType e) : m_eType(e) {
}
virtual ~CException() {}
@@ -143,7 +142,7 @@ public:
*
* @param uPreferredWidth If width of table is bigger than this, text in cells will be wrapped to several lines, if possible
*/
explicit CTable(size_type uPreferredWidth = 110) : m_uPreferredWidth(uPreferredWidth) {}
explicit CTable(size_type uPreferredWidth = 110) : m_vsHeaders(), m_vuMaxWidths(), m_vuMinWidths(), m_vbWrappable(), m_uPreferredWidth(uPreferredWidth), m_vsOutput() {}
virtual ~CTable() {}
/** Adds a new column to the table.
@@ -252,9 +251,7 @@ private:
template<typename K, typename V = bool>
class TCacheMap {
public:
TCacheMap(unsigned int uTTL = 5000) {
m_uTTL = uTTL;
}
TCacheMap(unsigned int uTTL = 5000) : m_mItems(), m_uTTL(uTTL) {}
virtual ~TCacheMap() {}
include/znc/WebModules.h
+2 -4
View File
@@ -76,12 +76,10 @@ private:
class CWebSubPage {
public:
CWebSubPage(const CString& sName, const CString& sTitle = "", unsigned int uFlags = 0) : m_sName(sName), m_sTitle(sTitle) {
m_uFlags = uFlags;
CWebSubPage(const CString& sName, const CString& sTitle = "", unsigned int uFlags = 0) : m_uFlags(uFlags), m_sName(sName), m_sTitle(sTitle), m_vParams() {
}
CWebSubPage(const CString& sName, const CString& sTitle, const VPair& vParams, unsigned int uFlags = 0) : m_sName(sName), m_sTitle(sTitle), m_vParams(vParams) {
m_uFlags = uFlags;
CWebSubPage(const CString& sName, const CString& sTitle, const VPair& vParams, unsigned int uFlags = 0) : m_uFlags(uFlags), m_sName(sName), m_sTitle(sTitle), m_vParams(vParams) {
}
virtual ~CWebSubPage() {}