mirror of
https://github.com/Chatterino/chatterino2.git
synced 2024-11-13 19:49:51 +01:00
replace all instances of NULL with nullptr
This commit is contained in:
parent
1c6ff37e76
commit
9cd70877a5
|
@ -42,7 +42,7 @@ void Emojis::parseEmojis(std::vector<std::tuple<messages::LazyLoadedImage *, QSt
|
||||||
|
|
||||||
if (i - lastSlice != 0) {
|
if (i - lastSlice != 0) {
|
||||||
vector.push_back(std::tuple<messages::LazyLoadedImage *, QString>(
|
vector.push_back(std::tuple<messages::LazyLoadedImage *, QString>(
|
||||||
NULL, text.mid(lastSlice, i - lastSlice)));
|
nullptr, text.mid(lastSlice, i - lastSlice)));
|
||||||
}
|
}
|
||||||
|
|
||||||
vector.push_back(std::tuple<messages::LazyLoadedImage *, QString>(
|
vector.push_back(std::tuple<messages::LazyLoadedImage *, QString>(
|
||||||
|
@ -63,7 +63,7 @@ void Emojis::parseEmojis(std::vector<std::tuple<messages::LazyLoadedImage *, QSt
|
||||||
|
|
||||||
if (lastSlice < text.length()) {
|
if (lastSlice < text.length()) {
|
||||||
vector.push_back(
|
vector.push_back(
|
||||||
std::tuple<messages::LazyLoadedImage *, QString>(NULL, text.mid(lastSlice)));
|
std::tuple<messages::LazyLoadedImage *, QString>(nullptr, text.mid(lastSlice)));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -254,7 +254,7 @@ void IrcManager::privateMessageReceived(Communi::IrcPrivateMessage *message)
|
||||||
{
|
{
|
||||||
auto c = ChannelManager::getInstance().getChannel(message->target().mid(1));
|
auto c = ChannelManager::getInstance().getChannel(message->target().mid(1));
|
||||||
|
|
||||||
if (c != NULL) {
|
if (c != nullptr) {
|
||||||
messages::MessageParseArgs args;
|
messages::MessageParseArgs args;
|
||||||
|
|
||||||
c->addMessage(twitch::TwitchMessageBuilder::parse(message, c.get(), args));
|
c->addMessage(twitch::TwitchMessageBuilder::parse(message, c.get(), args));
|
||||||
|
|
|
@ -20,7 +20,7 @@ namespace messages {
|
||||||
|
|
||||||
LazyLoadedImage::LazyLoadedImage(const QString &url, qreal scale, const QString &name,
|
LazyLoadedImage::LazyLoadedImage(const QString &url, qreal scale, const QString &name,
|
||||||
const QString &tooltip, const QMargins &margin, bool isHat)
|
const QString &tooltip, const QMargins &margin, bool isHat)
|
||||||
: _currentPixmap(NULL)
|
: _currentPixmap(nullptr)
|
||||||
, _currentFrame(0)
|
, _currentFrame(0)
|
||||||
, _currentFrameOffset(0)
|
, _currentFrameOffset(0)
|
||||||
, _url(url)
|
, _url(url)
|
||||||
|
|
|
@ -63,7 +63,7 @@ public:
|
||||||
|
|
||||||
int getWidth() const
|
int getWidth() const
|
||||||
{
|
{
|
||||||
if (_currentPixmap == NULL) {
|
if (_currentPixmap == nullptr) {
|
||||||
return 16;
|
return 16;
|
||||||
}
|
}
|
||||||
return _currentPixmap->width();
|
return _currentPixmap->width();
|
||||||
|
@ -71,7 +71,7 @@ public:
|
||||||
|
|
||||||
int getHeight() const
|
int getHeight() const
|
||||||
{
|
{
|
||||||
if (_currentPixmap == NULL) {
|
if (_currentPixmap == nullptr) {
|
||||||
return 16;
|
return 16;
|
||||||
}
|
}
|
||||||
return _currentPixmap->height();
|
return _currentPixmap->height();
|
||||||
|
|
|
@ -22,7 +22,7 @@ Word::Word(LazyLoadedImage *image, Type type, const QString ©text, const QSt
|
||||||
// Text word
|
// Text word
|
||||||
Word::Word(const QString &text, Type type, const QColor &color, const QString ©text,
|
Word::Word(const QString &text, Type type, const QColor &color, const QString ©text,
|
||||||
const QString &tooltip, const Link &link)
|
const QString &tooltip, const Link &link)
|
||||||
: _image(NULL)
|
: _image(nullptr)
|
||||||
, _text(text)
|
, _text(text)
|
||||||
, _color(color)
|
, _color(color)
|
||||||
, _isImage(false)
|
, _isImage(false)
|
||||||
|
|
|
@ -4,23 +4,23 @@
|
||||||
|
|
||||||
namespace chatterino {
|
namespace chatterino {
|
||||||
|
|
||||||
messages::LazyLoadedImage *Resources::badgeStaff(NULL);
|
messages::LazyLoadedImage *Resources::badgeStaff(nullptr);
|
||||||
messages::LazyLoadedImage *Resources::badgeAdmin(NULL);
|
messages::LazyLoadedImage *Resources::badgeAdmin(nullptr);
|
||||||
messages::LazyLoadedImage *Resources::badgeModerator(NULL);
|
messages::LazyLoadedImage *Resources::badgeModerator(nullptr);
|
||||||
messages::LazyLoadedImage *Resources::badgeGlobalmod(NULL);
|
messages::LazyLoadedImage *Resources::badgeGlobalmod(nullptr);
|
||||||
messages::LazyLoadedImage *Resources::badgeTurbo(NULL);
|
messages::LazyLoadedImage *Resources::badgeTurbo(nullptr);
|
||||||
messages::LazyLoadedImage *Resources::badgeBroadcaster(NULL);
|
messages::LazyLoadedImage *Resources::badgeBroadcaster(nullptr);
|
||||||
messages::LazyLoadedImage *Resources::badgePremium(NULL);
|
messages::LazyLoadedImage *Resources::badgePremium(nullptr);
|
||||||
|
|
||||||
messages::LazyLoadedImage *Resources::cheerBadge100000(NULL);
|
messages::LazyLoadedImage *Resources::cheerBadge100000(nullptr);
|
||||||
messages::LazyLoadedImage *Resources::cheerBadge10000(NULL);
|
messages::LazyLoadedImage *Resources::cheerBadge10000(nullptr);
|
||||||
messages::LazyLoadedImage *Resources::cheerBadge5000(NULL);
|
messages::LazyLoadedImage *Resources::cheerBadge5000(nullptr);
|
||||||
messages::LazyLoadedImage *Resources::cheerBadge1000(NULL);
|
messages::LazyLoadedImage *Resources::cheerBadge1000(nullptr);
|
||||||
messages::LazyLoadedImage *Resources::cheerBadge100(NULL);
|
messages::LazyLoadedImage *Resources::cheerBadge100(nullptr);
|
||||||
messages::LazyLoadedImage *Resources::cheerBadge1(NULL);
|
messages::LazyLoadedImage *Resources::cheerBadge1(nullptr);
|
||||||
|
|
||||||
messages::LazyLoadedImage *Resources::buttonBan(NULL);
|
messages::LazyLoadedImage *Resources::buttonBan(nullptr);
|
||||||
messages::LazyLoadedImage *Resources::buttonTimeout(NULL);
|
messages::LazyLoadedImage *Resources::buttonTimeout(nullptr);
|
||||||
|
|
||||||
Resources::Resources()
|
Resources::Resources()
|
||||||
{
|
{
|
||||||
|
|
|
@ -21,7 +21,7 @@ void TwitchMessageBuilder::appendTwitchBadges(const QStringList &badges)
|
||||||
{
|
{
|
||||||
for (QString badge : badges) {
|
for (QString badge : badges) {
|
||||||
if (badge.startsWith("bits/")) {
|
if (badge.startsWith("bits/")) {
|
||||||
long long int cheer = std::strtoll(badge.mid(5).toStdString().c_str(), NULL, 10);
|
long long int cheer = std::strtoll(badge.mid(5).toStdString().c_str(), nullptr, 10);
|
||||||
appendWord(Word(EmoteManager::getInstance().getCheerBadge(cheer), Word::BadgeCheer,
|
appendWord(Word(EmoteManager::getInstance().getCheerBadge(cheer), Word::BadgeCheer,
|
||||||
QString(), QString("Twitch Cheer" + QString::number(cheer))));
|
QString(), QString("Twitch Cheer" + QString::number(cheer))));
|
||||||
} else if (badge == "staff/1") {
|
} else if (badge == "staff/1") {
|
||||||
|
@ -166,7 +166,7 @@ SharedMessage TwitchMessageBuilder::parse(const Communi::IrcPrivateMessage *ircM
|
||||||
if (parameters.length() < 2)
|
if (parameters.length() < 2)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
long int id = std::stol(parameters.at(0).toStdString(), NULL, 10);
|
long int id = std::stol(parameters.at(0).toStdString(), nullptr, 10);
|
||||||
|
|
||||||
QStringList occurences = parameters.at(1).split(',');
|
QStringList occurences = parameters.at(1).split(',');
|
||||||
|
|
||||||
|
@ -176,8 +176,8 @@ SharedMessage TwitchMessageBuilder::parse(const Communi::IrcPrivateMessage *ircM
|
||||||
if (coords.length() < 2)
|
if (coords.length() < 2)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
long int start = std::stol(coords.at(0).toStdString(), NULL, 10);
|
long int start = std::stol(coords.at(0).toStdString(), nullptr, 10);
|
||||||
long int end = std::stol(coords.at(1).toStdString(), NULL, 10);
|
long int end = std::stol(coords.at(1).toStdString(), nullptr, 10);
|
||||||
|
|
||||||
if (start >= end || start < 0 || end > ircMessage->content().length())
|
if (start >= end || start < 0 || end > ircMessage->content().length())
|
||||||
continue;
|
continue;
|
||||||
|
@ -235,7 +235,7 @@ SharedMessage TwitchMessageBuilder::parse(const Communi::IrcPrivateMessage *ircM
|
||||||
for (const std::tuple<LazyLoadedImage *, QString> &tuple : parsed) {
|
for (const std::tuple<LazyLoadedImage *, QString> &tuple : parsed) {
|
||||||
LazyLoadedImage *image = std::get<0>(tuple);
|
LazyLoadedImage *image = std::get<0>(tuple);
|
||||||
|
|
||||||
if (image == NULL) { // is text
|
if (image == nullptr) { // is text
|
||||||
QString string = std::get<1>(tuple);
|
QString string = std::get<1>(tuple);
|
||||||
|
|
||||||
static QRegularExpression cheerRegex("cheer[1-9][0-9]*");
|
static QRegularExpression cheerRegex("cheer[1-9][0-9]*");
|
||||||
|
|
|
@ -137,7 +137,7 @@
|
||||||
// if (parameters.length() < 2)
|
// if (parameters.length() < 2)
|
||||||
// continue;
|
// continue;
|
||||||
//
|
//
|
||||||
// long int id = std::stol(parameters.at(0).toStdString(), NULL, 10);
|
// long int id = std::stol(parameters.at(0).toStdString(), nullptr, 10);
|
||||||
//
|
//
|
||||||
// QStringList occurences = parameters.at(1).split(',');
|
// QStringList occurences = parameters.at(1).split(',');
|
||||||
//
|
//
|
||||||
|
@ -148,8 +148,8 @@
|
||||||
// continue;
|
// continue;
|
||||||
//
|
//
|
||||||
// long int start =
|
// long int start =
|
||||||
// std::stol(coords.at(0).toStdString(), NULL, 10);
|
// std::stol(coords.at(0).toStdString(), nullptr, 10);
|
||||||
// long int end = std::stol(coords.at(1).toStdString(), NULL,
|
// long int end = std::stol(coords.at(1).toStdString(), nullptr,
|
||||||
// 10);
|
// 10);
|
||||||
//
|
//
|
||||||
// if (start >= end || start < 0 ||
|
// if (start >= end || start < 0 ||
|
||||||
|
@ -209,7 +209,7 @@
|
||||||
// for (const std::tuple<LazyLoadedImage *, QString> &tuple : parsed) {
|
// for (const std::tuple<LazyLoadedImage *, QString> &tuple : parsed) {
|
||||||
// LazyLoadedImage *image = std::get<0>(tuple);
|
// LazyLoadedImage *image = std::get<0>(tuple);
|
||||||
//
|
//
|
||||||
// if (image == NULL) { // is text
|
// if (image == nullptr) { // is text
|
||||||
// QString string = std::get<1>(tuple);
|
// QString string = std::get<1>(tuple);
|
||||||
//
|
//
|
||||||
// static QRegularExpression cheerRegex("cheer[1-9][0-9]*");
|
// static QRegularExpression cheerRegex("cheer[1-9][0-9]*");
|
||||||
|
|
|
@ -65,7 +65,7 @@ void MainWindow::layoutVisibleChatWidgets(Channel *channel)
|
||||||
{
|
{
|
||||||
auto *page = _notebook.getSelectedPage();
|
auto *page = _notebook.getSelectedPage();
|
||||||
|
|
||||||
if (page == NULL) {
|
if (page == nullptr) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -74,7 +74,7 @@ void MainWindow::layoutVisibleChatWidgets(Channel *channel)
|
||||||
for (auto it = widgets.begin(); it != widgets.end(); ++it) {
|
for (auto it = widgets.begin(); it != widgets.end(); ++it) {
|
||||||
ChatWidget *widget = *it;
|
ChatWidget *widget = *it;
|
||||||
|
|
||||||
if (channel == NULL || channel == widget->getChannel().get()) {
|
if (channel == nullptr || channel == widget->getChannel().get()) {
|
||||||
widget->layoutMessages();
|
widget->layoutMessages();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -84,7 +84,7 @@ void MainWindow::repaintVisibleChatWidgets(Channel *channel)
|
||||||
{
|
{
|
||||||
auto *page = _notebook.getSelectedPage();
|
auto *page = _notebook.getSelectedPage();
|
||||||
|
|
||||||
if (page == NULL) {
|
if (page == nullptr) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -93,7 +93,7 @@ void MainWindow::repaintVisibleChatWidgets(Channel *channel)
|
||||||
for (auto it = widgets.begin(); it != widgets.end(); ++it) {
|
for (auto it = widgets.begin(); it != widgets.end(); ++it) {
|
||||||
ChatWidget *widget = *it;
|
ChatWidget *widget = *it;
|
||||||
|
|
||||||
if (channel == NULL || channel == widget->getChannel().get()) {
|
if (channel == nullptr || channel == widget->getChannel().get()) {
|
||||||
widget->layoutMessages();
|
widget->layoutMessages();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -103,7 +103,7 @@ void MainWindow::repaintGifEmotes()
|
||||||
{
|
{
|
||||||
auto *page = _notebook.getSelectedPage();
|
auto *page = _notebook.getSelectedPage();
|
||||||
|
|
||||||
if (page == NULL) {
|
if (page == nullptr) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -67,7 +67,7 @@ void Notebook::removePage(NotebookPage *page)
|
||||||
int index = _pages.indexOf(page);
|
int index = _pages.indexOf(page);
|
||||||
|
|
||||||
if (_pages.size() == 1) {
|
if (_pages.size() == 1) {
|
||||||
select(NULL);
|
select(nullptr);
|
||||||
} else if (index == _pages.count() - 1) {
|
} else if (index == _pages.count() - 1) {
|
||||||
select(_pages[index - 1]);
|
select(_pages[index - 1]);
|
||||||
} else {
|
} else {
|
||||||
|
|
|
@ -98,7 +98,7 @@ void NotebookTab::moveAnimated(QPoint pos, bool animated)
|
||||||
{
|
{
|
||||||
_posAnimationDesired = pos;
|
_posAnimationDesired = pos;
|
||||||
|
|
||||||
if ((window() != NULL && !window()->isVisible()) || !animated || _posAnimated == false) {
|
if ((window() != nullptr && !window()->isVisible()) || !animated || _posAnimated == false) {
|
||||||
move(pos);
|
move(pos);
|
||||||
|
|
||||||
_posAnimated = true;
|
_posAnimated = true;
|
||||||
|
|
|
@ -41,7 +41,7 @@ ScrollBar::~ScrollBar()
|
||||||
{
|
{
|
||||||
auto highlight = _highlights;
|
auto highlight = _highlights;
|
||||||
|
|
||||||
while (highlight != NULL) {
|
while (highlight != nullptr) {
|
||||||
auto tmp = highlight->next;
|
auto tmp = highlight->next;
|
||||||
delete highlight;
|
delete highlight;
|
||||||
highlight = tmp;
|
highlight = tmp;
|
||||||
|
@ -52,12 +52,12 @@ void ScrollBar::removeHighlightsWhere(std::function<bool(ScrollBarHighlight &)>
|
||||||
{
|
{
|
||||||
_mutex.lock();
|
_mutex.lock();
|
||||||
|
|
||||||
ScrollBarHighlight *last = NULL;
|
ScrollBarHighlight *last = nullptr;
|
||||||
ScrollBarHighlight *current = _highlights;
|
ScrollBarHighlight *current = _highlights;
|
||||||
|
|
||||||
while (current != NULL) {
|
while (current != nullptr) {
|
||||||
if (func(*current)) {
|
if (func(*current)) {
|
||||||
if (last == NULL) {
|
if (last == nullptr) {
|
||||||
_highlights = current->next;
|
_highlights = current->next;
|
||||||
} else {
|
} else {
|
||||||
last->next = current->next;
|
last->next = current->next;
|
||||||
|
@ -79,7 +79,7 @@ void ScrollBar::addHighlight(ScrollBarHighlight *highlight)
|
||||||
{
|
{
|
||||||
_mutex.lock();
|
_mutex.lock();
|
||||||
|
|
||||||
if (_highlights == NULL) {
|
if (_highlights == nullptr) {
|
||||||
_highlights = highlight;
|
_highlights = highlight;
|
||||||
} else {
|
} else {
|
||||||
highlight->next = _highlights->next;
|
highlight->next = _highlights->next;
|
||||||
|
@ -224,7 +224,7 @@ void ScrollBar::paintEvent(QPaintEvent *)
|
||||||
|
|
||||||
// do {
|
// do {
|
||||||
// painter.fillRect();
|
// painter.fillRect();
|
||||||
// } while ((highlight = highlight->next()) != NULL);
|
// } while ((highlight = highlight->next()) != nullptr);
|
||||||
|
|
||||||
_mutex.unlock();
|
_mutex.unlock();
|
||||||
}
|
}
|
||||||
|
|
|
@ -289,7 +289,7 @@ void SettingsDialog::select(SettingsDialogTab *tab)
|
||||||
{
|
{
|
||||||
_pageStack.setCurrentWidget(tab->getWidget());
|
_pageStack.setCurrentWidget(tab->getWidget());
|
||||||
|
|
||||||
if (_selectedTab != NULL) {
|
if (_selectedTab != nullptr) {
|
||||||
_selectedTab->setSelected(false);
|
_selectedTab->setSelected(false);
|
||||||
_selectedTab->setStyleSheet("color: #FFF");
|
_selectedTab->setStyleSheet("color: #FFF");
|
||||||
}
|
}
|
||||||
|
|
|
@ -42,7 +42,7 @@ private:
|
||||||
|
|
||||||
void addTabs();
|
void addTabs();
|
||||||
|
|
||||||
SettingsDialogTab *_selectedTab = NULL;
|
SettingsDialogTab *_selectedTab = nullptr;
|
||||||
|
|
||||||
/// Widget creation helpers
|
/// Widget creation helpers
|
||||||
QCheckBox *createCheckbox(const QString &title, Setting<bool> &setting);
|
QCheckBox *createCheckbox(const QString &title, Setting<bool> &setting);
|
||||||
|
|
|
@ -15,7 +15,7 @@ class TextInputDialog : public QDialog
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
|
|
||||||
public:
|
public:
|
||||||
TextInputDialog(QWidget *parent = NULL);
|
TextInputDialog(QWidget *parent = nullptr);
|
||||||
|
|
||||||
QString getText() const
|
QString getText() const
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in a new issue