mirror of
https://github.com/Chatterino/chatterino2.git
synced 2024-11-13 19:49:51 +01:00
clang-tidy: use std::move where applicable (#2605)
Co-authored-by: pajlada <rasmus.karlsson@pajlada.com>
This commit is contained in:
parent
b0fee78f2b
commit
00ccdbc781
|
@ -13,7 +13,7 @@ AB_SETTINGS_CLASS *AB_SETTINGS_CLASS::instance = nullptr;
|
||||||
void _actuallyRegisterSetting(
|
void _actuallyRegisterSetting(
|
||||||
std::weak_ptr<pajlada::Settings::SettingData> setting)
|
std::weak_ptr<pajlada::Settings::SettingData> setting)
|
||||||
{
|
{
|
||||||
_settings.push_back(setting);
|
_settings.push_back(std::move(setting));
|
||||||
}
|
}
|
||||||
|
|
||||||
AB_SETTINGS_CLASS::AB_SETTINGS_CLASS(const QString &settingsDirectory)
|
AB_SETTINGS_CLASS::AB_SETTINGS_CLASS(const QString &settingsDirectory)
|
||||||
|
|
|
@ -106,7 +106,7 @@ void Args::applyCustomChannelLayout(const QString &argValue)
|
||||||
return QRect(-1, -1, -1, -1);
|
return QRect(-1, -1, -1, -1);
|
||||||
}();
|
}();
|
||||||
|
|
||||||
window.geometry_ = std::move(configMainLayout);
|
window.geometry_ = configMainLayout;
|
||||||
|
|
||||||
QStringList channelArgList = argValue.split(";");
|
QStringList channelArgList = argValue.split(";");
|
||||||
for (const QString &channelArg : channelArgList)
|
for (const QString &channelArg : channelArgList)
|
||||||
|
|
|
@ -320,13 +320,13 @@ void Channel::onConnected()
|
||||||
// Indirect channel
|
// Indirect channel
|
||||||
//
|
//
|
||||||
IndirectChannel::Data::Data(ChannelPtr _channel, Channel::Type _type)
|
IndirectChannel::Data::Data(ChannelPtr _channel, Channel::Type _type)
|
||||||
: channel(_channel)
|
: channel(std::move(_channel))
|
||||||
, type(_type)
|
, type(_type)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
IndirectChannel::IndirectChannel(ChannelPtr channel, Channel::Type type)
|
IndirectChannel::IndirectChannel(ChannelPtr channel, Channel::Type type)
|
||||||
: data_(std::make_unique<Data>(channel, type))
|
: data_(std::make_unique<Data>(std::move(channel), type))
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -339,7 +339,7 @@ void IndirectChannel::reset(ChannelPtr channel)
|
||||||
{
|
{
|
||||||
assert(this->data_->type != Channel::Type::Direct);
|
assert(this->data_->type != Channel::Type::Direct);
|
||||||
|
|
||||||
this->data_->channel = channel;
|
this->data_->channel = std::move(channel);
|
||||||
this->data_->changed.invoke();
|
this->data_->changed.invoke();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -6,7 +6,7 @@ namespace chatterino {
|
||||||
|
|
||||||
void _registerSetting(std::weak_ptr<pajlada::Settings::SettingData> setting)
|
void _registerSetting(std::weak_ptr<pajlada::Settings::SettingData> setting)
|
||||||
{
|
{
|
||||||
_actuallyRegisterSetting(setting);
|
_actuallyRegisterSetting(std::move(setting));
|
||||||
}
|
}
|
||||||
|
|
||||||
} // namespace chatterino
|
} // namespace chatterino
|
||||||
|
|
|
@ -57,7 +57,7 @@ HighlightPhrase::HighlightPhrase(const QString &pattern, bool showInMentions,
|
||||||
, isRegex_(isRegex)
|
, isRegex_(isRegex)
|
||||||
, isCaseSensitive_(isCaseSensitive)
|
, isCaseSensitive_(isCaseSensitive)
|
||||||
, soundUrl_(soundUrl)
|
, soundUrl_(soundUrl)
|
||||||
, color_(color)
|
, color_(std::move(color))
|
||||||
, regex_(isRegex_
|
, regex_(isRegex_
|
||||||
? pattern
|
? pattern
|
||||||
: REGEX_START_BOUNDARY + QRegularExpression::escape(pattern) +
|
: REGEX_START_BOUNDARY + QRegularExpression::escape(pattern) +
|
||||||
|
|
|
@ -39,7 +39,7 @@ namespace {
|
||||||
} // namespace
|
} // namespace
|
||||||
|
|
||||||
MessageLayout::MessageLayout(MessagePtr message)
|
MessageLayout::MessageLayout(MessagePtr message)
|
||||||
: message_(message)
|
: message_(std::move(message))
|
||||||
, container_(std::make_shared<MessageLayoutContainer>())
|
, container_(std::make_shared<MessageLayoutContainer>())
|
||||||
{
|
{
|
||||||
DebugCount::increase("message layout");
|
DebugCount::increase("message layout");
|
||||||
|
|
|
@ -88,7 +88,7 @@ FlagsEnum<MessageElementFlag> MessageLayoutElement::getFlags() const
|
||||||
ImageLayoutElement::ImageLayoutElement(MessageElement &creator, ImagePtr image,
|
ImageLayoutElement::ImageLayoutElement(MessageElement &creator, ImagePtr image,
|
||||||
const QSize &size)
|
const QSize &size)
|
||||||
: MessageLayoutElement(creator, size)
|
: MessageLayoutElement(creator, size)
|
||||||
, image_(image)
|
, image_(std::move(image))
|
||||||
{
|
{
|
||||||
this->trailingSpace = creator.hasTrailingSpace();
|
this->trailingSpace = creator.hasTrailingSpace();
|
||||||
}
|
}
|
||||||
|
|
|
@ -26,7 +26,7 @@ const std::shared_ptr<QColor> ColorProvider::color(ColorType type) const
|
||||||
void ColorProvider::updateColor(ColorType type, QColor color)
|
void ColorProvider::updateColor(ColorType type, QColor color)
|
||||||
{
|
{
|
||||||
auto colorPtr = this->typeColorMap_.at(type);
|
auto colorPtr = this->typeColorMap_.at(type);
|
||||||
*colorPtr = color;
|
*colorPtr = std::move(color);
|
||||||
}
|
}
|
||||||
|
|
||||||
QSet<QColor> ColorProvider::recentColors() const
|
QSet<QColor> ColorProvider::recentColors() const
|
||||||
|
|
|
@ -64,7 +64,7 @@ QColor TwitchAccount::color()
|
||||||
|
|
||||||
void TwitchAccount::setColor(QColor color)
|
void TwitchAccount::setColor(QColor color)
|
||||||
{
|
{
|
||||||
this->color_.set(color);
|
this->color_.set(std::move(color));
|
||||||
}
|
}
|
||||||
|
|
||||||
bool TwitchAccount::setOAuthClient(const QString &newClientID)
|
bool TwitchAccount::setOAuthClient(const QString &newClientID)
|
||||||
|
@ -131,7 +131,7 @@ void TwitchAccount::blockUser(QString userId, std::function<void()> onSuccess,
|
||||||
}
|
}
|
||||||
onSuccess();
|
onSuccess();
|
||||||
},
|
},
|
||||||
onFailure);
|
std::move(onFailure));
|
||||||
}
|
}
|
||||||
|
|
||||||
void TwitchAccount::unblockUser(QString userId, std::function<void()> onSuccess,
|
void TwitchAccount::unblockUser(QString userId, std::function<void()> onSuccess,
|
||||||
|
@ -149,7 +149,7 @@ void TwitchAccount::unblockUser(QString userId, std::function<void()> onSuccess,
|
||||||
}
|
}
|
||||||
onSuccess();
|
onSuccess();
|
||||||
},
|
},
|
||||||
onFailure);
|
std::move(onFailure));
|
||||||
}
|
}
|
||||||
|
|
||||||
void TwitchAccount::checkFollow(const QString targetUserID,
|
void TwitchAccount::checkFollow(const QString targetUserID,
|
||||||
|
|
|
@ -58,7 +58,7 @@ void Helix::getUserByName(QString userName,
|
||||||
HelixFailureCallback failureCallback)
|
HelixFailureCallback failureCallback)
|
||||||
{
|
{
|
||||||
QStringList userIds;
|
QStringList userIds;
|
||||||
QStringList userLogins{userName};
|
QStringList userLogins{std::move(userName)};
|
||||||
|
|
||||||
this->fetchUsers(
|
this->fetchUsers(
|
||||||
userIds, userLogins,
|
userIds, userLogins,
|
||||||
|
@ -78,7 +78,7 @@ void Helix::getUserById(QString userId,
|
||||||
ResultCallback<HelixUser> successCallback,
|
ResultCallback<HelixUser> successCallback,
|
||||||
HelixFailureCallback failureCallback)
|
HelixFailureCallback failureCallback)
|
||||||
{
|
{
|
||||||
QStringList userIds{userId};
|
QStringList userIds{std::move(userId)};
|
||||||
QStringList userLogins;
|
QStringList userLogins;
|
||||||
|
|
||||||
this->fetchUsers(
|
this->fetchUsers(
|
||||||
|
@ -136,7 +136,8 @@ void Helix::getUserFollowers(
|
||||||
QString userId, ResultCallback<HelixUsersFollowsResponse> successCallback,
|
QString userId, ResultCallback<HelixUsersFollowsResponse> successCallback,
|
||||||
HelixFailureCallback failureCallback)
|
HelixFailureCallback failureCallback)
|
||||||
{
|
{
|
||||||
this->fetchUsersFollows("", userId, successCallback, failureCallback);
|
this->fetchUsersFollows("", std::move(userId), std::move(successCallback),
|
||||||
|
std::move(failureCallback));
|
||||||
}
|
}
|
||||||
|
|
||||||
void Helix::getUserFollow(
|
void Helix::getUserFollow(
|
||||||
|
@ -145,7 +146,7 @@ void Helix::getUserFollow(
|
||||||
HelixFailureCallback failureCallback)
|
HelixFailureCallback failureCallback)
|
||||||
{
|
{
|
||||||
this->fetchUsersFollows(
|
this->fetchUsersFollows(
|
||||||
userId, targetId,
|
std::move(userId), std::move(targetId),
|
||||||
[successCallback](const auto &response) {
|
[successCallback](const auto &response) {
|
||||||
if (response.data.empty())
|
if (response.data.empty())
|
||||||
{
|
{
|
||||||
|
@ -155,7 +156,7 @@ void Helix::getUserFollow(
|
||||||
|
|
||||||
successCallback(true, response.data[0]);
|
successCallback(true, response.data[0]);
|
||||||
},
|
},
|
||||||
failureCallback);
|
std::move(failureCallback));
|
||||||
}
|
}
|
||||||
|
|
||||||
void Helix::fetchStreams(
|
void Helix::fetchStreams(
|
||||||
|
@ -209,7 +210,7 @@ void Helix::getStreamById(QString userId,
|
||||||
ResultCallback<bool, HelixStream> successCallback,
|
ResultCallback<bool, HelixStream> successCallback,
|
||||||
HelixFailureCallback failureCallback)
|
HelixFailureCallback failureCallback)
|
||||||
{
|
{
|
||||||
QStringList userIds{userId};
|
QStringList userIds{std::move(userId)};
|
||||||
QStringList userLogins;
|
QStringList userLogins;
|
||||||
|
|
||||||
this->fetchStreams(
|
this->fetchStreams(
|
||||||
|
@ -230,7 +231,7 @@ void Helix::getStreamByName(QString userName,
|
||||||
HelixFailureCallback failureCallback)
|
HelixFailureCallback failureCallback)
|
||||||
{
|
{
|
||||||
QStringList userIds;
|
QStringList userIds;
|
||||||
QStringList userLogins{userName};
|
QStringList userLogins{std::move(userName)};
|
||||||
|
|
||||||
this->fetchStreams(
|
this->fetchStreams(
|
||||||
userIds, userLogins,
|
userIds, userLogins,
|
||||||
|
@ -299,7 +300,7 @@ void Helix::getGameById(QString gameId,
|
||||||
ResultCallback<HelixGame> successCallback,
|
ResultCallback<HelixGame> successCallback,
|
||||||
HelixFailureCallback failureCallback)
|
HelixFailureCallback failureCallback)
|
||||||
{
|
{
|
||||||
QStringList gameIds{gameId};
|
QStringList gameIds{std::move(gameId)};
|
||||||
QStringList gameNames;
|
QStringList gameNames;
|
||||||
|
|
||||||
this->fetchGames(
|
this->fetchGames(
|
||||||
|
@ -409,7 +410,7 @@ void Helix::createClip(QString channelId,
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
.finally(finallyCallback)
|
.finally(std::move(finallyCallback))
|
||||||
.execute();
|
.execute();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -653,8 +654,8 @@ NetworkRequest Helix::makeRequest(QString url, QUrlQuery urlQuery)
|
||||||
|
|
||||||
void Helix::update(QString clientId, QString oauthToken)
|
void Helix::update(QString clientId, QString oauthToken)
|
||||||
{
|
{
|
||||||
this->clientId = clientId;
|
this->clientId = std::move(clientId);
|
||||||
this->oauthToken = oauthToken;
|
this->oauthToken = std::move(oauthToken);
|
||||||
}
|
}
|
||||||
|
|
||||||
void Helix::initialize()
|
void Helix::initialize()
|
||||||
|
|
|
@ -63,8 +63,8 @@ NetworkRequest Kraken::makeRequest(QString url, QUrlQuery urlQuery)
|
||||||
|
|
||||||
void Kraken::update(QString clientId, QString oauthToken)
|
void Kraken::update(QString clientId, QString oauthToken)
|
||||||
{
|
{
|
||||||
this->clientId = clientId;
|
this->clientId = std::move(clientId);
|
||||||
this->oauthToken = oauthToken;
|
this->oauthToken = std::move(oauthToken);
|
||||||
}
|
}
|
||||||
|
|
||||||
void Kraken::initialize()
|
void Kraken::initialize()
|
||||||
|
|
|
@ -33,7 +33,7 @@ TooltipPreviewImage::TooltipPreviewImage()
|
||||||
|
|
||||||
void TooltipPreviewImage::setImage(ImagePtr image)
|
void TooltipPreviewImage::setImage(ImagePtr image)
|
||||||
{
|
{
|
||||||
this->image_ = image;
|
this->image_ = std::move(image);
|
||||||
|
|
||||||
this->refreshTooltipWidgetPixmap();
|
this->refreshTooltipWidgetPixmap();
|
||||||
}
|
}
|
||||||
|
|
|
@ -17,7 +17,7 @@ class LambdaRunnable : public QRunnable
|
||||||
public:
|
public:
|
||||||
LambdaRunnable(std::function<void()> action)
|
LambdaRunnable(std::function<void()> action)
|
||||||
{
|
{
|
||||||
this->action_ = action;
|
this->action_ = std::move(action);
|
||||||
}
|
}
|
||||||
|
|
||||||
void run()
|
void run()
|
||||||
|
|
|
@ -143,7 +143,7 @@ void AttachedWindow::detach(const QString &winId)
|
||||||
|
|
||||||
void AttachedWindow::setChannel(ChannelPtr channel)
|
void AttachedWindow::setChannel(ChannelPtr channel)
|
||||||
{
|
{
|
||||||
this->ui_.split->setChannel(channel);
|
this->ui_.split->setChannel(std::move(channel));
|
||||||
}
|
}
|
||||||
|
|
||||||
void AttachedWindow::showEvent(QShowEvent *)
|
void AttachedWindow::showEvent(QShowEvent *)
|
||||||
|
|
|
@ -5,13 +5,13 @@
|
||||||
namespace chatterino {
|
namespace chatterino {
|
||||||
|
|
||||||
Label::Label(QString text, FontStyle style)
|
Label::Label(QString text, FontStyle style)
|
||||||
: Label(nullptr, text, style)
|
: Label(nullptr, std::move(text), style)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
Label::Label(BaseWidget *parent, QString text, FontStyle style)
|
Label::Label(BaseWidget *parent, QString text, FontStyle style)
|
||||||
: BaseWidget(parent)
|
: BaseWidget(parent)
|
||||||
, text_(text)
|
, text_(std::move(text))
|
||||||
, fontStyle_(style)
|
, fontStyle_(style)
|
||||||
{
|
{
|
||||||
this->connections_.managedConnect(getFonts()->fontChanged, [this] {
|
this->connections_.managedConnect(getFonts()->fontChanged, [this] {
|
||||||
|
|
|
@ -26,7 +26,7 @@ StreamView::StreamView(ChannelPtr channel, const QUrl &url)
|
||||||
|
|
||||||
auto chat = layoutCreator.emplace<ChannelView>();
|
auto chat = layoutCreator.emplace<ChannelView>();
|
||||||
chat->setFixedWidth(300);
|
chat->setFixedWidth(300);
|
||||||
chat->setChannel(channel);
|
chat->setChannel(std::move(channel));
|
||||||
|
|
||||||
this->layout()->setSpacing(0);
|
this->layout()->setSpacing(0);
|
||||||
this->layout()->setMargin(0);
|
this->layout()->setMargin(0);
|
||||||
|
|
|
@ -45,7 +45,7 @@ void NotificationPopup::updatePosition()
|
||||||
|
|
||||||
void NotificationPopup::addMessage(MessagePtr msg)
|
void NotificationPopup::addMessage(MessagePtr msg)
|
||||||
{
|
{
|
||||||
this->channel_->addMessage(msg);
|
this->channel_->addMessage(std::move(msg));
|
||||||
|
|
||||||
// QTimer::singleShot(5000, this, [this, msg] { this->channel->remove });
|
// QTimer::singleShot(5000, this, [this, msg] { this->channel->remove });
|
||||||
}
|
}
|
||||||
|
|
|
@ -38,7 +38,7 @@ Button::Button(BaseWidget *parent)
|
||||||
|
|
||||||
void Button::setMouseEffectColor(boost::optional<QColor> color)
|
void Button::setMouseEffectColor(boost::optional<QColor> color)
|
||||||
{
|
{
|
||||||
this->mouseEffectColor_ = color;
|
this->mouseEffectColor_ = std::move(color);
|
||||||
}
|
}
|
||||||
|
|
||||||
void Button::setPixmap(const QPixmap &_pixmap)
|
void Button::setPixmap(const QPixmap &_pixmap)
|
||||||
|
|
|
@ -550,7 +550,7 @@ bool ChannelView::getEnableScrollingToBottom() const
|
||||||
|
|
||||||
void ChannelView::setOverrideFlags(boost::optional<MessageElementFlags> value)
|
void ChannelView::setOverrideFlags(boost::optional<MessageElementFlags> value)
|
||||||
{
|
{
|
||||||
this->overrideFlags_ = value;
|
this->overrideFlags_ = std::move(value);
|
||||||
}
|
}
|
||||||
|
|
||||||
const boost::optional<MessageElementFlags> &ChannelView::getOverrideFlags()
|
const boost::optional<MessageElementFlags> &ChannelView::getOverrideFlags()
|
||||||
|
@ -647,7 +647,7 @@ void ChannelView::setChannel(ChannelPtr underlyingChannel)
|
||||||
this->channelConnections_.push_back(this->channel_->messageAppended.connect(
|
this->channelConnections_.push_back(this->channel_->messageAppended.connect(
|
||||||
[this](MessagePtr &message,
|
[this](MessagePtr &message,
|
||||||
boost::optional<MessageFlags> overridingFlags) {
|
boost::optional<MessageFlags> overridingFlags) {
|
||||||
this->messageAppended(message, overridingFlags);
|
this->messageAppended(message, std::move(overridingFlags));
|
||||||
}));
|
}));
|
||||||
|
|
||||||
this->channelConnections_.push_back(
|
this->channelConnections_.push_back(
|
||||||
|
@ -753,7 +753,7 @@ ChannelPtr ChannelView::sourceChannel() const
|
||||||
|
|
||||||
void ChannelView::setSourceChannel(ChannelPtr sourceChannel)
|
void ChannelView::setSourceChannel(ChannelPtr sourceChannel)
|
||||||
{
|
{
|
||||||
this->sourceChannel_ = sourceChannel;
|
this->sourceChannel_ = std::move(sourceChannel);
|
||||||
}
|
}
|
||||||
|
|
||||||
bool ChannelView::hasSourceChannel() const
|
bool ChannelView::hasSourceChannel() const
|
||||||
|
|
|
@ -66,7 +66,7 @@ SearchPopup::SearchPopup(QWidget *parent)
|
||||||
|
|
||||||
void SearchPopup::setChannelFilters(FilterSetPtr filters)
|
void SearchPopup::setChannelFilters(FilterSetPtr filters)
|
||||||
{
|
{
|
||||||
this->channelFilters_ = filters;
|
this->channelFilters_ = std::move(filters);
|
||||||
}
|
}
|
||||||
|
|
||||||
void SearchPopup::setChannel(const ChannelPtr &channel)
|
void SearchPopup::setChannel(const ChannelPtr &channel)
|
||||||
|
|
Loading…
Reference in a new issue