summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <montel@kde.org>2016-08-02 20:38:55 (GMT)
committerMontel Laurent <montel@kde.org>2016-08-02 20:38:55 (GMT)
commitf02be3572d2da2eeb60b1d6491500747e0c06178 (patch)
tree13c95bd9ac3ab88fe33edeb352b80d3a0d4f7609
parent880d5ac318ec0d5f6519f71cce91da7715f45eb1 (diff)
Fix usage of qHash
-rw-r--r--CMakeLists.txt2
-rw-r--r--src/period.cpp2
-rw-r--r--src/period.h3
3 files changed, 4 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5636732..4c700e0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,7 +18,7 @@ include(KDECMakeSettings)
include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
include(ECMQtDeclareLoggingCategory)
-set(PIM_VERSION "5.3.40")
+set(PIM_VERSION "5.3.41")
set(KCALENDARCORE_LIB_VERSION ${PIM_VERSION})
ecm_setup_version(${KCALENDARCORE_LIB_VERSION} VARIABLE_PREFIX KCALCORE
diff --git a/src/period.cpp b/src/period.cpp
index 06cf347..8675b81 100644
--- a/src/period.cpp
+++ b/src/period.cpp
@@ -165,7 +165,7 @@ QDataStream &KCalCore::operator>>(QDataStream &stream, KCalCore::Period &period)
return stream;
}
-uint qHash(const KCalCore::Period &key)
+uint KCalCore::qHash(const KCalCore::Period &key)
{
if (key.hasDuration()) {
return qHash(key.duration());
diff --git a/src/period.h b/src/period.h
index 2af07cf..3e823e9 100644
--- a/src/period.h
+++ b/src/period.h
@@ -214,16 +214,17 @@ KCALCORE_EXPORT QDataStream &operator<<(QDataStream &stream, const KCalCore::Per
/** Read a Period object into @p period from @p stream, in binary format. */
KCALCORE_EXPORT QDataStream &operator>>(QDataStream &stream, KCalCore::Period &period);
-}
/**
Return a hash value for a Period argument.
@param key is a Period.
*/
KCALCORE_EXPORT uint qHash(const KCalCore::Period &key);
+}
//@cond PRIVATE
Q_DECLARE_METATYPE(KCalCore::Period)
+Q_DECLARE_TYPEINFO(KCalCore::Period, Q_MOVABLE_TYPE);
//@endcond
#endif