From 31c2b3fd865a7456d032f7119a2f217e6a4cee20 Mon Sep 17 00:00:00 2001
From: Aaron Seigo <aseigo@kde.org>
Date: Fri, 6 May 2011 11:54:45 +0200
Subject: [PATCH] merge setGroup methods

---
 extenders/extendergroup.cpp |  1 -
 extenders/extenderitem.cpp  |  6 ------
 extenders/extenderitem.h    | 12 +-----------
 3 files changed, 1 insertion(+), 18 deletions(-)

diff --git a/extenders/extendergroup.cpp b/extenders/extendergroup.cpp
index e04dc9742..637a3cb42 100644
--- a/extenders/extendergroup.cpp
+++ b/extenders/extendergroup.cpp
@@ -379,7 +379,6 @@ int ExtenderGroupPrivate::insertIndexFromPos(const QPointF &pos) const
 {
     int insertIndex = -1;
 
-    //XXX: duplicated from panel
     if (pos != QPointF(-1, -1)) {
         for (int i = 0; i < layout->count(); ++i) {
             QRectF siblingGeometry = layout->itemAt(i)->geometry();
diff --git a/extenders/extenderitem.cpp b/extenders/extenderitem.cpp
index 3e5809f50..8a599cf5c 100644
--- a/extenders/extenderitem.cpp
+++ b/extenders/extenderitem.cpp
@@ -433,12 +433,6 @@ Extender *ExtenderItem::extender() const
     return d->extender;
 }
 
-//TODO KDE5: only one setGroup()
-void ExtenderItem::setGroup(ExtenderGroup *group)
-{
-    setGroup(group, QPointF(-1, -1));
-}
-
 void ExtenderItem::setGroup(ExtenderGroup *group, const QPointF &pos)
 {
     if (isGroup()) {
diff --git a/extenders/extenderitem.h b/extenders/extenderitem.h
index d1833ce1c..af7ac95eb 100644
--- a/extenders/extenderitem.h
+++ b/extenders/extenderitem.h
@@ -176,19 +176,9 @@ class PLASMA_EXPORT ExtenderItem : public QGraphicsWidget
         /**
          * @param group the group you want this item to belong to. Note that you can't nest
          * ExtenderGroups.
-         * @since 4.3
-         */
-        void setGroup(ExtenderGroup *group);
-
-        /**
-         * @param group the group you want this item to belong to. Note that you can't nest
-         * ExtenderGroups.
-         *
-         * @param group the new group
          * @param pos position inside the extender group
-         * @since 4.5
          */
-        void setGroup(ExtenderGroup *group, const QPointF &pos);
+        void setGroup(ExtenderGroup *group, const QPointF &pos = QPointF(-1, -1));
 
         /**
          * @returns the group this item belongs to.