From ba8faa357f78561d00b3acf694644b7c3d0bd92b Mon Sep 17 00:00:00 2001 From: Konstantinos Sideris Date: Sat, 10 Feb 2018 16:29:09 +0200 Subject: Remove empty destructors --- include/ChatPage.h | 1 - include/CommunitiesListItem.h | 3 --- include/LoginPage.h | 1 - include/RegisterPage.h | 1 - include/RoomInfoListItem.h | 2 -- include/RoomList.h | 1 - include/SideBarActions.h | 1 - include/TextInputWidget.h | 1 - include/TopRoomBar.h | 1 - include/UserInfoWidget.h | 1 - include/emoji/Category.h | 1 - include/timeline/TimelineItem.h | 2 -- include/timeline/TimelineViewManager.h | 1 - include/ui/Avatar.h | 1 - include/ui/Badge.h | 1 - include/ui/Label.h | 1 - include/ui/Ripple.h | 1 - include/ui/RippleOverlay.h | 1 - include/ui/SnackBar.h | 7 +++---- include/ui/TextField.h | 3 --- include/ui/Theme.h | 1 - 21 files changed, 3 insertions(+), 30 deletions(-) (limited to 'include') diff --git a/include/ChatPage.h b/include/ChatPage.h index 67ddd1ed..f784231a 100644 --- a/include/ChatPage.h +++ b/include/ChatPage.h @@ -60,7 +60,6 @@ public: ChatPage(QSharedPointer client, QSharedPointer userSettings, QWidget *parent = 0); - ~ChatPage(); // Initialize all the components of the UI. void bootstrap(QString userid, QString homeserver, QString token); diff --git a/include/CommunitiesListItem.h b/include/CommunitiesListItem.h index 099b4fa2..c9272524 100644 --- a/include/CommunitiesListItem.h +++ b/include/CommunitiesListItem.h @@ -24,8 +24,6 @@ public: QString community_id, QWidget *parent = nullptr); - ~CommunitiesListItem(); - void setCommunity(QSharedPointer community); inline bool isPressed() const; @@ -87,7 +85,6 @@ class WorldCommunityListItem : public CommunitiesListItem Q_OBJECT public: WorldCommunityListItem(QWidget *parent = nullptr); - ~WorldCommunityListItem(); protected: void mousePressEvent(QMouseEvent *event) override; diff --git a/include/LoginPage.h b/include/LoginPage.h index a49e7911..f3ea16a1 100644 --- a/include/LoginPage.h +++ b/include/LoginPage.h @@ -35,7 +35,6 @@ class LoginPage : public QWidget public: LoginPage(QSharedPointer client, QWidget *parent = 0); - ~LoginPage(); void reset(); diff --git a/include/RegisterPage.h b/include/RegisterPage.h index 2d1d954b..b98e59de 100644 --- a/include/RegisterPage.h +++ b/include/RegisterPage.h @@ -32,7 +32,6 @@ class RegisterPage : public QWidget public: RegisterPage(QSharedPointer client, QWidget *parent = 0); - ~RegisterPage(); protected: void paintEvent(QPaintEvent *event) override; diff --git a/include/RoomInfoListItem.h b/include/RoomInfoListItem.h index 8222dc2b..4e3fe0ce 100644 --- a/include/RoomInfoListItem.h +++ b/include/RoomInfoListItem.h @@ -67,8 +67,6 @@ public: RoomInfoListItem(QString room_id, mtx::responses::InvitedRoom room, QWidget *parent = 0); - ~RoomInfoListItem(); - void updateUnreadMessageCount(int count); void clearUnreadMessageCount(); void setState(QSharedPointer state) diff --git a/include/RoomList.h b/include/RoomList.h index b99b354f..7ceffd22 100644 --- a/include/RoomList.h +++ b/include/RoomList.h @@ -44,7 +44,6 @@ public: RoomList(QSharedPointer client, QSharedPointer userSettings, QWidget *parent = 0); - ~RoomList(); void setCache(QSharedPointer cache) { cache_ = cache; } void setInitialRooms(const std::map> &settings, diff --git a/include/SideBarActions.h b/include/SideBarActions.h index 5d3c6170..4b3be213 100644 --- a/include/SideBarActions.h +++ b/include/SideBarActions.h @@ -19,7 +19,6 @@ class SideBarActions : public QWidget public: SideBarActions(QWidget *parent = nullptr); - ~SideBarActions(); signals: void showSettings(); diff --git a/include/TextInputWidget.h b/include/TextInputWidget.h index c7cb06c5..6d28009e 100644 --- a/include/TextInputWidget.h +++ b/include/TextInputWidget.h @@ -80,7 +80,6 @@ class TextInputWidget : public QWidget public: TextInputWidget(QWidget *parent = 0); - ~TextInputWidget(); void stopTyping(); diff --git a/include/TopRoomBar.h b/include/TopRoomBar.h index 2ee25361..5b9c58e9 100644 --- a/include/TopRoomBar.h +++ b/include/TopRoomBar.h @@ -41,7 +41,6 @@ class TopRoomBar : public QWidget Q_OBJECT public: TopRoomBar(QWidget *parent = 0); - ~TopRoomBar(); void updateRoomAvatar(const QImage &avatar_image); void updateRoomAvatar(const QIcon &icon); diff --git a/include/UserInfoWidget.h b/include/UserInfoWidget.h index 3c20380f..cae9d5b9 100644 --- a/include/UserInfoWidget.h +++ b/include/UserInfoWidget.h @@ -32,7 +32,6 @@ class UserInfoWidget : public QWidget public: UserInfoWidget(QWidget *parent = 0); - ~UserInfoWidget(); void setAvatar(const QImage &img); void setDisplayName(const QString &name); diff --git a/include/emoji/Category.h b/include/emoji/Category.h index d60e11fe..a14029c8 100644 --- a/include/emoji/Category.h +++ b/include/emoji/Category.h @@ -32,7 +32,6 @@ class Category : public QWidget public: Category(QString category, std::vector emoji, QWidget *parent = nullptr); - ~Category(); signals: void emojiSelected(const QString &emoji); diff --git a/include/timeline/TimelineItem.h b/include/timeline/TimelineItem.h index c499957b..793b9067 100644 --- a/include/timeline/TimelineItem.h +++ b/include/timeline/TimelineItem.h @@ -86,8 +86,6 @@ public: void setEventId(const QString &event_id) { event_id_ = event_id; } void markReceived(); - ~TimelineItem(); - protected: void paintEvent(QPaintEvent *event) override; void contextMenuEvent(QContextMenuEvent *event) override; diff --git a/include/timeline/TimelineViewManager.h b/include/timeline/TimelineViewManager.h index 81fedfb2..e3cc311e 100644 --- a/include/timeline/TimelineViewManager.h +++ b/include/timeline/TimelineViewManager.h @@ -35,7 +35,6 @@ class TimelineViewManager : public QStackedWidget public: TimelineViewManager(QSharedPointer client, QWidget *parent); - ~TimelineViewManager(); // Initialize with timeline events. void initialize(const mtx::responses::Rooms &rooms); diff --git a/include/ui/Avatar.h b/include/ui/Avatar.h index d856b9d8..41967af5 100644 --- a/include/ui/Avatar.h +++ b/include/ui/Avatar.h @@ -16,7 +16,6 @@ class Avatar : public QWidget public: explicit Avatar(QWidget *parent = 0); - ~Avatar(); void setBackgroundColor(const QColor &color); void setIcon(const QIcon &icon); diff --git a/include/ui/Badge.h b/include/ui/Badge.h index 4084247e..fd73ad30 100644 --- a/include/ui/Badge.h +++ b/include/ui/Badge.h @@ -19,7 +19,6 @@ public: explicit Badge(QWidget *parent = 0); explicit Badge(const QIcon &icon, QWidget *parent = 0); explicit Badge(const QString &text, QWidget *parent = 0); - ~Badge(); void setBackgroundColor(const QColor &color); void setTextColor(const QColor &color); diff --git a/include/ui/Label.h b/include/ui/Label.h index 66e98115..09cf27d7 100644 --- a/include/ui/Label.h +++ b/include/ui/Label.h @@ -11,7 +11,6 @@ public: explicit Label(const QString &text, QWidget *parent = Q_NULLPTR, Qt::WindowFlags f = Qt::WindowFlags()); - ~Label() override {} signals: void clicked(QMouseEvent *e); diff --git a/include/ui/Ripple.h b/include/ui/Ripple.h index 0baebfd6..9184f061 100644 --- a/include/ui/Ripple.h +++ b/include/ui/Ripple.h @@ -18,7 +18,6 @@ class Ripple : public QParallelAnimationGroup public: explicit Ripple(const QPoint ¢er, QObject *parent = 0); Ripple(const QPoint ¢er, RippleOverlay *overlay, QObject *parent = 0); - ~Ripple(); inline void setOverlay(RippleOverlay *overlay); diff --git a/include/ui/RippleOverlay.h b/include/ui/RippleOverlay.h index 28a6b9e4..9ef91fbf 100644 --- a/include/ui/RippleOverlay.h +++ b/include/ui/RippleOverlay.h @@ -12,7 +12,6 @@ class RippleOverlay : public OverlayWidget public: explicit RippleOverlay(QWidget *parent = 0); - ~RippleOverlay(); void addRipple(Ripple *ripple); void addRipple(const QPoint &position, qreal radius = 300); diff --git a/include/ui/SnackBar.h b/include/ui/SnackBar.h index 8a35c327..bb579e92 100644 --- a/include/ui/SnackBar.h +++ b/include/ui/SnackBar.h @@ -2,7 +2,7 @@ #include #include -#include +#include #include #include "OverlayWidget.h" @@ -19,7 +19,6 @@ class SnackBar : public OverlayWidget public: explicit SnackBar(QWidget *parent); - ~SnackBar(); inline void setBackgroundColor(const QColor &color); inline void setTextColor(const QColor &color); @@ -48,8 +47,8 @@ private: QList messages_; - QTimer *showTimer_; - QTimer *hideTimer_; + QSharedPointer showTimer_; + QSharedPointer hideTimer_; int duration_; int boxWidth_; diff --git a/include/ui/TextField.h b/include/ui/TextField.h index 3682fbd2..1675a2e0 100644 --- a/include/ui/TextField.h +++ b/include/ui/TextField.h @@ -23,7 +23,6 @@ class TextField : public QLineEdit public: explicit TextField(QWidget *parent = 0); - ~TextField(); void setInkColor(const QColor &color); void setBackgroundColor(const QColor &color); @@ -72,7 +71,6 @@ class TextFieldLabel : public QWidget public: TextFieldLabel(TextField *parent); - ~TextFieldLabel(); inline void setColor(const QColor &color); inline void setOffset(const QPointF &pos); @@ -140,7 +138,6 @@ class TextFieldStateMachine : public QStateMachine public: TextFieldStateMachine(TextField *parent); - ~TextFieldStateMachine(); inline void setProgress(qreal progress); void setLabel(TextFieldLabel *label); diff --git a/include/ui/Theme.h b/include/ui/Theme.h index c2e4ab59..0ce5ef04 100644 --- a/include/ui/Theme.h +++ b/include/ui/Theme.h @@ -84,7 +84,6 @@ class Theme : public QObject Q_OBJECT public: explicit Theme(QObject *parent = 0); - ~Theme(); QColor getColor(const QString &key) const; -- cgit 1.5.1