From 68de44f1ddfb6b28a44cc944d6f3aa406b080212 Mon Sep 17 00:00:00 2001 From: Marco Martin Date: Fri, 9 Nov 2012 15:59:05 +0100 Subject: [PATCH] remove containment's geometry function also remove from the config restore --- containment.cpp | 35 ----------------------------------- containment.h | 5 ----- 2 files changed, 40 deletions(-) diff --git a/containment.cpp b/containment.cpp index 96f9e5b90..11b5ea8b7 100644 --- a/containment.cpp +++ b/containment.cpp @@ -226,22 +226,6 @@ void Containment::restore(KConfigGroup &group) return; } - QRectF geo = group.readEntry("geometry", geometry()); - //override max/min - //this ensures panels are set to their saved size even when they have max & min set to prevent - //resizing - if (geo.size() != geo.size().boundedTo(maximumSize())) { - setMaximumSize(maximumSize().expandedTo(geo.size())); - } - - if (geo.size() != geo.size().expandedTo(minimumSize())) { - setMinimumSize(minimumSize().boundedTo(geo.size())); - } - - - resize(geo.size()); - //FIXME: unbreak containments just for dashboard - setLocation((Plasma::Location)group.readEntry("location", (int)d->location)); setFormFactor((Plasma::FormFactor)group.readEntry("formfactor", (int)d->formFactor)); //kDebug() << "setScreen from restore"; @@ -1082,25 +1066,6 @@ bool Containment::acceptDrops() const return false; } -void Containment::setMaximumSize(QSizeF size) -{ - -} - -QSizeF Containment::maximumSize() const -{ - return QSizeF(); -} - -void Containment::setMinimumSize(QSizeF size) -{ - -} - -QSizeF Containment::minimumSize() const -{ - return QSizeF(); -} } // Plasma namespace diff --git a/containment.h b/containment.h index c6e1a35ce..46edd100c 100644 --- a/containment.h +++ b/containment.h @@ -521,11 +521,6 @@ Q_SIGNALS: */ void resizeEvent(QResizeEvent *event); - //FIXME: kill those - QSizeF maximumSize() const; - void setMaximumSize(QSizeF size); - QSizeF minimumSize() const; - void setMinimumSize(QSizeF size); private: /**