[patch] revert commit for KDE Bug 335073

revert_add_timer_to_prevent_bombarding_signal_over_DB_path_edit_field_which_can_corrupt_path_edited.patch (text/plain), 2.47 KB, created by Johannes Hirte on 2014-10-10 16:56:41 UTC

diff --git a/libs/widgets/common/databasewidget.cpp b/libs/widgets/common/databasewidget.cpp
index fdf07d1..38f59b2 100644
--- a/libs/widgets/common/databasewidget.cpp
+++ b/libs/widgets/common/databasewidget.cpp
@@ -33,7 +33,6 @@
 #include <QSqlError>
 #include <QLabel>
 #include <QGroupBox>
-#include <QTimer>
 
 // KDE includes
 
@@ -184,7 +183,7 @@ void DatabaseWidget::setupMainArea()
             this, SLOT(slotChangeDatabasePath(KUrl)));
 
     connect(databasePathEdit, SIGNAL(textChanged(QString)),
-            this, SLOT(slotDatabasePathEditedDelayed()));
+            this, SLOT(slotDatabasePathEdited(QString)));
 
     connect(databaseType, SIGNAL(currentIndexChanged(int)),
             this, SLOT(slotHandleDBTypeIndexChanged(int)));
@@ -225,15 +224,8 @@ void DatabaseWidget::slotChangeDatabasePath(const KUrl& result)
     checkDBPath();
 }
 
-void DatabaseWidget::slotDatabasePathEditedDelayed()
+void DatabaseWidget::slotDatabasePathEdited(const QString& newPath)
 {
-    QTimer::singleShot(300, this, SLOT(slotDatabasePathEdited()));
-}
-
-void DatabaseWidget::slotDatabasePathEdited()
-{
-    QString newPath = databasePathEdit->text();
-
 #ifndef _WIN32
 
     if (!newPath.isEmpty() && !QDir::isAbsolutePath(newPath))
@@ -243,7 +235,7 @@ void DatabaseWidget::slotDatabasePathEdited()
 
 #endif
 
-    databasePathEdit->setText(QDir::toNativeSeparators(newPath));
+    databasePathEdit->setText(QDir::toNativeSeparators(databasePathEdit->text()));
 
     checkDBPath();
 }
diff --git a/libs/widgets/common/databasewidget.h b/libs/widgets/common/databasewidget.h
index 9d16e6b..0bd3cc6 100644
--- a/libs/widgets/common/databasewidget.h
+++ b/libs/widgets/common/databasewidget.h
@@ -36,8 +36,8 @@
 // KDE includes
 
 #include <kdialog.h>
-#include <kurl.h>
 #include <kurlrequester.h>
+#include <kurl.h>
 
 // Local includes
 
@@ -83,6 +83,10 @@ public:
 
 public Q_SLOTS:
 
+    void slotChangeDatabasePath(const KUrl&);
+    void slotDatabasePathEdited(const QString&);
+    void slotHandleDBTypeIndexChanged(int index);
+    void slotHandleInternalServerCheckbox(int enableFields);
     void checkDatabaseConnection();
 
 private:
@@ -90,14 +94,6 @@ private:
     void checkDBPath();
     void setupMainArea();
 
-private Q_SLOTS:
-
-    void slotHandleInternalServerCheckbox(int enableFields);
-    void slotHandleDBTypeIndexChanged(int index);
-    void slotChangeDatabasePath(const KUrl&);
-    void slotDatabasePathEditedDelayed();
-    void slotDatabasePathEdited();
-
 private:
 
     class Private;