aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Krause <[email protected]>2015-08-10 19:13:05 +0200
committerVolker Krause <[email protected]>2015-08-10 19:13:05 +0200
commit07dabd35bcf0d9b048fd1da9fd00936bdfa61fba (patch)
tree2aca9cc9da682df2f7fc3c1b99ec729b67adfd60
parent7a7da080da2f03289edf1d50a551fe5095d75c24 (diff)
Don't accidentally export private classes.
Nested classes inherit the visibility of the outer class, which isn't really what we want for private classes. So hide them explicitly.
-rw-r--r--src/address.cpp2
-rw-r--r--src/addressee.cpp2
-rw-r--r--src/addresseehelper.cpp2
-rw-r--r--src/addresseelist.cpp2
-rw-r--r--src/calendarurl.cpp2
-rw-r--r--src/contactgroup.cpp8
-rw-r--r--src/email.cpp2
-rw-r--r--src/field.cpp2
-rw-r--r--src/gender.cpp2
-rw-r--r--src/geo.cpp2
-rw-r--r--src/impp.cpp2
-rw-r--r--src/key.cpp2
-rw-r--r--src/lang.cpp2
-rw-r--r--src/ldapdn.cpp2
-rw-r--r--src/ldif.cpp2
-rw-r--r--src/phonenumber.cpp2
-rw-r--r--src/related.cpp2
-rw-r--r--src/resourcelocatorurl.cpp2
-rw-r--r--src/secrecy.cpp2
-rw-r--r--src/sortmode.cpp4
-rw-r--r--src/sound.cpp2
-rw-r--r--src/timezone.cpp2
22 files changed, 26 insertions, 26 deletions
diff --git a/src/address.cpp b/src/address.cpp
index 2d349a7..adaae72 100644
--- a/src/address.cpp
+++ b/src/address.cpp
@@ -189,7 +189,7 @@ static bool parseAddressTemplateSection(const QString &tsection, QString &result
return ret;
}
-class Address::Private : public QSharedData
+class Q_DECL_HIDDEN Address::Private : public QSharedData
{
public:
Private()
diff --git a/src/addressee.cpp b/src/addressee.cpp
index 72e7ae0..ec9aa1a 100644
--- a/src/addressee.cpp
+++ b/src/addressee.cpp
@@ -42,7 +42,7 @@ template <class L>
static bool listEquals(const QVector<L> &list, const QVector<L> &pattern);
static bool listEquals(const QStringList &list, const QStringList &pattern);
-class Addressee::Private : public QSharedData
+class Q_DECL_HIDDEN Addressee::Private : public QSharedData
{
public:
Private()
diff --git a/src/addresseehelper.cpp b/src/addresseehelper.cpp
index c915a66..5cf2b36 100644
--- a/src/addresseehelper.cpp
+++ b/src/addresseehelper.cpp
@@ -28,7 +28,7 @@
using namespace KContacts;
-class KContacts::AddresseeHelperPrivate
+class Q_DECL_HIDDEN KContacts::AddresseeHelperPrivate
{
public:
QSet<QString> mTitles;
diff --git a/src/addresseelist.cpp b/src/addresseelist.cpp
index e7bbd96..e5f894d 100644
--- a/src/addresseelist.cpp
+++ b/src/addresseelist.cpp
@@ -153,7 +153,7 @@ bool SortingTraits::GivenName::lt(const Addressee &a1, const Addressee &a2)
static Field *sActiveField = Q_NULLPTR;
-class AddresseeList::Private : public QSharedData
+class Q_DECL_HIDDEN AddresseeList::Private : public QSharedData
{
public:
Private()
diff --git a/src/calendarurl.cpp b/src/calendarurl.cpp
index 913d6d3..35397a7 100644
--- a/src/calendarurl.cpp
+++ b/src/calendarurl.cpp
@@ -27,7 +27,7 @@
using namespace KContacts;
-class CalendarUrl::Private : public QSharedData
+class Q_DECL_HIDDEN CalendarUrl::Private : public QSharedData
{
public:
Private()
diff --git a/src/contactgroup.cpp b/src/contactgroup.cpp
index 1d9eba5..eed4e97 100644
--- a/src/contactgroup.cpp
+++ b/src/contactgroup.cpp
@@ -28,7 +28,7 @@
using namespace KContacts;
-class ContactGroup::ContactReference::ContactReferencePrivate : public QSharedData
+class Q_DECL_HIDDEN ContactGroup::ContactReference::ContactReferencePrivate : public QSharedData
{
public:
ContactReferencePrivate()
@@ -132,7 +132,7 @@ bool ContactGroup::ContactReference::operator==(const ContactReference &other) c
d->mCustoms == other.d->mCustoms;
}
-class ContactGroup::ContactGroupReference::ContactGroupReferencePrivate : public QSharedData
+class Q_DECL_HIDDEN ContactGroup::ContactGroupReference::ContactGroupReferencePrivate : public QSharedData
{
public:
ContactGroupReferencePrivate()
@@ -212,7 +212,7 @@ bool ContactGroup::ContactGroupReference::operator==(const ContactGroupReference
d->mCustoms == other.d->mCustoms;
}
-class ContactGroup::Data::DataPrivate : public QSharedData
+class Q_DECL_HIDDEN ContactGroup::Data::DataPrivate : public QSharedData
{
public:
DataPrivate()
@@ -305,7 +305,7 @@ bool ContactGroup::Data::operator==(const Data &other) const
d->mCustoms == other.d->mCustoms;
}
-class ContactGroup::Private : public QSharedData
+class Q_DECL_HIDDEN ContactGroup::Private : public QSharedData
{
public:
Private()
diff --git a/src/email.cpp b/src/email.cpp
index e19c541..8e127e0 100644
--- a/src/email.cpp
+++ b/src/email.cpp
@@ -26,7 +26,7 @@
using namespace KContacts;
-class Email::Private : public QSharedData
+class Q_DECL_HIDDEN Email::Private : public QSharedData
{
public:
Private()
diff --git a/src/field.cpp b/src/field.cpp
index ab4b91a..f38862e 100644
--- a/src/field.cpp
+++ b/src/field.cpp
@@ -27,7 +27,7 @@
using namespace KContacts;
-class Field::Private
+class Q_DECL_HIDDEN Field::Private
{
public:
Private(int fieldId, int category = 0,
diff --git a/src/gender.cpp b/src/gender.cpp
index 05ec60b..2ff37f4 100644
--- a/src/gender.cpp
+++ b/src/gender.cpp
@@ -25,7 +25,7 @@
using namespace KContacts;
-class Gender::Private : public QSharedData
+class Q_DECL_HIDDEN Gender::Private : public QSharedData
{
public:
Private()
diff --git a/src/geo.cpp b/src/geo.cpp
index a18560c..102a7ee 100644
--- a/src/geo.cpp
+++ b/src/geo.cpp
@@ -25,7 +25,7 @@
using namespace KContacts;
-class Geo::Private : public QSharedData
+class Q_DECL_HIDDEN Geo::Private : public QSharedData
{
public:
Private()
diff --git a/src/impp.cpp b/src/impp.cpp
index 541d752..f49d77d 100644
--- a/src/impp.cpp
+++ b/src/impp.cpp
@@ -27,7 +27,7 @@
using namespace KContacts;
-class Impp::Private : public QSharedData
+class Q_DECL_HIDDEN Impp::Private : public QSharedData
{
public:
Private()
diff --git a/src/key.cpp b/src/key.cpp
index 5f7477f..75a2ed1 100644
--- a/src/key.cpp
+++ b/src/key.cpp
@@ -28,7 +28,7 @@
using namespace KContacts;
-class Key::Private : public QSharedData
+class Q_DECL_HIDDEN Key::Private : public QSharedData
{
public:
Private()
diff --git a/src/lang.cpp b/src/lang.cpp
index 42e503d..45424ca 100644
--- a/src/lang.cpp
+++ b/src/lang.cpp
@@ -25,7 +25,7 @@
using namespace KContacts;
-class Lang::Private : public QSharedData
+class Q_DECL_HIDDEN Lang::Private : public QSharedData
{
public:
Private()
diff --git a/src/ldapdn.cpp b/src/ldapdn.cpp
index ea65cc9..c67b9d7 100644
--- a/src/ldapdn.cpp
+++ b/src/ldapdn.cpp
@@ -26,7 +26,7 @@
#include "kcontacts_debug.h"
-class LdapDN::LdapDNPrivate
+class Q_DECL_HIDDEN LdapDN::LdapDNPrivate
{
public:
LdapDNPrivate() : m_dn() {}
diff --git a/src/ldif.cpp b/src/ldif.cpp
index 8610ca9..e90b683 100644
--- a/src/ldif.cpp
+++ b/src/ldif.cpp
@@ -24,7 +24,7 @@
#include "kcontacts_debug.h"
-class Ldif::LdifPrivate
+class Q_DECL_HIDDEN Ldif::LdifPrivate
{
public:
int mModType;
diff --git a/src/phonenumber.cpp b/src/phonenumber.cpp
index 112a760..b0ef7f5 100644
--- a/src/phonenumber.cpp
+++ b/src/phonenumber.cpp
@@ -33,7 +33,7 @@ static QString cleanupNumber(const QString &input)
return input.simplified();
}
-class PhoneNumber::Private : public QSharedData
+class Q_DECL_HIDDEN PhoneNumber::Private : public QSharedData
{
public:
Private(Type type)
diff --git a/src/related.cpp b/src/related.cpp
index 6a9103f..e0a3146 100644
--- a/src/related.cpp
+++ b/src/related.cpp
@@ -25,7 +25,7 @@
using namespace KContacts;
-class Related::Private : public QSharedData
+class Q_DECL_HIDDEN Related::Private : public QSharedData
{
public:
Private()
diff --git a/src/resourcelocatorurl.cpp b/src/resourcelocatorurl.cpp
index 6110ac8..d33d86a 100644
--- a/src/resourcelocatorurl.cpp
+++ b/src/resourcelocatorurl.cpp
@@ -26,7 +26,7 @@
using namespace KContacts;
-class ResourceLocatorUrl::Private : public QSharedData
+class Q_DECL_HIDDEN ResourceLocatorUrl::Private : public QSharedData
{
public:
Private()
diff --git a/src/secrecy.cpp b/src/secrecy.cpp
index d738540..887b2bf 100644
--- a/src/secrecy.cpp
+++ b/src/secrecy.cpp
@@ -27,7 +27,7 @@
using namespace KContacts;
-class Secrecy::PrivateData : public QSharedData
+class Q_DECL_HIDDEN Secrecy::PrivateData : public QSharedData
{
public:
PrivateData()
diff --git a/src/sortmode.cpp b/src/sortmode.cpp
index bfa529a..7775eb7 100644
--- a/src/sortmode.cpp
+++ b/src/sortmode.cpp
@@ -27,7 +27,7 @@ SortMode::~SortMode()
{
}
-class NameSortMode::Private
+class Q_DECL_HIDDEN NameSortMode::Private
{
public:
NameType mNameType;
@@ -79,7 +79,7 @@ bool NameSortMode::lesser(const KContacts::Addressee &first, const KContacts::Ad
return lesser;
}
-class FieldSortMode::Private
+class Q_DECL_HIDDEN FieldSortMode::Private
{
public:
KContacts::Field *mField;
diff --git a/src/sound.cpp b/src/sound.cpp
index e4c8eda..8e746f1 100644
--- a/src/sound.cpp
+++ b/src/sound.cpp
@@ -25,7 +25,7 @@
using namespace KContacts;
-class Sound::Private : public QSharedData
+class Q_DECL_HIDDEN Sound::Private : public QSharedData
{
public:
Private()
diff --git a/src/timezone.cpp b/src/timezone.cpp
index ce027ef..b3cc9a3 100644
--- a/src/timezone.cpp
+++ b/src/timezone.cpp
@@ -25,7 +25,7 @@
using namespace KContacts;
-class TimeZone::Private : public QSharedData
+class Q_DECL_HIDDEN TimeZone::Private : public QSharedData
{
public:
Private(int offset = 0, bool valid = false)