[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kpeople] /: Fix minor EBN issues
From:       Yuri Chornoivan <null () kde ! org>
Date:       2018-09-12 16:04:51
Message-ID: E1g07dL-00088a-Nn () code ! kde ! org
[Download RAW message or body]

Git commit c39df38b662f089bf28b51ffa9f0f534e87fe567 by Yuri Chornoivan.
Committed on 12/09/2018 at 16:04.
Pushed by yurchor into branch 'master'.

Fix minor EBN issues

M  +1    -1    autotests/personsmodeltest.cpp
M  +2    -2    src/backends/abstractcontact.h
M  +3    -3    src/personssortfilterproxymodel.h
M  +3    -3    src/widgets/actions.h
M  +3    -3    src/widgets/plugins/mergecontactswidget.h

https://commits.kde.org/kpeople/c39df38b662f089bf28b51ffa9f0f534e87fe567

diff --git a/autotests/personsmodeltest.cpp b/autotests/personsmodeltest.cpp
index 3e5b9a5..2432bc4 100644
--- a/autotests/personsmodeltest.cpp
+++ b/autotests/personsmodeltest.cpp
@@ -150,7 +150,7 @@ void PersonsModelTest::unmergeContacts()
     QCOMPARE(modelRowsInsert.count(), 1);
     QCOMPARE(modelRowsInsert.first().at(0).toModelIndex(), QModelIndex());
 =

-    // Similarily, there must be one row removed and the parent must be
+    // Similarly, there must be one row removed and the parent must be
     // the old Person index
     QCOMPARE(modelRowsRemove.count(), 1);
     QCOMPARE(modelRowsRemove.first().at(0).toModelIndex(), personIndex);
diff --git a/src/backends/abstractcontact.h b/src/backends/abstractcontact.h
index 933ff09..787eda7 100644
--- a/src/backends/abstractcontact.h
+++ b/src/backends/abstractcontact.h
@@ -16,8 +16,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1=
301  USA
 */
 =

-#ifndef KPEOPLE_CONTACT
-#define KPEOPLE_CONTACT
+#ifndef KPEOPLE_ABSTRACT_CONTACT_H
+#define KPEOPLE_ABSTRACT_CONTACT_H
 =

 #include <QSharedData>
 #include <QVariant>
diff --git a/src/personssortfilterproxymodel.h b/src/personssortfilterproxy=
model.h
index c411f48..3be1028 100644
--- a/src/personssortfilterproxymodel.h
+++ b/src/personssortfilterproxymodel.h
@@ -16,8 +16,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1=
301  USA
 */
 =

-#ifndef PERSONSSORTFILTERMODEL_H
-#define PERSONSSORTFILTERMODEL_H
+#ifndef PERSONSSORTFILTERPROXYMODEL_H
+#define PERSONSSORTFILTERPROXYMODEL_H
 =

 #include <QScopedPointer>
 #include <QSortFilterProxyModel>
@@ -60,4 +60,4 @@ private:
 =

 }
 =

-#endif // PERSONSSORTFILTERMODEL_H
+#endif // PERSONSSORTFILTERPROXYMODEL_H
diff --git a/src/widgets/actions.h b/src/widgets/actions.h
index cbac2d5..870a157 100644
--- a/src/widgets/actions.h
+++ b/src/widgets/actions.h
@@ -16,8 +16,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1=
301  USA
 */
 =

-#ifndef KPEOPLEWIDGETS_GLOBAL_H
-#define KPEOPLEWIDGETS_GLOBAL_H
+#ifndef KPEOPLEWIDGETS_ACTIONS_H
+#define KPEOPLEWIDGETS_ACTIONS_H
 =

 #include <QList>
 #include <kpeople/widgets/kpeoplewidgets_export.h>
@@ -51,4 +51,4 @@ enum ActionType {
 KPEOPLEWIDGETS_EXPORT QList<QAction *> actionsForPerson(const QString &con=
tactUri, QObject *parent);
 }
 =

-#endif // KPEOPLEWIDGETS_GLOBAL_H
+#endif // KPEOPLEWIDGETS_ACTIONS_H
diff --git a/src/widgets/plugins/mergecontactswidget.h b/src/widgets/plugin=
s/mergecontactswidget.h
index be02753..1941dba 100644
--- a/src/widgets/plugins/mergecontactswidget.h
+++ b/src/widgets/plugins/mergecontactswidget.h
@@ -16,8 +16,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1=
301  USA
 */
 =

-#ifndef MERGE_CONTACT_WIDGET_H
-#define MERGE_CONTACT_WIDGET_H
+#ifndef MERGE_CONTACTS_WIDGET_H
+#define MERGE_CONTACTS_WIDGET_H
 =

 #include "abstractpersondetailswidget.h"
 =

@@ -59,4 +59,4 @@ private:
     QList< QPair<QPersistentModelIndex, PersonPresentationWidget *> > m_li=
stMergeContacts;
 };
 =

-#endif // MERGE_CONTACT_WIDGET_H
+#endif // MERGE_CONTACTS_WIDGET_H
[prev in list] [next in list] [prev in thread] [next in thread]