From 35dcfcaf948d9257ee7b30c772d11f3197bd7b5c Mon Sep 17 00:00:00 2001
From: Jean-Francois Dockes <jfd@recoll.org>
Date: Sat, 30 Jan 2010 17:47:35 +0100
Subject: [PATCH] QT GUI: fix small problems in newly native qt4 term expander

---
 src/qtgui/spell_w.cpp | 10 ++++++++--
 src/qtgui/spell_w.h   |  3 ---
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/qtgui/spell_w.cpp b/src/qtgui/spell_w.cpp
index 985a2d15..59ff6245 100644
--- a/src/qtgui/spell_w.cpp
+++ b/src/qtgui/spell_w.cpp
@@ -210,11 +210,11 @@ void SpellW::doExpand()
         suggsLV->setItem(0, 0, new QTableWidgetItem(tr("No expansion found")));
 #endif
     } else {
-        int row = 0;
 #if (QT_VERSION < 0x040000)
 	for (list<Rcl::TermMatchEntry>::reverse_iterator it = entries.rbegin(); 
 	     it != entries.rend(); it++) {
 #else
+        int row = 0;
 	for (list<Rcl::TermMatchEntry>::iterator it = entries.begin(); 
 	     it != entries.end(); it++) {
 #endif
@@ -247,15 +247,21 @@ void SpellW::wordChanged(const QString &text)
 {
     if (text.isEmpty()) {
 	expandPB->setEnabled(false);
-	suggsLV->clear();
+#if (QT_VERSION < 0x040000)
+        suggsLV->clear();
+#else
+        suggsLV->setRowCount(0);
+#endif
     } else {
 	expandPB->setEnabled(true);
     }
 }
 
 #if (QT_VERSION < 0x040000)
+void SpellW::textDoubleClicked(int, int){}
 void SpellW::textDoubleClicked()
 #else
+void SpellW::textDoubleClicked() {}
 void SpellW::textDoubleClicked(int row, int)
 #endif
 {
diff --git a/src/qtgui/spell_w.h b/src/qtgui/spell_w.h
index d5cbb82f..c6253998 100644
--- a/src/qtgui/spell_w.h
+++ b/src/qtgui/spell_w.h
@@ -53,11 +53,8 @@ public:
 public slots:
     virtual void doExpand();
     virtual void wordChanged(const QString&);
-#if (QT_VERSION < 0x040000)
     virtual void textDoubleClicked();
-#else
     virtual void textDoubleClicked(int, int);
-#endif
     virtual void modeSet(int);
 
 signals: