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 <michele.calgaro@yahoo.it>

1 files changed, 32 insertions, 32 deletions

diff --git a/kalarm/recurrenceeditprivate.h b/kalarm/recurrenceeditprivate.h
index 6a239ae78..a38248512 100644
--- a/kalarm/recurrenceeditprivate.h
+++ b/kalarm/recurrenceeditprivate.h
@@ -41,39 +41,39 @@ class NoRule : public TQFrame
 	public:
 		NoRule(TQWidget* parent, const char* name = 0) : TQFrame(parent, name)
 		                                                 { setFrameStyle(TQFrame::NoFrame); }
-		virtual int      frequency() const       { return 0; }
+		virtual int       frequency() const       { return 0; }
 };
 
 class Rule : public NoRule
 {
 		Q_OBJECT
-  
+
 	public:
 		Rule(const TQString& freqText, const TQString& freqWhatsThis, bool time, bool readOnly,
 		     TQWidget* parent, const char* name = 0);
-		int              frequency() const;
-		void             setFrequency(int);
-		virtual void     setFrequencyFocus()     { mSpinBox->setFocus(); }
+		int               frequency() const;
+		void              setFrequency(int);
+		virtual void      setFrequencyFocus()     { mSpinBox->setFocus(); }
 		TQVBoxLayout*     layout() const          { return mLayout; }
 		virtual TQWidget* validate(TQString&)      { return 0; }
-		virtual void     saveState();
-		virtual bool     stateChanged() const;
+		virtual void      saveState();
+		virtual bool      stateChanged() const;
 	signals:
-		void             frequencyChanged();
+		void              frequencyChanged();
 	private:
 		TQWidget*         mSpinBox;
-		SpinBox*         mIntSpinBox;
-		TimeSpinBox*     mTimeSpinBox;
+		SpinBox*          mIntSpinBox;
+		TimeSpinBox*      mTimeSpinBox;
 		TQVBoxLayout*     mLayout;
 		// Saved state of all controls
-		int              mSavedFrequency;    // frequency for the selected rule
+		int               mSavedFrequency;    // frequency for the selected rule
 };
 
 // Subdaily rule choices
 class SubDailyRule : public Rule
 {
 		Q_OBJECT
-  
+
 	public:
 		SubDailyRule(bool readOnly, TQWidget* parent, const char* name = 0);
 };
@@ -82,19 +82,19 @@ class SubDailyRule : public Rule
 class DayWeekRule : public Rule
 {
 		Q_OBJECT
-  
+
 	public:
 		DayWeekRule(const TQString& freqText, const TQString& freqWhatsThis, const TQString& daysWhatsThis,
 		            bool readOnly, TQWidget* parent, const char* name = 0);
 		TQBitArray        days() const;
-		void             setDays(bool);
-		void             setDays(const TQBitArray& days);
-		void             setDay(int dayOfWeek);
+		void              setDays(bool);
+		void              setDays(const TQBitArray& days);
+		void              setDay(int dayOfWeek);
 		virtual TQWidget* validate(TQString& errorMessage);
-		virtual void     saveState();
-		virtual bool     stateChanged() const;
+		virtual void      saveState();
+		virtual bool      stateChanged() const;
 	private:
-		CheckBox*        mDayBox[7];
+		CheckBox*         mDayBox[7];
 		// Saved state of all controls
 		TQBitArray        mSavedDays;         // ticked days for weekly rule
 };
@@ -117,7 +117,7 @@ class WeeklyRule : public DayWeekRule
 class MonthYearRule : public Rule
 {
 		Q_OBJECT
-  
+
 	public:
 		enum DayPosType { DATE, POS };
 
@@ -172,30 +172,30 @@ class MonthlyRule : public MonthYearRule
 class YearlyRule : public MonthYearRule
 {
 		Q_OBJECT
-  
+
 	public:
 		YearlyRule(bool readOnly, TQWidget* parent, const char* name = 0);
 		TQValueList<int>  months() const;
-		void             setMonths(const TQValueList<int>& months);
-		void             setDefaultValues(int dayOfMonth, int dayOfWeek, int month);
+		void              setMonths(const TQValueList<int>& months);
+		void              setDefaultValues(int dayOfMonth, int dayOfWeek, int month);
 		KARecurrence::Feb29Type feb29Type() const;
-		void             setFeb29Type(KARecurrence::Feb29Type);
+		void              setFeb29Type(KARecurrence::Feb29Type);
 		virtual TQWidget* validate(TQString& errorMessage);
-		virtual void     saveState();
-		virtual bool     stateChanged() const;
+		virtual void      saveState();
+		virtual bool      stateChanged() const;
 	protected:
-		virtual void     daySelected(int day);
+		virtual void      daySelected(int day);
 	protected slots:
-		virtual void     clicked(int id);
+		virtual void      clicked(int id);
 	private slots:
-		void             enableFeb29();
+		void              enableFeb29();
 	private:
-		CheckBox*        mMonthBox[12];
+		CheckBox*         mMonthBox[12];
 		TQLabel*          mFeb29Label;
-		ComboBox*        mFeb29Combo;
+		ComboBox*         mFeb29Combo;
 		// Saved state of all controls
 		TQValueList<int>  mSavedMonths;       // ticked months for yearly rule
-		int              mSavedFeb29Type;    // February 29th recurrence type
+		int               mSavedFeb29Type;    // February 29th recurrence type
 };
 
 #endif // RECURRENCEEDITPRIVATE_H