aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <montel@kde.org>2016-07-26 19:10:07 (GMT)
committerMontel Laurent <montel@kde.org>2016-07-26 19:10:07 (GMT)
commit74caed08cb778a9a8e1d9d6465c8a84c956addfc (patch)
tree7eb4c0419ccb9b0136531235a5c51515954e6e14
parent42d335d9515612004ae91b0b234040a009cad4ea (diff)
USe new connect api
-rw-r--r--src/actions/smsdialog.h4
-rw-r--r--src/editor/addresseditor/addresslocationwidget.h4
-rw-r--r--src/editor/customfieldeditor/customfieldeditorwidget.h4
-rw-r--r--src/editor/customfieldeditor/customfieldslistdelegate.h4
-rw-r--r--src/editor/generalinfoeditor/displaynameeditwidget.h4
-rw-r--r--src/editor/generalinfoeditor/mail/mailwidget.h3
-rw-r--r--src/editor/generalinfoeditor/namewidget.h4
-rw-r--r--src/editor/generalinfoeditor/web/webwidget.h3
-rw-r--r--src/editor/widgets/imagewidget.cpp16
-rw-r--r--src/editor/widgets/imagewidget.h4
10 files changed, 17 insertions, 33 deletions
diff --git a/src/actions/smsdialog.h b/src/actions/smsdialog.h
index 58f7c93..5f7e025 100644
--- a/src/actions/smsdialog.h
+++ b/src/actions/smsdialog.h
@@ -43,14 +43,12 @@ public:
QString message() const;
-private Q_SLOTS:
+private:
/**
* Calculates the needed amount of sms and the number of characters left in the current sms.
* Shows the result in the QLabel mLengthLabel.
*/
void updateCounter();
-
-private:
void initUI();
QString mNumber;
diff --git a/src/editor/addresseditor/addresslocationwidget.h b/src/editor/addresseditor/addresslocationwidget.h
index bd9725c..74ee82f 100644
--- a/src/editor/addresseditor/addresslocationwidget.h
+++ b/src/editor/addresseditor/addresslocationwidget.h
@@ -59,12 +59,10 @@ Q_SIGNALS:
void updateAddress(const KContacts::Address &address, int index);
void updateAddressCanceled();
-private Q_SLOTS:
+private:
void slotAddAddress();
void slotUpdateAddress();
void slotCancelModifyAddress();
-
-private:
void fillCountryCombo();
void switchMode();
void reset();
diff --git a/src/editor/customfieldeditor/customfieldeditorwidget.h b/src/editor/customfieldeditor/customfieldeditorwidget.h
index 50488de..2c3b008 100644
--- a/src/editor/customfieldeditor/customfieldeditorwidget.h
+++ b/src/editor/customfieldeditor/customfieldeditorwidget.h
@@ -42,11 +42,9 @@ public:
Q_SIGNALS:
void addNewField(const CustomField &field);
-private Q_SLOTS:
+private:
void slotAddField();
void slotFielNameChanged(const QString &text);
-
-private:
void fillTypes();
QLineEdit *mFieldName;
QPushButton *mAddField;
diff --git a/src/editor/customfieldeditor/customfieldslistdelegate.h b/src/editor/customfieldeditor/customfieldslistdelegate.h
index 4b1678c..b8d697f 100644
--- a/src/editor/customfieldeditor/customfieldslistdelegate.h
+++ b/src/editor/customfieldeditor/customfieldslistdelegate.h
@@ -41,10 +41,8 @@ public:
QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const Q_DECL_OVERRIDE;
bool editorEvent(QEvent *event, QAbstractItemModel *model, const QStyleOptionViewItem &option, const QModelIndex &index) Q_DECL_OVERRIDE;
-private Q_SLOTS:
- void setFirstColumnAsCurrent();
-
private:
+ void setFirstColumnAsCurrent();
void removeField(int row, QAbstractItemModel *model);
const QIcon mIcon;
QSize mButtonSize;
diff --git a/src/editor/generalinfoeditor/displaynameeditwidget.h b/src/editor/generalinfoeditor/displaynameeditwidget.h
index 881f67a..63b24b1 100644
--- a/src/editor/generalinfoeditor/displaynameeditwidget.h
+++ b/src/editor/generalinfoeditor/displaynameeditwidget.h
@@ -69,11 +69,9 @@ public Q_SLOTS:
protected:
bool eventFilter(QObject *object, QEvent *event) Q_DECL_OVERRIDE;
-private Q_SLOTS:
+private:
void displayTypeChanged(int);
void setComboBoxEditable(bool);
-
-private:
void updateView();
KComboBox *mView;
diff --git a/src/editor/generalinfoeditor/mail/mailwidget.h b/src/editor/generalinfoeditor/mail/mailwidget.h
index 6c9e839..bf09dea 100644
--- a/src/editor/generalinfoeditor/mail/mailwidget.h
+++ b/src/editor/generalinfoeditor/mail/mailwidget.h
@@ -47,11 +47,10 @@ Q_SIGNALS:
void removeWidget(MailWidget *);
void preferredChanged(MailWidget *);
-private Q_SLOTS:
+private:
void slotAddMail();
void slotRemoveMail();
void slotPreferredChanged();
-private:
KContacts::Email mEmail;
QString mOldType;
PreferredLineEditWidget *mMailEdit;
diff --git a/src/editor/generalinfoeditor/namewidget.h b/src/editor/generalinfoeditor/namewidget.h
index fe2ccaf..ad02f0f 100644
--- a/src/editor/generalinfoeditor/namewidget.h
+++ b/src/editor/generalinfoeditor/namewidget.h
@@ -48,11 +48,9 @@ public:
Q_SIGNALS:
void nameChanged(const KContacts::Addressee &contact);
-private Q_SLOTS:
+private:
void slotTextChanged(const QString &text);
void slotOpenNameEditDialog();
-
-private:
DisplayNameEditWidget::DisplayType mDisplayType;
KContacts::Addressee mContact;
KLineEdit *mNameEdit;
diff --git a/src/editor/generalinfoeditor/web/webwidget.h b/src/editor/generalinfoeditor/web/webwidget.h
index fc45164..3e33fd4 100644
--- a/src/editor/generalinfoeditor/web/webwidget.h
+++ b/src/editor/generalinfoeditor/web/webwidget.h
@@ -50,11 +50,10 @@ Q_SIGNALS:
void removeWidget(WebWidget *);
void preferredChanged(WebWidget *);
-private Q_SLOTS:
+private:
void slotRemoveWeb();
void slotAddWeb();
void slotPreferredChanged();
-private:
KContacts::ResourceLocatorUrl mUrl;
QStringList mWebSiteType;
QString mOldType;
diff --git a/src/editor/widgets/imagewidget.cpp b/src/editor/widgets/imagewidget.cpp
index c0b91fe..e7e27f9 100644
--- a/src/editor/widgets/imagewidget.cpp
+++ b/src/editor/widgets/imagewidget.cpp
@@ -249,28 +249,28 @@ void ImageWidget::contextMenuEvent(QContextMenuEvent *event)
if (mType == Photo) {
if (!mReadOnly) {
- menu.addAction(i18n("Change photo..."), this, SLOT(changeImage()));
- menu.addAction(i18n("Change URL..."), this, SLOT(changeUrl()));
+ menu.addAction(i18n("Change photo..."), this, &ImageWidget::changeImage);
+ menu.addAction(i18n("Change URL..."), this, &ImageWidget::changeUrl);
}
if (mHasImage) {
- menu.addAction(i18n("Save photo..."), this, SLOT(saveImage()));
+ menu.addAction(i18n("Save photo..."), this, &ImageWidget::saveImage);
if (!mReadOnly) {
- menu.addAction(i18n("Remove photo"), this, SLOT(deleteImage()));
+ menu.addAction(i18n("Remove photo"), this, &ImageWidget::deleteImage);
}
}
} else {
if (!mReadOnly) {
- menu.addAction(i18n("Change logo..."), this, SLOT(changeImage()));
- menu.addAction(i18n("Change URL..."), this, SLOT(changeUrl()));
+ menu.addAction(i18n("Change logo..."), this, &ImageWidget::changeImage);
+ menu.addAction(i18n("Change URL..."), this, &ImageWidget::changeUrl);
}
if (mHasImage) {
- menu.addAction(i18n("Save logo..."), this, SLOT(saveImage()));
+ menu.addAction(i18n("Save logo..."), this, &ImageWidget::saveImage);
if (!mReadOnly) {
- menu.addAction(i18n("Remove logo"), this, SLOT(deleteImage()));
+ menu.addAction(i18n("Remove logo"), this, &ImageWidget::deleteImage);
}
}
}
diff --git a/src/editor/widgets/imagewidget.h b/src/editor/widgets/imagewidget.h
index 43cd514..8f2edbc 100644
--- a/src/editor/widgets/imagewidget.h
+++ b/src/editor/widgets/imagewidget.h
@@ -64,15 +64,13 @@ protected:
// context menu handling
void contextMenuEvent(QContextMenuEvent *event) Q_DECL_OVERRIDE;
-private Q_SLOTS:
+private:
void updateView();
void changeImage();
void changeUrl();
void saveImage();
void deleteImage();
-
-private:
ImageLoader *imageLoader();
KContacts::Picture mPicture;