From: Manuel Nickschas Date: Wed, 22 Aug 2018 19:15:11 +0000 (+0200) Subject: qa: Remove lots of superfluous semicolons X-Git-Tag: test-travis-01~156 X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=00e1a9c29e792ba4d65dba21b7ba04131bcb13bc qa: Remove lots of superfluous semicolons Since we have now enabled -Wpedantic, the compiler warns us about superfluous semicolons, of which we apparently have a lot. Remove them. --- diff --git a/src/common/eventmanager.h b/src/common/eventmanager.h index 143363cf..d74e2362 100644 --- a/src/common/eventmanager.h +++ b/src/common/eventmanager.h @@ -195,6 +195,6 @@ private: }; -Q_DECLARE_OPERATORS_FOR_FLAGS(EventManager::EventFlags); +Q_DECLARE_OPERATORS_FOR_FLAGS(EventManager::EventFlags) #endif diff --git a/src/common/logger.cpp b/src/common/logger.cpp index aabba5e1..c767fc65 100644 --- a/src/common/logger.cpp +++ b/src/common/logger.cpp @@ -38,7 +38,7 @@ namespace { QByteArray msgWithTime(const Logger::LogEntry &msg) { return (msg.timeStamp.toString("yyyy-MM-dd hh:mm:ss ") + msg.message + "\n").toUtf8(); -}; +} } diff --git a/src/common/protocol.h b/src/common/protocol.h index 2453a520..1e3114f3 100644 --- a/src/common/protocol.h +++ b/src/common/protocol.h @@ -252,7 +252,7 @@ struct HeartBeatReply }; -}; +} // Required for InternalPeer Q_DECLARE_METATYPE(Protocol::SyncMessage) diff --git a/src/common/serializers/serializers.h b/src/common/serializers/serializers.h index b3c0aa04..61af769b 100644 --- a/src/common/serializers/serializers.h +++ b/src/common/serializers/serializers.h @@ -114,4 +114,4 @@ namespace Serializers { bool deserialize(QDataStream &stream, const Quassel::Features &features, NetworkInfo &data); bool deserialize(QDataStream &stream, const Quassel::Features &features, Identity &data); bool deserialize(QDataStream &stream, const Quassel::Features &features, Network::Server &data); -}; +} diff --git a/src/common/transfer.h b/src/common/transfer.h index 3612450a..57c9ccea 100644 --- a/src/common/transfer.h +++ b/src/common/transfer.h @@ -32,14 +32,14 @@ class Transfer : public SyncableObject Q_OBJECT SYNCABLE_OBJECT - Q_PROPERTY(QUuid uuid READ uuid); - Q_PROPERTY(Transfer::Status status READ status WRITE setStatus NOTIFY statusChanged); - Q_PROPERTY(Transfer::Direction direction READ direction WRITE setDirection NOTIFY directionChanged); - Q_PROPERTY(QHostAddress address READ address WRITE setAddress NOTIFY addressChanged); - Q_PROPERTY(quint16 port READ port WRITE setPort NOTIFY portChanged); - Q_PROPERTY(QString fileName READ fileName WRITE setFileName NOTIFY fileNameChanged); - Q_PROPERTY(quint64 fileSize READ fileSize WRITE setFileSize NOTIFY fileSizeChanged); - Q_PROPERTY(QString nick READ nick WRITE setNick NOTIFY nickChanged); + Q_PROPERTY(QUuid uuid READ uuid) + Q_PROPERTY(Transfer::Status status READ status WRITE setStatus NOTIFY statusChanged) + Q_PROPERTY(Transfer::Direction direction READ direction WRITE setDirection NOTIFY directionChanged) + Q_PROPERTY(QHostAddress address READ address WRITE setAddress NOTIFY addressChanged) + Q_PROPERTY(quint16 port READ port WRITE setPort NOTIFY portChanged) + Q_PROPERTY(QString fileName READ fileName WRITE setFileName NOTIFY fileNameChanged) + Q_PROPERTY(quint64 fileSize READ fileSize WRITE setFileSize NOTIFY fileSizeChanged) + Q_PROPERTY(QString nick READ nick WRITE setNick NOTIFY nickChanged) public: enum class Status { diff --git a/src/qtui/chatviewsettings.h b/src/qtui/chatviewsettings.h index c491bbac..19aed61e 100644 --- a/src/qtui/chatviewsettings.h +++ b/src/qtui/chatviewsettings.h @@ -37,7 +37,7 @@ public: OptIn = 1, OptOut = 2 }; - Q_DECLARE_FLAGS(operationModes, OperationMode); + Q_DECLARE_FLAGS(operationModes, OperationMode) ChatViewSettings(const QString &id = "__default__"); ChatViewSettings(ChatScene *scene); diff --git a/src/qtui/coreconfigwizard.cpp b/src/qtui/coreconfigwizard.cpp index ebb23b83..c51bd85b 100644 --- a/src/qtui/coreconfigwizard.cpp +++ b/src/qtui/coreconfigwizard.cpp @@ -547,4 +547,4 @@ int SyncRelayPage::nextId() const emit startOver(); return 0; } -}; /* namespace CoreConfigWizardPages */ +} /* namespace CoreConfigWizardPages */ diff --git a/src/qtui/coreconfigwizard.h b/src/qtui/coreconfigwizard.h index 2943c158..70512e70 100644 --- a/src/qtui/coreconfigwizard.h +++ b/src/qtui/coreconfigwizard.h @@ -39,7 +39,7 @@ namespace CoreConfigWizardPages { class SyncPage; class SyncRelayPage; -}; +} class CoreConfigWizard : public QWizard { diff --git a/src/qtui/inputwidget.cpp b/src/qtui/inputwidget.cpp index 98ef2ba5..7a4b5ac3 100644 --- a/src/qtui/inputwidget.cpp +++ b/src/qtui/inputwidget.cpp @@ -374,7 +374,7 @@ const Network *InputWidget::currentNetwork() const BufferInfo InputWidget::currentBufferInfo() const { return selectionModel()->currentIndex().data(NetworkModel::BufferInfoRole).value(); -}; +} void InputWidget::applyFormatActiveColor() diff --git a/src/qtui/titlesetter.cpp b/src/qtui/titlesetter.cpp index 02fa6ec4..731b9131 100644 --- a/src/qtui/titlesetter.cpp +++ b/src/qtui/titlesetter.cpp @@ -44,7 +44,8 @@ void TitleSetter::dataChanged(const QModelIndex &topLeft, const QModelIndex &bot QModelIndex currentTopicIndex = selectionModel()->currentIndex().sibling(selectionModel()->currentIndex().row(), 0); if (changedArea.contains(currentTopicIndex)) changeWindowTitle(currentTopicIndex); -}; +} + void TitleSetter::changeWindowTitle(const QModelIndex &index) { diff --git a/src/qtui/topicwidget.cpp b/src/qtui/topicwidget.cpp index c0831933..5426b08b 100644 --- a/src/qtui/topicwidget.cpp +++ b/src/qtui/topicwidget.cpp @@ -67,7 +67,7 @@ void TopicWidget::dataChanged(const QModelIndex &topLeft, const QModelIndex &bot QModelIndex currentTopicIndex = selectionModel()->currentIndex().sibling(selectionModel()->currentIndex().row(), 1); if (changedArea.contains(currentTopicIndex)) setTopic(selectionModel()->currentIndex()); -}; +} void TopicWidget::setUseCustomFont(const QVariant &v) { diff --git a/src/uisupport/treeviewtouch.cpp b/src/uisupport/treeviewtouch.cpp index 74799b3f..4aae13d0 100644 --- a/src/uisupport/treeviewtouch.cpp +++ b/src/uisupport/treeviewtouch.cpp @@ -78,4 +78,4 @@ void TreeViewTouch::mousePressEvent(QMouseEvent *event) { void TreeViewTouch::mouseMoveEvent(QMouseEvent *event) { if (!_touchScrollInProgress) QTreeView::mouseMoveEvent(event); -}; +}