diff options
| author |  Alexey Sokolov | 2016-04-30 18:23:42 +0100 |
|---|---|---|
| committer | Alexey Sokolov | 2016-04-30 18:50:44 +0100 |
| commit | 505d0768f8392e3c4775425dd97f41e1c829ef44 (patch) | |
| tree | 55dfa35f2e180b4186baf00ffbfd2ee38c0f1c18 /src/kvilib/ext/KviAnimatedPixmapCache.cpp | |
| parent | Update my clang-format to 3.8.0 (diff) | |
| download | KVIrc-505d0768f8392e3c4775425dd97f41e1c829ef44.tar.gz KVIrc-505d0768f8392e3c4775425dd97f41e1c829ef44.tar.bz2 KVIrc-505d0768f8392e3c4775425dd97f41e1c829ef44.zip | |
Apply clang-tidy: modernize-use-nullptr
Diffstat (limited to 'src/kvilib/ext/KviAnimatedPixmapCache.cpp')
| -rw-r--r-- | src/kvilib/ext/KviAnimatedPixmapCache.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/kvilib/ext/KviAnimatedPixmapCache.cpp b/src/kvilib/ext/KviAnimatedPixmapCache.cpp index ab972f4ff..f283bb225 100644 --- a/src/kvilib/ext/KviAnimatedPixmapCache.cpp +++ b/src/kvilib/ext/KviAnimatedPixmapCache.cpp @@ -30,8 +30,8 @@ #define FRAME_DELAY 100 -KviAnimatedPixmapCache * KviAnimatedPixmapCache::m_pInstance = NULL; -static QPixmap * g_pDummyPixmap = NULL; +KviAnimatedPixmapCache * KviAnimatedPixmapCache::m_pInstance = nullptr; +static QPixmap * g_pDummyPixmap = nullptr; KviAnimatedPixmapCache::KviAnimatedPixmapCache() { @@ -45,9 +45,9 @@ KviAnimatedPixmapCache::~KviAnimatedPixmapCache() if(g_pDummyPixmap) { delete g_pDummyPixmap; - g_pDummyPixmap = NULL; + g_pDummyPixmap = nullptr; } - m_pInstance = NULL; + m_pInstance = nullptr; } void KviAnimatedPixmapCache::init() @@ -62,13 +62,13 @@ void KviAnimatedPixmapCache::done() if(!m_pInstance) return; delete m_pInstance; - m_pInstance = NULL; + m_pInstance = nullptr; } KviAnimatedPixmapCache::Data * KviAnimatedPixmapCache::internalLoad(const QString & szFile, int iWidth, int iHeight) { m_cacheMutex.lock(); - Data * newData = 0; + Data * newData = nullptr; QMultiHash<QString, Data *>::iterator i = m_hCache.find(szFile); while(i != m_hCache.end() && i.key() == szFile && !newData) @@ -114,7 +114,7 @@ KviAnimatedPixmapCache::Data * KviAnimatedPixmapCache::internalResize(Data * dat bool hasToBeResized = false; - Data * newData = 0; + Data * newData = nullptr; QMultiHash<QString, Data *>::iterator i = m_hCache.find(data->file); while(i != m_hCache.end() && i.key() == data->file && !newData) { |