From 79d8b41bdafa49280a7ef42cfb4a2fdf360cd6a2 Mon Sep 17 00:00:00 2001 From: "Aaron J. Seigo" Date: Tue, 11 May 2010 07:20:46 +0000 Subject: [PATCH] adjustSize is not a slot, so create a private slot and use that as a relay svn path=/trunk/KDE/kdelibs/; revision=1125281 --- dialog.cpp | 8 +++++++- dialog.h | 1 + 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dialog.cpp b/dialog.cpp index 4ef14b85f..13c15f22e 100644 --- a/dialog.cpp +++ b/dialog.cpp @@ -87,6 +87,7 @@ public: void updateResizeCorners(); int calculateWidthForHeightAndRatio(int height, qreal ratio); Plasma::Applet *applet(); + void delayedAdjustSize(); Plasma::Dialog *q; @@ -184,6 +185,11 @@ Plasma::Applet *DialogPrivate::applet() return applet; } +void DialogPrivate::delayedAdjustSize() +{ + q->adjustSize(); +} + void DialogPrivate::checkBorders(bool updateMaskIfNeeded) { if (resizeChecksWithBorderCheck) { @@ -413,7 +419,7 @@ Dialog::Dialog(QWidget *parent, Qt::WindowFlags f) d->adjustSizeTimer = new QTimer(this); d->adjustSizeTimer->setSingleShot(true); - connect(d->adjustSizeTimer, SIGNAL(timeout()), this, SLOT(adjustSize())); + connect(d->adjustSizeTimer, SIGNAL(timeout()), this, SLOT(delayedAdjustSize())); connect(d->background, SIGNAL(repaintNeeded()), this, SLOT(update())); diff --git a/dialog.h b/dialog.h index d3944d325..a24f360d1 100644 --- a/dialog.h +++ b/dialog.h @@ -179,6 +179,7 @@ class PLASMA_EXPORT Dialog : public QWidget */ Q_PRIVATE_SLOT(d, void themeChanged()) Q_PRIVATE_SLOT(d, void checkBorders()) + Q_PRIVATE_SLOT(d, void delayedAdjustSize()) }; } // Plasma namespace