* fix spelling in comments to please John.

[lyx.git] / src / frontends / qt4 / GuiSelectionManager.cpp

diff --git a/src/frontends/qt4/GuiSelectionManager.cpp b/src/frontends/qt4/GuiSelectionManager.cpp
index 694f791bdabf76f87494c83f941c8003636418b5..4d172bc35d890cb52de14e27d6ec9f50f9edcfaf 100644 (file)
--- a/src/frontends/qt4/GuiSelectionManager.cpp
+++ b/src/frontends/qt4/GuiSelectionManager.cpp
@@ -23,12 +23,20 @@
 #include <QPushButton>
 #include <QAbstractListModel>
 
+#ifdef KeyPress
+#undef KeyPress
+#endif
+
+#ifdef ControlModifier
+#undef ControlModifier
+#endif
+
 
 namespace lyx {
 namespace frontend {
 
 GuiSelectionManager::GuiSelectionManager(
-       QListView * avail, 
+       QAbstractItemView * avail,
        QListView * sel,
        QPushButton * add, 
        QPushButton * del, 
@@ -145,7 +153,7 @@ bool GuiSelectionManager::isSelected(const QModelIndex & idx)
        QModelIndexList qmil = 
                        selectedModel->match(selectedModel->index(0), 
                                             Qt::DisplayRole, str, 1,
-                                            Qt::MatchExactly | Qt::MatchWrap);
+                                            Qt::MatchFlags(Qt::MatchExactly | Qt::MatchWrap));
        return !qmil.empty();
 }