* cosmetic

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23427 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/frontends/qt4/GuiToolbar.cpp b/src/frontends/qt4/GuiToolbar.cpp
index cbf50dd65656fd16aab1e30a080a9e8b02e2df96..72f090b22084af2722cbac8ac61fd5e16abba7cd 100644 (file)
--- a/src/frontends/qt4/GuiToolbar.cpp
+++ b/src/frontends/qt4/GuiToolbar.cpp
@@ -347,49 +347,51 @@ void GuiLayoutBox::resetFilter()
 }
 
 
-bool GuiLayoutBox::eventFilter(QObject *o, QEvent *e)
+bool GuiLayoutBox::eventFilter(QObject * o, QEvent * e)
 {
-       if (e->type() == QEvent::KeyPress) {
-               QKeyEvent * ke = static_cast<QKeyEvent*>(e);
-               bool modified = (ke->modifiers() == Qt::ControlModifier)
-                       || (ke->modifiers() == Qt::AltModifier)
-                       || (ke->modifiers() == Qt::MetaModifier);
-               
-               switch (ke->key()) {
-               case Qt::Key_Escape:
-                       if (!modified && !filter_.isEmpty()) {
-                               resetFilter();
-                               return true;
-                       }
-                       break;
-               case Qt::Key_Backspace:
-                       if (!modified) {
-                               // cut off one character
-                               setFilter(filter_.left(filter_.length() - 1));
-                       }
+       if (e->type() != QEvent::KeyPress)
+               return QComboBox::eventFilter(o, e);
+
+       QKeyEvent * ke = static_cast<QKeyEvent*>(e);
+       bool modified = (ke->modifiers() == Qt::ControlModifier)
+               || (ke->modifiers() == Qt::AltModifier)
+               || (ke->modifiers() == Qt::MetaModifier);
+       
+       switch (ke->key()) {
+       case Qt::Key_Escape:
+               if (!modified && !filter_.isEmpty()) {
+                       resetFilter();
+                       return true;
+               }
+               break;
+       case Qt::Key_Backspace:
+               if (!modified) {
+                       // cut off one character
+                       setFilter(filter_.left(filter_.length() - 1));
+               }
+               break;
+       default:
+               if (modified || ke->text().isEmpty())
                        break;
-               default:
-                       if (modified || ke->text().isEmpty())
-                               break;
-                       // find chars for the filter string
-                       QString s;
-                       for (int i = 0; i < ke->text().length(); ++i) {
-                               QChar c = ke->text()[i];
-                               if (c.isLetterOrNumber()
-                                   || c.isSymbol()
-                                   || c.isPunct()
-                                   || c.category() == QChar::Separator_Space) {
-                                       s += c;
-                               }
-                       }
-                       if (!s.isEmpty()) {
-                               // append new chars to the filter string
-                               setFilter(filter_ + s);
-                               return true;
+               // find chars for the filter string
+               QString s;
+               for (int i = 0; i < ke->text().length(); ++i) {
+                       QChar c = ke->text()[i];
+                       if (c.isLetterOrNumber()
+                           || c.isSymbol()
+                           || c.isPunct()
+                           || c.category() == QChar::Separator_Space) {
+                               s += c;
                        }
-                       break;
                }
+               if (!s.isEmpty()) {
+                       // append new chars to the filter string
+                       setFilter(filter_ + s);
+                       return true;
+               }
+               break;
        }
+
        return QComboBox::eventFilter(o, e);
 }
 

diff --git a/src/frontends/qt4/GuiToolbar.h b/src/frontends/qt4/GuiToolbar.h
index b4a4b6efbe6e839dadc6914c20d4617c8b8a2e82..d972f13bd1c843eb49b572950ca95de53b0a0e98 100644 (file)
--- a/src/frontends/qt4/GuiToolbar.h
+++ b/src/frontends/qt4/GuiToolbar.h
@@ -52,7 +52,7 @@ public:
        void addItemSort(docstring const & item, bool sorted);
 
        ///
-       bool eventFilter(QObject *o, QEvent *e);
+       bool eventFilter(QObject * o, QEvent * e);
        ///
        QString const & filter() { return filter_; }