enable Font cache only for MacOSX and inline width() for other platform.

[lyx.git] / src / frontends / qt4 / QSpellcheckerDialog.C

diff --git a/src/frontends/qt4/QSpellcheckerDialog.C b/src/frontends/qt4/QSpellcheckerDialog.C
index 63138689d7ecad8c2ad4a76451e8defbe7683dc0..b714ac321b789a4afb4ef39869eb51e8b0f98857 100644 (file)
--- a/src/frontends/qt4/QSpellcheckerDialog.C
+++ b/src/frontends/qt4/QSpellcheckerDialog.C
@@ -13,9 +13,8 @@
 #include "QSpellcheckerDialog.h"
 #include "QSpellchecker.h"
 
-#include <Q3ListBox>
+#include <QListWidget>
 #include <QPushButton>
-//Added by qt3to4:
 #include <QCloseEvent>
 
 namespace lyx {
@@ -29,13 +28,20 @@ QSpellcheckerDialog::QSpellcheckerDialog(QSpellchecker * form)
        connect(closePB, SIGNAL(clicked()),
                form, SLOT(slotClose()));
 
-    connect( replaceCO, SIGNAL( highlighted(const QString&) ), this, SLOT( replaceChanged(const QString &) ) );
-    connect( replacePB, SIGNAL( clicked() ), this, SLOT( replaceClicked() ) );
-    connect( ignorePB, SIGNAL( clicked() ), this, SLOT( ignoreClicked() ) );
-    connect( replacePB_3, SIGNAL( clicked() ), this, SLOT( acceptClicked() ) );
-    connect( addPB, SIGNAL( clicked() ), this, SLOT( addClicked() ) );
-    connect( suggestionsLB, SIGNAL( doubleClicked(QListBoxItem*) ), this, SLOT( replaceClicked() ) );
-    connect( suggestionsLB, SIGNAL( highlighted(const QString&) ), this, SLOT( suggestionChanged(const QString &) ) );
+       connect( replaceCO, SIGNAL( highlighted(const QString&) ),
+               this, SLOT( replaceChanged(const QString &) ) );
+       connect( replacePB, SIGNAL( clicked() ),
+               this, SLOT( replaceClicked() ) );
+       connect( ignorePB, SIGNAL( clicked() ),
+               this, SLOT( ignoreClicked() ) );
+       connect( replacePB_3, SIGNAL( clicked() ),
+               this, SLOT( acceptClicked() ) );
+       connect( addPB, SIGNAL( clicked() ),
+               this, SLOT( addClicked() ) );
+       connect( suggestionsLW, SIGNAL( itemDoubleClicked(QListWidgetItem*) ),
+               this, SLOT( replaceClicked() ) );
+       connect( suggestionsLW, SIGNAL( itemClicked(QListWidgetItem*) ),
+               this, SLOT( suggestionChanged(QListWidgetItem*) ) );
 }
 
 
@@ -59,29 +65,27 @@ void QSpellcheckerDialog::ignoreClicked()
        form_->ignore();
 }
 
-void QSpellcheckerDialog::suggestionChanged(const QString & str)
+void QSpellcheckerDialog::suggestionChanged(QListWidgetItem * item)
 {
        if (replaceCO->count() != 0)
-               replaceCO->changeItem(str, 0);
+               replaceCO->setItemText(0, item->text());
        else
-               replaceCO->insertItem(str);
+               replaceCO->addItem(item->text());
 
-       replaceCO->setCurrentItem(0);
+       replaceCO->setCurrentIndex(0);
 }
 
 void QSpellcheckerDialog::replaceChanged(const QString & str)
 {
-       if (suggestionsLB->currentText() == str)
+       if (suggestionsLW->currentItem()->text() == str)
                return;
 
-       unsigned int i = 0;
-       for (; i < suggestionsLB->count(); ++i) {
-               if (suggestionsLB->text(i) == str)
+       for (int i = 0; i < suggestionsLW->count(); ++i) {
+               if (suggestionsLW->item(i)->text() == str) {
+                       suggestionsLW->setCurrentRow(i);
                        break;
+               }
        }
-
-       if (i != suggestionsLB->count())
-               suggestionsLB->setCurrentItem(i);
 }
 
 
@@ -100,3 +104,5 @@ void QSpellcheckerDialog::reject()
 
 } // namespace frontend
 } // namespace lyx
+
+#include "QSpellcheckerDialog_moc.cpp"