From 80e6a0544066362910442f14dcdf19dcd66b0e7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lubo=C5=A1=20Lu=C5=88=C3=A1k?= Date: Sun, 29 Apr 2007 22:01:59 +0000 Subject: [PATCH] Merging from old trunk: r595998 | lunakl | 2006-10-16 14:41:38 +0200 (Mon, 16 Oct 2006) | 3 lines Fix two same argument names. svn path=/trunk/KDE/kdebase/workspace/; revision=659293 --- lib/kcommondecoration.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/kcommondecoration.h b/lib/kcommondecoration.h index dd09217ada..09d176e7d9 100644 --- a/lib/kcommondecoration.h +++ b/lib/kcommondecoration.h @@ -258,8 +258,8 @@ class KWIN_EXPORT KCommonDecoration : public KDecoration private: void resetLayout(); - void moveWidget(int x, int y, QWidget *w) const; - void resizeWidget(int w, int h, QWidget *w) const; + void moveWidget(int x, int y, QWidget *widget) const; + void resizeWidget(int w, int h, QWidget *widget) const; typedef QVector ButtonContainer; ///< If the entry is 0, it's a spacer. int buttonContainerWidth(const ButtonContainer &btnContainer, bool countHidden = false) const;