compile fix for OS X

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

diff --git a/src/frontends/qt4/QRef.C b/src/frontends/qt4/QRef.C
index f560e1559d49fd8d6c4d24dfd7da9838280de630..fbf1a61d9b997e2dd6b7c363830dd27c138300de 100644 (file)
--- a/src/frontends/qt4/QRef.C
+++ b/src/frontends/qt4/QRef.C
@@ -21,11 +21,12 @@
 
 #include "insets/insetref.h"
 
-#include <qlineedit.h>
-#include <qcheckbox.h>
-#include <q3listbox.h>
-#include <qpushbutton.h>
-#include <qtooltip.h>
+#include <QLineEdit>
+#include <QCheckBox>
+#include <QListWidget>
+#include <QListWidgetItem>
+#include <QPushButton>
+#include <QToolTip>
 
 
 using std::vector;
@@ -34,7 +35,8 @@ using std::string;
 namespace lyx {
 namespace frontend {
 
-typedef QController<ControlRef, QView<QRefDialog> > base_class;
+// full qualification because qt4 has also a ControlRef type
+typedef QController<lyx::frontend::ControlRef, QView<QRefDialog> > base_class;
 
 
 QRef::QRef(Dialog & parent)
@@ -51,7 +53,7 @@ void QRef::build_dialog()
        bcview().setOK(dialog_->okPB);
        bcview().setApply(dialog_->applyPB);
        bcview().setCancel(dialog_->closePB);
-       bcview().addReadOnly(dialog_->refsLB);
+       bcview().addReadOnly(dialog_->refsLW);
        bcview().addReadOnly(dialog_->sortCB);
        bcview().addReadOnly(dialog_->nameED);
        bcview().addReadOnly(dialog_->referenceED);
@@ -168,13 +170,13 @@ void QRef::redoRefs()
 {
        // Prevent these widgets from emitting any signals whilst
        // we modify their state.
-       dialog_->refsLB->blockSignals(true);
+       dialog_->refsLW->blockSignals(true);
        dialog_->referenceED->blockSignals(true);
 
-       int lastref = dialog_->refsLB->currentItem();
+       int lastref = dialog_->refsLW->currentRow();
 
-       dialog_->refsLB->setAutoUpdate(false);
-       dialog_->refsLB->clear();
+       dialog_->refsLW->setUpdatesEnabled(false);
+       dialog_->refsLW->clear();
 
        // need this because Qt will send a highlight() here for
        // the first item inserted
@@ -182,30 +184,33 @@ void QRef::redoRefs()
 
        for (std::vector<string>::const_iterator iter = refs_.begin();
                iter != refs_.end(); ++iter) {
-               dialog_->refsLB->insertItem(toqstr(*iter));
+               dialog_->refsLW->addItem(toqstr(*iter));
        }
 
        if (sort_)
-               dialog_->refsLB->sort();
+               dialog_->refsLW->sortItems();
 
        dialog_->referenceED->setText(tmp);
 
        // restore the last selection for new insets
        if (tmp.isEmpty() && lastref != -1
-               && lastref < int(dialog_->refsLB->count())) {
-               dialog_->refsLB->setCurrentItem(lastref);
-               dialog_->refsLB->clearSelection();
+               && lastref < int(dialog_->refsLW->count())) {
+               dialog_->refsLW->setCurrentRow(lastref);
+               dialog_->refsLW->clearSelection();
        } else
-               for (unsigned int i = 0; i < dialog_->refsLB->count(); ++i) {
-                       if (tmp == dialog_->refsLB->text(i))
-                               dialog_->refsLB->setSelected(i, true);
+               for (unsigned int i = 0; i < dialog_->refsLW->count(); ++i) {
+                       if (tmp == dialog_->refsLW->item(i)->text()) {
+                               QListWidgetItem * const item = dialog_->refsLW->item(i);
+                               dialog_->refsLW->setItemSelected(item, true);
+
+                       }
                }
 
-       dialog_->refsLB->setAutoUpdate(true);
-       dialog_->refsLB->update();
+       dialog_->refsLW->setUpdatesEnabled(true);
+       dialog_->refsLW->update();
 
        // Re-activate the emission of signals by these widgets.
-       dialog_->refsLB->blockSignals(false);
+       dialog_->refsLW->blockSignals(false);
        dialog_->referenceED->blockSignals(false);
 }
 
@@ -218,7 +223,7 @@ void QRef::updateRefs()
        string const name = controller().getBufferName(dialog_->bufferCO->currentItem());
        refs_ = controller().getLabelList(name);
        dialog_->sortCB->setEnabled(!refs_.empty());
-       dialog_->refsLB->setEnabled(!refs_.empty());
+       dialog_->refsLW->setEnabled(!refs_.empty());
        dialog_->gotoPB->setEnabled(!refs_.empty());
        redoRefs();
 }