diff --git a/src/plugins/coreplugin/mainwindow.cpp b/src/plugins/coreplugin/mainwindow.cpp index 6d3c24df7b0..ec9a4cf12c3 100644 --- a/src/plugins/coreplugin/mainwindow.cpp +++ b/src/plugins/coreplugin/mainwindow.cpp @@ -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 documentFactories = PluginManager::getObjects(); - 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 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(); diff --git a/src/plugins/coreplugin/mainwindow.h b/src/plugins/coreplugin/mainwindow.h index 65936fbd727..190d2d3fbd7 100644 --- a/src/plugins/coreplugin/mainwindow.h +++ b/src/plugins/coreplugin/mainwindow.h @@ -149,52 +149,52 @@ private: void readSettings(); void saveWindowSettings(); - ICore *m_coreImpl; + ICore *m_coreImpl = nullptr; QStringList m_aboutInformation; Context m_highPrioAdditionalContexts; Context m_lowPrioAdditionalContexts; - SettingsDatabase *m_settingsDatabase; - mutable QPrinter *m_printer; - WindowSupport *m_windowSupport; - EditorManager *m_editorManager; - ExternalToolManager *m_externalToolManager; - MessageManager *m_messageManager; - ProgressManagerPrivate *m_progressManager; - JsExpander *m_jsExpander; - VcsManager *m_vcsManager; - StatusBarManager *m_statusBarManager; - ModeManager *m_modeManager; - HelpManager *m_helpManager; - FancyTabWidget *m_modeStack; - NavigationWidget *m_navigationWidget; - RightPaneWidget *m_rightPaneWidget; - StatusBarWidget *m_outputView; - VersionDialog *m_versionDialog; + SettingsDatabase *m_settingsDatabase = nullptr; + mutable QPrinter *m_printer = nullptr; + WindowSupport *m_windowSupport = nullptr; + EditorManager *m_editorManager = nullptr; + ExternalToolManager *m_externalToolManager = nullptr; + MessageManager *m_messageManager = nullptr; + ProgressManagerPrivate *m_progressManager = nullptr; + JsExpander *m_jsExpander = nullptr; + VcsManager *m_vcsManager = nullptr; + StatusBarManager *m_statusBarManager = nullptr; + ModeManager *m_modeManager = nullptr; + HelpManager *m_helpManager = nullptr; + FancyTabWidget *m_modeStack = nullptr; + NavigationWidget *m_navigationWidget = nullptr; + RightPaneWidget *m_rightPaneWidget = nullptr; + StatusBarWidget *m_outputView = nullptr; + VersionDialog *m_versionDialog = nullptr; QList m_activeContext; QMap m_contextWidgets; - GeneralSettings *m_generalSettings; - SystemSettings *m_systemSettings; - ShortcutSettings *m_shortcutSettings; - ToolSettings *m_toolSettings; - MimeTypeSettings *m_mimeTypeSettings; - SystemEditor *m_systemEditor; + GeneralSettings *m_generalSettings = nullptr; + SystemSettings *m_systemSettings = nullptr; + ShortcutSettings *m_shortcutSettings = nullptr; + ToolSettings *m_toolSettings = nullptr; + MimeTypeSettings *m_mimeTypeSettings = nullptr; + SystemEditor *m_systemEditor = nullptr; // actions - QAction *m_focusToEditor; - QAction *m_newAction; - QAction *m_openAction; - QAction *m_openWithAction; - QAction *m_saveAllAction; - QAction *m_exitAction; - QAction *m_optionsAction; - QAction *m_toggleSideBarAction; - QAction *m_toggleModeSelectorAction; - QAction *m_themeAction; + QAction *m_focusToEditor = nullptr; + QAction *m_newAction = nullptr; + QAction *m_openAction = nullptr; + QAction *m_openWithAction = nullptr; + QAction *m_saveAllAction = nullptr; + QAction *m_exitAction = nullptr; + QAction *m_optionsAction = nullptr; + QAction *m_toggleSideBarAction = nullptr; + QAction *m_toggleModeSelectorAction = nullptr; + QAction *m_themeAction = nullptr; - QToolButton *m_toggleSideBarButton; + QToolButton *m_toggleSideBarButton = nullptr; QColor m_overrideColor; QList> m_preCloseListeners; }; diff --git a/src/plugins/texteditor/texteditoractionhandler.cpp b/src/plugins/texteditor/texteditoractionhandler.cpp index bbd14f9efdd..8ecf74daec3 100644 --- a/src/plugins/texteditor/texteditoractionhandler.cpp +++ b/src/plugins/texteditor/texteditoractionhandler.cpp @@ -120,133 +120,76 @@ public: void updateCurrentEditor(Core::IEditor *editor); public: - TextEditorActionHandler *q; - QAction *m_undoAction; - QAction *m_redoAction; - QAction *m_copyAction; - QAction *m_cutAction; - QAction *m_pasteAction; - QAction *m_circularPasteAction; - QAction *m_switchUtf8bomAction; - QAction *m_selectAllAction; - QAction *m_gotoAction; - QAction *m_printAction; - QAction *m_formatAction; - QAction *m_rewrapParagraphAction; - QAction *m_visualizeWhitespaceAction; - QAction *m_cleanWhitespaceAction; - QAction *m_textWrappingAction; - QAction *m_unCommentSelectionAction; - QAction *m_unfoldAllAction; - QAction *m_foldAction; - QAction *m_unfoldAction; - QAction *m_cutLineAction; - QAction *m_copyLineAction; - QAction *m_duplicateSelectionAction; - QAction *m_duplicateSelectionAndCommentAction; - QAction *m_deleteLineAction; - QAction *m_deleteEndOfWordAction; - QAction *m_deleteEndOfWordCamelCaseAction; - QAction *m_deleteStartOfWordAction; - QAction *m_deleteStartOfWordCamelCaseAction; - QAction *m_selectEncodingAction; - QAction *m_increaseFontSizeAction; - QAction *m_decreaseFontSizeAction; - QAction *m_resetFontSizeAction; - QAction *m_gotoBlockStartAction; - QAction *m_gotoBlockEndAction; - QAction *m_gotoBlockStartWithSelectionAction; - QAction *m_gotoBlockEndWithSelectionAction; - QAction *m_selectBlockUpAction; - QAction *m_selectBlockDownAction; - QAction *m_viewPageUpAction; - QAction *m_viewPageDownAction; - QAction *m_viewLineUpAction; - QAction *m_viewLineDownAction; - QAction *m_moveLineUpAction; - QAction *m_moveLineDownAction; - QAction *m_copyLineUpAction; - QAction *m_copyLineDownAction; - QAction *m_joinLinesAction; - QAction *m_insertLineAboveAction; - QAction *m_insertLineBelowAction; - QAction *m_upperCaseSelectionAction; - QAction *m_lowerCaseSelectionAction; - QAction *m_indentAction; - QAction *m_unindentAction; - QAction *m_followSymbolAction; - QAction *m_followSymbolInNextSplitAction; - QAction *m_jumpToFileAction; - QAction *m_jumpToFileInNextSplitAction; + TextEditorActionHandler *q = nullptr; + QAction *m_undoAction = nullptr; + QAction *m_redoAction = nullptr; + QAction *m_copyAction = nullptr; + QAction *m_cutAction = nullptr; + QAction *m_pasteAction = nullptr; + QAction *m_circularPasteAction = nullptr; + QAction *m_switchUtf8bomAction = nullptr; + QAction *m_selectAllAction = nullptr; + QAction *m_gotoAction = nullptr; + QAction *m_printAction = nullptr; + QAction *m_formatAction = nullptr; + QAction *m_rewrapParagraphAction = nullptr; + QAction *m_visualizeWhitespaceAction = nullptr; + QAction *m_cleanWhitespaceAction = nullptr; + QAction *m_textWrappingAction = nullptr; + QAction *m_unCommentSelectionAction = nullptr; + QAction *m_unfoldAllAction = nullptr; + QAction *m_foldAction = nullptr; + QAction *m_unfoldAction = nullptr; + QAction *m_cutLineAction = nullptr; + QAction *m_copyLineAction = nullptr; + QAction *m_duplicateSelectionAction = nullptr; + QAction *m_duplicateSelectionAndCommentAction = nullptr; + QAction *m_deleteLineAction = nullptr; + QAction *m_deleteEndOfWordAction = nullptr; + QAction *m_deleteEndOfWordCamelCaseAction = nullptr; + QAction *m_deleteStartOfWordAction = nullptr; + QAction *m_deleteStartOfWordCamelCaseAction = nullptr; + QAction *m_selectEncodingAction = nullptr; + QAction *m_increaseFontSizeAction = nullptr; + QAction *m_decreaseFontSizeAction = nullptr; + QAction *m_resetFontSizeAction = nullptr; + QAction *m_gotoBlockStartAction = nullptr; + QAction *m_gotoBlockEndAction = nullptr; + QAction *m_gotoBlockStartWithSelectionAction = nullptr; + QAction *m_gotoBlockEndWithSelectionAction = nullptr; + QAction *m_selectBlockUpAction = nullptr; + QAction *m_selectBlockDownAction = nullptr; + QAction *m_viewPageUpAction = nullptr; + QAction *m_viewPageDownAction = nullptr; + QAction *m_viewLineUpAction = nullptr; + QAction *m_viewLineDownAction = nullptr; + QAction *m_moveLineUpAction = nullptr; + QAction *m_moveLineDownAction = nullptr; + QAction *m_copyLineUpAction = nullptr; + QAction *m_copyLineDownAction = nullptr; + QAction *m_joinLinesAction = nullptr; + QAction *m_insertLineAboveAction = nullptr; + QAction *m_insertLineBelowAction = nullptr; + QAction *m_upperCaseSelectionAction = nullptr; + QAction *m_lowerCaseSelectionAction = nullptr; + QAction *m_indentAction = nullptr; + QAction *m_unindentAction = nullptr; + QAction *m_followSymbolAction = nullptr; + QAction *m_followSymbolInNextSplitAction = nullptr; + QAction *m_jumpToFileAction = nullptr; + QAction *m_jumpToFileInNextSplitAction = nullptr; QList m_modifyingActions; - uint m_optionalActions; + uint m_optionalActions = TextEditorActionHandler::None; QPointer m_currentEditorWidget; Core::Id m_contextId; }; TextEditorActionHandlerPrivate::TextEditorActionHandlerPrivate (TextEditorActionHandler *parent, Core::Id contextId, uint optionalActions) - : q(parent), - m_undoAction(0), - m_redoAction(0), - m_copyAction(0), - m_cutAction(0), - m_pasteAction(0), - m_circularPasteAction(0), - m_switchUtf8bomAction(0), - m_selectAllAction(0), - m_gotoAction(0), - m_printAction(0), - m_formatAction(0), - m_visualizeWhitespaceAction(0), - m_cleanWhitespaceAction(0), - m_textWrappingAction(0), - m_unCommentSelectionAction(0), - m_unfoldAllAction(0), - m_foldAction(0), - m_unfoldAction(0), - m_cutLineAction(0), - m_copyLineAction(0), - m_duplicateSelectionAction(0), - m_duplicateSelectionAndCommentAction(0), - m_deleteLineAction(0), - m_deleteEndOfWordAction(0), - m_deleteEndOfWordCamelCaseAction(0), - m_deleteStartOfWordAction(0), - m_deleteStartOfWordCamelCaseAction(0), - m_selectEncodingAction(0), - m_increaseFontSizeAction(0), - m_decreaseFontSizeAction(0), - m_resetFontSizeAction(0), - m_gotoBlockStartAction(0), - m_gotoBlockEndAction(0), - m_gotoBlockStartWithSelectionAction(0), - m_gotoBlockEndWithSelectionAction(0), - m_selectBlockUpAction(0), - m_selectBlockDownAction(0), - m_viewPageUpAction(0), - m_viewPageDownAction(0), - m_viewLineUpAction(0), - m_viewLineDownAction(0), - m_moveLineUpAction(0), - m_moveLineDownAction(0), - m_copyLineUpAction(0), - m_copyLineDownAction(0), - m_joinLinesAction(0), - m_insertLineAboveAction(0), - m_insertLineBelowAction(0), - m_upperCaseSelectionAction(0), - m_lowerCaseSelectionAction(0), - m_indentAction(0), - m_unindentAction(0), - m_followSymbolAction(0), - m_followSymbolInNextSplitAction(0), - m_jumpToFileAction(0), - m_jumpToFileInNextSplitAction(0), - m_optionalActions(optionalActions), - m_currentEditorWidget(0), - m_contextId(contextId) + : q(parent) + , m_optionalActions(optionalActions) + , m_contextId(contextId) { createActions(); connect(Core::EditorManager::instance(), &Core::EditorManager::currentEditorChanged,