Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge pull request #7912 from mkortstiege/nuke-std_namespace
[core] use std:: instead of using namespace std
  • Loading branch information
MartijnKaijser committed Aug 31, 2015
2 parents e07b83c + 3601d70 commit f462662
Show file tree
Hide file tree
Showing 254 changed files with 1,772 additions and 2,144 deletions.
11 changes: 5 additions & 6 deletions xbmc/addons/Addon.cpp
Expand Up @@ -47,7 +47,6 @@

using XFILE::CDirectory;
using XFILE::CFile;
using namespace std;

namespace ADDON
{
Expand Down Expand Up @@ -177,7 +176,7 @@ AddonProps::AddonProps(const cp_extension_t *ext)
std::string language;
language = CAddonMgr::GetInstance().GetExtValue(metadata->configuration, "language");
if (!language.empty())
extrainfo.insert(make_pair("language",language));
extrainfo.insert(std::make_pair("language",language));
broken = CAddonMgr::GetInstance().GetExtValue(metadata->configuration, "broken");
EMPTY_IF("nofanart",fanart)
EMPTY_IF("noicon",icon)
Expand Down Expand Up @@ -257,8 +256,8 @@ void AddonProps::BuildDependencies(const cp_plugin_info_t *plugin)
if (!plugin)
return;
for (unsigned int i = 0; i < plugin->num_imports; ++i)
dependencies.insert(make_pair(std::string(plugin->imports[i].plugin_id),
make_pair(AddonVersion(SS(plugin->imports[i].version)), plugin->imports[i].optional != 0)));
dependencies.insert(std::make_pair(std::string(plugin->imports[i].plugin_id),
std::make_pair(AddonVersion(SS(plugin->imports[i].version)), plugin->imports[i].optional != 0)));
}

/**
Expand Down Expand Up @@ -544,7 +543,7 @@ std::string CAddon::GetSetting(const std::string& key)
if (!LoadSettings())
return ""; // no settings available

map<std::string, std::string>::const_iterator i = m_settings.find(key);
std::map<std::string, std::string>::const_iterator i = m_settings.find(key);
if (i != m_settings.end())
return i->second;
return "";
Expand Down Expand Up @@ -593,7 +592,7 @@ void CAddon::SettingsToXML(CXBMCTinyXML &doc) const
{
TiXmlElement node("settings");
doc.InsertEndChild(node);
for (map<std::string, std::string>::const_iterator i = m_settings.begin(); i != m_settings.end(); ++i)
for (std::map<std::string, std::string>::const_iterator i = m_settings.begin(); i != m_settings.end(); ++i)
{
TiXmlElement nodeSetting("setting");
nodeSetting.SetAttribute("id", i->first.c_str());
Expand Down
5 changes: 2 additions & 3 deletions xbmc/addons/AddonCallbacksGUI.cpp
Expand Up @@ -50,7 +50,6 @@
#define CONTROL_BTNSORTASC 4
#define CONTROL_LABELFILES 12

using namespace std;
using namespace KODI::MESSAGING;

namespace ADDON
Expand Down Expand Up @@ -699,7 +698,7 @@ const char* CAddonCallbacksGUI::Window_GetProperty(void *addonData, GUIHANDLE ha
StringUtils::ToLower(lowerKey);

Lock();
string value = pWindow->GetProperty(lowerKey).asString();
std::string value = pWindow->GetProperty(lowerKey).asString();
Unlock();

return strdup(value.c_str());
Expand Down Expand Up @@ -1617,7 +1616,7 @@ const char* CAddonCallbacksGUI::ListItem_GetProperty(void *addonData, GUIHANDLE
if (!helper || !handle)
return NULL;

string string = ((CFileItem*)handle)->GetProperty(key).asString();
std::string string = ((CFileItem*)handle)->GetProperty(key).asString();
char *buffer = (char*) malloc (string.length()+1);
strcpy(buffer, string.c_str());
return buffer;
Expand Down
5 changes: 2 additions & 3 deletions xbmc/addons/AddonDatabase.cpp
Expand Up @@ -27,7 +27,6 @@
#include "dbwrappers/dataset.h"

using namespace ADDON;
using namespace std;

CAddonDatabase::CAddonDatabase()
{
Expand Down Expand Up @@ -310,9 +309,9 @@ bool CAddonDatabase::GetAddon(int id, AddonPtr &addon)
{
const dbiplus::sql_record* const record = *i;
if (!record->at(addonextra_key).get_asString().empty())
props.extrainfo.insert(make_pair(record->at(addonextra_key).get_asString(), record->at(addonextra_value).get_asString()));
props.extrainfo.insert(std::make_pair(record->at(addonextra_key).get_asString(), record->at(addonextra_value).get_asString()));
if (!m_pDS2->fv(dependencies_addon).get_asString().empty())
props.dependencies.insert(make_pair(record->at(dependencies_addon).get_asString(), make_pair(AddonVersion(record->at(dependencies_version).get_asString()), record->at(dependencies_optional).get_asBool())));
props.dependencies.insert(std::make_pair(record->at(dependencies_addon).get_asString(), std::make_pair(AddonVersion(record->at(dependencies_version).get_asString()), record->at(dependencies_optional).get_asBool())));
}

addon = CAddonMgr::AddonFromProps(props);
Expand Down
7 changes: 3 additions & 4 deletions xbmc/addons/AddonInstaller.cpp
Expand Up @@ -46,12 +46,11 @@

#include <functional>

using namespace std;
using namespace XFILE;
using namespace ADDON;
using namespace KODI::MESSAGING;

struct find_map : public binary_function<CAddonInstaller::JobMap::value_type, unsigned int, bool>
struct find_map : public std::binary_function<CAddonInstaller::JobMap::value_type, unsigned int, bool>
{
bool operator() (CAddonInstaller::JobMap::value_type t, unsigned int id) const
{
Expand Down Expand Up @@ -123,7 +122,7 @@ bool CAddonInstaller::IsDownloading() const
void CAddonInstaller::GetInstallList(VECADDONS &addons) const
{
CSingleLock lock(m_critSection);
vector<std::string> addonIDs;
std::vector<std::string> addonIDs;
for (JobMap::const_iterator i = m_downloadJobs.begin(); i != m_downloadJobs.end(); ++i)
{
if (i->second.jobID)
Expand All @@ -133,7 +132,7 @@ void CAddonInstaller::GetInstallList(VECADDONS &addons) const

CAddonDatabase database;
database.Open();
for (vector<std::string>::iterator it = addonIDs.begin(); it != addonIDs.end(); ++it)
for (std::vector<std::string>::iterator it = addonIDs.begin(); it != addonIDs.end(); ++it)
{
AddonPtr addon;
if (database.GetAddon(*it, addon))
Expand Down
9 changes: 4 additions & 5 deletions xbmc/addons/AddonManager.cpp
Expand Up @@ -59,7 +59,6 @@
#include "Util.h"
#include "addons/Webinterface.h"

using namespace std;
using namespace XFILE;

namespace ADDON
Expand All @@ -74,7 +73,7 @@ void cp_logger(cp_log_severity_t level, const char *msg, const char *apid, void
*
*/

map<TYPE, IAddonMgrCallback*> CAddonMgr::m_managers;
std::map<TYPE, IAddonMgrCallback*> CAddonMgr::m_managers;

AddonPtr CAddonMgr::Factory(const cp_extension_t *props)
{
Expand Down Expand Up @@ -895,10 +894,10 @@ bool CAddonMgr::PlatformSupportsAddon(const cp_plugin_info_t *plugin) const
if (!metadata)
return false;

vector<std::string> platforms;
std::vector<std::string> platforms;
if (CAddonMgr::GetInstance().GetExtList(metadata->configuration, "platform", platforms))
{
for (vector<std::string>::const_iterator platform = platforms.begin(); platform != platforms.end(); ++platform)
for (std::vector<std::string>::const_iterator platform = platforms.begin(); platform != platforms.end(); ++platform)
{
if (*platform == "all")
return true;
Expand Down Expand Up @@ -974,7 +973,7 @@ std::string CAddonMgr::GetExtValue(cp_cfg_element_t *base, const char *path) con
return "";
}

bool CAddonMgr::GetExtList(cp_cfg_element_t *base, const char *path, vector<std::string> &result) const
bool CAddonMgr::GetExtList(cp_cfg_element_t *base, const char *path, std::vector<std::string> &result) const
{
result.clear();
if (!base || !path)
Expand Down
7 changes: 3 additions & 4 deletions xbmc/addons/GUIDialogAddonInfo.cpp
Expand Up @@ -52,7 +52,6 @@
#define CONTROL_BTN_ROLLBACK 11
#define CONTROL_BTN_SELECT 12

using namespace std;
using namespace ADDON;
using namespace XFILE;

Expand Down Expand Up @@ -224,7 +223,7 @@ bool CGUIDialogAddonInfo::PromptIfDependency(int heading, int line2)
return false;

VECADDONS addons;
vector<string> deps;
std::vector<std::string> deps;
CAddonMgr::GetInstance().GetAllAddons(addons);
for (VECADDONS::const_iterator it = addons.begin();
it != addons.end();++it)
Expand All @@ -236,8 +235,8 @@ bool CGUIDialogAddonInfo::PromptIfDependency(int heading, int line2)

if (!deps.empty())
{
string line0 = StringUtils::Format(g_localizeStrings.Get(24046).c_str(), m_localAddon->Name().c_str());
string line1 = StringUtils::Join(deps, ", ");
std::string line0 = StringUtils::Format(g_localizeStrings.Get(24046).c_str(), m_localAddon->Name().c_str());
std::string line1 = StringUtils::Join(deps, ", ");
CGUIDialogOK::ShowAndGetInput(CVariant{heading}, CVariant{std::move(line0)}, CVariant{std::move(line1)}, CVariant{line2});
return true;
}
Expand Down
39 changes: 19 additions & 20 deletions xbmc/addons/GUIDialogAddonSettings.cpp
Expand Up @@ -51,7 +51,6 @@
#include "utils/XMLUtils.h"
#include "utils/Variant.h"

using namespace std;
using namespace ADDON;
using namespace KODI::MESSAGING;
using XFILE::CDirectory;
Expand Down Expand Up @@ -310,7 +309,7 @@ bool CGUIDialogAddonSettings::ShowVirtualKeyboard(int iControl)
pDlg->Reset();

int selected = -1;
vector<std::string> valuesVec;
std::vector<std::string> valuesVec;
if (setting->Attribute("values"))
StringUtils::Tokenize(setting->Attribute("values"), valuesVec, "|");
else if (setting->Attribute("lvalues"))
Expand Down Expand Up @@ -422,7 +421,7 @@ bool CGUIDialogAddonSettings::ShowVirtualKeyboard(int iControl)
bool bUseFileDirectories = false;
if (option)
{
vector<string> options = StringUtils::Split(option, '|');
std::vector<std::string> options = StringUtils::Split(option, '|');
bUseThumbs = find(options.begin(), options.end(), "usethumbs") != options.end();
bUseFileDirectories = find(options.begin(), options.end(), "treatasfolder") != options.end();
}
Expand Down Expand Up @@ -465,9 +464,9 @@ bool CGUIDialogAddonSettings::ShowVirtualKeyboard(int iControl)
const char *strType = setting->Attribute("addontype");
if (strType)
{
vector<string> addonTypes = StringUtils::Split(strType, ',');
vector<ADDON::TYPE> types;
for (vector<string>::iterator i = addonTypes.begin(); i != addonTypes.end(); ++i)
std::vector<std::string> addonTypes = StringUtils::Split(strType, ',');
std::vector<ADDON::TYPE> types;
for (std::vector<std::string>::iterator i = addonTypes.begin(); i != addonTypes.end(); ++i)
{
StringUtils::Trim(*i);
ADDON::TYPE type = TranslateType(*i);
Expand All @@ -481,7 +480,7 @@ bool CGUIDialogAddonSettings::ShowVirtualKeyboard(int iControl)
if (multiSelect)
{
// construct vector of addon IDs (IDs are comma seperated in single string)
vector<string> addonIDs = StringUtils::Split(value, ',');
std::vector<std::string> addonIDs = StringUtils::Split(value, ',');
if (CGUIWindowAddonBrowser::SelectAddonID(types, addonIDs, false) == 1)
{
value = StringUtils::Join(addonIDs, ",");
Expand Down Expand Up @@ -555,7 +554,7 @@ void CGUIDialogAddonSettings::SaveSettings(void)
{
UpdateFromControls();

for (map<std::string, std::string>::iterator i = m_settings.begin(); i != m_settings.end(); ++i)
for (std::map<std::string, std::string>::iterator i = m_settings.begin(); i != m_settings.end(); ++i)
m_addon->UpdateSetting(i->first, i->second);

if (m_saveToDisk)
Expand Down Expand Up @@ -722,7 +721,7 @@ void CGUIDialogAddonSettings::CreateControls()
((CGUIButtonControl *)pControl)->SetLabel2(GetAddonNames(value));
else if (type == "select" && !lvalues.empty())
{
vector<string> valuesVec = StringUtils::Split(lvalues, '|');
std::vector<std::string> valuesVec = StringUtils::Split(lvalues, '|');
int selected = atoi(value.c_str());
if (selected >= 0 && selected < (int)valuesVec.size())
{
Expand All @@ -748,8 +747,8 @@ void CGUIDialogAddonSettings::CreateControls()
}
else if ((type == "enum" || type == "labelenum") && !id.empty())
{
vector<std::string> valuesVec;
vector<std::string> entryVec;
std::vector<std::string> valuesVec;
std::vector<std::string> entryVec;

pControl = new CGUISpinControlEx(*pOriginalSpin);
if (!pControl) return;
Expand Down Expand Up @@ -803,7 +802,7 @@ void CGUIDialogAddonSettings::CreateControls()
((CGUISpinControlEx *)pControl)->SetText(label);
((CGUISpinControlEx *)pControl)->SetFloatValue(1.0f);

vector<std::string> items = GetFileEnumValues(values, XMLUtils::GetAttribute(setting, "mask"), XMLUtils::GetAttribute(setting, "option"));
std::vector<std::string> items = GetFileEnumValues(values, XMLUtils::GetAttribute(setting, "mask"), XMLUtils::GetAttribute(setting, "option"));
for (unsigned int i = 0; i < items.size(); ++i)
{
((CGUISpinControlEx *)pControl)->AddLabel(items[i], i);
Expand Down Expand Up @@ -854,7 +853,7 @@ void CGUIDialogAddonSettings::CreateControls()
float fMin = 0.0f;
float fMax = 100.0f;
float fInc = 1.0f;
vector<std::string> range = StringUtils::Split(XMLUtils::GetAttribute(setting, "range"), ',');
std::vector<std::string> range = StringUtils::Split(XMLUtils::GetAttribute(setting, "range"), ',');
if (range.size() > 1)
{
fMin = (float)atof(range[0].c_str());
Expand Down Expand Up @@ -911,8 +910,8 @@ void CGUIDialogAddonSettings::CreateControls()
std::string CGUIDialogAddonSettings::GetAddonNames(const std::string& addonIDslist) const
{
std::string retVal;
vector<string> addons = StringUtils::Split(addonIDslist, ',');
for (vector<string>::const_iterator it = addons.begin(); it != addons.end() ; ++it)
std::vector<std::string> addons = StringUtils::Split(addonIDslist, ',');
for (std::vector<std::string>::const_iterator it = addons.begin(); it != addons.end() ; ++it)
{
if (!retVal.empty())
retVal += ", ";
Expand All @@ -925,7 +924,7 @@ std::string CGUIDialogAddonSettings::GetAddonNames(const std::string& addonIDsli
return retVal;
}

vector<std::string> CGUIDialogAddonSettings::GetFileEnumValues(const std::string &path, const std::string &mask, const std::string &options) const
std::vector<std::string> CGUIDialogAddonSettings::GetFileEnumValues(const std::string &path, const std::string &mask, const std::string &options) const
{
// Create our base path, used for type "fileenum" settings
// replace $PROFILE with the profile path of the plugin/script
Expand All @@ -943,7 +942,7 @@ vector<std::string> CGUIDialogAddonSettings::GetFileEnumValues(const std::string
else
CDirectory::GetDirectory(fullPath, items, "", XFILE::DIR_FLAG_NO_FILE_DIRS);

vector<std::string> values;
std::vector<std::string> values;
for (int i = 0; i < items.Size(); ++i)
{
CFileItemPtr pItem = items[i];
Expand Down Expand Up @@ -992,7 +991,7 @@ bool CGUIDialogAddonSettings::GetCondition(const std::string &condition, const i
bool bCondition = true;
bool bCompare = true;
bool bControlDependend = false;//flag if the condition depends on another control
vector<std::string> conditionVec;
std::vector<std::string> conditionVec;

if (condition.find("+") != std::string::npos)
StringUtils::Tokenize(condition, conditionVec, "+");
Expand All @@ -1005,7 +1004,7 @@ bool CGUIDialogAddonSettings::GetCondition(const std::string &condition, const i

for (unsigned int i = 0; i < conditionVec.size(); i++)
{
vector<std::string> condVec;
std::vector<std::string> condVec;
if (!TranslateSingleString(conditionVec[i], condVec)) continue;

const CGUIControl* control2 = GetControl(controlId + atoi(condVec[1].c_str()));
Expand Down Expand Up @@ -1071,7 +1070,7 @@ bool CGUIDialogAddonSettings::GetCondition(const std::string &condition, const i
return bCondition;
}

bool CGUIDialogAddonSettings::TranslateSingleString(const std::string &strCondition, vector<std::string> &condVec)
bool CGUIDialogAddonSettings::TranslateSingleString(const std::string &strCondition, std::vector<std::string> &condVec)
{
std::string strTest = strCondition;
StringUtils::ToLower(strTest);
Expand Down

0 comments on commit f462662

Please sign in to comment.