aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregor Mi <[email protected]>2014-01-21 12:00:56 +0100
committerGregor Mi <[email protected]>2014-01-21 12:00:56 +0100
commit346b0dd2d3b8ee98ecd474b3595a29bf7cc79c87 (patch)
tree79cf821c231c50033b7dc82627421ef44589dfbe
parent572244cb4e478f04fcc47a625b6383d29adb04dc (diff)
fix a FIXME
-rw-r--r--src/ksane.cpp11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/ksane.cpp b/src/ksane.cpp
index ee40fcb..7e97787 100644
--- a/src/ksane.cpp
+++ b/src/ksane.cpp
@@ -285,12 +285,13 @@ QString KSaneWidget::selectDevice(QWidget* parent)
QString selected_name;
QPointer<KSaneDeviceDialog> sel = new KSaneDeviceDialog(parent);
- // sel.setDefault(prev_backend); // set default scanner - perhaps application using libksane should remember that
+ // set default scanner - perhaps application using libksane should remember that
+ // 2014-01-21: gm: +1
+ // sel.setDefault(prev_backend);
- Q_ASSERT_X(false, "KSaneWidget::selectDevice", "FIXME KF5"); // FIXME KF5
- //if(sel->exec() == KDialog::Accepted) {
- // selected_name = sel->getSelectedName();
- //}
+ if(sel->exec() == QDialog::Accepted) {
+ selected_name = sel->getSelectedName();
+ }
delete sel;
return selected_name;