Compil fix.

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

diff --git a/src/frontends/qt4/CustomizedWidgets.cpp b/src/frontends/qt4/CustomizedWidgets.cpp
index 8b360e43c4906d0af31dde83c5afa129b0d03781..9a8152bf41875c67ec0be3691909cd1341b2b9c1 100644 (file)
--- a/src/frontends/qt4/CustomizedWidgets.cpp
+++ b/src/frontends/qt4/CustomizedWidgets.cpp
@@ -26,7 +26,8 @@
 #include "GuiKeySymbol.h"
 
 #include <QApplication>
-#include <QCloseEvent>
+#include <QKeyEvent>
+#include <QShowEvent>
 
 #include "support/qstring_helpers.h"
 
@@ -36,6 +37,9 @@ using lyx::KeySequence;
 using lyx::KeyModifier;
 using lyx::toqstr;
 
+namespace lyx {
+namespace frontend {
+
 ShortcutLineEdit::ShortcutLineEdit(QWidget * parent)
        : QLineEdit(parent), keysequence_()
 {
@@ -90,7 +94,7 @@ void ShortcutLineEdit::keyPressEvent(QKeyEvent * e)
                        break;
                default:
                        appendToSequence(e);
-                       setText(toqstr(keysequence_.print(KeySequence::BindFile)));
+                       setText(toqstr(keysequence_.print(KeySequence::ForGui)));
        }
 }
 
@@ -123,36 +127,12 @@ void ShortcutLineEdit::appendToSequence(QKeyEvent * e)
        KeySymbol sym;
        setKeySymbol(&sym, e);
 
-       KeyModifier mod = lyx::NoModifier;
-       if (e->modifiers() & Qt::SHIFT)
-               mod |= lyx::ShiftModifier;
-       if (e->modifiers() & Qt::CTRL)
-               mod |= lyx::ControlModifier;
-       if (e->modifiers() & Qt::ALT | e->modifiers() & Qt::META)
-               mod |= lyx::AltModifier;
+       KeyModifier mod = lyx::q_key_state(e->modifiers());
        
        keysequence_.addkey(sym, mod, lyx::NoModifier);
 }
 
-
-QString const SearchLineEdit::hintMessage() const
-{
-       return toqstr("Search ...");
-}
-
-
-void SearchLineEdit::focusInEvent(QFocusEvent * e)
-{
-       if (text() == hintMessage())
-               clear();
-}
-
-
-void SearchLineEdit::focusOutEvent(QFocusEvent * e)
-{
-       if (text().isEmpty())
-               setText(hintMessage());
-}
-
+} // namespace frontend
+} // namespace lyx
 
 #include "CustomizedWidgets_moc.cpp"