[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=72429e6

The following commit has been merged in the master branch:
commit 72429e6622fc15f1bc4cef5c440dbd843322c97d
Author: Dario Freddi <dario.freddi at collabora.co.uk>
Date:   Fri Apr 22 14:38:19 2011 +0200

    Includes done right: own include must always go first, moc should go to the bottom - and remember a newline at the end of the file
---
 models/accounts-model-item.cpp | 5 ++++-
 models/accounts-model.cpp      | 5 ++++-
 models/accounts-model.h        | 2 +-
 models/contact-model-item.cpp  | 5 ++++-
 models/tree-node.cpp           | 4 +++-
 5 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/models/accounts-model-item.cpp b/models/accounts-model-item.cpp
index 33e4467..bb1beea 100644
--- a/models/accounts-model-item.cpp
+++ b/models/accounts-model-item.cpp
@@ -20,10 +20,11 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#include "accounts-model-item.h"
+
 #include <TelepathyQt4/Account>
 #include <TelepathyQt4/ContactManager>
 
-#include "accounts-model-item.h"
 #include "accounts-model.h"
 #include "contact-model-item.h"
 
@@ -381,3 +382,5 @@ void AccountsModelItem::addKnownContacts()
         emit childrenAdded(this, newNodes);
     }
 }
+
+#include "accounts-model-item.moc"
diff --git a/models/accounts-model.cpp b/models/accounts-model.cpp
index 366c46f..3bb821e 100644
--- a/models/accounts-model.cpp
+++ b/models/accounts-model.cpp
@@ -20,10 +20,11 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#include "accounts-model.h"
+
 #include <TelepathyQt4/ContactManager>
 #include <TelepathyQt4/PendingReady>
 
-#include "accounts-model.h"
 #include "accounts-model-item.h"
 #include "contact-model-item.h"
 
@@ -303,3 +304,5 @@ QModelIndex AccountsModel::parent(const QModelIndex &index) const
         return QModelIndex();
     }
 }
+
+#include "accounts-model.moc"
diff --git a/models/accounts-model.h b/models/accounts-model.h
index 42cc2b2..0a04d23 100644
--- a/models/accounts-model.h
+++ b/models/accounts-model.h
@@ -124,4 +124,4 @@ private:
     Private *mPriv;
 };
 
-#endif // TELEPATHY_ACCOUNTS_MODEL_H
\ No newline at end of file
+#endif // TELEPATHY_ACCOUNTS_MODEL_H
diff --git a/models/contact-model-item.cpp b/models/contact-model-item.cpp
index e77b8ed..f46343b 100644
--- a/models/contact-model-item.cpp
+++ b/models/contact-model-item.cpp
@@ -20,6 +20,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#include "contact-model-item.h"
+
 #include <QImage>
 
 #include <TelepathyQt4/AvatarData>
@@ -28,7 +30,6 @@
 #include <TelepathyQt4/RequestableChannelClassSpec>
 
 #include "accounts-model.h"
-#include "contact-model-item.h"
 
 struct ContactModelItem::Private
 {
@@ -172,3 +173,5 @@ Tp::ContactPtr ContactModelItem::contact() const
 {
     return mPriv->mContact;
 }
+
+#include "contact-model-item.moc"
diff --git a/models/tree-node.cpp b/models/tree-node.cpp
index 804f439..fbcc4e9 100644
--- a/models/tree-node.cpp
+++ b/models/tree-node.cpp
@@ -122,4 +122,6 @@ void TreeNode::remove()
     }
 
     deleteLater();
-}
\ No newline at end of file
+}
+
+#include "tree-node.moc"

-- 
ktp-common-internals packaging