summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <montel@kde.org>2016-07-26 19:18:18 (GMT)
committerMontel Laurent <montel@kde.org>2016-07-26 19:18:18 (GMT)
commit2dc9203635a9111ab5d8792e03870b4079a2c206 (patch)
tree303bee7116a53104175409652f4f7802c6657ac5
parentf53cdde5aca09e1ff0db121c64431bc3ec06cb63 (diff)
use new connect api
-rw-r--r--src/attendeeline.cpp2
-rw-r--r--src/attendeeline.h8
-rw-r--r--src/attendeelineeditdelegate.h6
-rw-r--r--src/categorydialog.h4
-rw-r--r--src/combinedincidenceeditor.h4
-rw-r--r--src/incidencealarm.h4
-rw-r--r--src/incidenceattachment.cpp6
-rw-r--r--src/incidencedescription.h4
-rw-r--r--src/incidencerecurrence.h4
-rw-r--r--src/incidenceresource.h4
-rw-r--r--src/individualmailcomponentfactory.h8
-rw-r--r--src/opencomposerjob.h4
-rw-r--r--src/resourcemodel.h2
-rw-r--r--src/schedulingdialog.h4
-rw-r--r--src/templatemanagementdialog.h3
-rw-r--r--src/visualfreebusywidget.cpp2
-rw-r--r--src/visualfreebusywidget.h4
17 files changed, 23 insertions, 50 deletions
diff --git a/src/attendeeline.cpp b/src/attendeeline.cpp
index bfd34e1..9cfbd86 100644
--- a/src/attendeeline.cpp
+++ b/src/attendeeline.cpp
@@ -52,7 +52,7 @@ void AttendeeComboBox::addItem(const QIcon &icon, const QString &text)
setCurrentIndex(0);
}
int index = mList.size() - 1;
- QAction *act = menu()->addAction(icon, text, this, SLOT(slotActionTriggered()));
+ QAction *act = menu()->addAction(icon, text, this, &AttendeeComboBox::slotActionTriggered);
act->setData(index);
}
diff --git a/src/attendeeline.h b/src/attendeeline.h
index 8834ea0..1e4dc67 100644
--- a/src/attendeeline.h
+++ b/src/attendeeline.h
@@ -60,10 +60,8 @@ public Q_SLOTS:
protected:
void keyPressEvent(QKeyEvent *ev) Q_DECL_OVERRIDE;
-private Q_SLOTS:
- void slotActionTriggered();
-
private:
+ void slotActionTriggered();
QMenu *mMenu;
QVector<QPair<QString, QIcon> > mList;
int mCurrentIndex;
@@ -127,12 +125,10 @@ Q_SIGNALS:
const KCalCore::Attendee::Ptr &newAttendee);
void editingFinished(KPIM::MultiplyingLine *);
-private Q_SLOTS:
+private:
void slotTextChanged(const QString &);
void slotHandleChange();
void slotComboChanged();
-
-private:
void dataFromFields();
void fieldsFromData();
diff --git a/src/attendeelineeditdelegate.h b/src/attendeelineeditdelegate.h
index 36f0b67..fb2acf2 100644
--- a/src/attendeelineeditdelegate.h
+++ b/src/attendeelineeditdelegate.h
@@ -37,7 +37,7 @@ class AttendeeLineEditDelegate : public QStyledItemDelegate
{
Q_OBJECT
public:
- AttendeeLineEditDelegate(QObject *parent = Q_NULLPTR);
+ explicit AttendeeLineEditDelegate(QObject *parent = Q_NULLPTR);
QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const Q_DECL_OVERRIDE;
void setEditorData(QWidget *editor, const QModelIndex &index) const Q_DECL_OVERRIDE;
@@ -49,11 +49,9 @@ public:
public Q_SLOTS:
bool helpEvent(QHelpEvent *event, QAbstractItemView *view, const QStyleOptionViewItem &option, const QModelIndex &index) Q_DECL_OVERRIDE;
-private Q_SLOTS:
+private:
void rightPressed();
void leftPressed();
-
-private:
QString mToolTip;
QString mWhatsThis;
KCompletion::CompletionMode mCompletionMode;
diff --git a/src/categorydialog.h b/src/categorydialog.h
index 6ce18fd..5474d46 100644
--- a/src/categorydialog.h
+++ b/src/categorydialog.h
@@ -62,14 +62,12 @@ public:
public Q_SLOTS:
void clear();
-private Q_SLOTS:
+private:
void handleTextChanged(const QString &newText);
void handleSelectionChanged();
void handleColorChanged(const QColor &);
void addCategory();
void removeCategory();
-
-private:
QStringList mCategoryList;
CategoryWidgetBase *mWidgets;
CalendarSupport::CategoryConfig *mCategoryConfig;
diff --git a/src/combinedincidenceeditor.h b/src/combinedincidenceeditor.h
index 488b6d2..32cdd6c 100644
--- a/src/combinedincidenceeditor.h
+++ b/src/combinedincidenceeditor.h
@@ -64,13 +64,11 @@ public:
void save(const KCalCore::Incidence::Ptr &incidence) Q_DECL_OVERRIDE;
void save(Akonadi::Item &item) Q_DECL_OVERRIDE;
-private Q_SLOTS:
- void handleDirtyStatusChange(bool isDirty);
-
Q_SIGNALS:
void showMessage(const QString &reason, KMessageWidget::MessageType) const;
private:
+ void handleDirtyStatusChange(bool isDirty);
QVector<IncidenceEditor *> mCombinedEditors;
int mDirtyEditorCount;
};
diff --git a/src/incidencealarm.h b/src/incidencealarm.h
index d5e8266..d9efb46 100644
--- a/src/incidencealarm.h
+++ b/src/incidencealarm.h
@@ -48,7 +48,7 @@ public:
Q_SIGNALS:
void alarmCountChanged(int newCount);
-private Q_SLOTS:
+private:
void editCurrentAlarm();
void handleDateTimeToggle();
void newAlarm();
@@ -57,8 +57,6 @@ private Q_SLOTS:
void toggleCurrentAlarm();
void updateAlarmList();
void updateButtons();
-
-private:
QString stringForAlarm(const KCalCore::Alarm::Ptr &alarm);
private:
diff --git a/src/incidenceattachment.cpp b/src/incidenceattachment.cpp
index db0982a..03662d4 100644
--- a/src/incidenceattachment.cpp
+++ b/src/incidenceattachment.cpp
@@ -497,13 +497,13 @@ void IncidenceAttachment::setupActions()
mPopupMenu->addSeparator();
#ifndef QT_NO_CLIPBOARD
- mCopyAction = KStandardAction::copy(this, SLOT(copyToClipboard()), ac);
+ mCopyAction = KStandardAction::copy(this, &IncidenceAttachment::copyToClipboard, ac);
mPopupMenu->addAction(mCopyAction);
- mCutAction = KStandardAction::cut(this, SLOT(cutToClipboard()), ac);
+ mCutAction = KStandardAction::cut(this, &IncidenceAttachment::cutToClipboard, ac);
mPopupMenu->addAction(mCutAction);
- QAction *action = KStandardAction::paste(this, SLOT(pasteFromClipboard()), ac);
+ QAction *action = KStandardAction::paste(this, &IncidenceAttachment::pasteFromClipboard, ac);
mPopupMenu->addAction(action);
mPopupMenu->addSeparator();
#endif
diff --git a/src/incidencedescription.h b/src/incidencedescription.h
index 1e1f3a7..06d582a 100644
--- a/src/incidencedescription.h
+++ b/src/incidencedescription.h
@@ -57,11 +57,9 @@ public:
void printDebugInfo() const Q_DECL_OVERRIDE;
-private Q_SLOTS:
+private:
void toggleRichTextDescription();
void enableRichTextDescription(bool enable);
-
-private:
void setupToolBar();
private:
diff --git a/src/incidencerecurrence.h b/src/incidencerecurrence.h
index 1424b85..4e450d9 100644
--- a/src/incidencerecurrence.h
+++ b/src/incidencerecurrence.h
@@ -65,7 +65,7 @@ public:
Q_SIGNALS:
void recurrenceChanged(IncidenceEditorNG::RecurrenceType type);
-private Q_SLOTS:
+private:
void addException();
void fillCombos();
void handleDateTimeToggle();
@@ -78,8 +78,6 @@ private Q_SLOTS:
void updateWeekDays(const QDate &newStartDate);
void handleStartDateChange(const QDate &);
-private:
-
/**
I needed save() to be const, so created this func.
save() calls this now, and changes members outside.
diff --git a/src/incidenceresource.h b/src/incidenceresource.h
index fd7a4be..7c146ea 100644
--- a/src/incidenceresource.h
+++ b/src/incidenceresource.h
@@ -59,8 +59,7 @@ Q_SIGNALS:
* @arg: new count of resources.
*/
void resourceCountChanged(int);
-
-private Q_SLOTS:
+private:
void findResources();
void bookResource();
void layoutChanged();
@@ -69,7 +68,6 @@ private Q_SLOTS:
void slotDateChanged();
void dialogOkPressed();
-private:
Ui::EventOrTodoDesktop *mUi;
/** completer for findResources */
diff --git a/src/individualmailcomponentfactory.h b/src/individualmailcomponentfactory.h
index a2f8480..5925c1a 100644
--- a/src/individualmailcomponentfactory.h
+++ b/src/individualmailcomponentfactory.h
@@ -42,12 +42,11 @@ public:
explicit IndividualMessageQueueJob(const KIdentityManagement::Identity &identity, const KCalCore::Attendee::List &update, const KCalCore::Attendee::List &edit, QObject *parent);
void start() Q_DECL_OVERRIDE;
-private Q_SLOTS:
+
+private:
void startQueueJob(const QStringList &to, const QStringList &cc);
void startComposerJob(const QStringList &to, const QStringList &cc);
void handleJobFinished(KJob *job);
-
-private:
KCalCore::Attendee::List mUpdate;
KCalCore::Attendee::List mEdit;
KIdentityManagement::Identity mIdentity;
@@ -90,9 +89,8 @@ protected:
Action action,
const KGuiItem &buttonYes, const KGuiItem &buttonNo);
-private Q_SLOTS:
- void onDialogClosed(int result);
private:
+ void onDialogClosed(int result);
IndividualMailDialog *mDialog;
};
diff --git a/src/opencomposerjob.h b/src/opencomposerjob.h
index 2461e78..2332645 100644
--- a/src/opencomposerjob.h
+++ b/src/opencomposerjob.h
@@ -40,12 +40,10 @@ public:
void start() Q_DECL_OVERRIDE;
-private Q_SLOTS:
+private:
void slotServiceOwnerChanged(const QString &, const QString &, const QString &);
void timeout();
void processMail();
-
-private:
QString mDBusService;
QString mError;
QString mTo, mCc, mBcc;
diff --git a/src/resourcemodel.h b/src/resourcemodel.h
index 1015113..7f1ae2c 100644
--- a/src/resourcemodel.h
+++ b/src/resourcemodel.h
@@ -119,7 +119,7 @@ private:
*/
QStringList headers;
-private Q_SLOTS:
+private:
/* Slot for founded collections
*
*/
diff --git a/src/schedulingdialog.h b/src/schedulingdialog.h
index ef2c7f9..34dbdc6 100644
--- a/src/schedulingdialog.h
+++ b/src/schedulingdialog.h
@@ -58,15 +58,13 @@ Q_SIGNALS:
void endDateChanged(const QDate &newDate);
void endTimeChanged(const QTime &newTime);
-private Q_SLOTS:
+private:
void slotWeekdaysChanged();
void slotMandatoryRolesChanged();
void slotStartDateChanged(const QDate &newDate);
void slotRowSelectionChanged(const QModelIndex &current, const QModelIndex &previous);
void slotSetEndTimeLabel(const QTime &startTime);
-
-private:
void updateWeekDays(const QDate &oldDate);
void fillCombos();
diff --git a/src/templatemanagementdialog.h b/src/templatemanagementdialog.h
index 3223f18..2ca4360 100644
--- a/src/templatemanagementdialog.h
+++ b/src/templatemanagementdialog.h
@@ -78,9 +78,8 @@ protected Q_SLOTS:
void slotApplyTemplate();
void slotOk();
-private Q_SLOTS:
- void slotHelp();
private:
+ void slotHelp();
void updateButtons();
Ui::TemplateManagementDialog_base m_base;
QStringList m_templates;
diff --git a/src/visualfreebusywidget.cpp b/src/visualfreebusywidget.cpp
index c390cbb..445a80d 100644
--- a/src/visualfreebusywidget.cpp
+++ b/src/visualfreebusywidget.cpp
@@ -265,7 +265,7 @@ VisualFreeBusyWidget::VisualFreeBusyWidget(KPIM::FreeBusyItemModel *model, int s
// set start to even hours, i.e. to 12:AM 0 Min 0 Sec
QDateTime horizonStart =
QDateTime(QDateTime::currentDateTime().addDays(-15).date());
- QDateTime horizonEnd = QDateTime::currentDateTime().addDays(15);
+ //QDateTime horizonEnd = QDateTime::currentDateTime().addDays(15);
mGanttGrid->setStartDateTime(horizonStart);
//connect( mGanttGraphicsView, SIGNAL(timeIntervalSelected(KDateTime,KDateTime)),
diff --git a/src/visualfreebusywidget.h b/src/visualfreebusywidget.h
index 2eb00af..ec42fc9 100644
--- a/src/visualfreebusywidget.h
+++ b/src/visualfreebusywidget.h
@@ -67,10 +67,8 @@ protected Q_SLOTS:
void showAttendeeStatusMenu();
void slotIntervalColorRectangleMoved(const KDateTime &start, const KDateTime &end);
-private Q_SLOTS:
- void splitterMoved();
-
private:
+ void splitterMoved();
KGantt::GraphicsView *mGanttGraphicsView;
QTreeView *mLeftView;
RowController *mRowController;