Commit 20caeae8 authored by Laurent Montel's avatar Laurent Montel 😁

normalize

parent e4c2d8bb
......@@ -200,7 +200,7 @@ class AkonadiModel : public Akonadi::EntityTreeModel
static QSize iconSize() { return mIconSize; }
signals:
Q_SIGNALS:
/** Signal emitted when a collection has been added to the model. */
void collectionAdded(const Akonadi::Collection&);
......@@ -248,7 +248,7 @@ class AkonadiModel : public Akonadi::EntityTreeModel
virtual QVariant entityHeaderData(int section, Qt::Orientation, int role, HeaderGroup) const;
virtual int entityColumnCount(HeaderGroup) const;
private slots:
private Q_SLOTS:
void checkResources(Akonadi::ServerManager::State);
void slotMigrationCompleted();
void slotCollectionChanged(const Akonadi::Collection& c, const QSet<QByteArray>& attrNames)
......
......@@ -42,10 +42,10 @@ class AkonadiResourceCreator : public QObject
void createResource();
Akonadi::AgentInstance agentInstance() const { return mAgentInstance; }
signals:
Q_SIGNALS:
void finished(AkonadiResourceCreator*, bool success);
private slots:
private Q_SLOTS:
void getAgentType();
void agentInstanceCreated(KJob*);
void configurationDialogAccepted();
......
......@@ -90,13 +90,13 @@ class AlarmCalendar : public QObject
static bool importAlarms(QWidget*, Akonadi::Collection* = 0);
static bool exportAlarms(const KAEvent::List&, QWidget* parent);
signals:
Q_SIGNALS:
void earliestAlarmChanged();
void haveDisabledAlarmsChanged(bool haveDisabled);
void atLoginEventAdded(const KAEvent&);
void calendarSaved(AlarmCalendar*);
private slots:
private Q_SLOTS:
void setAskResource(bool ask);
void slotCollectionStatusChanged(const Akonadi::Collection&, AkonadiModel::Change,
const QVariant& value, bool inserted);
......
......@@ -36,7 +36,7 @@ class AlarmListView : public EventListView
virtual void setModel(QAbstractItemModel*);
void selectTimeColumns(bool time, bool timeTo);
private slots:
private Q_SLOTS:
void sectionMoved();
private:
......
......@@ -65,12 +65,12 @@ class AlarmTimeWidget : public QFrame
static QString i18n_TimeAfterPeriod();
static const int maxDelayTime; // maximum time from now
signals:
Q_SIGNALS:
void changed(const KDateTime&);
void dateOnlyToggled(bool anyTime);
void pastMax();
private slots:
private Q_SLOTS:
void updateTimes();
void slotButtonSet(QAbstractButton*);
void dateTimeChanged();
......
......@@ -30,7 +30,7 @@ class AutostartApp : public KApplication
AutostartApp();
~AutostartApp() {}
private slots:
private Q_SLOTS:
void slotAutostart();
};
......
......@@ -47,10 +47,10 @@ class BirthdayDlg : public KDialog
explicit BirthdayDlg(QWidget* parent = 0);
QVector<KAEvent> events() const;
protected slots:
protected Q_SLOTS:
virtual void slotOk();
private slots:
private Q_SLOTS:
void slotSelectionChanged();
void slotTextLostFocus();
void resizeViewColumns();
......@@ -81,7 +81,7 @@ class BLineEdit : public QLineEdit
explicit BLineEdit(QWidget* parent = 0) : QLineEdit(parent) { }
explicit BLineEdit(const QString& text, QWidget* parent = 0) : QLineEdit(text, parent) { }
signals:
Q_SIGNALS:
void focusLost();
protected:
......
......@@ -51,14 +51,14 @@ class CalendarMigrator : public QObject
static bool completed() { return mCompleted; }
template <class Interface> static Interface* getAgentInterface(const Akonadi::AgentInstance&, QString& errorMessage, QObject* parent);
signals:
Q_SIGNALS:
/** Signal emitted when a resource is about to be created, and when creation has
* completed (successfully or not).
* @param id collection ID if @p finished is true, else invalid
*/
void creating(const QString& path, Akonadi::Collection::Id id, bool finished);
private slots:
private Q_SLOTS:
void collectionFetchResult(KJob*);
void creatingCalendar(const QString& path);
void calendarCreated(CalendarCreator*);
......
......@@ -85,10 +85,10 @@ class CollectionCheckListModel : public KCheckableProxyModel
virtual QVariant data(const QModelIndex&, int role = Qt::DisplayRole) const;
virtual bool setData(const QModelIndex&, const QVariant& value, int role);
signals:
Q_SIGNALS:
void collectionTypeChange(CollectionCheckListModel*);
private slots:
private Q_SLOTS:
void selectionChanged(const QItemSelection& selected, const QItemSelection& deselected);
void slotRowsInserted(const QModelIndex& parent, int start, int end);
void collectionStatusChanged(const Akonadi::Collection&, AkonadiModel::Change, const QVariant& value, bool inserted);
......@@ -122,7 +122,7 @@ class CollectionFilterCheckListModel : public QSortFilterProxyModel
protected:
bool filterAcceptsRow(int sourceRow, const QModelIndex& sourceParent) const;
private slots:
private Q_SLOTS:
void collectionTypeChanged(CollectionCheckListModel*);
private:
......@@ -282,7 +282,7 @@ class CollectionControlModel : public Akonadi::FavoriteCollectionsModel
/** Return a bulleted list of alarm types for inclusion in an i18n message. */
static QString typeListForDisplay(CalEvent::Types);
private slots:
private Q_SLOTS:
void reset();
void statusChanged(const Akonadi::Collection&, AkonadiModel::Change, const QVariant& value, bool inserted);
void collectionPopulated();
......
......@@ -52,7 +52,7 @@ class CollectionSearch : public QObject
public:
explicit CollectionSearch(const QString& mimeType, const QString& gid = QString(), bool remove = false);
signals:
Q_SIGNALS:
// Signal emitted if action is to fetch all collections for the mime type
void collections(const Akonadi::Collection::List&);
// Signal emitted if action is to fetch all items with the remote ID
......@@ -60,7 +60,7 @@ class CollectionSearch : public QObject
// Signal emitted if action is to delete all items with the remote ID
void deleted(int count);
private slots:
private Q_SLOTS:
void collectionFetchResult(KJob*);
void itemFetchResult(KJob*);
void itemDeleteResult(KJob*);
......
......@@ -44,11 +44,11 @@ class DeferAlarmDlg : public KDialog
void setDeferMinutes(int mins);
int deferMinutes() const { return mDeferMinutes; }
protected slots:
protected Q_SLOTS:
virtual void slotOk();
virtual void slotCancelDeferral();
private slots:
private Q_SLOTS:
void slotPastLimit();
private:
......
......@@ -118,14 +118,14 @@ class EditAlarmDlg : public KDialog
Reminder* reminder() const { return mReminder; }
LateCancelSelector* lateCancel() const { return mLateCancel; }
protected slots:
protected Q_SLOTS:
virtual void slotTry();
virtual void slotHelp(); // Load Template
virtual void slotDefault(); // More/Less Options
virtual void slotButtonClicked(int button);
void contentsChanged();
private slots:
private Q_SLOTS:
void slotRecurTypeChange(int repeatType);
void slotRecurFrequencyChange();
void slotEditDeferral();
......
......@@ -87,7 +87,7 @@ class EditDisplayAlarmDlg : public EditAlarmDlg
virtual CheckBox* type_createConfirmAckCheckbox(QWidget* parent) { mConfirmAck = createConfirmAckCheckbox(parent); return mConfirmAck; }
virtual bool checkText(QString& result, bool showErrorMessage = true) const;
private slots:
private Q_SLOTS:
void slotAlarmTypeChanged(int index);
void slotPickFile();
void slotCmdScriptToggled(bool);
......@@ -170,7 +170,7 @@ class EditCommandAlarmDlg : public EditAlarmDlg
virtual void type_executedTry(const QString& text, void* obj);
virtual bool checkText(QString& result, bool showErrorMessage = true) const;
private slots:
private Q_SLOTS:
void slotCmdScriptToggled(bool);
private:
......@@ -223,7 +223,7 @@ class EditEmailAlarmDlg : public EditAlarmDlg
virtual void type_aboutToTry();
virtual bool checkText(QString& result, bool showErrorMessage = true) const;
private slots:
private Q_SLOTS:
void slotTrySuccess();
void openAddressBook();
void slotAddAttachment();
......@@ -285,10 +285,10 @@ class EditAudioAlarmDlg : public EditAlarmDlg
virtual void type_executedTry(const QString& text, void* obj);
virtual bool checkText(QString& result, bool showErrorMessage = true) const;
protected slots:
protected Q_SLOTS:
virtual void slotTry();
private slots:
private Q_SLOTS:
void audioWinDestroyed() { slotAudioPlaying(false); }
void slotAudioPlaying(bool playing);
......
......@@ -47,12 +47,12 @@ class EventListView : public QTreeView
void setEditOnSingleClick(bool e) { mEditOnSingleClick = e; }
bool editOnSingleClick() const { return mEditOnSingleClick; }
public slots:
public Q_SLOTS:
virtual void slotFind();
virtual void slotFindNext() { findNext(true); }
virtual void slotFindPrev() { findNext(false); }
signals:
Q_SIGNALS:
void contextMenuRequested(const QPoint& globalPos);
void findActive(bool);
......
......@@ -42,10 +42,10 @@ class Find : public QObject
void display();
void findNext(bool forward) { findNext(forward, false, false); }
signals:
Q_SIGNALS:
void active(bool);
private slots:
private Q_SLOTS:
void slotFind();
void slotKFindDestroyed() { emit active(false); }
void slotSelectionChanged();
......
......@@ -53,7 +53,7 @@ class FontColourChooser : public QWidget
void setReadOnly(bool);
virtual bool eventFilter(QObject*, QEvent*);
private slots:
private Q_SLOTS:
void setSampleColour();
void slotDefaultFontToggled(bool);
......
......@@ -46,11 +46,11 @@ class FontColourButton : public PushButton
{ mReadOnly = ro; PushButton::setReadOnly(ro, noHighlight); }
virtual bool isReadOnly() const { return mReadOnly; }
signals:
Q_SIGNALS:
/** Signal emitted whenever a font or colour has been selected. */
void selected(const QColor& fg, const QColor& bg);
protected slots:
protected Q_SLOTS:
void slotButtonPressed();
private:
......@@ -75,7 +75,7 @@ class FontColourDlg : public KDialog
void setReadOnly(bool);
bool isReadOnly() const { return mReadOnly; }
protected slots:
protected Q_SLOTS:
virtual void slotOk();
private:
......
......@@ -58,7 +58,7 @@ class ItemListModel : public Akonadi::EntityMimeTypeFilterModel
static int iconWidth() { return AkonadiModel::iconSize().width(); }
signals:
Q_SIGNALS:
/** Signal emitted when either the first item is added to the model,
* or when the last item is deleted from the model.
*/
......@@ -67,7 +67,7 @@ class ItemListModel : public Akonadi::EntityMimeTypeFilterModel
protected:
virtual bool filterAcceptsRow(int sourceRow, const QModelIndex& sourceParent) const;
private slots:
private Q_SLOTS:
void slotRowsInserted();
void slotRowsRemoved();
void collectionStatusChanged(const Akonadi::Collection& collection, AkonadiModel::Change change, const QVariant&, bool inserted);
......
......@@ -95,7 +95,7 @@ class KAlarmApp : public KUniqueApplication
bool dbusDeleteEvent(const EventId& eventID) { return dbusHandleEvent(eventID, EVENT_CANCEL); }
QString dbusList();
public slots:
public Q_SLOTS:
void processQueue();
void setAlarmsEnabled(bool);
void purgeNewArchivedDefault(const Akonadi::Collection&);
......@@ -105,7 +105,7 @@ class KAlarmApp : public KUniqueApplication
void spreadWindows(bool);
void emailSent(KAMail::JobData&, const QStringList& errmsgs, bool copyerr = false);
signals:
Q_SIGNALS:
void trayIconToggled();
void alarmEnabledToggled(bool);
void audioPlaying(bool);
......@@ -118,7 +118,7 @@ class KAlarmApp : public KUniqueApplication
private:
typedef Preferences::Feb29Type Feb29Type; // allow it to be used in SIGNAL mechanism
private slots:
private Q_SLOTS:
void quitFatal();
void checkNextDueAlarm();
void checkKtimezoned();
......
......@@ -70,7 +70,7 @@ class KAMail : public QObject
static QString i18n_NeedFromEmailAddress();
static QString i18n_sent_mail();
private slots:
private Q_SLOTS:
void slotEmailSent(KJob*);
private:
......
......@@ -48,10 +48,10 @@ class LateCancelSelector : public QFrame
static QString i18n_chk_AutoCloseWin(); // text of 'Auto-close window after this time' checkbox
static QString i18n_chk_AutoCloseWinLC(); // text of 'Auto-close window after late-cancellation time' checkbox
signals:
Q_SIGNALS:
void changed(); // emitted whenever any change occurs
private slots:
private Q_SLOTS:
void slotToggled(bool);
private:
......
......@@ -74,14 +74,14 @@ class ButtonGroup : public QButtonGroup
* @param id Button ID
*/
void setButton(int id);
signals:
Q_SIGNALS:
/** Signal emitted whenever whenever any button in the group changes state,
* for whatever reason.
* @param button The button which is now selected
*/
void buttonSet(QAbstractButton* button);
private slots:
private Q_SLOTS:
void slotButtonToggled(bool);
private:
......
......@@ -76,7 +76,7 @@ class CheckBox : public QCheckBox
void mouseMoveEvent(QMouseEvent*) Q_DECL_OVERRIDE;
void keyPressEvent(QKeyEvent*) Q_DECL_OVERRIDE;
void keyReleaseEvent(QKeyEvent*) Q_DECL_OVERRIDE;
protected slots:
protected Q_SLOTS:
void slotClicked();
private:
Qt::FocusPolicy mFocusPolicy; // default focus policy for the QCheckBox
......
......@@ -35,7 +35,7 @@ class FileDialog : public KFileDialog
static QString getSaveFileName(const KUrl& dir = KUrl(), const QString& filter = QString(),
QWidget* parent = 0, const QString& caption = QString(), bool* append = 0);
private slots:
private Q_SLOTS:
void appendToggled(bool);
private:
......
......@@ -72,7 +72,7 @@ class Label : public QLabel
*/
virtual void setBuddy(QWidget* buddy);
private slots:
private Q_SLOTS:
void buddyDead();
private:
......
......@@ -81,7 +81,7 @@ class LineEdit : public KLineEdit
* setText() is called.
*/
void setCursorAtEnd(bool end = true) { mSetCursorAtEnd = end; }
public slots:
public Q_SLOTS:
/** Sets the contents of the line edit to be @p str. */
virtual void setText(const QString& str);
protected:
......
......@@ -76,7 +76,7 @@ class RadioButton : public QRadioButton
void mouseMoveEvent(QMouseEvent*) Q_DECL_OVERRIDE;
void keyPressEvent(QKeyEvent*) Q_DECL_OVERRIDE;
void keyReleaseEvent(QKeyEvent*) Q_DECL_OVERRIDE;
protected slots:
protected Q_SLOTS:
void slotClicked();
private:
Qt::FocusPolicy mFocusPolicy; // default focus policy for the QRadioButton
......
......@@ -111,7 +111,7 @@ class ShellProcess : public KProcess
*/
static const QByteArray& shellPath();
signals:
Q_SIGNALS:
/** Signal emitted when the shell process execution completes. It is not emitted
* if start() did not attempt to start the command execution, e.g. in kiosk mode.
*/
......@@ -121,7 +121,7 @@ class ShellProcess : public KProcess
/** Signal emitted when input is available from the process's stderr. */
void receivedStderr(ShellProcess*);
private slots:
private Q_SLOTS:
void writtenStdin(qint64 bytes);
void stdoutReady() { emit receivedStdout(this); }
void stderrReady() { emit receivedStderr(this); }
......
......@@ -110,7 +110,7 @@ class SpinBox : public QSpinBox
/** Initialise a QStyleOptionSpinBox with this instance's details. */
void initStyleOption(QStyleOptionSpinBox&) const;
signals:
Q_SIGNALS:
/** Signal emitted when the spin box's value is stepped (by the shifted or unshifted increment).
* @param step The requested step in the spin box's value. Note that the actual change in value
* may have been less than this.
......@@ -142,7 +142,7 @@ class SpinBox : public QSpinBox
void keyReleaseEvent(QKeyEvent*) Q_DECL_OVERRIDE;
void wheelEvent(QWheelEvent*) Q_DECL_OVERRIDE;
private slots:
private Q_SLOTS:
void textEdited();
void valueChange();
private:
......
......@@ -215,7 +215,7 @@ class SpinBox2 : public QFrame
*/
virtual void stepBy(int increment) { addValue(increment); }
public slots:
public Q_SLOTS:
/** Sets the current value to @p val. */
void setValue(int val) { mSpinbox->setValue(val); }
/** Increments the current value by adding the unshifted step increment for
......@@ -231,7 +231,7 @@ class SpinBox2 : public QFrame
/** Sets whether the widget is enabled. */
virtual void setEnabled(bool enabled);
signals:
Q_SIGNALS:
/** Signal which is emitted whenever the value of the spin box changes. */
void valueChanged(int value);
/** Signal which is emitted whenever the value of the spin box changes. */
......@@ -249,11 +249,11 @@ class SpinBox2 : public QFrame
mutable int wSpinboxHide; // width at left of 'mSpinbox' hidden by second spin widget
mutable QPoint mButtonPos; // position of buttons inside mirror widget
protected slots:
protected Q_SLOTS:
virtual void valueChange();
virtual void stepPage(int);
private slots:
private Q_SLOTS:
void updateMirrorButtons();
void updateMirrorFrame();
void paintTimer();
......
......@@ -57,10 +57,10 @@ class SynchTimer : public QObject
QTimer* mTimer;
protected slots:
protected Q_SLOTS:
virtual void slotTimer() = 0;
private slots:
private Q_SLOTS:
void slotReceiverGone(QObject* r) { disconnecT(r); }
private:
......@@ -97,7 +97,7 @@ class MinuteTimer : public SynchTimer
static MinuteTimer* instance();
virtual void start() { slotTimer(); }
protected slots:
protected Q_SLOTS:
virtual void slotTimer();
private:
......@@ -160,7 +160,7 @@ class DailyTimer : public SynchTimer
static DailyTimer* fixedInstance(const QTime& timeOfDay, bool create = true);
virtual void start();
protected slots:
protected Q_SLOTS:
virtual void slotTimer();
private:
......
......@@ -92,20 +92,20 @@ class TimeEdit : public QWidget
/** Sets the maximum value of the widget. */
void setMaximum(const QTime& time) { setMaximum(time.hour()*60 + time.minute()); }
public slots:
public Q_SLOTS:
/** Sets the value of the widget. */
virtual void setValue(int minutes);
/** Sets the value of the widget. */
void setValue(const QTime& t) { setValue(t.hour()*60 + t.minute()); }
signals:
Q_SIGNALS:
/** This signal is emitted every time the value of the widget changes
* (for whatever reason).
* @param minutes The new value.
*/
void valueChanged(int minutes);
private slots:
private Q_SLOTS:
void slotValueChanged(int);
void slotAmPmChanged(int item);
......
......@@ -114,13 +114,13 @@ class TimePeriod : public QWidget
*/
void setWhatsThises(const QString& units, const QString& dayWeek, const QString& hourMin = QString());
signals:
Q_SIGNALS:
/** This signal is emitted whenever the value held in the widget changes.
* @param period The current value of the time period.
*/
void valueChanged(const KCalCore::Duration& period);
private slots:
private Q_SLOTS:
void slotUnitsSelected(int index);
void slotDaysChanged(int);
void slotTimeChanged(int minutes);
......
......@@ -96,7 +96,7 @@ class TimeSpinBox : public SpinBox2
virtual QSize sizeHint() const;
virtual QSize minimumSizeHint() const;
public slots:
public Q_SLOTS:
/** Sets the value of the spin box.
* @param minutes The new value of the spin box, expressed in minutes.
*/
......@@ -108,7 +108,7 @@ class TimeSpinBox : public SpinBox2
virtual QString textFromValue(int v) const;
virtual int valueFromText(const QString&) const;
private slots:
private Q_SLOTS:
void slotValueChanged(int value);
private:
......
......@@ -83,10 +83,10 @@ class MainWindow : public MainWindowBase, public KCalCore::Calendar::CalendarObs
static QString i18n_o_ShowTimeToAlarms(); // text of 'Show Time to Alarms' action, with 'O' shortcut
static QString i18n_chk_ShowTimeToAlarm(); // text of 'Show time until alarm' checkbox
public slots:
public Q_SLOTS:
virtual void show();
signals:
Q_SIGNALS:
void selectionChanged();
protected:
......@@ -99,7 +99,7 @@ class MainWindow : public MainWindowBase, public KCalCore::Calendar::CalendarObs
virtual void saveProperties(KConfigGroup&);
virtual void readProperties(const KConfigGroup&);
private slots:
private Q_SLOTS:
void slotNew(EditAlarmDlg::Type);
void slotNewDisplay() { slotNew(EditAlarmDlg::DISPLAY); }
void slotNewCommand() { slotNew(EditAlarmDlg::COMMAND); }
......
......@@ -98,7 +98,7 @@ class MessageWin : public MainWindowBase
virtual void saveProperties(KConfigGroup&);
virtual void readProperties(const KConfigGroup&);
private slots:
private Q_SLOTS:
void slotOk();
void slotEdit();
void slotDefer();
......
......@@ -39,10 +39,10 @@ class NewAlarmAction : public KActionMenu