feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Help: Use nullptr and fix a few warnings

Browse Source 
Change-Id: I7f7307a765d8755bf96b0cad1210e61df0a0199f
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Eike Ziller
2018-04-19 10:47:13 +02:00
parent 0e81d01b2a
commit da18fc1f50
29 changed files with 70 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/help/localhelpmanager.cpp
View File

@@ -42,18 +42,18 @@
using namespace Help::Internal;
static LocalHelpManager *m_instance = 0;
static LocalHelpManager *m_instance = nullptr;
bool LocalHelpManager::m_guiNeedsSetup = true;
bool LocalHelpManager::m_needsCollectionFile = true;
QMutex LocalHelpManager::m_guiMutex;
QHelpEngine* LocalHelpManager::m_guiEngine = 0;
QHelpEngine* LocalHelpManager::m_guiEngine = nullptr;
QMutex LocalHelpManager::m_bkmarkMutex;
BookmarkManager* LocalHelpManager::m_bookmarkManager = 0;
BookmarkManager* LocalHelpManager::m_bookmarkManager = nullptr;
QStandardItemModel *LocalHelpManager::m_filterModel = 0;
QStandardItemModel *LocalHelpManager::m_filterModel = nullptr;
QString LocalHelpManager::m_currentFilter = QString();
int LocalHelpManager::m_currentFilterIndex = -1;
@@ -115,11 +115,11 @@ LocalHelpManager::~LocalHelpManager()
if (m_bookmarkManager) {
m_bookmarkManager->saveBookmarks();
delete m_bookmarkManager;
m_bookmarkManager = 0;
m_bookmarkManager = nullptr;
}
delete m_guiEngine;
m_guiEngine = 0;
m_guiEngine = nullptr;
}
LocalHelpManager *LocalHelpManager::instance()