opkg_manager: minor move of some codelines for more clarity

This commit is contained in:
2021-04-10 15:51:30 +02:00
parent adb5a93a64
commit bd8cf5e987

View File

@@ -43,13 +43,27 @@
class COPKGManager : public CMenuTarget class COPKGManager : public CMenuTarget
{ {
private: private:
struct pkg {
std::string name;
std::string version;
std::string desc;
bool installed;
bool upgradable;
CMenuForwarder *forwarder;
pkg() { }
pkg(std::string &_name, std::string &_version, std::string &_desc)
: name(_name), version(_version), desc(_desc), installed(false), upgradable(false) { }
};
struct pkg;
std::map<std::string,pkg> pkg_map;
std::vector<pkg*> pkg_vec;
int width; int width;
int is_wizard; int is_wizard;
std::string tmp_str; std::string tmp_str;
CConfigFile opkg_conf; CConfigFile opkg_conf;
void saveConfig(); void saveConfig();
void loadConfig(); void loadConfig();
struct pkg;
void init(int wizard_mode); void init(int wizard_mode);
bool silent; // Controls some screen messages, eg, avoids unintended or disturbing messages on update checks at background. bool silent; // Controls some screen messages, eg, avoids unintended or disturbing messages on update checks at background.
//config //config
@@ -59,9 +73,6 @@ class COPKGManager : public CMenuTarget
//filter //filter
std::vector<std::string> v_bad_pattern; std::vector<std::string> v_bad_pattern;
std::map<std::string,pkg> pkg_map;
std::vector<pkg*> pkg_vec;
CMenuWidget *menu; CMenuWidget *menu;
CMenuForwarder *upgrade_forwarder; CMenuForwarder *upgrade_forwarder;
bool list_installed_done; bool list_installed_done;
@@ -158,17 +169,7 @@ class COPKGManager : public CMenuTarget
std::string getInfoDir(); std::string getInfoDir();
std::string getPkgDescription(std::string pkgName, std::string pkgDesc=""); std::string getPkgDescription(std::string pkgName, std::string pkgDesc="");
struct pkg {
std::string name;
std::string version;
std::string desc;
bool installed;
bool upgradable;
CMenuForwarder *forwarder;
pkg() { }
pkg(std::string &_name, std::string &_version, std::string &_desc)
: name(_name), version(_version), desc(_desc), installed(false), upgradable(false) { }
};
int num_updates; int num_updates;
public: public: