use direct member initialization

Change-Id: I74cae303ba3b7df771b16dd203e8b5fbc9adb398
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Tim Jenssen
2017-01-24 14:25:11 +01:00
parent 7e37ddd416
commit 1b62ce2a98
3 changed files with 120 additions and 194 deletions

View File

@@ -111,34 +111,17 @@ MainWindow::MainWindow() :
m_settingsDatabase(new SettingsDatabase(QFileInfo(PluginManager::settings()->fileName()).path(),
QLatin1String("QtCreator"),
this)),
m_printer(0),
m_windowSupport(0),
m_editorManager(0),
m_externalToolManager(0),
m_progressManager(new ProgressManagerPrivate),
m_jsExpander(new JsExpander),
m_vcsManager(new VcsManager),
m_statusBarManager(0),
m_modeManager(0),
m_helpManager(new HelpManager),
m_modeStack(new FancyTabWidget(this)),
m_navigationWidget(0),
m_rightPaneWidget(0),
m_versionDialog(0),
m_generalSettings(new GeneralSettings),
m_systemSettings(new SystemSettings),
m_shortcutSettings(new ShortcutSettings),
m_toolSettings(new ToolSettings),
m_mimeTypeSettings(new MimeTypeSettings),
m_systemEditor(new SystemEditor),
m_focusToEditor(0),
m_newAction(0),
m_openAction(0),
m_openWithAction(0),
m_saveAllAction(0),
m_exitAction(0),
m_optionsAction(0),
m_toggleSideBarAction(0),
m_toggleSideBarButton(new QToolButton)
{
(void) new DocumentManager(this);
@@ -260,7 +243,7 @@ MainWindow::~MainWindow()
// explicitly delete window support, because that calls methods from ICore that call methods
// from mainwindow, so mainwindow still needs to be alive
delete m_windowSupport;
m_windowSupport = 0;
m_windowSupport = nullptr;
PluginManager::removeObject(m_shortcutSettings);
PluginManager::removeObject(m_generalSettings);
@@ -269,25 +252,25 @@ MainWindow::~MainWindow()
PluginManager::removeObject(m_mimeTypeSettings);
PluginManager::removeObject(m_systemEditor);
delete m_externalToolManager;
m_externalToolManager = 0;
m_externalToolManager = nullptr;
delete m_messageManager;
m_messageManager = 0;
m_messageManager = nullptr;
delete m_shortcutSettings;
m_shortcutSettings = 0;
m_shortcutSettings = nullptr;
delete m_generalSettings;
m_generalSettings = 0;
m_generalSettings = nullptr;
delete m_systemSettings;
m_systemSettings = 0;
m_systemSettings = nullptr;
delete m_toolSettings;
m_toolSettings = 0;
m_toolSettings = nullptr;
delete m_mimeTypeSettings;
m_mimeTypeSettings = 0;
m_mimeTypeSettings = nullptr;
delete m_systemEditor;
m_systemEditor = 0;
m_systemEditor = nullptr;
delete m_printer;
m_printer = 0;
m_printer = nullptr;
delete m_vcsManager;
m_vcsManager = 0;
m_vcsManager = nullptr;
//we need to delete editormanager and statusbarmanager explicitly before the end of the destructor,
//because they might trigger stuff that tries to access data from editorwindow, like removeContextWidget
@@ -299,28 +282,28 @@ MainWindow::~MainWindow()
delete m_outputView;
delete m_navigationWidget;
m_navigationWidget = 0;
m_navigationWidget = nullptr;
delete m_editorManager;
m_editorManager = 0;
m_editorManager = nullptr;
delete m_progressManager;
m_progressManager = 0;
m_progressManager = nullptr;
delete m_statusBarManager;
m_statusBarManager = 0;
m_statusBarManager = nullptr;
PluginManager::removeObject(m_coreImpl);
delete m_coreImpl;
m_coreImpl = 0;
m_coreImpl = nullptr;
delete m_rightPaneWidget;
m_rightPaneWidget = 0;
m_rightPaneWidget = nullptr;
delete m_modeManager;
m_modeManager = 0;
m_modeManager = nullptr;
delete m_helpManager;
m_helpManager = 0;
m_helpManager = nullptr;
delete m_jsExpander;
m_jsExpander = 0;
m_jsExpander = nullptr;
}
bool MainWindow::init(QString *errorMessage)
@@ -801,7 +784,7 @@ IDocument *MainWindow::openFiles(const QStringList &fileNames,
const QString &workingDirectory)
{
QList<IDocumentFactory*> documentFactories = PluginManager::getObjects<IDocumentFactory>();
IDocument *res = 0;
IDocument *res = nullptr;
foreach (const QString &fileName, fileNames) {
const QDir workingDir(workingDirectory.isEmpty() ? QDir::currentPath() : workingDirectory);
@@ -917,7 +900,7 @@ void MainWindow::updateFocusWidget(QWidget *old, QWidget *now)
QList<IContext *> newContext;
if (QWidget *p = qApp->focusWidget()) {
IContext *context = 0;
IContext *context = nullptr;
while (p) {
context = m_contextWidgets.value(p);
if (context)
@@ -1141,7 +1124,7 @@ bool MainWindow::showWarningWithOptions(const QString &title,
QMessageBox::Ok, parent);
if (!details.isEmpty())
msgBox.setDetailedText(details);
QAbstractButton *settingsButton = 0;
QAbstractButton *settingsButton = nullptr;
if (settingsId.isValid())
settingsButton = msgBox.addButton(tr("Settings..."), QMessageBox::AcceptRole);
msgBox.exec();