[SCM] ktp-common-internals packaging branch, master, updated. debian/15.12.1-2-1839-gf0635e9
Maximiliano Curia
maxy at moszumanska.debian.org
Mon May 9 09:04:28 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-common-internals.git;a=commitdiff;h=0875f51
The following commit has been merged in the master branch:
commit 0875f513077845ce028986b09281e6e66dd22263
Author: Martin Klapetek <martin.klapetek at gmail.com>
Date: Thu Feb 24 15:49:15 2011 +0100
Unify licence text, remove Tpy namespace and fix some compile warnings.
---
models/accounts-model-item.cpp | 11 ++++-------
models/accounts-model-item.h | 17 +++++++----------
models/accounts-model.cpp | 11 ++++-------
models/accounts-model.h | 15 ++++++---------
models/contact-model-item.cpp | 13 +++++--------
models/contact-model-item.h | 15 ++++++---------
models/tree-node.cpp | 11 ++++-------
models/tree-node.h | 19 ++++++++-----------
8 files changed, 44 insertions(+), 68 deletions(-)
diff --git a/models/accounts-model-item.cpp b/models/accounts-model-item.cpp
index 8cc907c..7334b06 100644
--- a/models/accounts-model-item.cpp
+++ b/models/accounts-model-item.cpp
@@ -1,7 +1,9 @@
/*
- * This file is part of TelepathyQt4
+ * Accounts model item, represents an account in the contactlist tree
+ * This file is based on TelepathyQt4Yell Models
*
* Copyright (C) 2010 Collabora Ltd. <http://www.collabora.co.uk/>
+ * Copyright (C) 2011 Martin Klapetek <martin dot klapetek at gmail dot com>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -25,9 +27,6 @@
#include "accounts-model.h"
#include "contact-model-item.h"
-namespace Tpy
-{
-
struct AccountsModelItem::Private
{
Private(const Tp::AccountPtr &account)
@@ -364,6 +363,4 @@ void AccountsModelItem::addKnownContacts()
if (newNodes.count() > 0) {
emit childrenAdded(this, newNodes);
}
-}
-
-}
+}
\ No newline at end of file
diff --git a/models/accounts-model-item.h b/models/accounts-model-item.h
index 901317a..edcc30e 100644
--- a/models/accounts-model-item.h
+++ b/models/accounts-model-item.h
@@ -1,8 +1,10 @@
/*
- * This file is part of TelepathyQt4
+ * Accounts model item, represents an account in the contactlist tree
+ * This file is based on TelepathyQt4Yell Models
*
* Copyright (C) 2010 Collabora Ltd. <http://www.collabora.co.uk/>
- *
+ * Copyright (C) 2011 Martin Klapetek <martin dot klapetek at gmail dot com>
+ *
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
@@ -18,8 +20,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef _TelepathyQt4Yell_Models_accounts_model_item_h_HEADER_GUARD_
-#define _TelepathyQt4Yell_Models_accounts_model_item_h_HEADER_GUARD_
+#ifndef TELEPATHY_ACCOUNTS_MODEL_ITEM_H
+#define TELEPATHY_ACCOUNTS_MODEL_ITEM_H
#include <TelepathyQt4/Constants>
#include <TelepathyQt4/Contact>
@@ -27,9 +29,6 @@
#include "tree-node.h"
-namespace Tpy
-{
-
class AccountsModelItem : public TreeNode
{
Q_OBJECT
@@ -73,6 +72,4 @@ private:
Private *mPriv;
};
-}
-
-#endif // _TelepathyQt4Yell_Models_accounts_model_item_h_HEADER_GUARD_
+#endif // TELEPATHY_ACCOUNTS_MODEL_ITEM_H
\ No newline at end of file
diff --git a/models/accounts-model.cpp b/models/accounts-model.cpp
index 800646a..1747d7e 100644
--- a/models/accounts-model.cpp
+++ b/models/accounts-model.cpp
@@ -1,7 +1,9 @@
/*
- * This file is part of TelepathyQt4
+ * Accounts and contacts model
+ * This file is based on TelepathyQt4Yell Models
*
* Copyright (C) 2010 Collabora Ltd. <http://www.collabora.co.uk/>
+ * Copyright (C) 2011 Martin Klapetek <martin dot klapetek at gmail dot com>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -25,9 +27,6 @@
#include "accounts-model-item.h"
#include "contact-model-item.h"
-namespace Tpy
-{
-
struct AccountsModel::Private
{
Private(const Tp::AccountManagerPtr &am)
@@ -304,6 +303,4 @@ QModelIndex AccountsModel::parent(const QModelIndex &index) const
// no parent: return root node
return QModelIndex();
}
-}
-
-}
+}
\ No newline at end of file
diff --git a/models/accounts-model.h b/models/accounts-model.h
index ac985ba..99d23cd 100644
--- a/models/accounts-model.h
+++ b/models/accounts-model.h
@@ -1,7 +1,9 @@
/*
- * This file is part of TelepathyQt4
+ * Accounts and contacts model
+ * This file is based on TelepathyQt4Yell Models
*
* Copyright (C) 2010 Collabora Ltd. <http://www.collabora.co.uk/>
+ * Copyright (C) 2011 Martin Klapetek <martin dot klapetek at gmail dot com>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -18,8 +20,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef _TelepathyQt4Yell_Models_accounts_model_h_HEADER_GUARD_
-#define _TelepathyQt4Yell_Models_accounts_model_h_HEADER_GUARD_
+#ifndef TELEPATHY_ACCOUNTS_MODEL_H
+#define TELEPATHY_ACCOUNTS_MODEL_H
#include <QAbstractListModel>
@@ -30,9 +32,6 @@
#include "accounts-model-item.h"
-namespace Tpy
-{
-
class AccountsModel : public QAbstractItemModel
{
Q_OBJECT
@@ -125,6 +124,4 @@ private:
Private *mPriv;
};
-}
-
-#endif // _TelepathyQt4Yell_Models_accounts_model_h_HEADER_GUARD_
+#endif // TELEPATHY_ACCOUNTS_MODEL_H
\ No newline at end of file
diff --git a/models/contact-model-item.cpp b/models/contact-model-item.cpp
index 34f596b..8136f3f 100644
--- a/models/contact-model-item.cpp
+++ b/models/contact-model-item.cpp
@@ -1,8 +1,10 @@
/*
- * This file is part of TelepathyQt4
+ * Contacts model item, represents a contact in the contactlist tree
+ * This file is based on TelepathyQt4Yell Models
*
* Copyright (C) 2010 Collabora Ltd. <http://www.collabora.co.uk/>
- *
+ * Copyright (C) 2011 Martin Klapetek <martin dot klapetek at gmail dot com>
+ *
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
@@ -28,9 +30,6 @@
#include "accounts-model.h"
#include "contact-model-item.h"
-namespace Tpy
-{
-
struct ContactModelItem::Private
{
Private(const Tp::ContactPtr &contact)
@@ -175,6 +174,4 @@ void ContactModelItem::onChanged()
Tp::ContactPtr ContactModelItem::contact() const
{
return mPriv->mContact;
-}
-
-}
+}
\ No newline at end of file
diff --git a/models/contact-model-item.h b/models/contact-model-item.h
index 1a5302e..2bf3f51 100644
--- a/models/contact-model-item.h
+++ b/models/contact-model-item.h
@@ -1,7 +1,9 @@
/*
- * This file is part of TelepathyQt4
+ * Contacts model item, represents a contact in the contactlist tree
+ * This file is based on TelepathyQt4Yell Models
*
* Copyright (C) 2010 Collabora Ltd. <http://www.collabora.co.uk/>
+ * Copyright (C) 2011 Martin Klapetek <martin dot klapetek at gmail dot com>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -18,16 +20,13 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef _TelepathyQt4Yell_Models_contact_model_item_h_HEADER_GUARD_
-#define _TelepathyQt4Yell_Models_contact_model_item_h_HEADER_GUARD_
+#ifndef TELEPATHY_CONTACT_MODEL_ITEM_H
+#define TELEPATHY_CONTACT_MODEL_ITEM_H
#include <TelepathyQt4/Types>
#include "tree-node.h"
-namespace Tpy
-{
-
class ContactModelItem : public TreeNode
{
Q_OBJECT
@@ -51,6 +50,4 @@ private:
Private *mPriv;
};
-}
-
-#endif // _TelepathyQt4Yell_Models_contact_model_item_h_HEADER_GUARD_
+#endif // TELEPATHY_CONTACT_MODEL_ITEM_H
\ No newline at end of file
diff --git a/models/tree-node.cpp b/models/tree-node.cpp
index 9e9f1ee..8d7a912 100644
--- a/models/tree-node.cpp
+++ b/models/tree-node.cpp
@@ -1,7 +1,9 @@
/*
- * This file is part of TelepathyQt4
+ * Tree model node
+ * This file is based on TelepathyQt4Yell Models
*
* Copyright (C) 2010 Collabora Ltd. <http://www.collabora.co.uk/>
+ * Copyright (C) 2011 Martin Klapetek <martin dot klapetek at gmail dot com>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -20,9 +22,6 @@
#include "tree-node.h"
-namespace Tpy
-{
-
struct TreeNode::Private
{
Private() :
@@ -120,6 +119,4 @@ void TreeNode::remove()
SIGNAL(childrenRemoved(TreeNode*,int,int)));
}
deleteLater();
-}
-
-}
+}
\ No newline at end of file
diff --git a/models/tree-node.h b/models/tree-node.h
index 5206971..64bcc27 100644
--- a/models/tree-node.h
+++ b/models/tree-node.h
@@ -1,8 +1,10 @@
-/*
- * This file is part of TelepathyQt4
+/* *
+ * Tree model node
+ * This file is based on TelepathyQt4Yell Models
*
* Copyright (C) 2010 Collabora Ltd. <http://www.collabora.co.uk/>
- *
+ * Copyright (C) 2011 Martin Klapetek <martin dot klapetek at gmail dot com>
+ *
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
@@ -18,15 +20,12 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef _TelepathyQt4Yell_Models_tree_node_h_HEADER_GUARD_
-#define _TelepathyQt4Yell_Models_tree_node_h_HEADER_GUARD_
+#ifndef TELEPATHY_TREE_NODE_H
+#define TELEPATHY_TREE_NODE_H
#include <QObject>
#include <QVariant>
-namespace Tpy
-{
-
class TreeNode : public QObject
{
Q_OBJECT
@@ -62,6 +61,4 @@ private:
Private *mPriv;
};
-}
-
-#endif // _TelepathyQt4Yell_Models_tree_node_h_HEADER_GUARD_
+#endif // TELEPATHY_TREE_NODE_H
--
ktp-common-internals packaging
More information about the pkg-kde-commits
mailing list