CVS commit by bmeyer: Removed custom key configure dialog M +2 -7 kdeprintfax.cpp 1.31 M +0 -1 kdeprintfax.h 1.12 --- kdebase/kdeprint/kdeprintfax/kdeprintfax.cpp #1.30:1.31 @@ -55,5 +55,4 @@ #include #include -#include #include @@ -198,5 +197,6 @@ void KdeprintFax::initActions() KStdAction::showMenubar(this, SLOT(slotToggleMenuBar()), actionCollection()); KStdAction::preferences(this, SLOT(slotConfigure()), actionCollection()); - KStdAction::keyBindings( this, SLOT( slotConfigureKeys() ), actionCollection() ); + KStdAction::keyBindings(guiFactory(), SLOT(configureShortcuts()), +actionCollection()); actionCollection()->action("fax_stop")->setEnabled(false); connect(actionCollection()->action("file_remove"), SIGNAL(enabled(bool)), actionCollection()->action("file_view"), SLOT(setEnabled(bool))); @@ -212,9 +212,4 @@ void KdeprintFax::slotToggleMenuBar() } -void KdeprintFax::slotConfigureKeys() -{ - KKeyDialog::configure( actionCollection(), this ); -} - void KdeprintFax::slotAdd() { --- kdebase/kdeprint/kdeprintfax/kdeprintfax.h #1.11:1.12 @@ -87,5 +87,4 @@ protected slots: void slotFaxAdd(); void slotFaxExecuted( QListViewItem* ); - void slotConfigureKeys(); protected: