Commit 9fd870d8 authored by David Jarvie's avatar David Jarvie
Browse files

Formatting

parent c8304e8c
......@@ -76,7 +76,7 @@ class AkonadiCollectionSearch : public QObject
QMap<Akonadi::ItemDeleteJob*, Akonadi::Collection::Id> mItemDeleteJobs;
Akonadi::Collection::List mCollections;
Akonadi::Item::List mItems;
int mDeleteCount{0};
int mDeleteCount {0};
bool mDelete;
};
......
......@@ -136,11 +136,11 @@ class AlarmCalendar : public QObject
QString mLocalFile; // calendar file, or local copy if it's a remote file
CalType mCalType; // what type of calendar mCalendar is (resources/ical/vcal)
CalEvent::Type mEventType; // what type of events the calendar file is for
bool mOpen{false}; // true if the calendar file is open
bool mIgnoreAtLogin{false}; // ignore new/updated repeat-at-login alarms
int mUpdateCount{0}; // nesting level of group of calendar update calls
bool mUpdateSave{false}; // save() was called while mUpdateCount > 0
bool mHaveDisabledAlarms{false}; // there is at least one individually disabled alarm
bool mOpen {false}; // true if the calendar file is open
bool mIgnoreAtLogin {false}; // ignore new/updated repeat-at-login alarms
int mUpdateCount {0}; // nesting level of group of calendar update calls
bool mUpdateSave {false}; // save() was called while mUpdateCount > 0
bool mHaveDisabledAlarms {false}; // there is at least one individually disabled alarm
using QObject::event; // prevent "hidden" warning
};
......
......@@ -94,18 +94,18 @@ class AlarmTimeWidget : public QFrame
TimeEdit* mTimeEdit;
TimeSpinBox* mDelayTimeEdit;
PushButton* mTimeZoneButton;
QWidget* mTimeZoneBox; // contains label and time zone combo box
QWidget* mTimeZoneBox; // contains label and time zone combo box
TimeZoneCombo* mTimeZone;
KADateTime mMinDateTime; // earliest allowed date/time
KADateTime mMaxDateTime; // latest allowed date/time
KADateTime::Spec mTimeSpec; // time spec used
int mAnyTime; // 0 = date/time is specified, 1 = only a date, -1 = uninitialised
bool mAnyTimeAllowed; // 'mAnyTimeCheckBox' is enabled
bool mDeferring; // being used to enter a deferral time
bool mMinDateTimeIsNow{false}; // earliest allowed date/time is the current time
bool mPastMax{false}; // current time is past the maximum date/time
bool mMinMaxTimeSet{false}; // limits have been set for the time edit control
bool mTimerSyncing; // mTimer is not yet synchronized to the minute boundary
KADateTime mMinDateTime; // earliest allowed date/time
KADateTime mMaxDateTime; // latest allowed date/time
KADateTime::Spec mTimeSpec; // time spec used
int mAnyTime; // 0 = date/time is specified, 1 = only a date, -1 = uninitialised
bool mAnyTimeAllowed; // 'mAnyTimeCheckBox' is enabled
bool mDeferring; // being used to enter a deferral time
bool mMinDateTimeIsNow {false}; // earliest allowed date/time is the current time
bool mPastMax {false}; // current time is past the maximum date/time
bool mMinMaxTimeSet {false}; // limits have been set for the time edit control
bool mTimerSyncing; // mTimer is not yet synchronized to the minute boundary
};
#endif // ALARMTIMEWIDGET_H
......
......@@ -67,7 +67,7 @@ class BirthdayDlg : public QDialog
FontColourButton* mFontColourButton;
CheckBox* mConfirmAck;
LateCancelSelector* mLateCancel;
SpecialActionsButton* mSpecialActionsButton{nullptr};
SpecialActionsButton* mSpecialActionsButton {nullptr};
RepetitionButton* mSubRepetition;
QDialogButtonBox* mButtonBox;
QString mPrefixText; // last entered value of prefix text
......
......@@ -146,38 +146,38 @@ class CommandOptions
QString arg(int n);
QString optionName(Option, bool shortName = false) const;
static CommandOptions* mFirstInstance; // the first instance
QCommandLineParser* mParser{nullptr};
QVector<QCommandLineOption*> mOptions; // all possible command line options
QStringList mNonExecArguments; // arguments except for --exec or --exec-display parameters
QStringList mExecArguments; // arguments for --exec or --exec-display
QString mError; // error message
Command mCommand{NONE}; // the selected command
Option mCommandOpt; // option for the selected command
EventId mEventId; // TRIGGER_EVENT, CANCEL_EVENT, EDIT: event ID
QString mTemplateName; // EDIT_NEW_PRESET: template name
EditAlarmDlg::Type mEditType; // NEW, EDIT_NEW_*: alarm edit type
KAEvent::SubAction mEditAction; // NEW: alarm edit sub-type
bool mEditActionSet{false}; // NEW: mEditAction is valid
QString mText; // NEW: alarm text
KADateTime mAlarmTime; // NEW: alarm time
KARecurrence* mRecurrence{nullptr}; // NEW: recurrence
int mRepeatCount{0}; // NEW: sub-repetition count
KCalendarCore::Duration mRepeatInterval{0}; // NEW: sub-repetition interval
int mLateCancel{0}; // NEW: late-cancellation interval
QColor mBgColour; // NEW: background colour
QColor mFgColour; // NEW: foreground colour
int mReminderMinutes{0}; // NEW: reminder period
QString mAudioFile; // NEW: audio file path
float mAudioVolume{-1.0f}; // NEW: audio file volume
KCalendarCore::Person::List mAddressees; // NEW: email addressees
QStringList mAttachments; // NEW: email attachment file names
QString mSubject; // NEW: email subject
uint mFromID{0}; // NEW: email sender ID
KAEvent::Flags mFlags; // NEW: event flags
bool mDisableAll{false}; // disable all alarm monitoring
static CommandOptions* mFirstInstance; // the first instance
QCommandLineParser* mParser {nullptr};
QVector<QCommandLineOption*> mOptions; // all possible command line options
QStringList mNonExecArguments; // arguments except for --exec or --exec-display parameters
QStringList mExecArguments; // arguments for --exec or --exec-display
QString mError; // error message
Command mCommand {NONE}; // the selected command
Option mCommandOpt; // option for the selected command
EventId mEventId; // TRIGGER_EVENT, CANCEL_EVENT, EDIT: event ID
QString mTemplateName; // EDIT_NEW_PRESET: template name
EditAlarmDlg::Type mEditType; // NEW, EDIT_NEW_*: alarm edit type
KAEvent::SubAction mEditAction; // NEW: alarm edit sub-type
bool mEditActionSet {false}; // NEW: mEditAction is valid
QString mText; // NEW: alarm text
KADateTime mAlarmTime; // NEW: alarm time
KARecurrence* mRecurrence {nullptr}; // NEW: recurrence
int mRepeatCount {0}; // NEW: sub-repetition count
KCalendarCore::Duration mRepeatInterval {0}; // NEW: sub-repetition interval
int mLateCancel {0}; // NEW: late-cancellation interval
QColor mBgColour; // NEW: background colour
QColor mFgColour; // NEW: foreground colour
int mReminderMinutes {0}; // NEW: reminder period
QString mAudioFile; // NEW: audio file path
float mAudioVolume {-1.0f}; // NEW: audio file volume
KCalendarCore::Person::List mAddressees; // NEW: email addressees
QStringList mAttachments; // NEW: email attachment file names
QString mSubject; // NEW: email subject
uint mFromID {0}; // NEW: email sender ID
KAEvent::Flags mFlags; // NEW: event flags
bool mDisableAll {false}; // disable all alarm monitoring
#ifndef NDEBUG
KADateTime mSimulationTime; // system time to be simulated, or invalid if none
KADateTime mSimulationTime; // system time to be simulated, or invalid if none
#endif
};
......
......@@ -155,7 +155,7 @@ class EditAlarmDlg : public QDialog
QDialogButtonBox* mButtonBox;
QAbstractButton* mTryButton;
QAbstractButton* mLoadTemplateButton{nullptr};
QAbstractButton* mLoadTemplateButton {nullptr};
QAbstractButton* mMoreLessButton;
private:
......@@ -164,27 +164,27 @@ class EditAlarmDlg : public QDialog
StackedScrollGroup* mTabScrollGroup;
int mMainPageIndex;
int mRecurPageIndex;
bool mMainPageShown{false}; // true once the main tab has been displayed
bool mRecurPageShown{false}; // true once the recurrence tab has been displayed
bool mRecurSetDefaultEndDate{true}; // adjust default end date/time when recurrence tab is displayed
bool mMainPageShown {false}; // true once the main tab has been displayed
bool mRecurPageShown {false}; // true once the recurrence tab has been displayed
bool mRecurSetDefaultEndDate {true}; // adjust default end date/time when recurrence tab is displayed
// Templates
QLineEdit* mTemplateName{nullptr};
QLineEdit* mTemplateName {nullptr};
ButtonGroup* mTemplateTimeGroup;
RadioButton* mTemplateDefaultTime; // no alarm time is specified
RadioButton* mTemplateUseTimeAfter;// alarm time is specified as an offset from current
RadioButton* mTemplateAnyTime; // alarms have date only, no time
RadioButton* mTemplateUseTime; // an alarm time is specified
TimeSpinBox* mTemplateTimeAfter; // the specified offset from the current time
TimeEdit* mTemplateTime; // the alarm time which is specified
QGroupBox* mDeferGroup{nullptr};
RadioButton* mTemplateDefaultTime; // no alarm time is specified
RadioButton* mTemplateUseTimeAfter; // alarm time is specified as an offset from current
RadioButton* mTemplateAnyTime; // alarms have date only, no time
RadioButton* mTemplateUseTime; // an alarm time is specified
TimeSpinBox* mTemplateTimeAfter; // the specified offset from the current time
TimeEdit* mTemplateTime; // the alarm time which is specified
QGroupBox* mDeferGroup {nullptr};
QLabel* mDeferTimeLabel;
QPushButton* mDeferChangeButton{nullptr};
QPushButton* mDeferChangeButton {nullptr};
AlarmTimeWidget* mTimeWidget{nullptr};
AlarmTimeWidget* mTimeWidget {nullptr};
LateCancelSelector* mLateCancel;
Reminder* mReminder; // null except for display alarms
CheckBox* mShowInKorganizer{nullptr};
CheckBox* mShowInKorganizer {nullptr};
QFrame* mMoreOptions; // contains options hidden by default
......@@ -196,7 +196,7 @@ class EditAlarmDlg : public QDialog
bool mUseResourceEventId; // whether to use mResourceEventId
QString mResourceEventId; // if non-null, save alarm in resource containing this event ID
Resource mResource; // resource to save event into, or invalid
int mDeferGroupHeight{0}; // height added by deferred time widget
int mDeferGroupHeight {0}; // height added by deferred time widget
int mDesktop; // desktop to display the dialog in
QString mEventId; // UID of event being edited, or blank for new event
bool mTemplate; // editing an alarm template
......@@ -206,10 +206,10 @@ class EditAlarmDlg : public QDialog
mutable bool mOnlyDeferred; // the only change made in the dialog was to the existing deferral
bool mDesiredReadOnly; // the specified read-only status of the dialog
bool mReadOnly; // the actual read-only status of the dialog
bool mShowingMore{true}; // the More Options button has been clicked
bool mShowingMore {true}; // the More Options button has been clicked
// Initial state of all controls
KAEvent* mSavedEvent{nullptr};
KAEvent* mSavedEvent {nullptr};
QString mSavedTemplateName; // mTemplateName value
QAbstractButton* mSavedTemplateTimeType; // selected button in mTemplateTimeGroup
QTime mSavedTemplateTime; // mTemplateTime value
......
......@@ -102,10 +102,10 @@ class EditDisplayAlarmDlg : public EditAlarmDlg
SoundPicker* mSoundPicker;
CheckBox* mConfirmAck;
FontColourButton* mFontColourButton;
SpecialActionsButton* mSpecialActionsButton{nullptr};
SpecialActionsButton* mSpecialActionsButton {nullptr};
Akonadi::Item::Id mAkonadiItemId; // if email text, message's Akonadi item ID, else -1
bool mReminderDeferral{false};
bool mReminderArchived{false};
bool mReminderDeferral {false};
bool mReminderArchived {false};
// Text message alarm widgets
TextEdit* mTextMessageEdit; // text message edit box
// Text file alarm widgets
......@@ -239,7 +239,7 @@ class EditEmailAlarmDlg : public EditAlarmDlg
TextEdit* mEmailMessageEdit; // email body edit box
QComboBox* mEmailAttachList;
QPushButton* mEmailAddAttachButton;
QPushButton* mEmailRemoveButton{nullptr};
QPushButton* mEmailRemoveButton {nullptr};
CheckBox* mEmailBcc;
QString mAttachDefaultDir;
......@@ -292,7 +292,7 @@ class EditAudioAlarmDlg : public EditAlarmDlg
void slotAudioPlaying(bool playing);
private:
MessageWin* mMessageWin{nullptr}; // MessageWin controlling test audio playback
MessageWin* mMessageWin {nullptr}; // MessageWin controlling test audio playback
// Audio alarm options
SoundWidget* mSoundConfig;
......
......@@ -44,7 +44,7 @@ class EmailIdCombo : public KIdentityManagement::IdentityCombo
void keyReleaseEvent(QKeyEvent*) override;
private:
bool mReadOnly{false}; // value cannot be changed
bool mReadOnly {false}; // value cannot be changed
};
#endif // EMAILIDCOMBO_H
......
......@@ -62,8 +62,8 @@ class EventListView : public QTreeView
private:
void findNext(bool forward);
Find* mFind{nullptr};
bool mEditOnSingleClick{false};
Find* mFind {nullptr};
bool mEditOnSingleClick {false};
using QObject::event; // prevent "hidden" warning
};
......
......@@ -64,13 +64,13 @@ class Find : public QObject
QCheckBox* mCommandType;
QCheckBox* mEmailType;
QCheckBox* mAudioType;
KFind* mFind{nullptr};
KFind* mFind {nullptr};
QStringList mHistory; // list of history items for Find dialog
QString mLastPattern; // pattern used in last search
QString mStartID; // ID of first alarm searched if 'from cursor' was selected
long mOptions{0}; // OR of find dialog options
long mOptions {0}; // OR of find dialog options
bool mNoCurrentItem; // there is no current item for the purposes of searching
bool mFound{false}; // true if any matches have been found
bool mFound {false}; // true if any matches have been found
};
#endif // FIND_H
......
......@@ -58,11 +58,11 @@ class FontColourChooser : public QWidget
void slotDefaultFontToggled(bool);
private:
ColourButton* mFgColourButton{nullptr};
ColourButton* mFgColourButton {nullptr};
ColourButton* mBgColourButton;
KFontChooser* mFontChooser;
CheckBox* mDefaultFont{nullptr};
bool mReadOnly{false};
CheckBox* mDefaultFont {nullptr};
bool mReadOnly {false};
};
#endif
......
......@@ -56,8 +56,8 @@ class FontColourButton : public PushButton
private:
QColor mBgColour, mFgColour;
QFont mFont;
bool mDefaultFont{true};
bool mReadOnly{false};
bool mDefaultFont {true};
bool mReadOnly {false};
};
......@@ -83,7 +83,7 @@ class FontColourDlg : public QDialog
QColor mBgColour, mFgColour;
QFont mFont;
bool mDefaultFont;
bool mReadOnly{false};
bool mReadOnly {false};
};
#endif // FONTCOLOURBUTTON_H
......
......@@ -61,9 +61,9 @@ class LateCancelSelector : public QFrame
QFrame* mTimeSelectorFrame;
TimeSelector* mTimeSelector; // displayed when late cancellation is selected
CheckBox* mAutoClose;
bool mDateOnly{false}; // hours/minutes units not allowed
bool mReadOnly{false}; // widget is read-only
bool mAutoCloseShown{false}; // auto-close checkbox is visible
bool mDateOnly {false}; // hours/minutes units not allowed
bool mReadOnly {false}; // widget is read-only
bool mAutoCloseShown {false}; // auto-close checkbox is visible
};
#endif // LATECANCEL_H
......
......@@ -79,10 +79,10 @@ class CheckBox : public QCheckBox
protected Q_SLOTS:
void slotClicked();
private:
Qt::FocusPolicy mFocusPolicy; // default focus policy for the QCheckBox
QWidget* mFocusWidget{nullptr}; // widget to receive focus when button is clicked on
bool mFocusWidgetEnable; // enable focus widget before setting focus
bool mReadOnly{false}; // value cannot be changed
Qt::FocusPolicy mFocusPolicy; // default focus policy for the QCheckBox
QWidget* mFocusWidget {nullptr}; // widget to receive focus when button is clicked on
bool mFocusWidgetEnable; // enable focus widget before setting focus
bool mReadOnly {false}; // value cannot be changed
};
#endif // CHECKBOX_H
......
......@@ -59,7 +59,7 @@ class ColourButton : public KColorButton
void keyPressEvent(QKeyEvent*) override;
void keyReleaseEvent(QKeyEvent*) override;
private:
bool mReadOnly{false}; // value cannot be changed
bool mReadOnly {false}; // value cannot be changed
};
#endif // COLOURBUTTON_H
......
......@@ -58,7 +58,7 @@ class ComboBox : public KComboBox
void keyPressEvent(QKeyEvent*) override;
void keyReleaseEvent(QKeyEvent*) override;
private:
bool mReadOnly{false}; // value cannot be changed
bool mReadOnly {false}; // value cannot be changed
};
#endif // COMBOBOX_H
......
......@@ -63,7 +63,7 @@ class GroupBox : public QGroupBox
void keyPressEvent(QKeyEvent*) override;
void keyReleaseEvent(QKeyEvent*) override;
private:
bool mReadOnly{false}; // value cannot be changed
bool mReadOnly {false}; // value cannot be changed
};
#endif // GROUPBOX_H
......
......@@ -77,8 +77,8 @@ class Label : public QLabel
private:
void activated();
QRadioButton* mRadioButton{nullptr}; // buddy widget if it's a radio button, else 0
LabelFocusWidget* mFocusWidget{nullptr};
QRadioButton* mRadioButton {nullptr}; // buddy widget if it's a radio button, else 0
LabelFocusWidget* mFocusWidget {nullptr};
};
......
......@@ -91,8 +91,8 @@ class LineEdit : public KLineEdit
void init();
Type mType;
bool mNoSelect{false};
bool mSetCursorAtEnd{false}; // setText() should position cursor at end
bool mNoSelect {false};
bool mSetCursorAtEnd {false}; // setText() should position cursor at end
};
#endif // LINEEDIT_H
......
......@@ -58,7 +58,7 @@ class PackedLayout : public QLayout
QList<QLayoutItem*> mItems;
Qt::Alignment mAlignment;
mutable int mWidthCached{0};
mutable int mWidthCached {0};
mutable int mHeightCached;
};
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment