From 6a281bef8f5879c837720eee704b6c0ba7abfca3 Mon Sep 17 00:00:00 2001 From: sledgehammer999 Date: Sun, 24 Jan 2016 18:39:25 +0200 Subject: [PATCH] Follow project coding style. Issue #2192. --- src/gui/loglistwidget.cpp | 79 ++++++++++++++++++++------------------- src/gui/loglistwidget.h | 14 +++---- 2 files changed, 47 insertions(+), 46 deletions(-) diff --git a/src/gui/loglistwidget.cpp b/src/gui/loglistwidget.cpp index ecab80e7a..f28ab870f 100644 --- a/src/gui/loglistwidget.cpp +++ b/src/gui/loglistwidget.cpp @@ -38,59 +38,60 @@ #include "guiiconprovider.h" LogListWidget::LogListWidget(int max_lines, QWidget *parent) : - QListWidget(parent), - m_maxLines(max_lines) + QListWidget(parent), + m_maxLines(max_lines) { - // Allow multiple selections - setSelectionMode(QAbstractItemView::ExtendedSelection); - // Context menu - QAction *copyAct = new QAction(GuiIconProvider::instance()->getIcon("edit-copy"), tr("Copy"), this); - QAction *clearAct = new QAction(GuiIconProvider::instance()->getIcon("edit-clear"), tr("Clear"), this); - connect(copyAct, SIGNAL(triggered()), SLOT(copySelection())); - connect(clearAct, SIGNAL(triggered()), SLOT(clearLog())); - addAction(copyAct); - addAction(clearAct); - setContextMenuPolicy(Qt::ActionsContextMenu); + // Allow multiple selections + setSelectionMode(QAbstractItemView::ExtendedSelection); + // Context menu + QAction *copyAct = new QAction(GuiIconProvider::instance()->getIcon("edit-copy"), tr("Copy"), this); + QAction *clearAct = new QAction(GuiIconProvider::instance()->getIcon("edit-clear"), tr("Clear"), this); + connect(copyAct, SIGNAL(triggered()), SLOT(copySelection())); + connect(clearAct, SIGNAL(triggered()), SLOT(clearLog())); + addAction(copyAct); + addAction(clearAct); + setContextMenuPolicy(Qt::ActionsContextMenu); } void LogListWidget::keyPressEvent(QKeyEvent *event) { - if (event->matches(QKeySequence::Copy)) { - copySelection(); - return; - } - if (event->matches(QKeySequence::SelectAll)) { - selectAll(); - return; - } + if (event->matches(QKeySequence::Copy)) { + copySelection(); + return; + } + if (event->matches(QKeySequence::SelectAll)) { + selectAll(); + return; + } } void LogListWidget::appendLine(const QString &line) { - QListWidgetItem *item = new QListWidgetItem; - // We need to use QLabel here to support rich text - QLabel *lbl = new QLabel(line); - lbl->setContentsMargins(4, 2, 4, 2); - item->setSizeHint(lbl->sizeHint()); - insertItem(0, item); - setItemWidget(item, lbl); - const int nbLines = count(); - // Limit log size - if (nbLines > m_maxLines) - delete takeItem(nbLines - 1); + QListWidgetItem *item = new QListWidgetItem; + // We need to use QLabel here to support rich text + QLabel *lbl = new QLabel(line); + lbl->setContentsMargins(4, 2, 4, 2); + item->setSizeHint(lbl->sizeHint()); + insertItem(0, item); + setItemWidget(item, lbl); + const int nbLines = count(); + // Limit log size + if (nbLines > m_maxLines) + delete takeItem(nbLines - 1); } void LogListWidget::copySelection() { - static QRegExp html_tag("<[^>]+>"); - QList items = selectedItems(); - QStringList strings; - foreach (QListWidgetItem* it, items) - strings << static_cast(itemWidget(it))->text().replace(html_tag, ""); + static QRegExp html_tag("<[^>]+>"); + QList items = selectedItems(); + QStringList strings; + foreach (QListWidgetItem* it, items) + strings << static_cast(itemWidget(it))->text().replace(html_tag, ""); - QApplication::clipboard()->setText(strings.join("\n")); + QApplication::clipboard()->setText(strings.join("\n")); } -void LogListWidget::clearLog() { - clear(); +void LogListWidget::clearLog() +{ + clear(); } diff --git a/src/gui/loglistwidget.h b/src/gui/loglistwidget.h index f09a710bd..fc3a8a3e0 100644 --- a/src/gui/loglistwidget.h +++ b/src/gui/loglistwidget.h @@ -36,25 +36,25 @@ QT_BEGIN_NAMESPACE class QKeyEvent; QT_END_NAMESPACE -class LogListWidget : public QListWidget +class LogListWidget: public QListWidget { Q_OBJECT public: - explicit LogListWidget(int max_lines = 100, QWidget *parent = 0); + explicit LogListWidget(int max_lines = 100, QWidget *parent = 0); public slots: - void appendLine(const QString &line); + void appendLine(const QString &line); protected slots: - void copySelection(); - void clearLog(); + void copySelection(); + void clearLog(); protected: - void keyPressEvent(QKeyEvent *event); + void keyPressEvent(QKeyEvent *event); private: - int m_maxLines; + int m_maxLines; };