From 8b4cbcaf7a91ca5d33edafd4537405aabf7371af Mon Sep 17 00:00:00 2001 From: Kurt Hindenburg Date: Sun, 1 Apr 2018 11:30:45 -0400 Subject: [PATCH] Use constuctor initialization list for all members --- src/HistorySizeDialog.cpp | 3 ++- src/HistorySizeWidget.cpp | 3 ++- src/IncrementalSearchBar.cpp | 3 ++- src/KeyBindingEditor.cpp | 1 + src/MainWindow.cpp | 3 +++ src/RenameTabDialog.cpp | 3 ++- src/RenameTabWidget.cpp | 3 ++- src/Screen.cpp | 5 +++++ src/ScreenWindow.cpp | 1 + src/Session.cpp | 17 +++++++++++++++++ src/SessionController.cpp | 6 ++++++ src/SessionListModel.cpp | 3 ++- src/SessionManager.cpp | 6 +++++- src/TerminalCharacterDecoder.cpp | 3 +++ src/TerminalDisplay.cpp | 17 +++++++++++++++++ src/ViewContainer.cpp | 17 +++++++++++++++-- src/ViewContainerTabBar.cpp | 5 ++++- src/ViewManager.cpp | 2 ++ src/ViewProperties.cpp | 2 ++ src/ViewSplitter.cpp | 1 + src/Vt102Emulation.cpp | 3 +++ src/ZModemDialog.cpp | 4 +++- 22 files changed, 100 insertions(+), 11 deletions(-) diff --git a/src/HistorySizeDialog.cpp b/src/HistorySizeDialog.cpp index 54a7d1f2e..17ab1fcb0 100644 --- a/src/HistorySizeDialog.cpp +++ b/src/HistorySizeDialog.cpp @@ -33,7 +33,8 @@ using namespace Konsole; HistorySizeDialog::HistorySizeDialog(QWidget *parent) : - QDialog(parent) + QDialog(parent), + _ui(nullptr) { setWindowTitle(i18nc("@title:window", "Adjust Scrollback")); auto buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok|QDialogButtonBox::Cancel); diff --git a/src/HistorySizeWidget.cpp b/src/HistorySizeWidget.cpp index 96198ec43..abcd69e85 100644 --- a/src/HistorySizeWidget.cpp +++ b/src/HistorySizeWidget.cpp @@ -33,7 +33,8 @@ using namespace Konsole; HistorySizeWidget::HistorySizeWidget(QWidget *parent) : - QWidget(parent) + QWidget(parent), + _ui(nullptr) { _ui = new Ui::HistorySizeWidget(); _ui->setupUi(this); diff --git a/src/IncrementalSearchBar.cpp b/src/IncrementalSearchBar.cpp index 60dae8629..7fd1d21d1 100644 --- a/src/IncrementalSearchBar.cpp +++ b/src/IncrementalSearchBar.cpp @@ -45,7 +45,8 @@ IncrementalSearchBar::IncrementalSearchBar(QWidget *aParent) : _reverseSearch(nullptr), _findNextButton(nullptr), _findPreviousButton(nullptr), - _searchFromButton(nullptr) + _searchFromButton(nullptr), + _searchTimer(nullptr) { auto barLayout = new QHBoxLayout(this); diff --git a/src/KeyBindingEditor.cpp b/src/KeyBindingEditor.cpp index 413ab18c0..f5b882279 100644 --- a/src/KeyBindingEditor.cpp +++ b/src/KeyBindingEditor.cpp @@ -35,6 +35,7 @@ using namespace Konsole; KeyBindingEditor::KeyBindingEditor(QWidget *parent) : QWidget(parent), + _ui(nullptr), _translator(new KeyboardTranslator(QString())) { _ui = new Ui::KeyBindingEditor(); diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp index e78858dae..76d3b7da4 100644 --- a/src/MainWindow.cpp +++ b/src/MainWindow.cpp @@ -63,7 +63,10 @@ using namespace Konsole; MainWindow::MainWindow() : KXmlGuiWindow(), + _viewManager(nullptr), _bookmarkHandler(nullptr), + _toggleMenuBarAction(nullptr), + _newTabMenuAction(nullptr), _pluggedController(nullptr), _menuBarInitialVisibility(true), _menuBarInitialVisibilityApplied(false) diff --git a/src/RenameTabDialog.cpp b/src/RenameTabDialog.cpp index be6770d2d..728ba86d2 100644 --- a/src/RenameTabDialog.cpp +++ b/src/RenameTabDialog.cpp @@ -32,7 +32,8 @@ using Konsole::RenameTabDialog; RenameTabDialog::RenameTabDialog(QWidget *parent) : - QDialog(parent) + QDialog(parent), + _ui(nullptr) { setWindowTitle(i18n("Rename Tab")); auto buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok|QDialogButtonBox::Cancel); diff --git a/src/RenameTabWidget.cpp b/src/RenameTabWidget.cpp index 70a1d965e..190fb0b7a 100644 --- a/src/RenameTabWidget.cpp +++ b/src/RenameTabWidget.cpp @@ -26,7 +26,8 @@ using Konsole::RenameTabWidget; RenameTabWidget::RenameTabWidget(QWidget *parent) : - QWidget(parent) + QWidget(parent), + _ui(nullptr) { _ui = new Ui::RenameTabWidget(); _ui->setupUi(this); diff --git a/src/Screen.cpp b/src/Screen.cpp index e44dc1041..30547e3bf 100644 --- a/src/Screen.cpp +++ b/src/Screen.cpp @@ -60,13 +60,18 @@ Screen::Screen(int lines, int columns): _screenLines(new ImageLine[_lines + 1]), _screenLinesSize(_lines), _scrolledLines(0), + _lastScrolledRegion(QRect()), _droppedLines(0), + _lineProperties(QVarLengthArray()), _history(new HistoryScrollNone()), _cuX(0), _cuY(0), + _currentForeground(CharacterColor()), + _currentBackground(CharacterColor()), _currentRendition(DEFAULT_RENDITION), _topMargin(0), _bottomMargin(0), + _tabStops(QBitArray()), _selBegin(0), _selTopLeft(0), _selBottomRight(0), diff --git a/src/ScreenWindow.cpp b/src/ScreenWindow.cpp index 7e27ba702..fbff2d8d4 100644 --- a/src/ScreenWindow.cpp +++ b/src/ScreenWindow.cpp @@ -27,6 +27,7 @@ using namespace Konsole; ScreenWindow::ScreenWindow(Screen *screen, QObject *parent) : QObject(parent), + _screen(nullptr), _windowBuffer(nullptr), _windowBufferSize(0), _bufferNeedsUpdate(true), diff --git a/src/Session.cpp b/src/Session.cpp index d4f56a3a4..5e5e3d2b1 100644 --- a/src/Session.cpp +++ b/src/Session.cpp @@ -66,18 +66,35 @@ static const int ZMODEM_BUFFER_SIZE = 1048576; // 1 Mb Session::Session(QObject* parent) : QObject(parent) + , _uniqueIdentifier(QUuid()) , _shellProcess(nullptr) , _emulation(nullptr) + , _views(QList()) , _monitorActivity(false) , _monitorSilence(false) , _notifiedActivity(false) , _silenceSeconds(10) + , _silenceTimer(nullptr) + , _activityTimer(nullptr) , _autoClose(true) , _closePerUserRequest(false) + , _nameTitle(QString()) + , _displayTitle(QString()) + , _userTitle(QString()) + , _localTabTitleFormat(QString()) + , _remoteTabTitleFormat(QString()) , _tabTitleSetByUser(false) + , _iconName(QString()) + , _iconText(QString()) , _addToUtmp(true) , _flowControlEnabled(true) + , _program(QString()) + , _arguments(QStringList()) + , _environment(QStringList()) , _sessionId(0) + , _initialWorkingDir(QString()) + , _currentWorkingDir(QString()) + , _reportedWorkingUrl(QUrl()) , _sessionProcessInfo(nullptr) , _foregroundProcessInfo(nullptr) , _foregroundPid(0) diff --git a/src/SessionController.cpp b/src/SessionController.cpp index 2b0e5b100..90056b617 100644 --- a/src/SessionController.cpp +++ b/src/SessionController.cpp @@ -99,6 +99,8 @@ SessionController::SessionController(Session* session , TerminalDisplay* view, Q , _view(view) , _copyToGroup(nullptr) , _profileList(nullptr) + , _sessionIcon(QIcon()) + , _sessionIconName(QString()) , _previousState(-1) , _searchFilter(nullptr) , _urlFilter(nullptr) @@ -107,6 +109,7 @@ SessionController::SessionController(Session* session , TerminalDisplay* view, Q , _findAction(nullptr) , _findNextAction(nullptr) , _findPreviousAction(nullptr) + , _interactionTimer(nullptr) , _searchStartLine(0) , _prevSearchResultLine(0) , _searchBar(nullptr) @@ -116,8 +119,11 @@ SessionController::SessionController(Session* session , TerminalDisplay* view, Q , _listenForScreenWindowUpdates(false) , _preventClose(false) , _keepIconUntilInteraction(false) + , _selectedText(QString()) , _showMenuAction(nullptr) + , _bookmarkValidProgramsToClear(QStringList()) , _isSearchBarEnabled(false) + , _editProfileDialog(nullptr) { Q_ASSERT(session); Q_ASSERT(view); diff --git a/src/SessionListModel.cpp b/src/SessionListModel.cpp index f995e3073..e361f7116 100644 --- a/src/SessionListModel.cpp +++ b/src/SessionListModel.cpp @@ -34,7 +34,8 @@ using Konsole::Session; using Konsole::SessionListModel; SessionListModel::SessionListModel(QObject *parent) : - QAbstractListModel(parent) + QAbstractListModel(parent), + _sessions(QList()) { } diff --git a/src/SessionManager.cpp b/src/SessionManager.cpp index f53af8783..611f5e752 100644 --- a/src/SessionManager.cpp +++ b/src/SessionManager.cpp @@ -41,7 +41,11 @@ using namespace Konsole; -SessionManager::SessionManager() +SessionManager::SessionManager() : + _sessions(QList()), + _sessionProfiles(QHash()), + _sessionRuntimeProfiles(QHash()), + _restoreMapping(QHash()) { ProfileManager *profileMananger = ProfileManager::instance(); connect(profileMananger, &Konsole::ProfileManager::profileChanged, this, diff --git a/src/TerminalCharacterDecoder.cpp b/src/TerminalCharacterDecoder.cpp index 1a9868e8d..57e3aa2be 100644 --- a/src/TerminalCharacterDecoder.cpp +++ b/src/TerminalCharacterDecoder.cpp @@ -36,6 +36,7 @@ PlainTextDecoder::PlainTextDecoder() , _includeLeadingWhitespace(true) , _includeTrailingWhitespace(true) , _recordLinePositions(false) + , _linePositions(QList()) { } void PlainTextDecoder::setLeadingWhitespace(bool enable) @@ -167,6 +168,8 @@ HTMLDecoder::HTMLDecoder() : , _colorTable(ColorScheme::defaultTable) , _innerSpanOpen(false) , _lastRendition(DEFAULT_RENDITION) + , _lastForeColor(CharacterColor()) + , _lastBackColor(CharacterColor()) { } diff --git a/src/TerminalDisplay.cpp b/src/TerminalDisplay.cpp index b5b5990ba..39d03dd8f 100644 --- a/src/TerminalDisplay.cpp +++ b/src/TerminalDisplay.cpp @@ -354,6 +354,7 @@ TerminalDisplay::TerminalDisplay(QWidget* parent) , _screenWindow(nullptr) , _bellMasked(false) , _verticalLayout(new QVBoxLayout(this)) + , _fixedFont(true) , _fontHeight(1) , _fontWidth(1) , _fontAscent(1) @@ -362,12 +363,20 @@ TerminalDisplay::TerminalDisplay(QWidget* parent) , _columns(1) , _usedLines(1) , _usedColumns(1) + , _contentRect(QRect()) , _image(nullptr) + , _imageSize(0) + , _lineProperties(QVector()) , _randomSeed(0) , _resizing(false) , _showTerminalSizeHint(true) , _bidiEnabled(false) + , _mouseMarks(false) , _isPrimaryScreen(true) + , _bracketedPasteMode(false) + , _iPntSel(QPoint()) + , _pntSel(QPoint()) + , _tripleSelBegin(QPoint()) , _actSel(0) , _wordSelectionMode(false) , _lineSelectionMode(false) @@ -376,6 +385,7 @@ TerminalDisplay::TerminalDisplay(QWidget* parent) , _autoCopySelectedText(false) , _copyTextAsHTML(true) , _middleClickPasteMode(Enum::PasteFromX11Selection) + , _scrollBar(nullptr) , _scrollbarLocation(Enum::ScrollBarRight) , _scrollFullPage(false) , _wordCharacters(QStringLiteral(":@-./_~")) @@ -389,6 +399,7 @@ TerminalDisplay::TerminalDisplay(QWidget* parent) , _showUrlHint(false) , _openLinksByDirectClick(false) , _ctrlRequiredForDrag(true) + , _dropUrlsAsText(false) , _tripleClickMode(Enum::SelectWholeLine) , _possibleTripleClick(false) , _resizeWidget(nullptr) @@ -396,21 +407,27 @@ TerminalDisplay::TerminalDisplay(QWidget* parent) , _flowControlWarningEnabled(false) , _outputSuspendedMessageWidget(nullptr) , _lineSpacing(0) + , _size(QSize()) , _blendColor(qRgba(0, 0, 0, 0xff)) + , _wallpaper(nullptr) , _filterChain(new TerminalImageFilterChain()) + , _mouseOverHotspotArea(QRegion()) , _filterUpdateRequired(true) , _cursorShape(Enum::BlockCursor) + , _cursorColor(QColor()) , _antialiasText(true) , _useFontLineCharacters(false) , _printerFriendly(false) , _sessionController(nullptr) , _trimLeadingSpaces(false) , _trimTrailingSpaces(false) + , _mouseWheelZoom(false) , _margin(1) , _centerContents(false) , _readOnlyMessageWidget(nullptr) , _readOnly(false) , _opacity(1.0) + , _scrollWheelState(ScrollState()) { // terminal applications are not designed with Right-To-Left in mind, // so the layout is forced to Left-To-Right diff --git a/src/ViewContainer.cpp b/src/ViewContainer.cpp index 0afd6c9b0..dccb71a93 100644 --- a/src/ViewContainer.cpp +++ b/src/ViewContainer.cpp @@ -57,6 +57,9 @@ ViewContainer::ViewContainer(NavigationPosition position, QObject *parent) : QObject(parent), _navigationVisibility(AlwaysShowNavigation), _navigationPosition(position), + _views(QList()), + _navigation(QHash()), + _features(nullptr), _searchBar(nullptr) { } @@ -273,8 +276,16 @@ QList ViewContainer::widgetsForItem(ViewProperties *item) const TabbedViewContainer::TabbedViewContainer(NavigationPosition position, ViewManager *connectedViewManager, QObject *parent) : ViewContainer(position, parent), + _tabBar(nullptr), + _stackWidget(nullptr), + _containerWidget(nullptr), _connectedViewManager(connectedViewManager), - _contextMenuTabIndex(0) + _layout(nullptr), + _tabBarLayout(nullptr), + _newTabButton(nullptr), + _closeTabButton(nullptr), + _contextMenuTabIndex(0), + _contextPopupMenu(nullptr) { _containerWidget = new QWidget; _stackWidget = new QStackedWidget(); @@ -820,7 +831,9 @@ ViewManager *TabbedViewContainer::connectedViewManager() } StackedViewContainer::StackedViewContainer(QObject *parent) : - ViewContainer(NavigationPositionTop, parent) + ViewContainer(NavigationPositionTop, parent), + _containerWidget(nullptr), + _stackWidget(nullptr) { _containerWidget = new QWidget; auto layout = new QVBoxLayout(_containerWidget); diff --git a/src/ViewContainerTabBar.cpp b/src/ViewContainerTabBar.cpp index d9986cc41..72c3e74ec 100644 --- a/src/ViewContainerTabBar.cpp +++ b/src/ViewContainerTabBar.cpp @@ -43,7 +43,10 @@ ViewContainerTabBar::ViewContainerTabBar(QWidget *parent, TabbedViewContainer *c _dropIndicator(nullptr), _dropIndicatorIndex(-1), _drawIndicatorDisabled(false), - _connectedContainer(container) + _supportedMimeType(QString()), + _connectedContainer(container), + _dragStart(QPoint()), + _mousePressTimer(nullptr) { setDrawBase(true); setDocumentMode(true); diff --git a/src/ViewManager.cpp b/src/ViewManager.cpp index dd97650da..6cd03641c 100644 --- a/src/ViewManager.cpp +++ b/src/ViewManager.cpp @@ -52,6 +52,8 @@ int ViewManager::lastManagerId = 0; ViewManager::ViewManager(QObject *parent, KActionCollection *collection) : QObject(parent), _viewSplitter(nullptr), + _pluggedController(nullptr), + _sessionMap(QHash()), _actionCollection(collection), _navigationMethod(TabbedNavigation), _navigationVisibility(ViewContainer::AlwaysShowNavigation), diff --git a/src/ViewProperties.cpp b/src/ViewProperties.cpp index bba568e10..fef63fc3f 100644 --- a/src/ViewProperties.cpp +++ b/src/ViewProperties.cpp @@ -27,6 +27,8 @@ QString ViewProperties::_mimeType = QStringLiteral("application/x-konsole-view-i ViewProperties::ViewProperties(QObject *parent) : QObject(parent), + _icon(QIcon()), + _title(QString()), _identifier(0) { } diff --git a/src/ViewSplitter.cpp b/src/ViewSplitter.cpp index 88828f655..d86cea7bc 100644 --- a/src/ViewSplitter.cpp +++ b/src/ViewSplitter.cpp @@ -32,6 +32,7 @@ using Konsole::ViewContainer; ViewSplitter::ViewSplitter(QWidget *parent) : QSplitter(parent), + _containers(QList()), _recursiveSplitting(true) { } diff --git a/src/Vt102Emulation.cpp b/src/Vt102Emulation.cpp index d24c92b0d..b9917612f 100644 --- a/src/Vt102Emulation.cpp +++ b/src/Vt102Emulation.cpp @@ -66,6 +66,9 @@ unsigned short Konsole::vt100_graphics[32] = { Vt102Emulation::Vt102Emulation() : Emulation(), + _currentModes(TerminalState()), + _savedModes(TerminalState()), + _pendingTitleUpdates(QHash()), _titleUpdateTimer(new QTimer(this)), _reportFocusEvents(false) { diff --git a/src/ZModemDialog.cpp b/src/ZModemDialog.cpp index 16f73a580..ea85b02ac 100644 --- a/src/ZModemDialog.cpp +++ b/src/ZModemDialog.cpp @@ -30,7 +30,9 @@ using Konsole::ZModemDialog; ZModemDialog::ZModemDialog(QWidget *aParent, bool modal, const QString &caption) : - QDialog(aParent) + QDialog(aParent), + _textEdit(nullptr), + mButtonBox(nullptr) { setObjectName(QStringLiteral("zmodem_progress")); setModal(modal);