From: Stefan Schimanski <sts@lyx.org>
Date: Tue, 4 Mar 2008 09:46:49 +0000 (+0000)
Subject: * cosmetic
X-Git-Tag: 1.6.10~5913
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=cabd59db2c5df243b45203e97daa20e2aab0a0f1;p=features.git

* 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 cbf50dd656..72f090b220 100644
--- 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 b4a4b6efbe..d972f13bd1 100644
--- 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_; }