summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/ChatPage.cc2
-rw-r--r--src/CommunitiesListItem.cc4
-rw-r--r--src/LoginPage.cc2
-rw-r--r--src/RegisterPage.cc2
-rw-r--r--src/RoomInfoListItem.cc2
-rw-r--r--src/RoomList.cc2
-rw-r--r--src/SideBarActions.cc2
-rw-r--r--src/TextInputWidget.cc2
-rw-r--r--src/TopRoomBar.cc2
-rw-r--r--src/UserInfoWidget.cc2
-rw-r--r--src/emoji/Category.cc2
-rw-r--r--src/timeline/TimelineItem.cc2
-rw-r--r--src/timeline/TimelineViewManager.cc2
-rw-r--r--src/ui/Avatar.cc2
-rw-r--r--src/ui/Badge.cc2
-rw-r--r--src/ui/Ripple.cc2
-rw-r--r--src/ui/RippleOverlay.cc2
-rw-r--r--src/ui/SnackBar.cc16
-rw-r--r--src/ui/TextField.cc6
-rw-r--r--src/ui/Theme.cc2
20 files changed, 4 insertions, 56 deletions
diff --git a/src/ChatPage.cc b/src/ChatPage.cc

index ba7e2797..64368da2 100644 --- a/src/ChatPage.cc +++ b/src/ChatPage.cc
@@ -988,5 +988,3 @@ ChatPage::retryInitialSync() client_->initialSync(); initialSyncTimer_->start(INITIAL_SYNC_RETRY_TIMEOUT); } - -ChatPage::~ChatPage() {} diff --git a/src/CommunitiesListItem.cc b/src/CommunitiesListItem.cc
index a7789df7..5aedfcbc 100644 --- a/src/CommunitiesListItem.cc +++ b/src/CommunitiesListItem.cc
@@ -13,8 +13,6 @@ CommunitiesListItem::CommunitiesListItem(QSharedPointer<Community> community, setFixedWidth(ui::sidebar::CommunitiesSidebarSize); } -CommunitiesListItem::~CommunitiesListItem() {} - void CommunitiesListItem::setCommunity(QSharedPointer<Community> community) { @@ -150,8 +148,6 @@ WorldCommunityListItem::WorldCommunityListItem(QWidget *parent) : CommunitiesListItem(QSharedPointer<Community>(), "", parent) {} -WorldCommunityListItem::~WorldCommunityListItem() {} - void WorldCommunityListItem::mousePressEvent(QMouseEvent *event) { diff --git a/src/LoginPage.cc b/src/LoginPage.cc
index ef665b39..fca1ec68 100644 --- a/src/LoginPage.cc +++ b/src/LoginPage.cc
@@ -295,5 +295,3 @@ LoginPage::paintEvent(QPaintEvent *) QPainter p(this); style()->drawPrimitive(QStyle::PE_Widget, &opt, &p, this); } - -LoginPage::~LoginPage() {} diff --git a/src/RegisterPage.cc b/src/RegisterPage.cc
index 28d0a8a4..9165680b 100644 --- a/src/RegisterPage.cc +++ b/src/RegisterPage.cc
@@ -177,5 +177,3 @@ RegisterPage::paintEvent(QPaintEvent *) QPainter p(this); style()->drawPrimitive(QStyle::PE_Widget, &opt, &p, this); } - -RegisterPage::~RegisterPage() {} diff --git a/src/RoomInfoListItem.cc b/src/RoomInfoListItem.cc
index 3388e5d7..45ee6148 100644 --- a/src/RoomInfoListItem.cc +++ b/src/RoomInfoListItem.cc
@@ -388,5 +388,3 @@ RoomInfoListItem::setDescriptionMessage(const DescInfo &info) lastMsgInfo_ = info; update(); } - -RoomInfoListItem::~RoomInfoListItem() {} diff --git a/src/RoomList.cc b/src/RoomList.cc
index 099e5b1c..1f8747ae 100644 --- a/src/RoomList.cc +++ b/src/RoomList.cc
@@ -73,8 +73,6 @@ RoomList::RoomList(QSharedPointer<MatrixClient> client, }); } -RoomList::~RoomList() {} - void RoomList::clear() { diff --git a/src/SideBarActions.cc b/src/SideBarActions.cc
index 7c4cebbd..904184f1 100644 --- a/src/SideBarActions.cc +++ b/src/SideBarActions.cc
@@ -116,8 +116,6 @@ SideBarActions::SideBarActions(QWidget *parent) connect(settingsBtn_, &QPushButton::clicked, this, &SideBarActions::showSettings); } -SideBarActions::~SideBarActions() {} - void SideBarActions::resizeEvent(QResizeEvent *event) { diff --git a/src/TextInputWidget.cc b/src/TextInputWidget.cc
index 755145c5..239f9d54 100644 --- a/src/TextInputWidget.cc +++ b/src/TextInputWidget.cc
@@ -401,8 +401,6 @@ TextInputWidget::hideUploadSpinner() spinner_->stop(); } -TextInputWidget::~TextInputWidget() {} - void TextInputWidget::stopTyping() { diff --git a/src/TopRoomBar.cc b/src/TopRoomBar.cc
index d3ae307f..f676a4d8 100644 --- a/src/TopRoomBar.cc +++ b/src/TopRoomBar.cc
@@ -233,5 +233,3 @@ TopRoomBar::updateRoomTopic(QString topic) roomTopic_ = topic; update(); } - -TopRoomBar::~TopRoomBar() {} diff --git a/src/UserInfoWidget.cc b/src/UserInfoWidget.cc
index fe0c2b56..77aed5d5 100644 --- a/src/UserInfoWidget.cc +++ b/src/UserInfoWidget.cc
@@ -119,8 +119,6 @@ UserInfoWidget::closeLogoutDialog(bool isLoggingOut) emit logout(); } -UserInfoWidget::~UserInfoWidget() {} - void UserInfoWidget::resizeEvent(QResizeEvent *event) { diff --git a/src/emoji/Category.cc b/src/emoji/Category.cc
index a0d838c0..c1b526f2 100644 --- a/src/emoji/Category.cc +++ b/src/emoji/Category.cc
@@ -88,5 +88,3 @@ Category::paintEvent(QPaintEvent *) QPainter p(this); style()->drawPrimitive(QStyle::PE_Widget, &opt, &p, this); } - -Category::~Category() {} diff --git a/src/timeline/TimelineItem.cc b/src/timeline/TimelineItem.cc
index 62e195a4..7756ba4a 100644 --- a/src/timeline/TimelineItem.cc +++ b/src/timeline/TimelineItem.cc
@@ -497,8 +497,6 @@ TimelineItem::setUserAvatar(const QImage &avatar) userAvatar_->setImage(avatar); } -TimelineItem::~TimelineItem() {} - void TimelineItem::contextMenuEvent(QContextMenuEvent *event) { diff --git a/src/timeline/TimelineViewManager.cc b/src/timeline/TimelineViewManager.cc
index 7318ce2b..fdc3b9e2 100644 --- a/src/timeline/TimelineViewManager.cc +++ b/src/timeline/TimelineViewManager.cc
@@ -45,8 +45,6 @@ TimelineViewManager::TimelineViewManager(QSharedPointer<MatrixClient> client, QW &TimelineViewManager::messageSendFailed); } -TimelineViewManager::~TimelineViewManager() {} - void TimelineViewManager::messageSent(const QString &event_id, const QString &roomid, int txn_id) { diff --git a/src/ui/Avatar.cc b/src/ui/Avatar.cc
index 17ee198e..81e6cbed 100644 --- a/src/ui/Avatar.cc +++ b/src/ui/Avatar.cc
@@ -17,8 +17,6 @@ Avatar::Avatar(QWidget *parent) setSizePolicy(policy); } -Avatar::~Avatar() {} - QColor Avatar::textColor() const { diff --git a/src/ui/Badge.cc b/src/ui/Badge.cc
index 016ed64f..6701f9b7 100644 --- a/src/ui/Badge.cc +++ b/src/ui/Badge.cc
@@ -22,8 +22,6 @@ Badge::Badge(const QString &text, QWidget *parent) setText(text); } -Badge::~Badge() {} - void Badge::init() { diff --git a/src/ui/Ripple.cc b/src/ui/Ripple.cc
index 008d7a6a..e22c4a62 100644 --- a/src/ui/Ripple.cc +++ b/src/ui/Ripple.cc
@@ -25,8 +25,6 @@ Ripple::Ripple(const QPoint &center, RippleOverlay *overlay, QObject *parent) init(); } -Ripple::~Ripple() {} - void Ripple::setRadius(qreal radius) { diff --git a/src/ui/RippleOverlay.cc b/src/ui/RippleOverlay.cc
index a3567db2..20e98c0f 100644 --- a/src/ui/RippleOverlay.cc +++ b/src/ui/RippleOverlay.cc
@@ -11,8 +11,6 @@ RippleOverlay::RippleOverlay(QWidget *parent) setAttribute(Qt::WA_NoSystemBackground); } -RippleOverlay::~RippleOverlay() {} - void RippleOverlay::addRipple(Ripple *ripple) { diff --git a/src/ui/SnackBar.cc b/src/ui/SnackBar.cc
index fb415fcd..1f02ee95 100644 --- a/src/ui/SnackBar.cc +++ b/src/ui/SnackBar.cc
@@ -23,20 +23,12 @@ SnackBar::SnackBar(QWidget *parent) font.setWeight(50); setFont(font); - showTimer_ = new QTimer(); - hideTimer_ = new QTimer(); + showTimer_ = QSharedPointer<QTimer>(new QTimer); + hideTimer_ = QSharedPointer<QTimer>(new QTimer); hideTimer_->setSingleShot(true); - connect(showTimer_, SIGNAL(timeout()), this, SLOT(onTimeout())); - connect(hideTimer_, SIGNAL(timeout()), this, SLOT(hideMessage())); -} - -SnackBar::~SnackBar() -{ - stopTimers(); - - delete showTimer_; - delete hideTimer_; + connect(showTimer_.data(), SIGNAL(timeout()), this, SLOT(onTimeout())); + connect(hideTimer_.data(), SIGNAL(timeout()), this, SLOT(hideMessage())); } void diff --git a/src/ui/TextField.cc b/src/ui/TextField.cc
index 9b410ae5..0c936e69 100644 --- a/src/ui/TextField.cc +++ b/src/ui/TextField.cc
@@ -32,8 +32,6 @@ TextField::TextField(QWidget *parent) QCoreApplication::processEvents(); } -TextField::~TextField() {} - void TextField::setBackgroundColor(const QColor &color) { @@ -273,8 +271,6 @@ TextFieldStateMachine::TextFieldStateMachine(TextField *parent) connect(text_field_, SIGNAL(textChanged(QString)), this, SLOT(setupProperties())); } -TextFieldStateMachine::~TextFieldStateMachine() {} - void TextFieldStateMachine::setLabel(TextFieldLabel *label) { @@ -350,8 +346,6 @@ TextFieldLabel::TextFieldLabel(TextField *parent) setFont(font); } -TextFieldLabel::~TextFieldLabel() {} - void TextFieldLabel::paintEvent(QPaintEvent *) { diff --git a/src/ui/Theme.cc b/src/ui/Theme.cc
index 622428b0..7209864a 100644 --- a/src/ui/Theme.cc +++ b/src/ui/Theme.cc
@@ -22,8 +22,6 @@ Theme::Theme(QObject *parent) setColor("Transparent", ui::Color::Transparent); } -Theme::~Theme() {} - QColor Theme::rgba(int r, int g, int b, qreal a) const {