diff options
author | Pranam Lashkari <lpranam@collabora.com> | 2021-09-14 00:54:50 +0530 |
---|---|---|
committer | Tor Lillqvist <tml@iki.fi> | 2021-10-21 12:28:13 +0300 |
commit | f02a0a1447cacc9214f91d2b8341796b44ed2733 (patch) | |
tree | 23c5b28880ae1e7f097645385c313561e8ae204a /wsd | |
parent | Don't show 'reconnecting' on idle (diff) | |
download | online-f02a0a1447cacc9214f91d2b8341796b44ed2733.tar.gz online-f02a0a1447cacc9214f91d2b8341796b44ed2733.zip |
freemium: renamed Freemium namespace to CommandControl
also renamed freemium files accordingly
Signed-off-by: Pranam Lashkari <lpranam@collabora.com>
Change-Id: Id33b8a1d1a2a8725bfa6e7b7c562430ea126993c
Diffstat (limited to 'wsd')
-rw-r--r-- | wsd/DocumentBroker.cpp | 20 | ||||
-rw-r--r-- | wsd/Storage.cpp | 4 |
2 files changed, 12 insertions, 12 deletions
diff --git a/wsd/DocumentBroker.cpp b/wsd/DocumentBroker.cpp index b57f4b5978..de65eec637 100644 --- a/wsd/DocumentBroker.cpp +++ b/wsd/DocumentBroker.cpp @@ -40,7 +40,7 @@ #include <common/Protocol.hpp> #include <common/Unit.hpp> #include <common/FileUtil.hpp> -#include <Freemium.hpp> +#include <CommandControl.hpp> #if !MOBILEAPP #include <net/HttpHelper.hpp> @@ -766,15 +766,15 @@ bool DocumentBroker::download(const std::shared_ptr<ClientSession>& session, con #ifdef ENABLE_FREEMIUM Object::Ptr freemiumInfo = new Object(); - freemiumInfo->set("IsFreemiumUser", Freemium::FreemiumManager::isFreemiumUser()); - freemiumInfo->set("FreemiumDenyList", Freemium::FreemiumManager::getFreemiumDenyList()); - freemiumInfo->set("FreemiumPurchaseTitle", Freemium::FreemiumManager::getFreemiumPurchaseTitle()); - freemiumInfo->set("FreemiumPurchaseLink", Freemium::FreemiumManager::getFreemiumPurchaseLink()); - freemiumInfo->set("FreemiumPurchaseDescription", Freemium::FreemiumManager::getFreemiumPurchaseDescription()); - freemiumInfo->set("WriterHighlights", Freemium::FreemiumManager::getWriterHighlights()); - freemiumInfo->set("CalcHighlights", Freemium::FreemiumManager::getCalcHighlights()); - freemiumInfo->set("ImpressHighlights", Freemium::FreemiumManager::getImpressHighlights()); - freemiumInfo->set("DrawHighlights", Freemium::FreemiumManager::getDrawHighlights()); + freemiumInfo->set("IsFreemiumUser", CommandControl::FreemiumManager::isFreemiumUser()); + freemiumInfo->set("FreemiumDenyList", CommandControl::FreemiumManager::getFreemiumDenyList()); + freemiumInfo->set("FreemiumPurchaseTitle", CommandControl::FreemiumManager::getFreemiumPurchaseTitle()); + freemiumInfo->set("FreemiumPurchaseLink", CommandControl::FreemiumManager::getFreemiumPurchaseLink()); + freemiumInfo->set("FreemiumPurchaseDescription", CommandControl::FreemiumManager::getFreemiumPurchaseDescription()); + freemiumInfo->set("WriterHighlights", CommandControl::FreemiumManager::getWriterHighlights()); + freemiumInfo->set("CalcHighlights", CommandControl::FreemiumManager::getCalcHighlights()); + freemiumInfo->set("ImpressHighlights", CommandControl::FreemiumManager::getImpressHighlights()); + freemiumInfo->set("DrawHighlights", CommandControl::FreemiumManager::getDrawHighlights()); std::ostringstream ossFreemiumInfo; freemiumInfo->stringify(ossFreemiumInfo); diff --git a/wsd/Storage.cpp b/wsd/Storage.cpp index 410591911f..418bc5b2ab 100644 --- a/wsd/Storage.cpp +++ b/wsd/Storage.cpp @@ -52,7 +52,7 @@ #include <common/JsonUtil.hpp> #include <common/TraceEvent.hpp> #include <NetUtil.hpp> -#include <Freemium.hpp> +#include <CommandControl.hpp> #ifdef IOS #include <ios.h> @@ -908,7 +908,7 @@ WopiStorage::WOPIFileInfo::WOPIFileInfo(const FileInfo &fileInfo, bool booleanFlag = false; JsonUtil::findJSONValue(object, "IsUserFreemium", booleanFlag); - Freemium::FreemiumManager::setFreemiumUser(booleanFlag); + CommandControl::FreemiumManager::setFreemiumUser(booleanFlag); if (JsonUtil::findJSONValue(object, "DisableChangeTrackingRecord", booleanFlag)) _disableChangeTrackingRecord = (booleanFlag ? WOPIFileInfo::TriState::True : WOPIFileInfo::TriState::False); |