livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replace some boost elements with C++ standard counterparts

master
Ansariel 2023-12-08 22:13:30 +01:00
parent 35bf40259b
commit 4ffe206285
4 changed files with 40 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
indra/newview/fsdiscordconnect.cpp
View File

@ -44,21 +44,20 @@
#include "llfloaterreg.h"
#include "discord-rpc/discord_rpc.h"
#include "boost/algorithm/string/case_conv.hpp"
#include <discord-rpc/discord_rpc.h>
#include <boost/algorithm/string/case_conv.hpp>
#include "fsdiscordkey.h"
#include "llviewernetwork.h"
boost::scoped_ptr<LLEventPump> FSDiscordConnect::sStateWatcher(new LLEventStream("DiscordConnectState"));
boost::scoped_ptr<LLEventPump> FSDiscordConnect::sInfoWatcher(new LLEventStream("DiscordConnectInfo"));
std::unique_ptr<LLEventPump> FSDiscordConnect::sStateWatcher = std::make_unique<LLEventStream>("DiscordConnectState");
std::unique_ptr<LLEventPump> FSDiscordConnect::sInfoWatcher = std::make_unique<LLEventStream>("DiscordConnectInfo");
// Returns false when the file exists and has not our UUID
// Or, put simply, returns true if someone else is using it
bool FSDiscordConnect::checkMarkerFile()
bool FSDiscordConnect::checkMarkerFile() const
{
if (!LLFile::isfile(mMarkerFilename))
{
@ -94,7 +93,7 @@ void FSDiscordConnect::clearMarkerFile()
LLFile::remove(mMarkerFilename);
}
void handleDiscordReady(const DiscordUser *request)
static void handleDiscordReady(const DiscordUser *request)
{
LLSD info;
info["name"] = request->username;
@ -102,12 +101,12 @@ void handleDiscordReady(const DiscordUser *request)
FSDiscordConnect::getInstance()->setConnectionState(FSDiscordConnect::DISCORD_CONNECTED);
}
void handleDiscordError(int errorCode, const char* message)
static void handleDiscordError(int errorCode, const char* message)
{
LL_WARNS("DiscordConnect") << "Discord error, errorCode: \"" << errorCode << "\", message: \"" << message << "\"" << LL_ENDL;
}
void handleDiscordDisconnected(int errorCode, const char* message)
static void handleDiscordDisconnected(int errorCode, const char* message)
{
LL_INFOS("DiscordConnect") << "Discord disconnected, errorCode: \"" << errorCode << "\", message: \"" << message << "\"" << LL_ENDL;
FSDiscordConnect::getInstance()->setConnectionState(FSDiscordConnect::DISCORD_NOT_CONNECTED);
@ -157,7 +156,7 @@ void FSDiscordConnect::discordConnectedCoro(bool autoConnect)
}
bool isRegionVisible(LLViewerRegion* region)
static bool isRegionVisible(LLViewerRegion* region)
{
U8 rating = region->getSimAccess();
bool visible = true;
@ -183,9 +182,9 @@ bool isRegionVisible(LLViewerRegion* region)
return visible;
}
void FSDiscordConnect::updateRichPresence()
void FSDiscordConnect::updateRichPresence() const
{
LLViewerRegion * region = gAgent.getRegion();
LLViewerRegion* region = gAgent.getRegion();
if (!isConnected() || !region)
{
return;
@ -238,7 +237,8 @@ void FSDiscordConnect::updateRichPresence()
discordPresence.largeImageKey = "secondlife_512";
#endif
discordPresence.largeImageText = LLGridManager::getInstance()->getGridLabel().c_str();
auto gridLabel = LLGridManager::getInstance()->getGridLabel();
discordPresence.largeImageText = gridLabel.c_str();
discordPresence.smallImageKey = "firestorm_512";
std::string appName = std::string("via " + APP_NAME);
discordPresence.smallImageText = appName.c_str();
@ -256,10 +256,11 @@ FSDiscordConnect::FSDiscordConnect()
: mConnectionState(DISCORD_NOT_CONNECTED),
mConnected(false),
mInfo(),
mRefreshInfo(false)
mRefreshInfo(false),
mConnectTime(0)
{
mMarkerFilename = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, "discord_in_use_marker");
LLEventPumps::instance().obtain("mainloop").listen("FSDiscordConnect", boost::bind(&FSDiscordConnect::Tick, this, _1));
LLEventPumps::instance().obtain("mainloop").listen("FSDiscordConnect", std::bind(&FSDiscordConnect::Tick, this, std::placeholders::_1));
}
FSDiscordConnect::~FSDiscordConnect()
@ -270,7 +271,7 @@ FSDiscordConnect::~FSDiscordConnect()
void FSDiscordConnect::connectToDiscord()
{
LLCoros::instance().launch("FSDiscordConnect::discordConnectCoro",
boost::bind(&FSDiscordConnect::discordConnectCoro, this));
std::bind(&FSDiscordConnect::discordConnectCoro, this));
}
void FSDiscordConnect::disconnectFromDiscord()
@ -278,13 +279,13 @@ void FSDiscordConnect::disconnectFromDiscord()
setConnectionState(FSDiscordConnect::DISCORD_DISCONNECTING);
LLCoros::instance().launch("FSDiscordConnect::discordDisconnectCoro",
boost::bind(&FSDiscordConnect::discordDisconnectCoro, this));
std::bind(&FSDiscordConnect::discordDisconnectCoro, this));
}
void FSDiscordConnect::checkConnectionToDiscord(bool auto_connect)
{
LLCoros::instance().launch("FSDiscordConnect::discordConnectedCoro",
boost::bind(&FSDiscordConnect::discordConnectedCoro, this, auto_connect));
std::bind(&FSDiscordConnect::discordConnectedCoro, this, auto_connect));
}
bool FSDiscordConnect::Tick(const LLSD&)

11
indra/newview/fsdiscordconnect.h
View File

@ -60,10 +60,10 @@ public:
void setConnectionState(EConnectionState connection_state);
void setConnected(bool connected);
bool isConnected() { return mConnected; }
bool isConnected() const { return mConnected; }
EConnectionState getConnectionState() { return mConnectionState; }
void updateRichPresence();
void updateRichPresence() const;
bool Tick(const LLSD&);
@ -74,15 +74,14 @@ private:
LLSD mInfo;
bool mRefreshInfo;
static boost::scoped_ptr<LLEventPump> sStateWatcher;
static boost::scoped_ptr<LLEventPump> sInfoWatcher;
static boost::scoped_ptr<LLEventPump> sContentWatcher;
static std::unique_ptr<LLEventPump> sStateWatcher;
static std::unique_ptr<LLEventPump> sInfoWatcher;
void discordConnectCoro();
void discordDisconnectCoro();
void discordConnectedCoro(bool autoConnect);
bool checkMarkerFile();
bool checkMarkerFile() const;
void setMarkerFile();
void clearMarkerFile();

25
indra/newview/llflickrconnect.cpp
View File

@ -44,23 +44,22 @@
#include "llfloaterreg.h"
#include "llcorehttputil.h"
boost::scoped_ptr<LLEventPump> LLFlickrConnect::sStateWatcher(new LLEventStream("FlickrConnectState"));
boost::scoped_ptr<LLEventPump> LLFlickrConnect::sInfoWatcher(new LLEventStream("FlickrConnectInfo"));
boost::scoped_ptr<LLEventPump> LLFlickrConnect::sContentWatcher(new LLEventStream("FlickrConnectContent"));
std::unique_ptr<LLEventPump> LLFlickrConnect::sStateWatcher = std::make_unique<LLEventStream>("FlickrConnectState");
std::unique_ptr<LLEventPump> LLFlickrConnect::sInfoWatcher = std::make_unique<LLEventStream>("FlickrConnectInfo");
// Local functions
void log_flickr_connect_error(const std::string& request, U32 status, const std::string& reason, const std::string& code, const std::string& description)
static void log_flickr_connect_error(const std::string& request, U32 status, const std::string& reason, const std::string& code, const std::string& description)
{
// Note: 302 (redirect) is *not* an error that warrants logging
if (status != 302)
{
LL_WARNS("FlickrConnect") << request << " request failed with a " << status << " " << reason << ". Reason: " << code << " (" << description << ")" << LL_ENDL;
LL_WARNS("FlickrConnect") << request << " request failed with a " << status << " " << reason << ". Reason: " << code << " (" << description << ")" << LL_ENDL;
}
}
void toast_user_for_flickr_success()
static void toast_user_for_flickr_success()
{
LLSD args;
LLSD args;
args["MESSAGE"] = LLTrans::getString("flickr_post_success");
LLNotificationsUtil::add("FlickrConnect", args);
}
@ -437,19 +436,19 @@ std::string LLFlickrConnect::getFlickrConnectURL(const std::string& route, bool
void LLFlickrConnect::connectToFlickr(const std::string& request_token, const std::string& oauth_verifier)
{
LLCoros::instance().launch("LLFlickrConnect::flickrConnectCoro",
boost::bind(&LLFlickrConnect::flickrConnectCoro, this, request_token, oauth_verifier));
std::bind(&LLFlickrConnect::flickrConnectCoro, this, request_token, oauth_verifier));
}
void LLFlickrConnect::disconnectFromFlickr()
{
LLCoros::instance().launch("LLFlickrConnect::flickrDisconnectCoro",
boost::bind(&LLFlickrConnect::flickrDisconnectCoro, this));
std::bind(&LLFlickrConnect::flickrDisconnectCoro, this));
}
void LLFlickrConnect::checkConnectionToFlickr(bool auto_connect)
{
LLCoros::instance().launch("LLFlickrConnect::flickrConnectedCoro",
boost::bind(&LLFlickrConnect::flickrConnectedCoro, this, auto_connect));
std::bind(&LLFlickrConnect::flickrConnectedCoro, this, auto_connect));
}
void LLFlickrConnect::loadFlickrInfo()
@ -457,7 +456,7 @@ void LLFlickrConnect::loadFlickrInfo()
if(mRefreshInfo)
{
LLCoros::instance().launch("LLFlickrConnect::flickrInfoCoro",
boost::bind(&LLFlickrConnect::flickrInfoCoro, this));
std::bind(&LLFlickrConnect::flickrInfoCoro, this));
}
}
@ -473,7 +472,7 @@ void LLFlickrConnect::uploadPhoto(const std::string& image_url, const std::strin
setConnectionState(LLFlickrConnect::FLICKR_POSTING);
LLCoros::instance().launch("LLFlickrConnect::flickrShareCoro",
boost::bind(&LLFlickrConnect::flickrShareCoro, this, body));
std::bind(&LLFlickrConnect::flickrShareCoro, this, body));
}
void LLFlickrConnect::uploadPhoto(LLPointer<LLImageFormatted> image, const std::string& title, const std::string& description, const std::string& tags, int safety_level)
@ -481,7 +480,7 @@ void LLFlickrConnect::uploadPhoto(LLPointer<LLImageFormatted> image, const std::
setConnectionState(LLFlickrConnect::FLICKR_POSTING);
LLCoros::instance().launch("LLFlickrConnect::flickrShareImageCoro",
boost::bind(&LLFlickrConnect::flickrShareImageCoro, this, image,
std::bind(&LLFlickrConnect::flickrShareImageCoro, this, image,
title, description, tags, safety_level));
}

9
indra/newview/llflickrconnect.h
View File

@ -78,8 +78,8 @@ public:
void setConnectionState(EConnectionState connection_state);
void setConnected(bool connected);
bool isConnected() { return mConnected; }
bool isTransactionOngoing() { return ((mConnectionState == FLICKR_CONNECTION_IN_PROGRESS) || (mConnectionState == FLICKR_POSTING) || (mConnectionState == FLICKR_DISCONNECTING)); }
bool isConnected() const { return mConnected; }
bool isTransactionOngoing() const { return ((mConnectionState == FLICKR_CONNECTION_IN_PROGRESS) || (mConnectionState == FLICKR_POSTING) || (mConnectionState == FLICKR_DISCONNECTING)); }
EConnectionState getConnectionState() { return mConnectionState; }
void openFlickrWeb(std::string url);
@ -94,9 +94,8 @@ private:
bool mRefreshInfo;
bool mReadFromMaster;
static boost::scoped_ptr<LLEventPump> sStateWatcher;
static boost::scoped_ptr<LLEventPump> sInfoWatcher;
static boost::scoped_ptr<LLEventPump> sContentWatcher;
static std::unique_ptr<LLEventPump> sStateWatcher;
static std::unique_ptr<LLEventPump> sInfoWatcher;
bool testShareStatus(LLSD &result);
void flickrConnectCoro(std::string requestToken, std::string oauthVerifier);