From 3528630f80fc17b80262ff7722217e80db22d55b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lubo=C5=A1=20Lu=C5=88=C3=A1k?= <l.lunak@kde.org>
Date: Fri, 29 Aug 2008 12:03:12 +0000
Subject: [PATCH] Qt4/KDE4 dialog ctors don't accept object name or modal flag.

svn path=/trunk/KDE/kdebase/workspace/; revision=854326
---
 kcmkwin/kwincompositing/ktimerdialog.cpp | 3 ---
 kcmkwin/kwincompositing/ktimerdialog.h   | 1 -
 kcmkwin/kwincompositing/main.cpp         | 3 ++-
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/kcmkwin/kwincompositing/ktimerdialog.cpp b/kcmkwin/kwincompositing/ktimerdialog.cpp
index 81b3a22303..61ef440b69 100644
--- a/kcmkwin/kwincompositing/ktimerdialog.cpp
+++ b/kcmkwin/kwincompositing/ktimerdialog.cpp
@@ -38,7 +38,6 @@
 #include "ktimerdialog.moc"
 
 KTimerDialog::KTimerDialog( int msec, TimerStyle style, QWidget *parent,
-                 const char *name, bool modal,
                  const QString &caption,
                  int buttonMask, ButtonCode defaultButton,
                  bool separator,
@@ -47,8 +46,6 @@ KTimerDialog::KTimerDialog( int msec, TimerStyle style, QWidget *parent,
                  const KGuiItem &user3 )
     : KDialog( parent )
 {
-    setObjectName( name );
-    setModal( modal );
     setCaption( caption );
     setButtons( (ButtonCodes)buttonMask );
     setDefaultButton( defaultButton );
diff --git a/kcmkwin/kwincompositing/ktimerdialog.h b/kcmkwin/kwincompositing/ktimerdialog.h
index bfbbf1c7fc..dae0f0624b 100644
--- a/kcmkwin/kwincompositing/ktimerdialog.h
+++ b/kcmkwin/kwincompositing/ktimerdialog.h
@@ -71,7 +71,6 @@ class KTimerDialog : public KDialog
      * For the rest of the arguments, See @see KDialog .
      */
     explicit KTimerDialog( int msec, TimerStyle style=CountDown, QWidget *parent=0,
-                           const char *name=0, bool modal=true,
                            const QString &caption=QString(),
                            int buttonMask=Ok|Apply|Cancel, ButtonCode defaultButton=Ok,
                            bool separator=false,
diff --git a/kcmkwin/kwincompositing/main.cpp b/kcmkwin/kwincompositing/main.cpp
index 7cce33da3a..eafcf38b53 100644
--- a/kcmkwin/kwincompositing/main.cpp
+++ b/kcmkwin/kwincompositing/main.cpp
@@ -50,10 +50,11 @@ namespace KWin
 
 
 ConfirmDialog::ConfirmDialog() :
-        KTimerDialog(10000, KTimerDialog::CountDown, 0, "mainKTimerDialog", true,
+        KTimerDialog(10000, KTimerDialog::CountDown, 0,
                      i18n("Confirm Desktop Effects Change"), KTimerDialog::Ok|KTimerDialog::Cancel,
                      KTimerDialog::Cancel)
     {
+    setObjectName( "mainKTimerDialog" );
     setButtonGuiItem( KDialog::Ok, KGuiItem( i18n( "&Accept Configuration" ), "dialog-ok" ));
     setButtonGuiItem( KDialog::Cancel, KGuiItem( i18n( "&Return to Previous Configuration" ), "dialog-cancel" ));