Qt4/KDE4 dialog ctors don't accept object name or modal flag.
svn path=/trunk/KDE/kdebase/workspace/; revision=854326
This commit is contained in:
parent
95c30f158f
commit
3528630f80
3 changed files with 2 additions and 5 deletions
|
@ -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 );
|
||||
|
|
|
@ -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,
|
||||
|
|
|
@ -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" ));
|
||||
|
||||
|
|
Loading…
Reference in a new issue