[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [knotes] /: Initialize variables
From: Montel Laurent <null () kde ! org>
Date: 2017-09-10 15:20:10
Message-ID: E1dr41q-0005GA-Rj () code ! kde ! org
[Download RAW message or body]
Git commit f68f7b6601b2916891b82256dedad8038958b5d2 by Montel Laurent.
Committed on 10/09/2017 at 15:20.
Pushed by mlaurent into branch 'master'.
Initialize variables
M +1 -1 notesagent/notesagent.h
M +2 -2 notesagent/notesagentalarmdialog.h
M +2 -2 notesagent/notesagentnotedialog.h
M +2 -2 notesagent/notesagentsettingsdialog.h
M +4 -4 notesagent/notesmanager.h
M +1 -2 noteshared/src/akonadi/noteschangerecorder.cpp
M +3 -6 noteshared/src/alarms/notealarmdialog.cpp
M +3 -6 noteshared/src/config/notenetworkconfig.cpp
M +2 -2 noteshared/src/job/createnewnotejob.cpp
M +3 -3 noteshared/src/network/notehostdialog.h
M +3 -3 noteshared/src/network/notesnetworkreceiver.cpp
M +1 -1 noteshared/src/network/notesnetworksender.h
M +1 -1 src/apps/application.h
M +8 -8 src/apps/knotesapp.h
M +3 -3 src/configdialog/knoteconfigdialog.h
M +6 -6 src/configdialog/knotedisplayconfigwidget.h
M +5 -5 src/configdialog/knoteeditorconfigwidget.h
M +3 -3 src/configdialog/knotesimpleconfigdialog.h
M +2 -2 src/dialog/knotedeleteselectednotesdialog.h
M +2 -2 src/dialog/knoteselectednotesdialog.h
M +1 -1 src/dialog/knoteskeydialog.h
M +5 -5 src/finddialog/knotefinddialog.h
M +24 -24 src/knoteedit.h
M +2 -2 src/kontactplugin/kcmknotessummary.h
M +20 -20 src/kontactplugin/knotes_part.h
M +1 -1 src/kontactplugin/knotes_plugin.h
M +4 -4 src/kontactplugin/knoteseditdialog.h
M +2 -2 src/kontactplugin/knotesiconview.h
M +1 -1 src/kontactplugin/knotesselectdeletenotesdialog.h
M +2 -2 src/kontactplugin/knoteswidget.h
M +8 -8 src/kontactplugin/summarywidget.h
M +1 -3 src/notes/knote.cpp
M +12 -12 src/notes/knote.h
M +1 -1 src/notes/knotedisplaysettings.h
M +1 -1 src/print/knoteprinter.h
M +5 -5 src/print/knoteprintselectednotesdialog.h
M +1 -1 src/print/knoteprintselectthemedialog.h
https://commits.kde.org/knotes/f68f7b6601b2916891b82256dedad8038958b5d2
diff --git a/notesagent/notesagent.h b/notesagent/notesagent.h
index c167671..6ba6692 100644
--- a/notesagent/notesagent.h
+++ b/notesagent/notesagent.h
@@ -60,7 +60,7 @@ private Q_SLOTS:
private:
bool mAgentInitialized;
- NotesManager *mNotesManager;
+ NotesManager *mNotesManager = nullptr;
};
#endif // NOTESAGENT_H
diff --git a/notesagent/notesagentalarmdialog.h b/notesagent/notesagentalarmdialog.h
index 18968ea..6a62390 100644
--- a/notesagent/notesagentalarmdialog.h
+++ b/notesagent/notesagentalarmdialog.h
@@ -50,8 +50,8 @@ private Q_SLOTS:
private:
void readConfig();
void writeConfig();
- NoteShared::NoteListWidget *mListWidget;
- QLabel *mCurrentDateTime;
+ NoteShared::NoteListWidget *mListWidget = nullptr;
+ QLabel *mCurrentDateTime = nullptr;
};
#endif // NOTESAGENTALARMDIALOG_H
diff --git a/notesagent/notesagentnotedialog.h b/notesagent/notesagentnotedialog.h
index c588519..7bae8f6 100644
--- a/notesagent/notesagentnotedialog.h
+++ b/notesagent/notesagentnotedialog.h
@@ -41,8 +41,8 @@ private Q_SLOTS:
private:
void readConfig();
void writeConfig();
- KPIMTextEdit::RichTextEditorWidget *mNote;
- QLineEdit *mSubject;
+ KPIMTextEdit::RichTextEditorWidget *mNote = nullptr;
+ QLineEdit *mSubject = nullptr;
};
#endif // NOTESAGENTNOTEDIALOG_H
diff --git a/notesagent/notesagentsettingsdialog.h \
b/notesagent/notesagentsettingsdialog.h index 7cd18d4..3d8f1c3 100644
--- a/notesagent/notesagentsettingsdialog.h
+++ b/notesagent/notesagentsettingsdialog.h
@@ -38,8 +38,8 @@ private Q_SLOTS:
private:
void writeConfig();
void readConfig();
- KNotifyConfigWidget *mNotify;
- NoteShared::NoteNetworkConfigWidget *mNetworkConfig;
+ KNotifyConfigWidget *mNotify = nullptr;
+ NoteShared::NoteNetworkConfigWidget *mNetworkConfig = nullptr;
};
#endif // NOTESAGENTSETTINGSDIALOG_H
diff --git a/notesagent/notesmanager.h b/notesagent/notesmanager.h
index d5159ba..08ca957 100644
--- a/notesagent/notesmanager.h
+++ b/notesagent/notesmanager.h
@@ -63,10 +63,10 @@ private Q_SLOTS:
private:
void clear();
Akonadi::Item::List mListItem;
- QTcpServer *mListener;
- QTimer *mCheckAlarm;
- NoteShared::NotesChangeRecorder *mNoteRecorder;
- Akonadi::Session *mSession;
+ QTcpServer *mListener = nullptr;
+ QTimer *mCheckAlarm = nullptr;
+ NoteShared::NotesChangeRecorder *mNoteRecorder = nullptr;
+ Akonadi::Session *mSession = nullptr;
QPointer<NotesAgentAlarmDialog> mAlarmDialog;
};
diff --git a/noteshared/src/akonadi/noteschangerecorder.cpp \
b/noteshared/src/akonadi/noteschangerecorder.cpp index 80e4e39..8425390 100644
--- a/noteshared/src/akonadi/noteschangerecorder.cpp
+++ b/noteshared/src/akonadi/noteschangerecorder.cpp
@@ -33,11 +33,10 @@ class NoteShared::NotesChangeRecorderPrivate
{
public:
NotesChangeRecorderPrivate()
- : mChangeRecorder(nullptr)
{
}
- Akonadi::ChangeRecorder *mChangeRecorder;
+ Akonadi::ChangeRecorder *mChangeRecorder = nullptr;
};
NotesChangeRecorder::NotesChangeRecorder(QObject *parent)
diff --git a/noteshared/src/alarms/notealarmdialog.cpp \
b/noteshared/src/alarms/notealarmdialog.cpp index ff08df9..66c797b 100644
--- a/noteshared/src/alarms/notealarmdialog.cpp
+++ b/noteshared/src/alarms/notealarmdialog.cpp
@@ -50,15 +50,12 @@ class NoteShared::NoteAlarmDialogPrivate
{
public:
NoteAlarmDialogPrivate()
- : m_atDate(nullptr)
- , m_atTime(nullptr)
- , m_buttons(nullptr)
{
}
- KDateComboBox *m_atDate;
- KTimeComboBox *m_atTime;
- QButtonGroup *m_buttons;
+ KDateComboBox *m_atDate = nullptr;
+ KTimeComboBox *m_atTime = nullptr;
+ QButtonGroup *m_buttons = nullptr;
};
NoteAlarmDialog::NoteAlarmDialog(const QString &caption, QWidget *parent)
diff --git a/noteshared/src/config/notenetworkconfig.cpp \
b/noteshared/src/config/notenetworkconfig.cpp index 2084519..dc6b3c6 100644
--- a/noteshared/src/config/notenetworkconfig.cpp
+++ b/noteshared/src/config/notenetworkconfig.cpp
@@ -37,15 +37,12 @@ class NoteShared::NoteNetworkConfigWidgetPrivate
{
public:
NoteNetworkConfigWidgetPrivate()
- : mTmpChkB(nullptr)
- , kcfg_SenderID(nullptr)
- , kcfg_Port(nullptr)
{
}
- QCheckBox *mTmpChkB;
- QLineEdit *kcfg_SenderID;
- QSpinBox *kcfg_Port;
+ QCheckBox *mTmpChkB = nullptr;
+ QLineEdit *kcfg_SenderID = nullptr;
+ QSpinBox *kcfg_Port = nullptr;
};
NoteNetworkConfigWidget::NoteNetworkConfigWidget(QWidget *parent)
diff --git a/noteshared/src/job/createnewnotejob.cpp \
b/noteshared/src/job/createnewnotejob.cpp index 27dc4df..497bbfc 100644
--- a/noteshared/src/job/createnewnotejob.cpp
+++ b/noteshared/src/job/createnewnotejob.cpp
@@ -50,8 +50,8 @@ public:
QString mTitle;
QString mText;
- bool mRichText;
- QWidget *mWidget;
+ bool mRichText = false;
+ QWidget *mWidget = nullptr;
};
CreateNewNoteJob::CreateNewNoteJob(QObject *parent, QWidget *widget)
diff --git a/noteshared/src/network/notehostdialog.h \
b/noteshared/src/network/notehostdialog.h index 0c8b3ad..c2625ca 100644
--- a/noteshared/src/network/notehostdialog.h
+++ b/noteshared/src/network/notehostdialog.h
@@ -63,9 +63,9 @@ private Q_SLOTS:
void slotServiceDoubleClicked(const QModelIndex &idx);
private:
void readConfig();
- KHistoryComboBox *m_hostCombo;
- QTreeView *m_servicesView;
- QPushButton *mOkButton;
+ KHistoryComboBox *m_hostCombo = nullptr;
+ QTreeView *m_servicesView = nullptr;
+ QPushButton *mOkButton = nullptr;
};
}
diff --git a/noteshared/src/network/notesnetworkreceiver.cpp \
b/noteshared/src/network/notesnetworkreceiver.cpp index 76a543f..ec3c033 100644
--- a/noteshared/src/network/notesnetworkreceiver.cpp
+++ b/noteshared/src/network/notesnetworkreceiver.cpp
@@ -71,10 +71,10 @@ public:
delete m_sock;
}
- QTimer *m_timer; // to avoid memory and connection floods
+ QTimer *m_timer = nullptr; // to avoid memory and connection floods
- QByteArray *m_buffer;
- QTcpSocket *m_sock;
+ QByteArray *m_buffer = nullptr;
+ QTcpSocket *m_sock = nullptr;
QString m_titleAddon;
};
diff --git a/noteshared/src/network/notesnetworksender.h \
b/noteshared/src/network/notesnetworksender.h index 0220f22..3c59b07 100644
--- a/noteshared/src/network/notesnetworksender.h
+++ b/noteshared/src/network/notesnetworksender.h
@@ -53,7 +53,7 @@ protected Q_SLOTS:
void slotWritten(qint64);
private:
- QTcpSocket *m_socket;
+ QTcpSocket *m_socket = nullptr;
QByteArray m_note;
QByteArray m_title;
QByteArray m_sender;
diff --git a/src/apps/application.h b/src/apps/application.h
index d8f4357..306704b 100644
--- a/src/apps/application.h
+++ b/src/apps/application.h
@@ -33,7 +33,7 @@ public:
int activate(const QStringList &args, const QString &workingDir) override;
private:
- KNotesApp *mMainWindow;
+ KNotesApp *mMainWindow = nullptr;
};
#endif
diff --git a/src/apps/knotesapp.h b/src/apps/knotesapp.h
index 2489bb5..ec5722f 100644
--- a/src/apps/knotesapp.h
+++ b/src/apps/knotesapp.h
@@ -99,18 +99,18 @@ private:
void updateSystray();
void createNote(const Akonadi::Item &item);
void fetchNotesFromCollection(const Akonadi::Collection &col);
- KXMLGUIFactory *m_guiFactory;
- KXMLGUIBuilder *m_guiBuilder;
+ KXMLGUIFactory *m_guiFactory = nullptr;
+ KXMLGUIBuilder *m_guiBuilder = nullptr;
QDomDocument m_noteGUI;
- KNotesAkonadiTray *mTray;
- QMenu *m_noteMenu;
+ KNotesAkonadiTray *mTray = nullptr;
+ QMenu *m_noteMenu = nullptr;
QList<QAction *> m_noteActions;
- KDNSSD::PublicService *m_publisher;
+ KDNSSD::PublicService *m_publisher = nullptr;
QHash<Akonadi::Item::Id, KNote *> mNotes;
- NoteShared::NotesChangeRecorder *mNoteRecorder;
- NoteShared::NotesAkonadiTreeModel *mNoteTreeModel;
+ NoteShared::NotesChangeRecorder *mNoteRecorder = nullptr;
+ NoteShared::NotesAkonadiTreeModel *mNoteTreeModel = nullptr;
QPointer<KNoteFindDialog> mFindDialog;
- bool mDebugBaloo;
+ bool mDebugBaloo = false;
};
#endif
diff --git a/src/configdialog/knoteconfigdialog.h \
b/src/configdialog/knoteconfigdialog.h index 32aaf2c..e4b71a3 100644
--- a/src/configdialog/knoteconfigdialog.h
+++ b/src/configdialog/knoteconfigdialog.h
@@ -73,7 +73,7 @@ public:
private Q_SLOTS:
void slotHelpLinkClicked(const QString &);
private:
- QLineEdit *mDefaultTitle;
+ QLineEdit *mDefaultTitle = nullptr;
};
class KNotePrintConfig : public KCModule
@@ -91,7 +91,7 @@ private Q_SLOTS:
void slotDownloadNewThemes();
private:
- KNotePrintSelectThemeComboBox *mSelectTheme;
+ KNotePrintSelectThemeComboBox *mSelectTheme = nullptr;
};
class KNoteCollectionConfig : public KCModule
@@ -104,7 +104,7 @@ public:
void save() override;
private:
- KNoteCollectionConfigWidget *mCollectionConfigWidget;
+ KNoteCollectionConfigWidget *mCollectionConfigWidget = nullptr;
};
#endif
diff --git a/src/configdialog/knotedisplayconfigwidget.h \
b/src/configdialog/knotedisplayconfigwidget.h index 17f2c35..6153454 100644
--- a/src/configdialog/knotedisplayconfigwidget.h
+++ b/src/configdialog/knotedisplayconfigwidget.h
@@ -37,12 +37,12 @@ public:
void save(NoteShared::NoteDisplayAttribute *attr);
private:
- KColorButton *kcfg_FgColor;
- KColorButton *kcfg_BgColor;
- QCheckBox *kcfg_ShowInTaskbar;
- QCheckBox *kcfg_RememberDesktop;
- QSpinBox *kcfg_Width;
- QSpinBox *kcfg_Height;
+ KColorButton *kcfg_FgColor = nullptr;
+ KColorButton *kcfg_BgColor = nullptr;
+ QCheckBox *kcfg_ShowInTaskbar = nullptr;
+ QCheckBox *kcfg_RememberDesktop = nullptr;
+ QSpinBox *kcfg_Width = nullptr;
+ QSpinBox *kcfg_Height = nullptr;
};
#endif // KNOTEDISPLAYCONFIGWIDGET_H
diff --git a/src/configdialog/knoteeditorconfigwidget.h \
b/src/configdialog/knoteeditorconfigwidget.h index e624d8b..d26d9fa 100644
--- a/src/configdialog/knoteeditorconfigwidget.h
+++ b/src/configdialog/knoteeditorconfigwidget.h
@@ -38,11 +38,11 @@ public:
void save(NoteShared::NoteDisplayAttribute *attr, bool &isRichText);
private:
- QSpinBox *kcfg_TabSize;
- QCheckBox *kcfg_AutoIndent;
- QCheckBox *kcfg_RichText;
- KFontRequester *kcfg_Font;
- KFontRequester *kcfg_TitleFont;
+ QSpinBox *kcfg_TabSize = nullptr;
+ QCheckBox *kcfg_AutoIndent = nullptr;
+ QCheckBox *kcfg_RichText = nullptr;
+ KFontRequester *kcfg_Font = nullptr;
+ KFontRequester *kcfg_TitleFont = nullptr;
};
#endif // KNOTEEDITORCONFIGWIDGET_H
diff --git a/src/configdialog/knotesimpleconfigdialog.h \
b/src/configdialog/knotesimpleconfigdialog.h index dd09afd..37bab08 100644
--- a/src/configdialog/knotesimpleconfigdialog.h
+++ b/src/configdialog/knotesimpleconfigdialog.h
@@ -40,9 +40,9 @@ public Q_SLOTS:
private:
void readConfig();
void writeConfig();
- QTabWidget *mTabWidget;
- KNoteEditorConfigWidget *mEditorConfigWidget;
- KNoteDisplayConfigWidget *mDisplayConfigWidget;
+ QTabWidget *mTabWidget = nullptr;
+ KNoteEditorConfigWidget *mEditorConfigWidget = nullptr;
+ KNoteDisplayConfigWidget *mDisplayConfigWidget = nullptr;
};
#endif // KNoteSimpleConfigDialog_H
diff --git a/src/dialog/knotedeleteselectednotesdialog.h \
b/src/dialog/knotedeleteselectednotesdialog.h index 2cb8db7..a883d9b 100644
--- a/src/dialog/knotedeleteselectednotesdialog.h
+++ b/src/dialog/knotedeleteselectednotesdialog.h
@@ -42,8 +42,8 @@ private Q_SLOTS:
private:
void readConfig();
void writeConfig();
- NoteShared::NoteListWidget *mNoteList;
- QPushButton *mOkButton;
+ NoteShared::NoteListWidget *mNoteList = nullptr;
+ QPushButton *mOkButton = nullptr;
};
#endif // KNOTEDELETESELECTEDNOTESDIALOG_H
diff --git a/src/dialog/knoteselectednotesdialog.h \
b/src/dialog/knoteselectednotesdialog.h index 0f5c283..6dc9a76 100644
--- a/src/dialog/knoteselectednotesdialog.h
+++ b/src/dialog/knoteselectednotesdialog.h
@@ -45,9 +45,9 @@ private:
void writeConfig();
void readConfig();
- QListWidget *mListNotes;
+ QListWidget *mListNotes = nullptr;
QHash<Akonadi::Item::Id, KNote *> mNotes;
- QPushButton *mOkButton;
+ QPushButton *mOkButton = nullptr;
};
#endif // KNOTESELECTEDNOTESDIALOG_H
diff --git a/src/dialog/knoteskeydialog.h b/src/dialog/knoteskeydialog.h
index 311142c..c4ac49d 100644
--- a/src/dialog/knoteskeydialog.h
+++ b/src/dialog/knoteskeydialog.h
@@ -35,7 +35,7 @@ public:
private:
void readConfig();
void writeConfig();
- KShortcutsEditor *m_keyChooser;
+ KShortcutsEditor *m_keyChooser = nullptr;
};
#endif // KNOTESKEYDIALOG_H
diff --git a/src/finddialog/knotefinddialog.h b/src/finddialog/knotefinddialog.h
index ef79adf..8e8bc56 100644
--- a/src/finddialog/knotefinddialog.h
+++ b/src/finddialog/knotefinddialog.h
@@ -49,10 +49,10 @@ private Q_SLOTS:
private:
QHash<Akonadi::Item::Id, Akonadi::Item> mNotes;
- QLabel *mResultSearch;
- QLineEdit *mSearchLineEdit;
- QPushButton *mSearchButton;
- NoteShared::NoteListWidget *mNoteList;
+ QLabel *mResultSearch = nullptr;
+ QLineEdit *mSearchLineEdit = nullptr;
+ QPushButton *mSearchButton = nullptr;
+ NoteShared::NoteListWidget *mNoteList = nullptr;
};
class KNOTES_EXPORT KNoteFindDialog : public QDialog
@@ -69,7 +69,7 @@ Q_SIGNALS:
private:
void writeConfig();
void readConfig();
- KNoteFindWidget *mNoteFindWidget;
+ KNoteFindWidget *mNoteFindWidget = nullptr;
};
#endif // KNOTEFINDDIALOG_H
diff --git a/src/knoteedit.h b/src/knoteedit.h
index b667d5b..ce55c74 100644
--- a/src/knoteedit.h
+++ b/src/knoteedit.h
@@ -104,30 +104,30 @@ private:
QColor mDefaultBackgroundColor;
QColor mDefaultForegroundColor;
- KToggleAction *m_textBold;
- KToggleAction *m_textItalic;
- KToggleAction *m_textUnderline;
- KToggleAction *m_textStrikeOut;
-
- KToggleAction *m_textAlignLeft;
- KToggleAction *m_textAlignCenter;
- KToggleAction *m_textAlignRight;
- KToggleAction *m_textAlignBlock;
-
- KToggleAction *m_textList;
- KToggleAction *m_textSuper;
- KToggleAction *m_textSub;
-
- QAction *m_textIncreaseIndent;
- QAction *m_textDecreaseIndent;
-
- QAction *m_textColor;
- KFontAction *m_textFont;
- KFontSizeAction *m_textSize;
- KNote *m_note;
- KActionCollection *m_actions;
- PimCommon::KActionMenuChangeCase *mChangeCaseActionMenu;
- bool m_autoIndentMode;
+ KToggleAction *m_textBold = nullptr;
+ KToggleAction *m_textItalic = nullptr;
+ KToggleAction *m_textUnderline = nullptr;
+ KToggleAction *m_textStrikeOut = nullptr;
+
+ KToggleAction *m_textAlignLeft = nullptr;
+ KToggleAction *m_textAlignCenter = nullptr;
+ KToggleAction *m_textAlignRight = nullptr;
+ KToggleAction *m_textAlignBlock = nullptr;
+
+ KToggleAction *m_textList = nullptr;
+ KToggleAction *m_textSuper = nullptr;
+ KToggleAction *m_textSub = nullptr;
+
+ QAction *m_textIncreaseIndent = nullptr;
+ QAction *m_textDecreaseIndent = nullptr;
+
+ QAction *m_textColor = nullptr;
+ KFontAction *m_textFont = nullptr;
+ KFontSizeAction *m_textSize = nullptr;
+ KNote *m_note = nullptr;
+ KActionCollection *m_actions = nullptr;
+ PimCommon::KActionMenuChangeCase *mChangeCaseActionMenu = nullptr;
+ bool m_autoIndentMode = false;
};
#endif
diff --git a/src/kontactplugin/kcmknotessummary.h \
b/src/kontactplugin/kcmknotessummary.h index 7dfd3f7..5ab8885 100644
--- a/src/kontactplugin/kcmknotessummary.h
+++ b/src/kontactplugin/kcmknotessummary.h
@@ -49,8 +49,8 @@ private:
void loadFolders();
void storeFolders();
- PimCommon::CheckedCollectionWidget *mCheckedCollectionWidget;
- KViewStateMaintainer<Akonadi::ETMViewStateSaver> *mModelState;
+ PimCommon::CheckedCollectionWidget *mCheckedCollectionWidget = nullptr;
+ KViewStateMaintainer<Akonadi::ETMViewStateSaver> *mModelState = nullptr;
};
#endif
diff --git a/src/kontactplugin/knotes_part.h b/src/kontactplugin/knotes_part.h
index 7e3f368..7b17d79 100644
--- a/src/kontactplugin/knotes_part.h
+++ b/src/kontactplugin/knotes_part.h
@@ -119,26 +119,26 @@ private:
void fetchNotesFromCollection(const Akonadi::Collection &col);
void updateNetworkListener();
void printSelectedNotes(bool preview);
- KNotesWidget *mNotesWidget;
- KDNSSD::PublicService *mPublisher;
- QAction *mNoteEdit;
- QAction *mNoteRename;
- QAction *mNoteDelete;
- QAction *mNotePrint;
- QAction *mNotePrintPreview;
- QAction *mNoteConfigure;
- QAction *mNoteSendMail;
- QAction *mNoteSendNetwork;
- QAction *mNoteSetAlarm;
- QAction *mNewNote;
- QAction *mSaveAs;
- QAction *mQuickSearchAction;
- KToggleAction *mReadOnly;
- NoteShared::NotesChangeRecorder *mNoteRecorder;
- NoteShared::NotesAkonadiTreeModel *mNoteTreeModel;
- QItemSelectionModel *mSelectionModel;
- KCheckableProxyModel *mModelProxy;
- KViewStateMaintainer<Akonadi::ETMViewStateSaver> *mModelState;
+ KNotesWidget *mNotesWidget = nullptr;
+ KDNSSD::PublicService *mPublisher = nullptr;
+ QAction *mNoteEdit = nullptr;
+ QAction *mNoteRename = nullptr;
+ QAction *mNoteDelete = nullptr;
+ QAction *mNotePrint = nullptr;
+ QAction *mNotePrintPreview = nullptr;
+ QAction *mNoteConfigure = nullptr;
+ QAction *mNoteSendMail = nullptr;
+ QAction *mNoteSendNetwork = nullptr;
+ QAction *mNoteSetAlarm = nullptr;
+ QAction *mNewNote = nullptr;
+ QAction *mSaveAs = nullptr;
+ QAction *mQuickSearchAction = nullptr;
+ KToggleAction *mReadOnly = nullptr;
+ NoteShared::NotesChangeRecorder *mNoteRecorder = nullptr;
+ NoteShared::NotesAkonadiTreeModel *mNoteTreeModel = nullptr;
+ QItemSelectionModel *mSelectionModel = nullptr;
+ KCheckableProxyModel *mModelProxy = nullptr;
+ KViewStateMaintainer<Akonadi::ETMViewStateSaver> *mModelState = nullptr;
QPointer<KNoteFindDialog> mNoteFindDialog;
};
diff --git a/src/kontactplugin/knotes_plugin.h b/src/kontactplugin/knotes_plugin.h
index 0d0b0f3..a2a86ef 100644
--- a/src/kontactplugin/knotes_plugin.h
+++ b/src/kontactplugin/knotes_plugin.h
@@ -69,7 +69,7 @@ private Q_SLOTS:
void slotNewNote();
private:
- KontactInterface::UniqueAppWatcher *mUniqueAppWatcher;
+ KontactInterface::UniqueAppWatcher *mUniqueAppWatcher = nullptr;
};
#endif
diff --git a/src/kontactplugin/knoteseditdialog.h \
b/src/kontactplugin/knoteseditdialog.h index c525367..f241800 100644
--- a/src/kontactplugin/knoteseditdialog.h
+++ b/src/kontactplugin/knoteseditdialog.h
@@ -64,10 +64,10 @@ private:
void init(bool readOnly);
void readConfig();
void writeConfig();
- QLineEdit *mTitleEdit;
- KNoteEdit *mNoteEdit;
- KToolBar *mTool;
- QPushButton *mOkButton;
+ QLineEdit *mTitleEdit = nullptr;
+ KNoteEdit *mNoteEdit = nullptr;
+ KToolBar *mTool = nullptr;
+ QPushButton *mOkButton = nullptr;
};
#endif // KNOTESEDITDIALOG_H
diff --git a/src/kontactplugin/knotesiconview.h b/src/kontactplugin/knotesiconview.h
index daeb695..bc448bd 100644
--- a/src/kontactplugin/knotesiconview.h
+++ b/src/kontactplugin/knotesiconview.h
@@ -42,7 +42,7 @@ protected:
bool event(QEvent *e) override;
private:
- KNotesPart *m_part;
+ KNotesPart *m_part = nullptr;
QHash<Akonadi::Item::Id, KNotesIconViewItem *> mNoteList;
};
@@ -86,7 +86,7 @@ private:
QPixmap mDefaultPixmap;
Akonadi::Item mItem;
- KNoteDisplaySettings *mDisplayAttribute;
+ KNoteDisplaySettings *mDisplayAttribute = nullptr;
bool mReadOnly;
};
diff --git a/src/kontactplugin/knotesselectdeletenotesdialog.h \
b/src/kontactplugin/knotesselectdeletenotesdialog.h index 6a1e867..7d276e3 100644
--- a/src/kontactplugin/knotesselectdeletenotesdialog.h
+++ b/src/kontactplugin/knotesselectdeletenotesdialog.h
@@ -43,7 +43,7 @@ public:
private:
void writeConfig();
void readConfig();
- KNotesSelectDeleteNotesListWidget *mSelectedListWidget;
+ KNotesSelectDeleteNotesListWidget *mSelectedListWidget = nullptr;
};
#endif // KNOTESSELECTDELETENOTESDIALOG_H
diff --git a/src/kontactplugin/knoteswidget.h b/src/kontactplugin/knoteswidget.h
index 1542f44..40b7e6e 100644
--- a/src/kontactplugin/knoteswidget.h
+++ b/src/kontactplugin/knoteswidget.h
@@ -37,8 +37,8 @@ public Q_SLOTS:
void slotFocusQuickSearch();
private:
- KNotesIconView *mIconView;
- KNotesListWidgetSearchLine *mSearchLine;
+ KNotesIconView *mIconView = nullptr;
+ KNotesListWidgetSearchLine *mSearchLine = nullptr;
};
#endif // KNOTESWIDGET_H
diff --git a/src/kontactplugin/summarywidget.h b/src/kontactplugin/summarywidget.h
index 0f6dfd9..96c591f 100644
--- a/src/kontactplugin/summarywidget.h
+++ b/src/kontactplugin/summarywidget.h
@@ -69,16 +69,16 @@ private:
void displayNotes(const QModelIndex &parent, int &counter);
void createNote(const Akonadi::Item &item, int counter);
QPixmap mDefaultPixmap;
- QGridLayout *mLayout;
- KontactInterface::Plugin *mPlugin;
+ QGridLayout *mLayout = nullptr;
+ KontactInterface::Plugin *mPlugin = nullptr;
QList<QLabel *> mLabels;
QPixmap mPixmap;
- NoteShared::NotesChangeRecorder *mNoteRecorder;
- NoteShared::NotesAkonadiTreeModel *mNoteTreeModel;
- QItemSelectionModel *mSelectionModel;
- KCheckableProxyModel *mModelProxy;
- KViewStateMaintainer<Akonadi::ETMViewStateSaver> *mModelState;
- bool mInProgress;
+ NoteShared::NotesChangeRecorder *mNoteRecorder = nullptr;
+ NoteShared::NotesAkonadiTreeModel *mNoteTreeModel = nullptr;
+ QItemSelectionModel *mSelectionModel = nullptr;
+ KCheckableProxyModel *mModelProxy = nullptr;
+ KViewStateMaintainer<Akonadi::ETMViewStateSaver> *mModelState = nullptr;
+ bool mInProgress = false;
};
#endif
diff --git a/src/notes/knote.cpp b/src/notes/knote.cpp
index 49f17da..93e2403 100644
--- a/src/notes/knote.cpp
+++ b/src/notes/knote.cpp
@@ -682,9 +682,7 @@ void KNote::createActions()
{
// create the menu items for the note - not the editor...
// rename, mail, print, save as, insert date, alarm, close, delete, new note
- QAction *action;
-
- action = new QAction(QIcon::fromTheme(QStringLiteral("document-new")), \
i18n("New"), this); + QAction *action = new \
QAction(QIcon::fromTheme(QStringLiteral("document-new")), i18n("New"), this); \
actionCollection()->addAction(QStringLiteral("new_note"), action);
connect(action, &QAction::triggered, this, &KNote::slotRequestNewNote);
diff --git a/src/notes/knote.h b/src/notes/knote.h
index 739b4ef..ab0ca45 100644
--- a/src/notes/knote.h
+++ b/src/notes/knote.h
@@ -140,26 +140,26 @@ private:
void updateAllAttributes();
void saveNoteContent();
Akonadi::Item mItem;
- QLayout *m_noteLayout;
- QLabel *m_label;
- QSizeGrip *m_grip;
- KNoteButton *m_button;
- KToolBar *m_tool;
- KNoteEdit *m_editor;
+ QLayout *m_noteLayout = nullptr;
+ QLabel *m_label = nullptr;
+ QSizeGrip *m_grip = nullptr;
+ KNoteButton *m_button = nullptr;
+ KToolBar *m_tool = nullptr;
+ KNoteEdit *m_editor = nullptr;
- QMenu *m_menu;
+ QMenu *m_menu = nullptr;
- KToggleAction *m_readOnly;
+ KToggleAction *m_readOnly = nullptr;
#if KDEPIM_HAVE_X11
- KSelectAction *m_toDesktop;
+ KSelectAction *m_toDesktop = nullptr;
#endif
- KToggleAction *m_keepAbove;
- KToggleAction *m_keepBelow;
+ KToggleAction *m_keepAbove = nullptr;
+ KToggleAction *m_keepBelow = nullptr;
KSharedConfig::Ptr m_kwinConf;
- KNoteDisplaySettings *mDisplayAttribute;
+ KNoteDisplaySettings *mDisplayAttribute = nullptr;
bool mAllowDebugBaloo;
};
diff --git a/src/notes/knotedisplaysettings.h b/src/notes/knotedisplaysettings.h
index c73e4bb..2033118 100644
--- a/src/notes/knotedisplaysettings.h
+++ b/src/notes/knotedisplaysettings.h
@@ -53,7 +53,7 @@ public:
bool autoIndent() const;
private:
- NoteShared::NoteDisplayAttribute *mDisplayAttribute;
+ NoteShared::NoteDisplayAttribute *mDisplayAttribute = nullptr;
};
#endif // KNOTEDISPLAYSETTINGS_H
diff --git a/src/print/knoteprinter.h b/src/print/knoteprinter.h
index 1158f52..011eb40 100644
--- a/src/print/knoteprinter.h
+++ b/src/print/knoteprinter.h
@@ -47,7 +47,7 @@ private:
QFont m_defaultFont;
QString mHtmlPreviewText;
- KNoteGrantleePrint *mGrantleePrint;
+ KNoteGrantleePrint *mGrantleePrint = nullptr;
};
#endif // KNOTEPRINTER
diff --git a/src/print/knoteprintselectednotesdialog.h \
b/src/print/knoteprintselectednotesdialog.h index 2ff2492..6071f47 100644
--- a/src/print/knoteprintselectednotesdialog.h
+++ b/src/print/knoteprintselectednotesdialog.h
@@ -53,12 +53,12 @@ private:
void writeConfig();
void readConfig();
- QListWidget *mListNotes;
+ QListWidget *mListNotes = nullptr;
QHash<Akonadi::Item::Id, KNote *> mNotes;
- KNotePrintSelectThemeComboBox *mTheme;
- QDialogButtonBox *mButtonBox;
- QPushButton *mUser1Button;
- bool mPreview;
+ KNotePrintSelectThemeComboBox *mTheme = nullptr;
+ QDialogButtonBox *mButtonBox = nullptr;
+ QPushButton *mUser1Button = nullptr;
+ bool mPreview = false;
};
#endif // KNOTEPRINTSELECTEDNOTESDIALOG_H
diff --git a/src/print/knoteprintselectthemedialog.h \
b/src/print/knoteprintselectthemedialog.h index 10e81dc..94cdbaf 100644
--- a/src/print/knoteprintselectthemedialog.h
+++ b/src/print/knoteprintselectthemedialog.h
@@ -34,7 +34,7 @@ public:
QString selectedTheme() const;
private:
- KNotePrintSelectThemeComboBox *mThemes;
+ KNotePrintSelectThemeComboBox *mThemes = nullptr;
};
#endif // KNOTEPRINTSELECTTHEMEDIALOG_H
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic