[SCM] ktp-common-internals packaging branch, master, updated. debian/15.12.1-2-1839-gf0635e9

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-common-internals.git;a=commitdiff;h=d32ba84

The following commit has been merged in the master branch:
commit d32ba84857d28ea1e05ed2798936529f986c3013
Author: George Goldberg <george.goldberg at collabora.co.uk>
Date:   Fri Jan 28 15:31:13 2011 +0000

    George Kiagiadakis Review: move ContactIdentifier qHash function declaration to be directly below the ContactIdentifier class declaration in the header file.
---
 kpeople/nepomuk-feeder/nepomuk-storage.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kpeople/nepomuk-feeder/nepomuk-storage.h b/kpeople/nepomuk-feeder/nepomuk-storage.h
index d793875..f85fafc 100644
--- a/kpeople/nepomuk-feeder/nepomuk-storage.h
+++ b/kpeople/nepomuk-feeder/nepomuk-storage.h
@@ -53,6 +53,8 @@ private:
     QString m_contactId;
 };
 
+int qHash(ContactIdentifier c);
+
 class ContactResources {
 public:
     ContactResources(const Nepomuk::PersonContact &personContact,
@@ -110,8 +112,6 @@ private:
     QHash<ContactIdentifier, ContactResources> m_contacts;
 };
 
-int qHash(ContactIdentifier c);
-
 
 #endif // Header guard
 

-- 
ktp-common-internals packaging