From a934072cf9695e46e793898102590322f43c0733 Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Sat, 28 Mar 2009 15:53:26 +0100 Subject: astyle. First round.. --- src/modelmenu.cpp | 42 +++++++++++++++++++++++------------------- 1 file changed, 23 insertions(+), 19 deletions(-) (limited to 'src/modelmenu.cpp') diff --git a/src/modelmenu.cpp b/src/modelmenu.cpp index 3ed5b9ac..fae8acab 100644 --- a/src/modelmenu.cpp +++ b/src/modelmenu.cpp @@ -23,13 +23,13 @@ ModelMenu::ModelMenu(QWidget * parent) - : KMenu(parent) - , m_maxRows(7) - , m_firstSeparator(-1) - , m_maxWidth(-1) - , m_hoverRole(0) - , m_separatorRole(0) - , m_model(0) + : KMenu(parent) + , m_maxRows(7) + , m_firstSeparator(-1) + , m_maxWidth(-1) + , m_hoverRole(0) + , m_separatorRole(0) + , m_model(0) { connect(this, SIGNAL(aboutToShow()), this, SLOT(aboutToShow())); } @@ -121,10 +121,10 @@ int ModelMenu::separatorRole() const Q_DECLARE_METATYPE(QModelIndex) void ModelMenu::aboutToShow() { - if (QMenu *menu = qobject_cast(sender())) + if (QMenu *menu = qobject_cast(sender())) { QVariant v = menu->menuAction()->data(); - if (v.canConvert()) + if (v.canConvert()) { QModelIndex idx = qvariant_cast(v); createMenu(idx, -1, menu, menu); @@ -145,7 +145,7 @@ void ModelMenu::aboutToShow() void ModelMenu::createMenu(const QModelIndex &parent, int max, QMenu *parentMenu, QMenu *menu) { - if (!menu) + if (!menu) { QString title = parent.data().toString(); menu = new QMenu(title, this); @@ -163,16 +163,20 @@ void ModelMenu::createMenu(const QModelIndex &parent, int max, QMenu *parentMenu if (max != -1) end = qMin(max, end); - connect(menu, SIGNAL( triggered(QAction*) ), this, SLOT( triggered(QAction*) ) ); - connect(menu, SIGNAL( hovered(QAction*) ), this, SLOT( hovered(QAction*) ) ); + connect(menu, SIGNAL(triggered(QAction*)), this, SLOT(triggered(QAction*))); + connect(menu, SIGNAL(hovered(QAction*)), this, SLOT(hovered(QAction*))); - for (int i = 0; i < end; ++i) { + for (int i = 0; i < end; ++i) + { QModelIndex idx = m_model->index(i, 0, parent); - if (m_model->hasChildren(idx)) { + if (m_model->hasChildren(idx)) + { createMenu(idx, -1, menu); - } else { + } + else + { if (m_separatorRole != 0 - && idx.data(m_separatorRole).toBool()) + && idx.data(m_separatorRole).toBool()) addSeparator(); else menu->addAction(makeAction(idx)); @@ -184,7 +188,7 @@ void ModelMenu::createMenu(const QModelIndex &parent, int max, QMenu *parentMenu KAction *ModelMenu::makeAction(const QModelIndex &index) { - QIcon icon = qvariant_cast( index.data(Qt::DecorationRole) ); + QIcon icon = qvariant_cast(index.data(Qt::DecorationRole)); KAction *action = (KAction *) makeAction(KIcon(icon), index.data().toString(), this); QVariant v; v.setValue(index); @@ -204,7 +208,7 @@ KAction *ModelMenu::makeAction(const KIcon &icon, const QString &text, QObject * void ModelMenu::triggered(QAction *action) { QVariant v = action->data(); - if (v.canConvert()) + if (v.canConvert()) { QModelIndex idx = qvariant_cast(v); emit activated(idx); @@ -214,7 +218,7 @@ void ModelMenu::triggered(QAction *action) void ModelMenu::hovered(QAction *action) { QVariant v = action->data(); - if (v.canConvert()) + if (v.canConvert()) { QModelIndex idx = qvariant_cast(v); QString hoveredString = idx.data(m_hoverRole).toString(); -- cgit v1.2.1