QDialogButtonBox for the remaining dialogs.

[lyx.git] / src / frontends / qt4 / ButtonPolicy.cpp

diff --git a/src/frontends/qt4/ButtonPolicy.cpp b/src/frontends/qt4/ButtonPolicy.cpp
index cd57f681128707a0f98919271c188e054a95067d..3061d6a84f71af0383c7cf84911108333de190a3 100644 (file)
--- a/src/frontends/qt4/ButtonPolicy.cpp
+++ b/src/frontends/qt4/ButtonPolicy.cpp
@@ -398,7 +398,6 @@ void ButtonPolicy::Private::initNoRepeatedApplyReadOnly()
        state_machine_[INITIAL][SMI_VALID] = VALID;
        state_machine_[INITIAL][SMI_INVALID] = INVALID;
        state_machine_[INITIAL][SMI_READ_ONLY] = RO_INITIAL;
-       state_machine_[INITIAL][SMI_RESTORE] = INITIAL;
        // State::VALID
        state_machine_[VALID][SMI_VALID] = VALID;
        state_machine_[VALID][SMI_READ_WRITE] = VALID;
@@ -420,7 +419,6 @@ void ButtonPolicy::Private::initNoRepeatedApplyReadOnly()
        state_machine_[RO_INITIAL][SMI_VALID] = RO_VALID;
        state_machine_[RO_INITIAL][SMI_INVALID] = RO_INVALID;
        state_machine_[RO_INITIAL][SMI_READ_WRITE] = INITIAL;
-       state_machine_[RO_INITIAL][SMI_RESTORE] = INITIAL;
        // State::RO_VALID
        state_machine_[RO_VALID][SMI_VALID] = RO_VALID;
        state_machine_[RO_VALID][SMI_READ_ONLY] = RO_VALID;
@@ -610,10 +608,11 @@ void ButtonPolicy::Private::initOkApplyCancelAutoReadOnly()
        state_machine_[APPLIED][SMI_AUTOAPPLY] = AUTOAPPLY_INITIAL;
        // State::AUTOAPPLY_INITIAL
        state_machine_[AUTOAPPLY_INITIAL][SMI_AUTOAPPLY] = APPLIED;
+       state_machine_[AUTOAPPLY_INITIAL][SMI_APPLY] = AUTOAPPLY_INITIAL;
        state_machine_[AUTOAPPLY_INITIAL][SMI_READ_ONLY] = RO_AUTOAPPLY;
        state_machine_[AUTOAPPLY_INITIAL][SMI_VALID] = AUTOAPPLY_CHANGED;
-       state_machine_[AUTOAPPLY_INITIAL][SMI_INVALID] = AUTOAPPLY_CHANGED;     
-       state_machine_[AUTOAPPLY_INITIAL][SMI_READ_WRITE] = AUTOAPPLY_INITIAL;  
+       state_machine_[AUTOAPPLY_INITIAL][SMI_INVALID] = AUTOAPPLY_CHANGED;
+       state_machine_[AUTOAPPLY_INITIAL][SMI_READ_WRITE] = AUTOAPPLY_INITIAL;
        // State::AUTOAPPLY_CHANGED
        state_machine_[AUTOAPPLY_CHANGED][SMI_AUTOAPPLY] = APPLIED;
        state_machine_[AUTOAPPLY_CHANGED][SMI_READ_ONLY] = RO_AUTOAPPLY;