From c822d344caac7367564ef929037082e3374267be Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Fri, 7 Aug 2015 17:06:29 +0900 Subject: Fixed KAlarm building warnings. Minor style patch up. Fixed possible error in treating deferred evens (see kalarm/alarmevent.cpp:1739). (cherry picked from commit c036d97d35d25c4511d9569d40c1de07dab96bb6) Signed-off-by: Michele Calgaro --- kalarm/recurrenceedit.h | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'kalarm/recurrenceedit.h') diff --git a/kalarm/recurrenceedit.h b/kalarm/recurrenceedit.h index 82ab954c6..ce99522f7 100644 --- a/kalarm/recurrenceedit.h +++ b/kalarm/recurrenceedit.h @@ -56,7 +56,7 @@ class YearlyRule; class RecurrenceEdit : public TQFrame { Q_OBJECT - + public: // Don't alter the order of these recurrence types enum RepeatType { INVALID_RECUR = -1, NO_RECUR, AT_LOGIN, SUBDAILY, DAILY, WEEKLY, MONTHLY, ANNUAL }; @@ -70,7 +70,7 @@ class RecurrenceEdit : public TQFrame void set(const KAEvent&, bool keepDuration); /** Write recurrence settings into an event */ void updateEvent(KAEvent&, bool adjustStart); - TQWidget* checkData(const TQDateTime& startDateTime, TQString& errorMessage) const; + TQWidget* checkData(const TQDateTime& startDateTime, TQString& errorMessage) const; RepeatType repeatType() const { return mRuleButtonType; } bool isTimedRepeatType() const { return mRuleButtonType >= SUBDAILY; } int subRepeatCount(int* subRepeatInterval = 0) const; @@ -124,7 +124,7 @@ class RecurrenceEdit : public TQFrame void saveState(); // Main rule box and choices - TQWidgetStack* mRuleStack; + TQWidgetStack* mRuleStack; Rule* mRule; // current rule widget, or 0 if NoRule NoRule* mNoRule; SubDailyRule* mSubDailyRule; @@ -159,32 +159,32 @@ class RecurrenceEdit : public TQFrame RadioButton* mNoEndDateButton; RadioButton* mRepeatCountButton; SpinBox* mRepeatCountEntry; - TQLabel* mRepeatCountLabel; + TQLabel* mRepeatCountLabel; RadioButton* mEndDateButton; DateEdit* mEndDateEdit; TimeEdit* mEndTimeEdit; CheckBox* mEndAnyTimeCheckBox; // Exceptions - TQGroupBox* mExceptionGroup; - TQListBox* mExceptionDateList; + TQGroupBox* mExceptionGroup; + TQListBox* mExceptionDateList; DateEdit* mExceptionDateEdit; - TQPushButton* mChangeExceptionButton; - TQPushButton* mDeleteExceptionButton; + TQPushButton* mChangeExceptionButton; + TQPushButton* mDeleteExceptionButton; TQValueList mExceptionDates; // Current start date and time - TQDateTime mCurrStartDateTime; + TQDateTime mCurrStartDateTime; RepetitionButton* mSubRepetition; bool mNoEmitTypeChanged; // suppress typeChanged() signal bool mReadOnly; // Initial state of non-rule controls - TQButton* mSavedRuleButton; // which rule button was selected - TQButton* mSavedRangeButton; // which range button was selected + TQButton* mSavedRuleButton; // which rule button was selected + TQButton* mSavedRangeButton; // which range button was selected int mSavedRecurCount; // recurrence repeat count DateTime mSavedEndDateTime; // end date/time - TQValueList mSavedExceptionDates; // exception dates + TQValueList mSavedExceptionDates; // exception dates int mSavedRepeatInterval; // sub-repetition interval (via mSubRepetition button) int mSavedRepeatCount; // sub-repetition count (via mSubRepetition button) }; -- cgit v1.2.1