Commit a77fc522 authored by twanvl's avatar twanvl

Just commenting

parent 10b8df90
...@@ -21,9 +21,11 @@ DECLARE_POINTER_TYPE(InstallablePackage); ...@@ -21,9 +21,11 @@ DECLARE_POINTER_TYPE(InstallablePackage);
// ----------------------------------------------------------------------------- : Installer // ----------------------------------------------------------------------------- : Installer
/// A package that contains other packages that can be installed /// A package that contains other packages that can be installed
/** Installers will be sent around the internet, etc. so they are fairly selfcontained.
*/
class Installer : public Packaged { class Installer : public Packaged {
public: public:
String prefered_filename; ///< What filename should be used (by default) String prefered_filename; ///< What filename should be used (by default), when creating the installer
vector<PackageDescriptionP> packages; ///< Packages to install vector<PackageDescriptionP> packages; ///< Packages to install
/// Add a package to the installer (if it is not already added). /// Add a package to the installer (if it is not already added).
...@@ -41,7 +43,10 @@ class Installer : public Packaged { ...@@ -41,7 +43,10 @@ class Installer : public Packaged {
// ----------------------------------------------------------------------------- : Installer descriptions // ----------------------------------------------------------------------------- : Installer descriptions
/// A description of a package in an installer /// A description of a package in an installer.
/** This is essentially the same information as in a Packaged object.
* TODO: try to merge these!
*/
class PackageDescription : public IntrusivePtrBase<PackageDescription> { class PackageDescription : public IntrusivePtrBase<PackageDescription> {
public: public:
PackageDescription(); PackageDescription();
...@@ -59,6 +64,7 @@ class PackageDescription : public IntrusivePtrBase<PackageDescription> { ...@@ -59,6 +64,7 @@ class PackageDescription : public IntrusivePtrBase<PackageDescription> {
vector<PackageDependencyP> dependencies; ///< Dependencies of this package vector<PackageDependencyP> dependencies; ///< Dependencies of this package
/// Merge two descriptions a package. This package takes precedence /// Merge two descriptions a package. This package takes precedence
/** Usually one of the descriptions will refer to the locally installed one, the other to the new one */
void merge(const PackageDescription& p2); void merge(const PackageDescription& p2);
DECLARE_REFLECTION(); DECLARE_REFLECTION();
......
...@@ -48,6 +48,7 @@ struct HtmlWindowToBrowser : public wxHtmlWindow { ...@@ -48,6 +48,7 @@ struct HtmlWindowToBrowser : public wxHtmlWindow {
// ----------------------------------------------------------------------------- : DownloadableInstallers // ----------------------------------------------------------------------------- : DownloadableInstallers
/// Handle downloading of installers
class DownloadableInstallerList { class DownloadableInstallerList {
public: public:
DownloadableInstallerList() : status(NONE) {} DownloadableInstallerList() : status(NONE) {}
...@@ -66,6 +67,7 @@ class DownloadableInstallerList { ...@@ -66,6 +67,7 @@ class DownloadableInstallerList {
}; };
}; };
/// The global installer downloader
DownloadableInstallerList downloadable_installers; DownloadableInstallerList downloadable_installers;
bool DownloadableInstallerList::done() { bool DownloadableInstallerList::done() {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment