From cd78e02a243c0d65476df8589c3f334681aa5eac Mon Sep 17 00:00:00 2001 From: Richard Heck Date: Wed, 9 Jun 2010 15:14:22 +0000 Subject: [PATCH] Minor code cleanup. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34636 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/frontends/qt4/GuiCompleter.cpp | 42 ++++++++++++++---------------- 1 file changed, 20 insertions(+), 22 deletions(-) diff --git a/src/frontends/qt4/GuiCompleter.cpp b/src/frontends/qt4/GuiCompleter.cpp index d061aefcb4..4f59d50309 100644 --- a/src/frontends/qt4/GuiCompleter.cpp +++ b/src/frontends/qt4/GuiCompleter.cpp @@ -111,8 +111,7 @@ public: { if (list_ == 0) return 0; - else - return list_->size(); + return list_->size(); } /// @@ -130,24 +129,23 @@ public: if (index.column() == 0) return toqstr(list_->data(index.row())); - if (index.column() == 1) { - // get icon from cache - QPixmap scaled; - QString const name = ":" + toqstr(list_->icon(index.row())); - if (!QPixmapCache::find("completion" + name, scaled)) { - // load icon from disk - QPixmap p = QPixmap(name); - if (!p.isNull()) { - // scale it to 16x16 or smaller - scaled = p.scaled(min(16, p.width()), min(16, p.height()), - Qt::KeepAspectRatio, Qt::SmoothTransformation); - } - - QPixmapCache::insert("completion" + name, scaled); + if (index.column() != 1) + return QVariant(); + + // get icon from cache + QPixmap scaled; + QString const name = ":" + toqstr(list_->icon(index.row())); + if (!QPixmapCache::find("completion" + name, scaled)) { + // load icon from disk + QPixmap p = QPixmap(name); + if (!p.isNull()) { + // scale it to 16x16 or smaller + scaled = p.scaled(min(16, p.width()), min(16, p.height()), + Qt::KeepAspectRatio, Qt::SmoothTransformation); } - return scaled; + QPixmapCache::insert("completion" + name, scaled); } - return QVariant(); + return scaled; } private: @@ -170,10 +168,10 @@ GuiCompleter::GuiCompleter(GuiWorkArea * gui, QObject * parent) // create the popup QTreeView *listView = new QTreeView; - listView->setEditTriggers(QAbstractItemView::NoEditTriggers); - listView->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); - listView->setSelectionBehavior(QAbstractItemView::SelectRows); - listView->setSelectionMode(QAbstractItemView::SingleSelection); + listView->setEditTriggers(QAbstractItemView::NoEditTriggers); + listView->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); + listView->setSelectionBehavior(QAbstractItemView::SelectRows); + listView->setSelectionMode(QAbstractItemView::SingleSelection); listView->header()->hide(); listView->setIndentation(0); listView->setUniformRowHeights(true); -- 2.39.2