mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-29 00:11:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

COPKGManager: use and apply namespace std

Browse Source
This commit is contained in:
Thilo Graf
2014-11-10 10:39:53 +01:00
parent dbfa0859cf
commit c4e5a9f95c
1 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/gui/opkg_manager.cpp
View File

@@ -55,6 +55,8 @@
/* later this can be changed to just "opkg" */ /* later this can be changed to just "opkg" */
#define OPKG_CL "opkg-cl" #define OPKG_CL "opkg-cl"
using namespace std;
enum enum
{ {
OM_LIST, OM_LIST,
@@ -68,7 +70,7 @@ enum
OM_MAX OM_MAX
}; };
static const std::string pkg_types[OM_MAX] = static const string pkg_types[OM_MAX] =
{ {
OPKG_CL " list ", OPKG_CL " list ",
OPKG_CL " list-installed ", OPKG_CL " list-installed ",
@@ -94,7 +96,7 @@ COPKGManager::~COPKGManager()
{ {
} }
int COPKGManager::exec(CMenuTarget* parent, const std::string &actionKey) int COPKGManager::exec(CMenuTarget* parent, const string &actionKey)
{ {
int res = menu_return::RETURN_REPAINT; int res = menu_return::RETURN_REPAINT;
@@ -145,11 +147,11 @@ int COPKGManager::exec(CMenuTarget* parent, const std::string &actionKey)
return res; return res;
} }
std::map<string, struct pkg>::iterator it = pkg_map.find(actionKey); map<string, struct pkg>::iterator it = pkg_map.find(actionKey);
if (it != pkg_map.end()) { if (it != pkg_map.end()) {
if (parent) if (parent)
parent->hide(); parent->hide();
std::string force = ""; string force = "";
if (it->second.installed && !it->second.upgradable) { if (it->second.installed && !it->second.upgradable) {
char l[200]; char l[200];
snprintf(l, sizeof(l), g_Locale->getText(LOCALE_OPKG_MESSAGEBOX_REINSTALL), actionKey.c_str()); snprintf(l, sizeof(l), g_Locale->getText(LOCALE_OPKG_MESSAGEBOX_REINSTALL), actionKey.c_str());
@@ -225,7 +227,7 @@ void COPKGManager::updateMenu()
bool upgradesAvailable = false; bool upgradesAvailable = false;
getPkgData(OM_LIST_INSTALLED); getPkgData(OM_LIST_INSTALLED);
getPkgData(OM_LIST_UPGRADEABLE); getPkgData(OM_LIST_UPGRADEABLE);
for (std::map<string, struct pkg>::iterator it = pkg_map.begin(); it != pkg_map.end(); it++) { for (map<string, struct pkg>::iterator it = pkg_map.begin(); it != pkg_map.end(); it++) {
if (badpackage(it->second.name)) if (badpackage(it->second.name))
continue; continue;
it->second.forwarder->iconName_Info_right = ""; it->second.forwarder->iconName_Info_right = "";
@@ -280,7 +282,7 @@ int COPKGManager::showMenu()
menu->addKey(CRCInput::RC_red, this, "rc_red"); menu->addKey(CRCInput::RC_red, this, "rc_red");
pkg_vec.clear(); pkg_vec.clear();
for (std::map<string, struct pkg>::iterator it = pkg_map.begin(); it != pkg_map.end(); it++) { for (map<string, struct pkg>::iterator it = pkg_map.begin(); it != pkg_map.end(); it++) {
if (badpackage(it->second.name)) if (badpackage(it->second.name))
continue; continue;
it->second.forwarder = new CMenuForwarder(it->second.desc, true, NULL , this, it->second.name.c_str()); it->second.forwarder = new CMenuForwarder(it->second.desc, true, NULL , this, it->second.name.c_str());
@@ -334,14 +336,14 @@ void COPKGManager::getPkgData(const int pkg_content_id)
if (list_installed_done) if (list_installed_done)
return; return;
list_installed_done = true; list_installed_done = true;
for (std::map<string, struct pkg>::iterator it = pkg_map.begin(); it != pkg_map.end(); it++) for (map<string, struct pkg>::iterator it = pkg_map.begin(); it != pkg_map.end(); it++)
it->second.installed = false; it->second.installed = false;
break; break;
case OM_LIST_UPGRADEABLE: case OM_LIST_UPGRADEABLE:
if (list_upgradeable_done) if (list_upgradeable_done)
return; return;
list_upgradeable_done = true; list_upgradeable_done = true;
for (std::map<string, struct pkg>::iterator it = pkg_map.begin(); it != pkg_map.end(); it++) for (map<string, struct pkg>::iterator it = pkg_map.begin(); it != pkg_map.end(); it++)
it->second.upgradable = false; it->second.upgradable = false;
break; break;
} }
@@ -361,7 +363,7 @@ void COPKGManager::getPkgData(const int pkg_content_id)
std::string line(buf); std::string line(buf);
trim(line); trim(line);
std::string name = getBlankPkgName(line); string name = getBlankPkgName(line);
switch (pkg_content_id) { switch (pkg_content_id) {
case OM_LIST: { case OM_LIST: {
@@ -369,13 +371,13 @@ void COPKGManager::getPkgData(const int pkg_content_id)
break; break;
} }
case OM_LIST_INSTALLED: { case OM_LIST_INSTALLED: {
std::map<string, struct pkg>::iterator it = pkg_map.find(name); map<string, struct pkg>::iterator it = pkg_map.find(name);
if (it != pkg_map.end()) if (it != pkg_map.end())
it->second.installed = true; it->second.installed = true;
break; break;
} }
case OM_LIST_UPGRADEABLE: { case OM_LIST_UPGRADEABLE: {
std::map<string, struct pkg>::iterator it = pkg_map.find(name); map<string, struct pkg>::iterator it = pkg_map.find(name);
if (it != pkg_map.end()) if (it != pkg_map.end())
it->second.upgradable = true; it->second.upgradable = true;
break; break;
@@ -389,7 +391,7 @@ void COPKGManager::getPkgData(const int pkg_content_id)
pclose(f); pclose(f);
} }
std::string COPKGManager::getBlankPkgName(const std::string& line) string COPKGManager::getBlankPkgName(const string& line)
{ {
size_t l_pos = line.find(" "); size_t l_pos = line.find(" ");
if (l_pos != string::npos) if (l_pos != string::npos)
@@ -400,7 +402,7 @@ std::string COPKGManager::getBlankPkgName(const std::string& line)
int COPKGManager::execCmd(const char *cmdstr, bool verbose, bool acknowledge) int COPKGManager::execCmd(const char *cmdstr, bool verbose, bool acknowledge)
{ {
fprintf(stderr, "execCmd(%s)\n", cmdstr); fprintf(stderr, "execCmd(%s)\n", cmdstr);
std::string cmd(cmdstr); string cmd(cmdstr);
if (verbose) { if (verbose) {
cmd += " 2>&1"; cmd += " 2>&1";
int res; int res;