mirror of
https://github.com/znc/znc.git
synced 2026-08-10 02:43:05 +02:00
Fix all those warnings from -Wshadow
git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@964 726aef4b-f618-498e-8847-2d620e286838
This commit is contained in:
@@ -89,10 +89,10 @@ public:
|
||||
|
||||
if (Table.size()) {
|
||||
unsigned int uTableIdx = 0;
|
||||
CString sLine;
|
||||
CString sTmp;
|
||||
|
||||
while (Table.GetLine(uTableIdx++, sLine)) {
|
||||
PutModule(sLine);
|
||||
while (Table.GetLine(uTableIdx++, sTmp)) {
|
||||
PutModule(sTmp);
|
||||
}
|
||||
} else {
|
||||
PutModule("You have no entries.");
|
||||
@@ -116,10 +116,10 @@ public:
|
||||
|
||||
if (Table.size()) {
|
||||
unsigned int uTableIdx = 0;
|
||||
CString sLine;
|
||||
CString sTmp;
|
||||
|
||||
while (Table.GetLine(uTableIdx++, sLine)) {
|
||||
PutModule(sLine);
|
||||
while (Table.GetLine(uTableIdx++, sTmp)) {
|
||||
PutModule(sTmp);
|
||||
}
|
||||
} else {
|
||||
PutModule("You have no entries.");
|
||||
|
||||
+3
-3
@@ -270,11 +270,11 @@ public:
|
||||
Table.SetCell("Channels", it->second->GetChannels());
|
||||
}
|
||||
|
||||
CString sLine;
|
||||
CString sTmp;
|
||||
unsigned int uTableIdx = 0;
|
||||
|
||||
while (Table.GetLine(uTableIdx++, sLine)) {
|
||||
PutModule(sLine);
|
||||
while (Table.GetLine(uTableIdx++, sTmp)) {
|
||||
PutModule(sTmp);
|
||||
}
|
||||
} else if (sCommand.CaseCmp("ADDCHANS") == 0 || sCommand.CaseCmp("DELCHANS") == 0) {
|
||||
CString sUser = sLine.Token(1);
|
||||
|
||||
@@ -419,10 +419,10 @@ public:
|
||||
Table.SetCell("Description", "Show which users can not part this channel");
|
||||
|
||||
unsigned int uTableIdx = 0;
|
||||
CString sLine;
|
||||
CString sTmp;
|
||||
|
||||
while (Table.GetLine(uTableIdx++, sLine)) {
|
||||
PutModule(sLine);
|
||||
while (Table.GetLine(uTableIdx++, sTmp)) {
|
||||
PutModule(sTmp);
|
||||
}
|
||||
} else if (sCommand.CaseCmp("LIST") == 0) {
|
||||
if (!m_ssChannels.size()) {
|
||||
@@ -443,10 +443,10 @@ public:
|
||||
}
|
||||
|
||||
unsigned int uTableIdx = 0;
|
||||
CString sLine;
|
||||
CString sTmp;
|
||||
|
||||
while (Table.GetLine(uTableIdx++, sLine)) {
|
||||
PutModule(sLine);
|
||||
while (Table.GetLine(uTableIdx++, sTmp)) {
|
||||
PutModule(sTmp);
|
||||
}
|
||||
} else if (sCommand.CaseCmp("ADDFIXCHAN") == 0) {
|
||||
if(!m_pUser->IsAdmin()) {
|
||||
@@ -577,10 +577,10 @@ public:
|
||||
void SendNickList(CUser* pUser, const set<CString>& ssNicks, const CString& sChan) {
|
||||
CString sNickList;
|
||||
for (set<CString>::iterator it = ssNicks.begin(); it != ssNicks.end(); it++) {
|
||||
CUser* pUser = CZNC::Get().FindUser(*it);
|
||||
CUser* pChanUser = CZNC::Get().FindUser(*it);
|
||||
|
||||
if (pUser && pUser->IsUserAttached()) {
|
||||
sNickList += (pUser->IsAdmin()) ? "@" : "+";
|
||||
if (pChanUser && pChanUser->IsUserAttached()) {
|
||||
sNickList += (pChanUser->IsAdmin()) ? "@" : "+";
|
||||
}
|
||||
|
||||
sNickList += "?" + (*it) + " ";
|
||||
|
||||
@@ -180,7 +180,7 @@ public:
|
||||
if ( DecryptChannel( sArgs, sFile ) )
|
||||
{
|
||||
CString sLine;
|
||||
CString::size_type iPos = 0;
|
||||
iPos = 0;
|
||||
while( ReadLine( sFile, sLine, iPos ) )
|
||||
{
|
||||
sLine.Trim();
|
||||
|
||||
Reference in New Issue
Block a user