replace all instances of NULL with nullptr

This commit is contained in:
Rasmus Karlsson
2017-06-11 09:37:30 +02:00
parent 1c6ff37e76
commit 9cd70877a5
15 changed files with 47 additions and 47 deletions
+1 -1
View File
@@ -20,7 +20,7 @@ namespace messages {
LazyLoadedImage::LazyLoadedImage(const QString &url, qreal scale, const QString &name,
const QString &tooltip, const QMargins &margin, bool isHat)
: _currentPixmap(NULL)
: _currentPixmap(nullptr)
, _currentFrame(0)
, _currentFrameOffset(0)
, _url(url)
+2 -2
View File
@@ -63,7 +63,7 @@ public:
int getWidth() const
{
if (_currentPixmap == NULL) {
if (_currentPixmap == nullptr) {
return 16;
}
return _currentPixmap->width();
@@ -71,7 +71,7 @@ public:
int getHeight() const
{
if (_currentPixmap == NULL) {
if (_currentPixmap == nullptr) {
return 16;
}
return _currentPixmap->height();
+1 -1
View File
@@ -22,7 +22,7 @@ Word::Word(LazyLoadedImage *image, Type type, const QString &copytext, const QSt
// Text word
Word::Word(const QString &text, Type type, const QColor &color, const QString &copytext,
const QString &tooltip, const Link &link)
: _image(NULL)
: _image(nullptr)
, _text(text)
, _color(color)
, _isImage(false)