summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorKonstantinos Sideris <sideris.konstantin@gmail.com>2017-10-01 12:11:33 +0300
committerKonstantinos Sideris <sideris.konstantin@gmail.com>2017-10-01 12:51:29 +0300
commit0c0ac68bc2e23fe1590614bb961a21a4bb09d0dc (patch)
tree11da9fbb7105834401d8e7999d42a4107221aa37 /src
parentMerge pull request #82 from rokups/fix/#50 (diff)
downloadnheko-0c0ac68bc2e23fe1590614bb961a21a4bb09d0dc.tar.xz
Remove extra clang-format options
Diffstat (limited to 'src')
-rw-r--r--src/Cache.cc3
-rw-r--r--src/EmojiCategory.cc4
-rw-r--r--src/EmojiPanel.cc6
-rw-r--r--src/Login.cc4
-rw-r--r--src/LoginPage.cc8
-rw-r--r--src/MainWindow.cc6
-rw-r--r--src/MatrixClient.cc12
-rw-r--r--src/RegisterPage.cc4
-rw-r--r--src/RoomInfoListItem.cc8
-rw-r--r--src/RoomList.cc4
-rw-r--r--src/TextInputWidget.cc4
-rw-r--r--src/TimelineItem.cc4
-rw-r--r--src/TimelineViewManager.cc4
-rw-r--r--src/TopRoomBar.cc4
-rw-r--r--src/UserInfoWidget.cc4
-rw-r--r--src/ui/Avatar.cc4
-rw-r--r--src/ui/Badge.cc4
-rw-r--r--src/ui/FlatButton.cc11
-rw-r--r--src/ui/RaisedButton.cc4
-rw-r--r--src/ui/Ripple.cc4
-rw-r--r--src/ui/RippleOverlay.cc4
-rw-r--r--src/ui/TextField.cc15
-rw-r--r--src/ui/Theme.cc4
23 files changed, 43 insertions, 86 deletions
diff --git a/src/Cache.cc b/src/Cache.cc

index 6733428e..bda81316 100644 --- a/src/Cache.cc +++ b/src/Cache.cc
@@ -126,7 +126,8 @@ Cache::insertRoomState(lmdb::txn &txn, const QString &roomid, const RoomState &s auto memberEvent = QJsonDocument(membership.serialize()).toBinaryData(); switch (membership.content().membershipState()) { - // We add or update (e.g invite -> join) a new user to the membership list. + // We add or update (e.g invite -> join) a new user to the membership + // list. case events::Membership::Invite: case events::Membership::Join: { lmdb::dbi_put(txn, diff --git a/src/EmojiCategory.cc b/src/EmojiCategory.cc
index 9de86d6b..ea32ea9c 100644 --- a/src/EmojiCategory.cc +++ b/src/EmojiCategory.cc
@@ -80,6 +80,4 @@ EmojiCategory::EmojiCategory(QString category, QList<Emoji> emoji, QWidget *pare connect(emojiListView_, &QListView::clicked, this, &EmojiCategory::clickIndex); } -EmojiCategory::~EmojiCategory() -{ -} +EmojiCategory::~EmojiCategory() {} diff --git a/src/EmojiPanel.cc b/src/EmojiPanel.cc
index f7736fb8..c272a478 100644 --- a/src/EmojiPanel.cc +++ b/src/EmojiPanel.cc
@@ -220,9 +220,9 @@ EmojiPanel::showEmojiCategory(const EmojiCategory *category) // HACK // If we want to go to a previous category and position the label at the top - // the 6*50 offset won't work because not all the categories have the same height. - // To ensure the category is at the top, we move to the top - // and go as normal to the next category. + // the 6*50 offset won't work because not all the categories have the same + // height. To ensure the category is at the top, we move to the top and go as + // normal to the next category. if (current > posToGo) this->scrollArea_->ensureVisible(0, 0, 0, 0); diff --git a/src/Login.cc b/src/Login.cc
index 7010e359..d0dd1ea9 100644 --- a/src/Login.cc +++ b/src/Login.cc
@@ -22,9 +22,7 @@ #include "Deserializable.h" #include "Login.h" -LoginRequest::LoginRequest() -{ -} +LoginRequest::LoginRequest() {} LoginRequest::LoginRequest(QString username, QString password) : user_(username) diff --git a/src/LoginPage.cc b/src/LoginPage.cc
index 2f4178dd..fd7fede3 100644 --- a/src/LoginPage.cc +++ b/src/LoginPage.cc
@@ -223,8 +223,8 @@ void LoginPage::versionError(QString error) { // Matrix homeservers are often kept on a subdomain called 'matrix' - // so let's try that next, unless the address was set explicitly or the domain part of the - // username already points to this subdomain + // so let's try that next, unless the address was set explicitly or the domain + // part of the username already points to this subdomain QUrl currentServer = client_->getHomeServer(); QString mxidAddress = matrixid_input_->text().split(":").at(1); if (currentServer.host() == inferredServerAddress_ && @@ -297,6 +297,4 @@ LoginPage::onBackButtonClicked() emit backButtonClicked(); } -LoginPage::~LoginPage() -{ -} +LoginPage::~LoginPage() {} diff --git a/src/MainWindow.cc b/src/MainWindow.cc
index 39fb1d2a..43f4a949 100644 --- a/src/MainWindow.cc +++ b/src/MainWindow.cc
@@ -15,8 +15,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "Config.h" #include "MainWindow.h" +#include "Config.h" #include <QApplication> #include <QLayout> @@ -244,6 +244,4 @@ MainWindow::instance() return instance_; } -MainWindow::~MainWindow() -{ -} +MainWindow::~MainWindow() {} diff --git a/src/MatrixClient.cc b/src/MatrixClient.cc
index 2e4f7c47..981a30c2 100644 --- a/src/MatrixClient.cc +++ b/src/MatrixClient.cc
@@ -64,8 +64,8 @@ MatrixClient::onVersionsResponse(QNetworkReply *reply) int status_code = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt(); if (status_code == 404) { - emit versionError( - "Versions endpoint was not found on the server. Possibly not a Matrix server"); + emit versionError("Versions endpoint was not found on the server. Possibly " + "not a Matrix server"); return; } @@ -581,8 +581,8 @@ MatrixClient::sync() noexcept query.addQueryItem("access_token", token_); if (next_batch_.isEmpty()) { - qDebug() - << "Sync requires a valid next_batch token. Initial sync should be performed."; + qDebug() << "Sync requires a valid next_batch token. Initial sync should " + "be performed."; return; } @@ -684,8 +684,8 @@ MatrixClient::versions() noexcept void MatrixClient::getOwnProfile() noexcept { - // FIXME: Remove settings from the matrix client. The class should store the user's matrix - // ID. + // FIXME: Remove settings from the matrix client. The class should store the + // user's matrix ID. QSettings settings; auto userid = settings.value("auth/user_id", "").toString(); diff --git a/src/RegisterPage.cc b/src/RegisterPage.cc
index ce9f43a6..e485de7d 100644 --- a/src/RegisterPage.cc +++ b/src/RegisterPage.cc
@@ -181,6 +181,4 @@ RegisterPage::onRegisterButtonClicked() } } -RegisterPage::~RegisterPage() -{ -} +RegisterPage::~RegisterPage() {} diff --git a/src/RoomInfoListItem.cc b/src/RoomInfoListItem.cc
index d19a3505..533fc267 100644 --- a/src/RoomInfoListItem.cc +++ b/src/RoomInfoListItem.cc
@@ -152,8 +152,8 @@ RoomInfoListItem::paintEvent(QPaintEvent *event) font.setBold(false); p.setFont(font); - // The limit is the space between the end of the username and the start of the - // timestamp. + // The limit is the space between the end of the username and the start of + // the timestamp. int descriptionLimit = std::max(0, width() - 3 * Padding - msgStampWidth - IconSize - nameWidth - 5); auto description = @@ -310,6 +310,4 @@ RoomInfoListItem::mousePressEvent(QMouseEvent *event) ripple_overlay_->addRipple(ripple); } -RoomInfoListItem::~RoomInfoListItem() -{ -} +RoomInfoListItem::~RoomInfoListItem() {} diff --git a/src/RoomList.cc b/src/RoomList.cc
index 9ef3646a..5c67d98f 100644 --- a/src/RoomList.cc +++ b/src/RoomList.cc
@@ -61,9 +61,7 @@ RoomList::RoomList(QSharedPointer<MatrixClient> client, QWidget *parent) SLOT(updateRoomAvatar(const QString &, const QPixmap &))); } -RoomList::~RoomList() -{ -} +RoomList::~RoomList() {} void RoomList::clear() diff --git a/src/TextInputWidget.cc b/src/TextInputWidget.cc
index 62b25423..5f06d992 100644 --- a/src/TextInputWidget.cc +++ b/src/TextInputWidget.cc
@@ -213,6 +213,4 @@ TextInputWidget::hideUploadSpinner() spinner_->stop(); } -TextInputWidget::~TextInputWidget() -{ -} +TextInputWidget::~TextInputWidget() {} diff --git a/src/TimelineItem.cc b/src/TimelineItem.cc
index a6eb2bea..97269584 100644 --- a/src/TimelineItem.cc +++ b/src/TimelineItem.cc
@@ -461,6 +461,4 @@ TimelineItem::descriptiveTime(const QDateTime &then) return then.toString("dd/MM/yy"); } -TimelineItem::~TimelineItem() -{ -} +TimelineItem::~TimelineItem() {} diff --git a/src/TimelineViewManager.cc b/src/TimelineViewManager.cc
index afc8881b..a4d616c3 100644 --- a/src/TimelineViewManager.cc +++ b/src/TimelineViewManager.cc
@@ -37,9 +37,7 @@ TimelineViewManager::TimelineViewManager(QSharedPointer<MatrixClient> client, QW client_.data(), &MatrixClient::messageSent, this, &TimelineViewManager::messageSent); } -TimelineViewManager::~TimelineViewManager() -{ -} +TimelineViewManager::~TimelineViewManager() {} void TimelineViewManager::messageSent(const QString &event_id, const QString &roomid, int txn_id) diff --git a/src/TopRoomBar.cc b/src/TopRoomBar.cc
index 130e18f1..1805f063 100644 --- a/src/TopRoomBar.cc +++ b/src/TopRoomBar.cc
@@ -137,6 +137,4 @@ TopRoomBar::setRoomSettings(QSharedPointer<RoomSettings> settings) roomSettings_ = settings; } -TopRoomBar::~TopRoomBar() -{ -} +TopRoomBar::~TopRoomBar() {} diff --git a/src/UserInfoWidget.cc b/src/UserInfoWidget.cc
index a14836ac..b65329da 100644 --- a/src/UserInfoWidget.cc +++ b/src/UserInfoWidget.cc
@@ -120,9 +120,7 @@ UserInfoWidget::closeLogoutDialog(bool isLoggingOut) emit logout(); } -UserInfoWidget::~UserInfoWidget() -{ -} +UserInfoWidget::~UserInfoWidget() {} void UserInfoWidget::resizeEvent(QResizeEvent *event) diff --git a/src/ui/Avatar.cc b/src/ui/Avatar.cc
index c8068366..c2ee629b 100644 --- a/src/ui/Avatar.cc +++ b/src/ui/Avatar.cc
@@ -19,9 +19,7 @@ Avatar::Avatar(QWidget *parent) setSizePolicy(policy); } -Avatar::~Avatar() -{ -} +Avatar::~Avatar() {} QColor Avatar::textColor() const diff --git a/src/ui/Badge.cc b/src/ui/Badge.cc
index ab34be0f..6e73eca0 100644 --- a/src/ui/Badge.cc +++ b/src/ui/Badge.cc
@@ -22,9 +22,7 @@ Badge::Badge(const QString &text, QWidget *parent) setText(text); } -Badge::~Badge() -{ -} +Badge::~Badge() {} void Badge::init() diff --git a/src/ui/FlatButton.cc b/src/ui/FlatButton.cc
index f2314078..45a7683e 100644 --- a/src/ui/FlatButton.cc +++ b/src/ui/FlatButton.cc
@@ -12,7 +12,8 @@ #include "ThemeManager.h" // The ampersand is automatically set in QPushButton or QCheckbx -// by KDEPlatformTheme plugin in Qt5. [https://bugs.kde.org/show_bug.cgi?id=337491] +// by KDEPlatformTheme plugin in Qt5. +// [https://bugs.kde.org/show_bug.cgi?id=337491] // // A workaroud is to add // @@ -79,9 +80,7 @@ FlatButton::FlatButton(const QString &text, ui::Role role, QWidget *parent, ui:: setRole(role); } -FlatButton::~FlatButton() -{ -} +FlatButton::~FlatButton() {} void FlatButton::applyPreset(ui::ButtonPreset preset) @@ -611,9 +610,7 @@ FlatButtonStateMachine::FlatButtonStateMachine(FlatButton *parent) addTransition(button_, QEvent::FocusOut, pressed_state_, hovered_state_); } -FlatButtonStateMachine::~FlatButtonStateMachine() -{ -} +FlatButtonStateMachine::~FlatButtonStateMachine() {} void FlatButtonStateMachine::setOverlayOpacity(qreal opacity) diff --git a/src/ui/RaisedButton.cc b/src/ui/RaisedButton.cc
index c30f253a..c519f84f 100644 --- a/src/ui/RaisedButton.cc +++ b/src/ui/RaisedButton.cc
@@ -70,9 +70,7 @@ RaisedButton::RaisedButton(const QString &text, QWidget *parent) setText(text); } -RaisedButton::~RaisedButton() -{ -} +RaisedButton::~RaisedButton() {} bool RaisedButton::event(QEvent *event) diff --git a/src/ui/Ripple.cc b/src/ui/Ripple.cc
index 2869bf7b..008d7a6a 100644 --- a/src/ui/Ripple.cc +++ b/src/ui/Ripple.cc
@@ -25,9 +25,7 @@ Ripple::Ripple(const QPoint &center, RippleOverlay *overlay, QObject *parent) init(); } -Ripple::~Ripple() -{ -} +Ripple::~Ripple() {} void Ripple::setRadius(qreal radius) diff --git a/src/ui/RippleOverlay.cc b/src/ui/RippleOverlay.cc
index cf264363..26d432f6 100644 --- a/src/ui/RippleOverlay.cc +++ b/src/ui/RippleOverlay.cc
@@ -11,9 +11,7 @@ RippleOverlay::RippleOverlay(QWidget *parent) setAttribute(Qt::WA_NoSystemBackground); } -RippleOverlay::~RippleOverlay() -{ -} +RippleOverlay::~RippleOverlay() {} void RippleOverlay::addRipple(Ripple *ripple) diff --git a/src/ui/TextField.cc b/src/ui/TextField.cc
index efa77c39..e038f2dd 100644 --- a/src/ui/TextField.cc +++ b/src/ui/TextField.cc
@@ -32,9 +32,7 @@ TextField::TextField(QWidget *parent) QCoreApplication::processEvents(); } -TextField::~TextField() -{ -} +TextField::~TextField() {} void TextField::setBackgroundColor(const QColor &color) @@ -199,7 +197,8 @@ TextField::paintEvent(QPaintEvent *event) if (text().isEmpty()) { painter.setOpacity(1 - state_machine_->progress()); - // painter.fillRect(rect(), parentWidget()->palette().color(backgroundRole())); + // painter.fillRect(rect(), + // parentWidget()->palette().color(backgroundRole())); painter.fillRect(rect(), backgroundColor()); } @@ -273,9 +272,7 @@ TextFieldStateMachine::TextFieldStateMachine(TextField *parent) connect(text_field_, SIGNAL(textChanged(QString)), this, SLOT(setupProperties())); } -TextFieldStateMachine::~TextFieldStateMachine() -{ -} +TextFieldStateMachine::~TextFieldStateMachine() {} void TextFieldStateMachine::setLabel(TextFieldLabel *label) @@ -352,9 +349,7 @@ TextFieldLabel::TextFieldLabel(TextField *parent) setFont(font); } -TextFieldLabel::~TextFieldLabel() -{ -} +TextFieldLabel::~TextFieldLabel() {} void TextFieldLabel::paintEvent(QPaintEvent *) diff --git a/src/ui/Theme.cc b/src/ui/Theme.cc
index 1560cf12..52d4b883 100644 --- a/src/ui/Theme.cc +++ b/src/ui/Theme.cc
@@ -22,9 +22,7 @@ Theme::Theme(QObject *parent) setColor("Transparent", ui::Color::Transparent); } -Theme::~Theme() -{ -} +Theme::~Theme() {} QColor Theme::rgba(int r, int g, int b, qreal a) const