[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=68efd69

The following commit has been merged in the master branch:
commit 68efd69977bfd650ba29e3ae91e6c684dccbc785
Author: Dario Freddi <dario.freddi at collabora.com>
Date:   Fri Nov 18 23:42:48 2011 +0100

    Fix all warnings
---
 circular-countdown.cpp           |  2 ++
 models/accounts-filter-model.cpp |  2 +-
 models/accounts-model.cpp        |  1 +
 models/groups-model.cpp          | 11 ++++++++---
 models/proxy-tree-node.cpp       |  2 ++
 models/tree-node.cpp             |  3 +++
 6 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/circular-countdown.cpp b/circular-countdown.cpp
index 0821e4c..9a05384 100644
--- a/circular-countdown.cpp
+++ b/circular-countdown.cpp
@@ -63,6 +63,8 @@ CircularCountdown::~CircularCountdown()
 }
 
 void CircularCountdown::paintEvent(QPaintEvent *event) {
+    Q_UNUSED(event);
+
     if (d->timeLine->state() == QTimeLine::Running || d->timeLine->state() == QTimeLine::Paused) {
         QPainter painter(this);
         //always take parent widget's palette and use it's Base color
diff --git a/models/accounts-filter-model.cpp b/models/accounts-filter-model.cpp
index 0665800..e7fa831 100644
--- a/models/accounts-filter-model.cpp
+++ b/models/accounts-filter-model.cpp
@@ -27,7 +27,7 @@
 #include "contact-model-item.h"
 #include "accounts-model-item.h"
 
-#include <common/kpresence.h>
+#include <kpresence.h>
 
 #include <KDebug>
 
diff --git a/models/accounts-model.cpp b/models/accounts-model.cpp
index c161caf..355ee95 100644
--- a/models/accounts-model.cpp
+++ b/models/accounts-model.cpp
@@ -217,6 +217,7 @@ QObject *AccountsModel::contactItemForId(const QString &accountId, const QString
 
 int AccountsModel::columnCount(const QModelIndex &parent) const
 {
+    Q_UNUSED(parent);
     return 1;
 }
 
diff --git a/models/groups-model.cpp b/models/groups-model.cpp
index 0c05d20..e73cbeb 100644
--- a/models/groups-model.cpp
+++ b/models/groups-model.cpp
@@ -93,6 +93,7 @@ GroupsModel::~GroupsModel()
 
 int GroupsModel::columnCount(const QModelIndex &parent) const
 {
+    Q_UNUSED(parent);
     return 1;
 }
 
@@ -157,6 +158,8 @@ QMimeData* GroupsModel::mimeData(const QModelIndexList& indexes) const
 
 bool GroupsModel::dropMimeData(const QMimeData* data, Qt::DropAction action, int row, int column, const QModelIndex& parent)
 {
+    Q_UNUSED(row);
+
     if (action == Qt::IgnoreAction) {
         return true;
     }
@@ -306,7 +309,9 @@ void GroupsModel::onSourceItemsAdded(TreeNode *parent, const QList<TreeNode *> &
 
 void GroupsModel::onSourceItemsRemoved(TreeNode* parent, int first, int last)
 {
-
+    Q_UNUSED(parent);
+    Q_UNUSED(first);
+    Q_UNUSED(last);
 }
 
 void GroupsModel::loadAccountsModel()
@@ -400,7 +405,7 @@ void GroupsModel::addContactToGroups(ContactModelItem* contactItem, QStringList
 
     Q_FOREACH (const QString &group, groups) {
         bool groupExists = false;
-        GroupsModelItem *groupItem;
+        GroupsModelItem *groupItem = 0;
 
         //check if the group already exists first
         for (int i = 0; i < mPriv->mTree->children().size(); i++) {
@@ -428,7 +433,7 @@ void GroupsModel::addContactToGroups(ContactModelItem* contactItem, QStringList
             }
         }
 
-        if (!groupExists) {
+        if (!groupExists && groupItem) {
             groupItem = new GroupsModelItem(group);
             onItemsAdded(mPriv->mTree, QList<TreeNode *>() << groupItem);
         }
diff --git a/models/proxy-tree-node.cpp b/models/proxy-tree-node.cpp
index 4c11484..966f7e0 100644
--- a/models/proxy-tree-node.cpp
+++ b/models/proxy-tree-node.cpp
@@ -74,6 +74,8 @@ QVariant ProxyTreeNode::data(int role) const
 
 bool ProxyTreeNode::setData(int role, const QVariant &value)
 {
+    Q_UNUSED(role);
+    Q_UNUSED(value);
     return false;
 }
 
diff --git a/models/tree-node.cpp b/models/tree-node.cpp
index f892d5a..bcecc6f 100644
--- a/models/tree-node.cpp
+++ b/models/tree-node.cpp
@@ -94,11 +94,14 @@ TreeNode *TreeNode::parent() const
 
 QVariant TreeNode::data(int role) const
 {
+    Q_UNUSED(role);
     return QVariant();
 }
 
 bool TreeNode::setData(int role, const QVariant &value)
 {
+    Q_UNUSED(role);
+    Q_UNUSED(value);
     return false;
 }
 

-- 
ktp-common-internals packaging