From c036d97d35d25c4511d9569d40c1de07dab96bb6 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). Signed-off-by: Michele Calgaro --- kalarm/editdlg.h | 120 +++++++++++++++++++++++++++---------------------------- 1 file changed, 60 insertions(+), 60 deletions(-) (limited to 'kalarm/editdlg.h') diff --git a/kalarm/editdlg.h b/kalarm/editdlg.h index 1b2b0a492..93a3de076 100644 --- a/kalarm/editdlg.h +++ b/kalarm/editdlg.h @@ -58,7 +58,7 @@ class PickAlarmFileRadio; class EditAlarmDlg : public KDialogBase { Q_OBJECT - + public: enum MessageType { MESSAGE, FILE }; enum CmdLogType { DISCARD_OUTPUT, LOG_TO_FILE, EXEC_IN_TERMINAL }; @@ -71,25 +71,25 @@ class EditAlarmDlg : public KDialogBase static CheckBox* createConfirmAckCheckbox(TQWidget* parent, const char* name = 0); - static TQString i18n_ConfirmAck(); // plain text of 'Confirm acknowledgement' checkbox - static TQString i18n_k_ConfirmAck(); // text of 'Confirm acknowledgement' checkbox, with 'k' shortcut - static TQString i18n_SpecialActions(); // plain text of 'Special Actions...' button - static TQString i18n_ShowInKOrganizer(); // plain text of 'Show in KOrganizer' checkbox - static TQString i18n_g_ShowInKOrganizer(); // text of 'Show in KOrganizer' checkbox, with 'G' shortcut - static TQString i18n_EnterScript(); // plain text of 'Enter a script' checkbox - static TQString i18n_p_EnterScript(); // text of 'Enter a script' checkbox, with 'P' shortcut - static TQString i18n_ExecInTermWindow(); // plain text of 'Execute in terminal window' checkbox - static TQString i18n_w_ExecInTermWindow(); // text of 'Execute in terminal window' radio button, with 'W' shortcut - static TQString i18n_u_ExecInTermWindow(); // text of 'Execute in terminal window' radio button, with 'U' shortcut - static TQString i18n_g_LogToFile(); // text of 'Log to file' radio button, with 'G' shortcut - static TQString i18n_CopyEmailToSelf(); // plain text of 'Copy email to self' checkbox - static TQString i18n_e_CopyEmailToSelf(); // text of 'Copy email to self' checkbox, with 'E' shortcut - static TQString i18n_s_CopyEmailToSelf(); // text of 'Copy email to self' checkbox, with 'S' shortcut - static TQString i18n_EmailFrom(); // plain text of 'From:' (email address) - static TQString i18n_f_EmailFrom(); // text of 'From:' (email address), with 'F' shortcut - static TQString i18n_EmailTo(); // plain text of 'To:' (email addressee) - static TQString i18n_EmailSubject(); // plain text of 'Subject:' (email) - static TQString i18n_j_EmailSubject(); // text of 'Subject:' (email), with 'J' shortcut + static TQString i18n_ConfirmAck(); // plain text of 'Confirm acknowledgement' checkbox + static TQString i18n_k_ConfirmAck(); // text of 'Confirm acknowledgement' checkbox, with 'k' shortcut + static TQString i18n_SpecialActions(); // plain text of 'Special Actions...' button + static TQString i18n_ShowInKOrganizer(); // plain text of 'Show in KOrganizer' checkbox + static TQString i18n_g_ShowInKOrganizer(); // text of 'Show in KOrganizer' checkbox, with 'G' shortcut + static TQString i18n_EnterScript(); // plain text of 'Enter a script' checkbox + static TQString i18n_p_EnterScript(); // text of 'Enter a script' checkbox, with 'P' shortcut + static TQString i18n_ExecInTermWindow(); // plain text of 'Execute in terminal window' checkbox + static TQString i18n_w_ExecInTermWindow(); // text of 'Execute in terminal window' radio button, with 'W' shortcut + static TQString i18n_u_ExecInTermWindow(); // text of 'Execute in terminal window' radio button, with 'U' shortcut + static TQString i18n_g_LogToFile(); // text of 'Log to file' radio button, with 'G' shortcut + static TQString i18n_CopyEmailToSelf(); // plain text of 'Copy email to self' checkbox + static TQString i18n_e_CopyEmailToSelf(); // text of 'Copy email to self' checkbox, with 'E' shortcut + static TQString i18n_s_CopyEmailToSelf(); // text of 'Copy email to self' checkbox, with 'S' shortcut + static TQString i18n_EmailFrom(); // plain text of 'From:' (email address) + static TQString i18n_f_EmailFrom(); // text of 'From:' (email address), with 'F' shortcut + static TQString i18n_EmailTo(); // plain text of 'To:' (email addressee) + static TQString i18n_EmailSubject(); // plain text of 'Subject:' (email) + static TQString i18n_j_EmailSubject(); // text of 'Subject:' (email), with 'J' shortcut protected: virtual void resizeEvent(TQResizeEvent*); @@ -132,7 +132,7 @@ class EditAlarmDlg : public KDialogBase void saveState(const KAEvent*); bool stateChanged() const; - TQTabWidget* mTabs; // the tabs in the dialog + TQTabWidget* mTabs; // the tabs in the dialog int mMainPageIndex; int mRecurPageIndex; bool mMainPageShown; // true once the main tab has been displayed @@ -144,10 +144,10 @@ class EditAlarmDlg : public KDialogBase RadioButton* mCommandRadio; PickAlarmFileRadio* mFileRadio; RadioButton* mEmailRadio; - TQWidgetStack* mAlarmTypeStack; + TQWidgetStack* mAlarmTypeStack; // Templates - TQLineEdit* mTemplateName; + TQLineEdit* mTemplateName; ButtonGroup* mTemplateTimeGroup; RadioButton* mTemplateDefaultTime; // no alarm time is specified RadioButton* mTemplateUseTimeAfter;// alarm time is specified as an offset from current @@ -157,14 +157,14 @@ class EditAlarmDlg : public KDialogBase TimeEdit* mTemplateTime; // the alarm time which is specified // Display alarm options widgets - TQFrame* mDisplayAlarmsFrame; - TQHBox* mFileBox; - TQHBox* mFilePadding; + TQFrame* mDisplayAlarmsFrame; + TQHBox* mFileBox; + TQHBox* mFilePadding; SoundPicker* mSoundPicker; CheckBox* mConfirmAck; FontColourButton* mFontColourButton; // for text display option ColourCombo* mBgColourButton; // for file display option - TQHBox* mBgColourBox; + TQHBox* mBgColourBox; SpecialActionsButton* mSpecialActionsButton; Reminder* mReminder; bool mReminderDeferral; @@ -173,32 +173,32 @@ class EditAlarmDlg : public KDialogBase TextEdit* mTextMessageEdit; // text message edit box // Text file alarm widgets LineEdit* mFileMessageEdit; // text file URL edit box - TQPushButton* mFileBrowseButton; // text file browse button - TQString mFileDefaultDir; // default directory for browse button + TQPushButton* mFileBrowseButton; // text file browse button + TQString mFileDefaultDir; // default directory for browse button // Command alarm widgets - TQFrame* mCommandFrame; + TQFrame* mCommandFrame; CheckBox* mCmdTypeScript; // entering a script LineEdit* mCmdCommandEdit; // command line edit box TextEdit* mCmdScriptEdit; // script edit box ButtonGroup* mCmdOutputGroup; // what to do with command output LineEdit* mCmdLogFileEdit; // log file URL edit box - TQWidget* mCmdPadding; + TQWidget* mCmdPadding; // Email alarm widgets - TQFrame* mEmailFrame; + TQFrame* mEmailFrame; EmailIdCombo* mEmailFromList; LineEdit* mEmailToEdit; - TQPushButton* mEmailAddressButton; // email open address book button - TQLineEdit* mEmailSubjectEdit; + TQPushButton* mEmailAddressButton; // email open address book button + TQLineEdit* mEmailSubjectEdit; TextEdit* mEmailMessageEdit; // email body edit box - TQComboBox* mEmailAttachList; - TQPushButton* mEmailAddAttachButton; - TQPushButton* mEmailRemoveButton; + TQComboBox* mEmailAttachList; + TQPushButton* mEmailAddAttachButton; + TQPushButton* mEmailRemoveButton; CheckBox* mEmailBcc; - TQString mAttachDefaultDir; + TQString mAttachDefaultDir; - TQGroupBox* mDeferGroup; - TQLabel* mDeferTimeLabel; - TQPushButton* mDeferChangeButton; + TQGroupBox* mDeferGroup; + TQLabel* mDeferTimeLabel; + TQPushButton* mDeferChangeButton; AlarmTimeWidget* mTimeWidget; LateCancelSelector* mLateCancel; @@ -206,11 +206,11 @@ class EditAlarmDlg : public KDialogBase RecurrenceEdit* mRecurrenceEdit; - TQString mAlarmMessage; // message text/file name/command/email message + TQString mAlarmMessage; // message text/file name/command/email message DateTime mAlarmDateTime; DateTime mDeferDateTime; EmailAddressList mEmailAddresses; // list of addresses to send email to - TQStringList mEmailAttachments; // list of email attachment file names + TQStringList mEmailAttachments; // list of email attachment file names unsigned long mKMailSerialNumber; // if email text, message's KMail serial number, else 0 int mDeferGroupHeight; // height added by deferred time widget int mDesktop; // desktop to display the dialog in @@ -223,34 +223,34 @@ class EditAlarmDlg : public KDialogBase // Initial state of all controls KAEvent* mSavedEvent; - TQString mSavedTemplateName; // mTemplateName value - TQButton* mSavedTemplateTimeType; // selected button in mTemplateTimeGroup - TQTime mSavedTemplateTime; // mTemplateTime value + TQString mSavedTemplateName; // mTemplateName value + TQButton* mSavedTemplateTimeType; // selected button in mTemplateTimeGroup + TQTime mSavedTemplateTime; // mTemplateTime value int mSavedTemplateAfterTime; // mTemplateAfterTime value - TQButton* mSavedTypeRadio; // mMessageRadio, etc + TQButton* mSavedTypeRadio; // mMessageRadio, etc SoundPicker::Type mSavedSoundType; // mSoundPicker sound type bool mSavedRepeatSound; // mSoundPicker repeat status - TQString mSavedSoundFile; // mSoundPicker sound file + TQString mSavedSoundFile; // mSoundPicker sound file float mSavedSoundVolume; // mSoundPicker volume float mSavedSoundFadeVolume;// mSoundPicker fade volume int mSavedSoundFadeSeconds;// mSoundPicker fade time bool mSavedConfirmAck; // mConfirmAck status - TQFont mSavedFont; // mFontColourButton font - TQColor mSavedBgColour; // mFontColourButton background colour - TQColor mSavedFgColour; // mFontColourButton foreground colour - TQString mSavedPreAction; // mSpecialActionsButton pre-alarm action - TQString mSavedPostAction; // mSpecialActionsButton post-alarm action + TQFont mSavedFont; // mFontColourButton font + TQColor mSavedBgColour; // mFontColourButton background colour + TQColor mSavedFgColour; // mFontColourButton foreground colour + TQString mSavedPreAction; // mSpecialActionsButton pre-alarm action + TQString mSavedPostAction; // mSpecialActionsButton post-alarm action int mSavedReminder; // mReminder value bool mSavedOnceOnly; // mReminder once-only status - TQString mSavedTextFileCommandMessage; // mTextMessageEdit/mFileMessageEdit/mCmdCommandEdit/mEmailMessageEdit value - TQString mSavedEmailFrom; // mEmailFromList current value - TQString mSavedEmailTo; // mEmailToEdit value - TQString mSavedEmailSubject; // mEmailSubjectEdit value - TQStringList mSavedEmailAttach; // mEmailAttachList values + TQString mSavedTextFileCommandMessage; // mTextMessageEdit/mFileMessageEdit/mCmdCommandEdit/mEmailMessageEdit value + TQString mSavedEmailFrom; // mEmailFromList current value + TQString mSavedEmailTo; // mEmailToEdit value + TQString mSavedEmailSubject; // mEmailSubjectEdit value + TQStringList mSavedEmailAttach; // mEmailAttachList values bool mSavedEmailBcc; // mEmailBcc status bool mSavedCmdScript; // mCmdTypeScript status - TQButton* mSavedCmdOutputRadio; // selected button in mCmdOutputGroup - TQString mSavedCmdLogFile; // mCmdLogFileEdit value + TQButton* mSavedCmdOutputRadio; // selected button in mCmdOutputGroup + TQString mSavedCmdLogFile; // mCmdLogFileEdit value DateTime mSavedDateTime; // mTimeWidget value int mSavedRecurrenceType; // RecurrenceEdit::RepeatType value int mSavedLateCancel; // mLateCancel value -- cgit v1.2.1