mirror of
https://github.com/OpenSpace/OpenSpace.git
synced 2026-04-26 14:08:53 -05:00
Address clang tidy complaints
Update Ghoul repository Update SGCT repository
This commit is contained in:
@@ -114,7 +114,7 @@ void SyncModule::internalInitialize(const ghoul::Dictionary& configuration) {
|
||||
|
||||
_torrentClient.initialize();
|
||||
|
||||
global::callback::deinitialize.push_back([&]() { _torrentClient.deinitialize(); });
|
||||
global::callback::deinitialize.emplace_back([&]() { _torrentClient.deinitialize(); });
|
||||
}
|
||||
|
||||
void SyncModule::internalDeinitialize() {
|
||||
|
||||
@@ -74,12 +74,12 @@ documentation::Documentation HttpSynchronization::Documentation() {
|
||||
}
|
||||
|
||||
HttpSynchronization::HttpSynchronization(const ghoul::Dictionary& dict,
|
||||
const std::string& synchronizationRoot,
|
||||
const std::vector<std::string>& synchronizationRepositories
|
||||
std::string synchronizationRoot,
|
||||
std::vector<std::string> synchronizationRepositories
|
||||
)
|
||||
: openspace::ResourceSynchronization(dict)
|
||||
, _synchronizationRoot(synchronizationRoot)
|
||||
, _synchronizationRepositories(synchronizationRepositories)
|
||||
, _synchronizationRoot(std::move(synchronizationRoot))
|
||||
, _synchronizationRepositories(std::move(synchronizationRepositories))
|
||||
{
|
||||
documentation::testSpecificationAndThrow(
|
||||
Documentation(),
|
||||
@@ -184,7 +184,7 @@ bool HttpSynchronization::hasSyncFile() {
|
||||
}
|
||||
|
||||
bool HttpSynchronization::trySyncFromUrl(std::string listUrl) {
|
||||
HttpRequest::RequestOptions opt;
|
||||
HttpRequest::RequestOptions opt = {};
|
||||
opt.requestTimeoutSeconds = 0;
|
||||
|
||||
SyncHttpMemoryDownload fileListDownload(std::move(listUrl));
|
||||
|
||||
@@ -34,9 +34,8 @@ namespace openspace {
|
||||
|
||||
class HttpSynchronization : public ResourceSynchronization {
|
||||
public:
|
||||
HttpSynchronization(const ghoul::Dictionary& dict,
|
||||
const std::string& synchronizationRoot,
|
||||
const std::vector<std::string>& synchronizationRepositories);
|
||||
HttpSynchronization(const ghoul::Dictionary& dict, std::string synchronizationRoot,
|
||||
std::vector<std::string> synchronizationRepositories);
|
||||
|
||||
virtual ~HttpSynchronization();
|
||||
|
||||
|
||||
@@ -61,10 +61,10 @@ documentation::Documentation TorrentSynchronization::Documentation() {
|
||||
}
|
||||
|
||||
TorrentSynchronization::TorrentSynchronization(const ghoul::Dictionary& dict,
|
||||
const std::string& synchronizationRoot,
|
||||
std::string synchronizationRoot,
|
||||
TorrentClient& torrentClient)
|
||||
: ResourceSynchronization(dict)
|
||||
, _synchronizationRoot(synchronizationRoot)
|
||||
, _synchronizationRoot(std::move(synchronizationRoot))
|
||||
, _torrentClient(torrentClient)
|
||||
{
|
||||
documentation::testSpecificationAndThrow(
|
||||
|
||||
@@ -35,8 +35,8 @@ class TorrentSynchronizationJob;
|
||||
|
||||
class TorrentSynchronization : public ResourceSynchronization {
|
||||
public:
|
||||
TorrentSynchronization(const ghoul::Dictionary& dict,
|
||||
const std::string& synchronizationRoot, TorrentClient& client);
|
||||
TorrentSynchronization(const ghoul::Dictionary& dict, std::string synchronizationRoot,
|
||||
TorrentClient& client);
|
||||
|
||||
virtual ~TorrentSynchronization();
|
||||
|
||||
@@ -59,7 +59,7 @@ private:
|
||||
|
||||
std::atomic_bool _enabled = false;
|
||||
|
||||
TorrentClient::TorrentId _torrentId;
|
||||
TorrentClient::TorrentId _torrentId = 0;
|
||||
TorrentClient::TorrentProgress _progress;
|
||||
std::mutex _progressMutex;
|
||||
std::string _identifier;
|
||||
|
||||
@@ -96,9 +96,9 @@ documentation::Documentation UrlSynchronization::Documentation() {
|
||||
}
|
||||
|
||||
UrlSynchronization::UrlSynchronization(const ghoul::Dictionary& dict,
|
||||
const std::string& synchronizationRoot)
|
||||
std::string synchronizationRoot)
|
||||
: ResourceSynchronization(dict)
|
||||
, _synchronizationRoot(synchronizationRoot)
|
||||
, _synchronizationRoot(std::move(synchronizationRoot))
|
||||
{
|
||||
documentation::testSpecificationAndThrow(
|
||||
Documentation(),
|
||||
@@ -225,7 +225,7 @@ void UrlSynchronization::start() {
|
||||
return !_shouldCancel;
|
||||
});
|
||||
|
||||
HttpRequest::RequestOptions opt;
|
||||
HttpRequest::RequestOptions opt = {};
|
||||
opt.requestTimeoutSeconds = 0;
|
||||
fileDownload->start(opt);
|
||||
}
|
||||
|
||||
@@ -35,8 +35,7 @@ namespace openspace {
|
||||
|
||||
class UrlSynchronization : public ResourceSynchronization {
|
||||
public:
|
||||
UrlSynchronization(const ghoul::Dictionary& dict,
|
||||
const std::string& synchronizationRoot);
|
||||
UrlSynchronization(const ghoul::Dictionary& dict, std::string synchronizationRoot);
|
||||
|
||||
virtual ~UrlSynchronization();
|
||||
|
||||
|
||||
Reference in New Issue
Block a user