diff options
author | Thomas Groman <tgroman@nuegia.net> | 2019-09-19 00:41:48 -0700 |
---|---|---|
committer | Thomas Groman <tgroman@nuegia.net> | 2019-09-19 00:41:48 -0700 |
commit | 32b3ed0a1362a4b0798ad71fac3450fb77cb7e41 (patch) | |
tree | 7be7a2f602e6a5af7bc2db86bef9cf2a659c3d3d /libraries/systeminfo/include | |
parent | 5fb2c6334e7d5237db11695b4c0ec0f2d1e47c88 (diff) | |
download | MultiMC-32b3ed0a1362a4b0798ad71fac3450fb77cb7e41.tar MultiMC-32b3ed0a1362a4b0798ad71fac3450fb77cb7e41.tar.gz MultiMC-32b3ed0a1362a4b0798ad71fac3450fb77cb7e41.tar.lz MultiMC-32b3ed0a1362a4b0798ad71fac3450fb77cb7e41.tar.xz MultiMC-32b3ed0a1362a4b0798ad71fac3450fb77cb7e41.zip |
merged from 0.6.7 codebase
Diffstat (limited to 'libraries/systeminfo/include')
-rw-r--r-- | libraries/systeminfo/include/distroutils.h | 8 | ||||
-rw-r--r-- | libraries/systeminfo/include/sys.h | 50 |
2 files changed, 29 insertions, 29 deletions
diff --git a/libraries/systeminfo/include/distroutils.h b/libraries/systeminfo/include/distroutils.h index 5ff8d591..2e85f433 100644 --- a/libraries/systeminfo/include/distroutils.h +++ b/libraries/systeminfo/include/distroutils.h @@ -4,10 +4,10 @@ namespace Sys { struct LsbInfo { - QString distributor; - QString version; - QString description; - QString codename; + QString distributor; + QString version; + QString description; + QString codename; }; bool main_lsb_info(LsbInfo & out); diff --git a/libraries/systeminfo/include/sys.h b/libraries/systeminfo/include/sys.h index c573eb53..7980dfdf 100644 --- a/libraries/systeminfo/include/sys.h +++ b/libraries/systeminfo/include/sys.h @@ -6,37 +6,37 @@ namespace Sys const uint64_t megabyte = 1024ull * 1024ull; struct KernelInfo { - QString kernelName; - QString kernelVersion; + QString kernelName; + QString kernelVersion; }; KernelInfo getKernelInfo(); struct DistributionInfo { - DistributionInfo operator+(const DistributionInfo& rhs) const - { - DistributionInfo out; - if(!distributionName.isEmpty()) - { - out.distributionName = distributionName; - } - else - { - out.distributionName = rhs.distributionName; - } - if(!distributionVersion.isEmpty()) - { - out.distributionVersion = distributionVersion; - } - else - { - out.distributionVersion = rhs.distributionVersion; - } - return out; - } - QString distributionName; - QString distributionVersion; + DistributionInfo operator+(const DistributionInfo& rhs) const + { + DistributionInfo out; + if(!distributionName.isEmpty()) + { + out.distributionName = distributionName; + } + else + { + out.distributionName = rhs.distributionName; + } + if(!distributionVersion.isEmpty()) + { + out.distributionVersion = distributionVersion; + } + else + { + out.distributionVersion = rhs.distributionVersion; + } + return out; + } + QString distributionName; + QString distributionVersion; }; DistributionInfo getDistributionInfo(); |