From fcd8eed7cd65ca4956b66ebc98d157e502a27070 Mon Sep 17 00:00:00 2001 From: Diadlo Date: Fri, 6 Jan 2017 14:02:54 +0300 Subject: [PATCH] style: Fix style of a lot of pointers --- src/chatlog/chatlinecontentproxy.cpp | 4 ++-- src/chatlog/chatlinecontentproxy.h | 2 +- src/chatlog/chatlog.cpp | 2 +- src/chatlog/content/filetransferwidget.cpp | 2 +- src/chatlog/content/filetransferwidget.h | 2 +- src/chatlog/content/image.h | 2 +- src/chatlog/content/notificationicon.cpp | 2 +- src/chatlog/content/notificationicon.h | 2 +- src/chatlog/content/spinner.h | 2 +- src/chatlog/content/text.h | 2 +- src/friendlist.cpp | 2 +- src/group.cpp | 4 ++-- src/net/toxuri.cpp | 2 +- src/net/toxuri.h | 2 +- src/persistence/offlinemsgengine.cpp | 2 +- src/video/genericnetcamview.cpp | 2 +- src/video/groupnetcamview.cpp | 2 +- src/video/netcamview.h | 2 +- src/widget/about/aboutuser.cpp | 4 ++-- src/widget/about/aboutuser.h | 4 ++-- src/widget/categorywidget.h | 2 +- src/widget/circlewidget.cpp | 4 ++-- src/widget/contentdialog.cpp | 2 +- src/widget/contentlayout.cpp | 2 +- src/widget/emoticonswidget.cpp | 2 +- src/widget/emoticonswidget.h | 2 +- src/widget/flowlayout.cpp | 8 ++++---- src/widget/form/addfriendform.h | 4 ++-- src/widget/form/genericchatform.cpp | 4 ++-- src/widget/form/genericchatform.h | 4 ++-- src/widget/form/groupchatform.cpp | 4 ++-- src/widget/form/loadhistorydialog.cpp | 2 +- src/widget/form/loadhistorydialog.h | 2 +- src/widget/form/profileform.cpp | 2 +- src/widget/form/profileform.h | 4 ++-- .../form/settings/verticalonlyscroller.cpp | 2 +- .../form/settings/verticalonlyscroller.h | 2 +- src/widget/friendlistlayout.cpp | 4 ++-- src/widget/friendlistwidget.cpp | 18 +++++++++--------- src/widget/friendlistwidget.h | 2 +- src/widget/friendwidget.cpp | 2 +- src/widget/friendwidget.h | 2 +- src/widget/genericchatitemwidget.cpp | 2 +- src/widget/genericchatitemwidget.h | 2 +- src/widget/genericchatroomwidget.cpp | 2 +- src/widget/genericchatroomwidget.h | 2 +- src/widget/groupwidget.cpp | 4 ++-- src/widget/gui.cpp | 18 ++++++++---------- src/widget/gui.h | 12 ++++++------ src/widget/loginscreen.cpp | 2 +- src/widget/loginscreen.h | 2 +- src/widget/maskablepixmapwidget.cpp | 2 +- src/widget/maskablepixmapwidget.h | 2 +- src/widget/notificationedgewidget.cpp | 2 +- src/widget/notificationedgewidget.h | 2 +- src/widget/notificationscrollarea.cpp | 2 +- src/widget/passwordedit.h | 2 +- src/widget/qrwidget.cpp | 2 +- src/widget/qrwidget.h | 2 +- src/widget/style.cpp | 2 +- src/widget/tool/activatedialog.cpp | 2 +- src/widget/tool/adjustingscrollarea.cpp | 2 +- src/widget/tool/adjustingscrollarea.h | 2 +- src/widget/tool/callconfirmwidget.cpp | 2 +- src/widget/tool/callconfirmwidget.h | 2 +- src/widget/tool/chattextedit.cpp | 2 +- src/widget/tool/chattextedit.h | 2 +- src/widget/tool/flyoutoverlaywidget.cpp | 2 +- src/widget/tool/flyoutoverlaywidget.h | 4 ++-- src/widget/tool/friendrequestdialog.cpp | 2 +- src/widget/tool/friendrequestdialog.h | 2 +- src/widget/tool/micfeedbackwidget.cpp | 2 +- src/widget/tool/micfeedbackwidget.h | 2 +- src/widget/tool/movablewidget.cpp | 2 +- src/widget/tool/profileimporter.cpp | 2 +- src/widget/tool/profileimporter.h | 2 +- src/widget/tool/removefrienddialog.cpp | 2 +- src/widget/tool/removefrienddialog.h | 2 +- src/widget/widget.cpp | 10 +++++----- src/widget/widget.h | 4 ++-- 80 files changed, 121 insertions(+), 123 deletions(-) diff --git a/src/chatlog/chatlinecontentproxy.cpp b/src/chatlog/chatlinecontentproxy.cpp index 08f247325..a8ee6aad9 100644 --- a/src/chatlog/chatlinecontentproxy.cpp +++ b/src/chatlog/chatlinecontentproxy.cpp @@ -58,7 +58,7 @@ QRectF ChatLineContentProxy::boundingRect() const return result; } -void ChatLineContentProxy::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) +void ChatLineContentProxy::paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget) { painter->setClipRect(boundingRect()); proxy->paint(painter, option, widget); @@ -69,7 +69,7 @@ qreal ChatLineContentProxy::getAscent() const return 7.0; } -QWidget *ChatLineContentProxy::getWidget() const +QWidget* ChatLineContentProxy::getWidget() const { return proxy->widget(); } diff --git a/src/chatlog/chatlinecontentproxy.h b/src/chatlog/chatlinecontentproxy.h index 8d3b7d934..522d98cfd 100644 --- a/src/chatlog/chatlinecontentproxy.h +++ b/src/chatlog/chatlinecontentproxy.h @@ -42,7 +42,7 @@ public: QRectF boundingRect() const override; void setWidth(qreal width) override; - void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override; + void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget) override; qreal getAscent() const override; QWidget* getWidget() const; diff --git a/src/chatlog/chatlog.cpp b/src/chatlog/chatlog.cpp index 76904ee91..6cb74a2be 100644 --- a/src/chatlog/chatlog.cpp +++ b/src/chatlog/chatlog.cpp @@ -882,7 +882,7 @@ bool ChatLog::isActiveFileTransfer(ChatLine::Ptr l) if (!proxy) continue; - QWidget *widget = proxy->getWidget(); + QWidget* widget = proxy->getWidget(); FileTransferWidget *transferWidget = qobject_cast(widget); if (transferWidget && transferWidget->isActive()) return true; diff --git a/src/chatlog/content/filetransferwidget.cpp b/src/chatlog/content/filetransferwidget.cpp index 30c1c7e95..bb03052f8 100644 --- a/src/chatlog/content/filetransferwidget.cpp +++ b/src/chatlog/content/filetransferwidget.cpp @@ -40,7 +40,7 @@ #include -FileTransferWidget::FileTransferWidget(QWidget *parent, ToxFile file) +FileTransferWidget::FileTransferWidget(QWidget* parent, ToxFile file) : QWidget(parent) , ui(new Ui::FileTransferWidget) , fileInfo(file) diff --git a/src/chatlog/content/filetransferwidget.h b/src/chatlog/content/filetransferwidget.h index 6a0e104de..2a74b3bb2 100644 --- a/src/chatlog/content/filetransferwidget.h +++ b/src/chatlog/content/filetransferwidget.h @@ -39,7 +39,7 @@ class FileTransferWidget : public QWidget Q_OBJECT public: - explicit FileTransferWidget(QWidget *parent, ToxFile file); + explicit FileTransferWidget(QWidget* parent, ToxFile file); virtual ~FileTransferWidget(); void autoAcceptTransfer(const QString& path); bool isActive() const; diff --git a/src/chatlog/content/image.h b/src/chatlog/content/image.h index 8ca4e2a8f..f7dbc8b4c 100644 --- a/src/chatlog/content/image.h +++ b/src/chatlog/content/image.h @@ -30,7 +30,7 @@ public: Image(QSize size, const QString &filename); virtual QRectF boundingRect() const override; - virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override; + virtual void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget) override; virtual void setWidth(qreal width) override; virtual qreal getAscent() const override; diff --git a/src/chatlog/content/notificationicon.cpp b/src/chatlog/content/notificationicon.cpp index f7a67cbd8..6e683b580 100644 --- a/src/chatlog/content/notificationicon.cpp +++ b/src/chatlog/content/notificationicon.cpp @@ -43,7 +43,7 @@ QRectF NotificationIcon::boundingRect() const return QRectF(QPointF(-size.width() / 2.0, -size.height() / 2.0), size); } -void NotificationIcon::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) +void NotificationIcon::paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget) { painter->setClipRect(boundingRect()); diff --git a/src/chatlog/content/notificationicon.h b/src/chatlog/content/notificationicon.h index 3d680a4a6..3fdcfcaf1 100644 --- a/src/chatlog/content/notificationicon.h +++ b/src/chatlog/content/notificationicon.h @@ -34,7 +34,7 @@ public: explicit NotificationIcon(QSize size); virtual QRectF boundingRect() const override; - virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override; + virtual void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget) override; virtual void setWidth(qreal width) override; virtual qreal getAscent() const override; diff --git a/src/chatlog/content/spinner.h b/src/chatlog/content/spinner.h index 83752d9fc..caab0850a 100644 --- a/src/chatlog/content/spinner.h +++ b/src/chatlog/content/spinner.h @@ -35,7 +35,7 @@ public: Spinner(const QString& img, QSize size, qreal speed); virtual QRectF boundingRect() const override; - virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override; + virtual void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget) override; virtual void setWidth(qreal width) override; virtual void visibilityChanged(bool visible) override; virtual qreal getAscent() const override; diff --git a/src/chatlog/content/text.h b/src/chatlog/content/text.h index f31a595b8..186cfb093 100644 --- a/src/chatlog/content/text.h +++ b/src/chatlog/content/text.h @@ -47,7 +47,7 @@ public: virtual QString getSelectedText() const final; virtual QRectF boundingRect() const final; - virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) final; + virtual void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget) final; virtual void visibilityChanged(bool keepInMemory) final; diff --git a/src/friendlist.cpp b/src/friendlist.cpp index 25c373c44..1bc7919d2 100644 --- a/src/friendlist.cpp +++ b/src/friendlist.cpp @@ -72,7 +72,7 @@ Friend* FriendList::findFriend(const ToxPk& friendPk) auto id = key2id.find(friendPk.getKey()); if (id != key2id.end()) { - Friend *f = findFriend(*id); + Friend* f = findFriend(*id); if (!f) return nullptr; if (f->getPublicKey() == friendPk) diff --git a/src/group.cpp b/src/group.cpp index 317afa71b..5d9a7463e 100644 --- a/src/group.cpp +++ b/src/group.cpp @@ -53,7 +53,7 @@ void Group::updatePeer(int peerId, QString name) peers[peerId] = name; toxids[peerPk] = name; - Friend *f = FriendList::findFriend(peerKey); + Friend* f = FriendList::findFriend(peerKey); if (f != nullptr && f->hasAlias()) { peers[peerId] = f->getDisplayedName(); @@ -100,7 +100,7 @@ void Group::regeneratePeerList() if (toxids[peerPk].isEmpty()) toxids[peerPk] = tr("", "Placeholder when someone's name in a group chat is empty"); - Friend *f = FriendList::findFriend(id); + Friend* f = FriendList::findFriend(id); if (f != nullptr && f->hasAlias()) { peers[i] = f->getDisplayedName(); diff --git a/src/net/toxuri.cpp b/src/net/toxuri.cpp index d785b730a..4c78daff5 100644 --- a/src/net/toxuri.cpp +++ b/src/net/toxuri.cpp @@ -82,7 +82,7 @@ bool handleToxURI(const QString &toxURI) return true; } -ToxURIDialog::ToxURIDialog(QWidget *parent, const QString &userId, const QString &message) : +ToxURIDialog::ToxURIDialog(QWidget* parent, const QString &userId, const QString &message) : QDialog(parent) { setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); diff --git a/src/net/toxuri.h b/src/net/toxuri.h index fa275d8ba..0b0cb4a58 100644 --- a/src/net/toxuri.h +++ b/src/net/toxuri.h @@ -33,7 +33,7 @@ class ToxURIDialog : public QDialog { Q_OBJECT public: - explicit ToxURIDialog(QWidget *parent, const QString &userId, const QString &message); + explicit ToxURIDialog(QWidget* parent, const QString &userId, const QString &message); QString getRequestMessage(); private: diff --git a/src/persistence/offlinemsgengine.cpp b/src/persistence/offlinemsgengine.cpp index 83c54360e..b30a7003f 100644 --- a/src/persistence/offlinemsgengine.cpp +++ b/src/persistence/offlinemsgengine.cpp @@ -38,7 +38,7 @@ const int OfflineMsgEngine::offlineTimeout = 20000; QMutex OfflineMsgEngine::globalMutex; -OfflineMsgEngine::OfflineMsgEngine(Friend *frnd) : +OfflineMsgEngine::OfflineMsgEngine(Friend* frnd) : mutex(QMutex::Recursive), f(frnd) { diff --git a/src/video/genericnetcamview.cpp b/src/video/genericnetcamview.cpp index 80156e041..67c4a22c6 100644 --- a/src/video/genericnetcamview.cpp +++ b/src/video/genericnetcamview.cpp @@ -23,7 +23,7 @@ #include #include -GenericNetCamView::GenericNetCamView(QWidget *parent) +GenericNetCamView::GenericNetCamView(QWidget* parent) : QWidget(parent) { verLayout = new QVBoxLayout(this); diff --git a/src/video/groupnetcamview.cpp b/src/video/groupnetcamview.cpp index 59506e756..5a0dfd265 100644 --- a/src/video/groupnetcamview.cpp +++ b/src/video/groupnetcamview.cpp @@ -107,7 +107,7 @@ private: VideoSurface* videoSurface; }; -GroupNetCamView::GroupNetCamView(int group, QWidget *parent) +GroupNetCamView::GroupNetCamView(int group, QWidget* parent) : GenericNetCamView(parent) , group(group) { diff --git a/src/video/netcamview.h b/src/video/netcamview.h index c7a076493..cf204a2e6 100644 --- a/src/video/netcamview.h +++ b/src/video/netcamview.h @@ -34,7 +34,7 @@ class NetCamView : public GenericNetCamView Q_OBJECT public: - NetCamView(int friendId, QWidget *parent=0); + NetCamView(int friendId, QWidget* parent=0); ~NetCamView(); virtual void show(VideoSource* source, const QString& title); diff --git a/src/widget/about/aboutuser.cpp b/src/widget/about/aboutuser.cpp index 0f454fe81..6556ef0f7 100644 --- a/src/widget/about/aboutuser.cpp +++ b/src/widget/about/aboutuser.cpp @@ -8,7 +8,7 @@ #include #include -AboutUser::AboutUser(ToxPk &toxId, QWidget *parent) : +AboutUser::AboutUser(ToxPk &toxId, QWidget* parent) : QDialog(parent), ui(new Ui::AboutUser) { @@ -34,7 +34,7 @@ AboutUser::AboutUser(ToxPk &toxId, QWidget *parent) : ui->selectSaveDir->setText(Settings::getInstance().getAutoAcceptDir(this->friendPk)); } -void AboutUser::setFriend(Friend *f) +void AboutUser::setFriend(Friend* f) { this->setWindowTitle(f->getDisplayedName()); ui->userName->setText(f->getDisplayedName()); diff --git a/src/widget/about/aboutuser.h b/src/widget/about/aboutuser.h index 119ce3fea..cb97c9a03 100644 --- a/src/widget/about/aboutuser.h +++ b/src/widget/about/aboutuser.h @@ -14,9 +14,9 @@ class AboutUser : public QDialog Q_OBJECT public: - explicit AboutUser(ToxPk &toxID, QWidget *parent = 0); + explicit AboutUser(ToxPk &toxID, QWidget* parent = 0); ~AboutUser(); - void setFriend(Friend *f); + void setFriend(Friend* f); private: Ui::AboutUser *ui; diff --git a/src/widget/categorywidget.h b/src/widget/categorywidget.h index ac4330754..260fa2c55 100644 --- a/src/widget/categorywidget.h +++ b/src/widget/categorywidget.h @@ -61,7 +61,7 @@ protected: void setContainerAttribute(Qt::WidgetAttribute attribute, bool enabled); QLayout* friendOnlineLayout() const; QLayout* friendOfflineLayout() const; - void emitChatroomWidget(QLayout *layout, int index); + void emitChatroomWidget(QLayout* layout, int index); private: virtual void onSetName() {} diff --git a/src/widget/circlewidget.cpp b/src/widget/circlewidget.cpp index b8d39938a..221f83a71 100644 --- a/src/widget/circlewidget.cpp +++ b/src/widget/circlewidget.cpp @@ -154,7 +154,7 @@ void CircleWidget::contextMenuEvent(QContextMenuEvent* event) void CircleWidget::dragEnterEvent(QDragEnterEvent* event) { ToxId toxId(event->mimeData()->text()); - Friend *f = FriendList::findFriend(toxId.getPublicKey()); + Friend* f = FriendList::findFriend(toxId.getPublicKey()); if (f != nullptr) event->acceptProposedAction(); @@ -178,7 +178,7 @@ void CircleWidget::dropEvent(QDropEvent* event) // Check, that the user has a friend with the same ToxId ToxId toxId(event->mimeData()->text()); - Friend *f = FriendList::findFriend(toxId.getPublicKey()); + Friend* f = FriendList::findFriend(toxId.getPublicKey()); if (!f) return; diff --git a/src/widget/contentdialog.cpp b/src/widget/contentdialog.cpp index 1934e2426..02660e1c7 100644 --- a/src/widget/contentdialog.cpp +++ b/src/widget/contentdialog.cpp @@ -62,7 +62,7 @@ ContentDialog::ContentDialog(SettingsWidget* settingsWidget, QWidget* parent) setStyleSheet(Style::getStylesheet(":/ui/contentDialog/contentDialog.css")); splitter->setHandleWidth(6); - QWidget *friendWidget = new QWidget(); + QWidget* friendWidget = new QWidget(); friendWidget->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed); friendWidget->setAutoFillBackground(true); diff --git a/src/widget/contentlayout.cpp b/src/widget/contentlayout.cpp index 8805bd9b5..eff4b5e48 100644 --- a/src/widget/contentlayout.cpp +++ b/src/widget/contentlayout.cpp @@ -29,7 +29,7 @@ ContentLayout::ContentLayout() init(); } -ContentLayout::ContentLayout(QWidget *parent) +ContentLayout::ContentLayout(QWidget* parent) : QVBoxLayout(parent) { init(); diff --git a/src/widget/emoticonswidget.cpp b/src/widget/emoticonswidget.cpp index ebb5ea1cb..8dd2f1afa 100644 --- a/src/widget/emoticonswidget.cpp +++ b/src/widget/emoticonswidget.cpp @@ -31,7 +31,7 @@ #include -EmoticonsWidget::EmoticonsWidget(QWidget *parent) : +EmoticonsWidget::EmoticonsWidget(QWidget* parent) : QMenu(parent) { setStyleSheet(Style::getStylesheet(":/ui/emoticonWidget/emoticonWidget.css")); diff --git a/src/widget/emoticonswidget.h b/src/widget/emoticonswidget.h index bf64288f2..5f69e6dcd 100644 --- a/src/widget/emoticonswidget.h +++ b/src/widget/emoticonswidget.h @@ -28,7 +28,7 @@ class EmoticonsWidget : public QMenu { Q_OBJECT public: - explicit EmoticonsWidget(QWidget *parent = 0); + explicit EmoticonsWidget(QWidget* parent = 0); signals: void insertEmoticon(QString str); diff --git a/src/widget/flowlayout.cpp b/src/widget/flowlayout.cpp index cd2f93e79..66015e27e 100644 --- a/src/widget/flowlayout.cpp +++ b/src/widget/flowlayout.cpp @@ -41,7 +41,7 @@ #include #include "flowlayout.h" -FlowLayout::FlowLayout(QWidget *parent, int margin, int hSpacing, int vSpacing) +FlowLayout::FlowLayout(QWidget* parent, int margin, int hSpacing, int vSpacing) : QLayout(parent), m_hSpace(hSpacing), m_vSpace(vSpacing) { setContentsMargins(margin, margin, margin, margin); @@ -149,7 +149,7 @@ int FlowLayout::doLayout(const QRect &rect, bool testOnly) const QLayoutItem *item; foreach (item, itemList) { - QWidget *wid = item->widget(); + QWidget* wid = item->widget(); int spaceX = horizontalSpacing(); if (spaceX == -1) spaceX = wid->style()->layoutSpacing( @@ -186,11 +186,11 @@ int FlowLayout::smartSpacing(QStyle::PixelMetric pm) const } else if (parent->isWidgetType()) { - QWidget *pw = static_cast(parent); + QWidget* pw = static_cast(parent); return pw->style()->pixelMetric(pm, 0, pw); } else { - return static_cast(parent)->spacing(); + return static_cast(parent)->spacing(); } } diff --git a/src/widget/form/addfriendform.h b/src/widget/form/addfriendform.h index 2982b97e7..02d0a750c 100644 --- a/src/widget/form/addfriendform.h +++ b/src/widget/form/addfriendform.h @@ -74,7 +74,7 @@ private slots: private: void retranslateUi(); void addFriendRequestWidget(const QString& friendAddress, const QString& message); - void removeFriendRequestWidget(QWidget *friendWidget); + void removeFriendRequestWidget(QWidget* friendWidget); void retranslateAcceptButton(QPushButton* acceptButton); void retranslateRejectButton(QPushButton* rejectButton); void deleteFriendRequest(const ToxId& toxId); @@ -86,7 +86,7 @@ private: QLineEdit toxId; QTextEdit message; QVBoxLayout layout, headLayout; - QWidget *head, *main; + QWidget* head, *main; QString lastUsername; QTabWidget* tabWidget; QVBoxLayout* requestsLayout; diff --git a/src/widget/form/genericchatform.cpp b/src/widget/form/genericchatform.cpp index 5e052c980..6bd2700f7 100644 --- a/src/widget/form/genericchatform.cpp +++ b/src/widget/form/genericchatform.cpp @@ -49,7 +49,7 @@ #include "src/widget/translator.h" #include "src/widget/widget.h" -GenericChatForm::GenericChatForm(QWidget *parent) +GenericChatForm::GenericChatForm(QWidget* parent) : QWidget(parent, Qt::Window) , audioInputFlag(false) , audioOutputFlag(false) @@ -498,7 +498,7 @@ void GenericChatForm::onSelectAllClicked() QString GenericChatForm::resolveToxId(const ToxPk &id) { - Friend *f = FriendList::findFriend(id); + Friend* f = FriendList::findFriend(id); if (f) return f->getDisplayedName(); diff --git a/src/widget/form/genericchatform.h b/src/widget/form/genericchatform.h index d5e865e9d..1be415334 100644 --- a/src/widget/form/genericchatform.h +++ b/src/widget/form/genericchatform.h @@ -55,7 +55,7 @@ class GenericChatForm : public QWidget { Q_OBJECT public: - explicit GenericChatForm(QWidget *parent = 0); + explicit GenericChatForm(QWidget* parent = 0); ~GenericChatForm(); void setName(const QString &newName); @@ -122,7 +122,7 @@ protected: int curRow; CroppingLabel *nameLabel; MaskablePixmapWidget *avatar; - QWidget *headWidget; + QWidget* headWidget; QPushButton *fileButton, *screenshotButton, *emoteButton, *callButton, *videoButton, *volButton, *micButton; FlyoutOverlayWidget *fileFlyout; QVBoxLayout *headTextLayout; diff --git a/src/widget/form/groupchatform.cpp b/src/widget/form/groupchatform.cpp index 34c3ff2e4..0cb6ed55f 100644 --- a/src/widget/form/groupchatform.cpp +++ b/src/widget/form/groupchatform.cpp @@ -283,7 +283,7 @@ void GroupChatForm::peerAudioPlaying(int peer) void GroupChatForm::dragEnterEvent(QDragEnterEvent *ev) { ToxId toxId = ToxId(ev->mimeData()->text()); - Friend *frnd = FriendList::findFriend(toxId.getPublicKey()); + Friend* frnd = FriendList::findFriend(toxId.getPublicKey()); if (frnd) ev->acceptProposedAction(); } @@ -291,7 +291,7 @@ void GroupChatForm::dragEnterEvent(QDragEnterEvent *ev) void GroupChatForm::dropEvent(QDropEvent *ev) { ToxId toxId = ToxId(ev->mimeData()->text()); - Friend *frnd = FriendList::findFriend(toxId.getPublicKey()); + Friend* frnd = FriendList::findFriend(toxId.getPublicKey()); if (!frnd) return; diff --git a/src/widget/form/loadhistorydialog.cpp b/src/widget/form/loadhistorydialog.cpp index c45055a14..075bb3704 100644 --- a/src/widget/form/loadhistorydialog.cpp +++ b/src/widget/form/loadhistorydialog.cpp @@ -20,7 +20,7 @@ #include "loadhistorydialog.h" #include "ui_loadhistorydialog.h" -LoadHistoryDialog::LoadHistoryDialog(QWidget *parent) : +LoadHistoryDialog::LoadHistoryDialog(QWidget* parent) : QDialog(parent), ui(new Ui::LoadHistoryDialog) { diff --git a/src/widget/form/loadhistorydialog.h b/src/widget/form/loadhistorydialog.h index 462c9a065..9f50177a1 100644 --- a/src/widget/form/loadhistorydialog.h +++ b/src/widget/form/loadhistorydialog.h @@ -32,7 +32,7 @@ class LoadHistoryDialog : public QDialog Q_OBJECT public: - explicit LoadHistoryDialog(QWidget *parent = 0); + explicit LoadHistoryDialog(QWidget* parent = 0); ~LoadHistoryDialog(); QDateTime getFromDate(); diff --git a/src/widget/form/profileform.cpp b/src/widget/form/profileform.cpp index bc4220236..60164c8ce 100644 --- a/src/widget/form/profileform.cpp +++ b/src/widget/form/profileform.cpp @@ -48,7 +48,7 @@ #include #include -ProfileForm::ProfileForm(QWidget *parent) : +ProfileForm::ProfileForm(QWidget* parent) : QWidget{parent}, qr{nullptr} { bodyUI = new Ui::IdentitySettings; diff --git a/src/widget/form/profileform.h b/src/widget/form/profileform.h index 052546122..56347bc4e 100644 --- a/src/widget/form/profileform.h +++ b/src/widget/form/profileform.h @@ -55,7 +55,7 @@ class ProfileForm : public QWidget { Q_OBJECT public: - explicit ProfileForm(QWidget *parent = nullptr); + explicit ProfileForm(QWidget* parent = nullptr); ~ProfileForm(); virtual void show() final{} void show(ContentLayout* contentLayout); @@ -97,7 +97,7 @@ private: Ui::IdentitySettings* bodyUI; MaskablePixmapWidget* profilePicture; QLabel* nameLabel; - QWidget *head; + QWidget* head; Core* core; QTimer timer; bool hasCheck = false; diff --git a/src/widget/form/settings/verticalonlyscroller.cpp b/src/widget/form/settings/verticalonlyscroller.cpp index bc635f8d3..612836534 100644 --- a/src/widget/form/settings/verticalonlyscroller.cpp +++ b/src/widget/form/settings/verticalonlyscroller.cpp @@ -22,7 +22,7 @@ #include "verticalonlyscroller.h" -VerticalOnlyScroller::VerticalOnlyScroller(QWidget *parent) : +VerticalOnlyScroller::VerticalOnlyScroller(QWidget* parent) : QScrollArea(parent) { } diff --git a/src/widget/form/settings/verticalonlyscroller.h b/src/widget/form/settings/verticalonlyscroller.h index 85a53dca7..22fff89c9 100644 --- a/src/widget/form/settings/verticalonlyscroller.h +++ b/src/widget/form/settings/verticalonlyscroller.h @@ -29,7 +29,7 @@ class VerticalOnlyScroller : public QScrollArea { Q_OBJECT public: - explicit VerticalOnlyScroller(QWidget *parent = 0); + explicit VerticalOnlyScroller(QWidget* parent = 0); protected: virtual void resizeEvent(QResizeEvent *event) final override; diff --git a/src/widget/friendlistlayout.cpp b/src/widget/friendlistlayout.cpp index 25e38fed1..e10dafdcb 100644 --- a/src/widget/friendlistlayout.cpp +++ b/src/widget/friendlistlayout.cpp @@ -82,7 +82,7 @@ void FriendListLayout::moveFriendWidgets(FriendListWidget* listWidget) QWidget* getWidget = friendOnlineLayout.getLayout()->takeAt(0)->widget(); FriendWidget* friendWidget = qobject_cast(getWidget); - Friend *f = FriendList::findFriend(friendWidget->friendId); + Friend* f = FriendList::findFriend(friendWidget->friendId); listWidget->moveWidget(friendWidget, f->getStatus(), false); } while (!friendOfflineLayout.getLayout()->isEmpty()) @@ -90,7 +90,7 @@ void FriendListLayout::moveFriendWidgets(FriendListWidget* listWidget) QWidget* getWidget = friendOfflineLayout.getLayout()->takeAt(0)->widget(); FriendWidget* friendWidget = qobject_cast(getWidget); - Friend *f = FriendList::findFriend(friendWidget->friendId); + Friend* f = FriendList::findFriend(friendWidget->friendId); listWidget->moveWidget(friendWidget, f->getStatus(), false); } } diff --git a/src/widget/friendlistwidget.cpp b/src/widget/friendlistwidget.cpp index 1e4367896..2ecd9435e 100644 --- a/src/widget/friendlistwidget.cpp +++ b/src/widget/friendlistwidget.cpp @@ -202,7 +202,7 @@ void FriendListWidget::setMode(Mode mode) int count = activityLayout ? activityLayout->count() : 0; for (int i = 0; i < count; i++) { - QWidget *widget = activityLayout->itemAt(i)->widget(); + QWidget* widget = activityLayout->itemAt(i)->widget(); CategoryWidget *categoryWidget = qobject_cast(widget); if (categoryWidget) { @@ -332,11 +332,11 @@ void FriendListWidget::setMode(Mode mode) } } -void FriendListWidget::moveFriends(QLayout *layout) +void FriendListWidget::moveFriends(QLayout* layout) { for (int i = 0; i < layout->count(); i++) { - QWidget *widget = layout->itemAt(i)->widget(); + QWidget* widget = layout->itemAt(i)->widget(); FriendWidget *friendWidget = qobject_cast(widget); CircleWidget *circleWidget = qobject_cast(widget); if (circleWidget) @@ -350,7 +350,7 @@ void FriendListWidget::moveFriends(QLayout *layout) QDate activityDate = getDateFriend(contact); Time time = getTime(activityDate); - QWidget *w = activityLayout->itemAt(time)->widget(); + QWidget* w = activityLayout->itemAt(time)->widget(); CategoryWidget* categoryWidget = qobject_cast(w); categoryWidget->addFriendWidget(friendWidget, contact->getStatus()); } @@ -413,7 +413,7 @@ void FriendListWidget::addCircleWidget(FriendWidget* friendWidget) { if (friendWidget != nullptr) { - Friend *f = FriendList::findFriend(friendWidget->friendId); + Friend* f = FriendList::findFriend(friendWidget->friendId); ToxPk toxPk = f->getPublicKey(); int circleId = Settings::getInstance().getFriendCircleID(toxPk); CircleWidget* circleOriginal = CircleWidget::getFromID(circleId); @@ -640,7 +640,7 @@ void FriendListWidget::cycleContacts(GenericChatroomWidget* activeChatroomWidget void FriendListWidget::dragEnterEvent(QDragEnterEvent* event) { ToxId toxId(event->mimeData()->text()); - Friend *frnd = FriendList::findFriend(toxId.getPublicKey()); + Friend* frnd = FriendList::findFriend(toxId.getPublicKey()); if (frnd) event->acceptProposedAction(); } @@ -655,7 +655,7 @@ void FriendListWidget::dropEvent(QDropEvent* event) // Check, that the user has a friend with the same ToxId ToxId toxId(event->mimeData()->text()); - Friend *f = FriendList::findFriend(toxId.getPublicKey()); + Friend* f = FriendList::findFriend(toxId.getPublicKey()); if (!f) return; @@ -684,7 +684,7 @@ void FriendListWidget::moveWidget(FriendWidget* widget, Status s, bool add) { if (mode == Name) { - Friend *f = FriendList::findFriend(widget->friendId); + Friend* f = FriendList::findFriend(widget->friendId); int circleId = Settings::getInstance().getFriendCircleID(f->getPublicKey()); CircleWidget* circleWidget = CircleWidget::getFromID(circleId); @@ -704,7 +704,7 @@ void FriendListWidget::moveWidget(FriendWidget* widget, Status s, bool add) Friend* contact = FriendList::findFriend(widget->friendId); QDate activityDate = getDateFriend(contact); Time time = getTime(activityDate); - QWidget *w = activityLayout->itemAt(time)->widget(); + QWidget* w = activityLayout->itemAt(time)->widget(); CategoryWidget* categoryWidget = qobject_cast(w); categoryWidget->addFriendWidget(widget, contact->getStatus()); categoryWidget->show(); diff --git a/src/widget/friendlistwidget.h b/src/widget/friendlistwidget.h index 0ff2f1fb2..a510f58be 100644 --- a/src/widget/friendlistwidget.h +++ b/src/widget/friendlistwidget.h @@ -81,7 +81,7 @@ private slots: private: CircleWidget* createCircleWidget(int id = -1); QLayout* nextLayout(QLayout* layout, bool forward) const; - void moveFriends(QLayout *layout); + void moveFriends(QLayout* layout); Mode mode; bool groupsOnTop; diff --git a/src/widget/friendwidget.cpp b/src/widget/friendwidget.cpp index 6106f9ca3..9ec6997b7 100644 --- a/src/widget/friendwidget.cpp +++ b/src/widget/friendwidget.cpp @@ -77,7 +77,7 @@ FriendWidget::FriendWidget(int FriendId, QString id) * Default context menu event handler. * Redirect all event information to the signal. */ -void FriendWidget::contextMenuEvent(QContextMenuEvent * event) +void FriendWidget::contextMenuEvent(QContextMenuEvent* event) { emit contextMenuCalled(event); } diff --git a/src/widget/friendwidget.h b/src/widget/friendwidget.h index 1d573328b..1326e46ea 100644 --- a/src/widget/friendwidget.h +++ b/src/widget/friendwidget.h @@ -28,7 +28,7 @@ class FriendWidget : public GenericChatroomWidget Q_OBJECT public: FriendWidget(int FriendId, QString id); - virtual void contextMenuEvent(QContextMenuEvent * event) override; + virtual void contextMenuEvent(QContextMenuEvent* event) override; virtual void setAsActiveChatroom() override; virtual void setAsInactiveChatroom() override; virtual void updateStatusLight() override; diff --git a/src/widget/genericchatitemwidget.cpp b/src/widget/genericchatitemwidget.cpp index 4e4b1263b..e58fb2874 100644 --- a/src/widget/genericchatitemwidget.cpp +++ b/src/widget/genericchatitemwidget.cpp @@ -23,7 +23,7 @@ #include "src/widget/tool/croppinglabel.h" #include -GenericChatItemWidget::GenericChatItemWidget(QWidget *parent) +GenericChatItemWidget::GenericChatItemWidget(QWidget* parent) : QFrame(parent), compact(false) { setProperty("compact", Settings::getInstance().getCompactLayout()); diff --git a/src/widget/genericchatitemwidget.h b/src/widget/genericchatitemwidget.h index 4f9a4a973..94bc99526 100644 --- a/src/widget/genericchatitemwidget.h +++ b/src/widget/genericchatitemwidget.h @@ -36,7 +36,7 @@ public: FriendOnlineItem }; - explicit GenericChatItemWidget(QWidget *parent = 0); + explicit GenericChatItemWidget(QWidget* parent = 0); bool isCompact() const; void setCompact(bool compact); diff --git a/src/widget/genericchatroomwidget.cpp b/src/widget/genericchatroomwidget.cpp index 160a252b5..56adde55c 100644 --- a/src/widget/genericchatroomwidget.cpp +++ b/src/widget/genericchatroomwidget.cpp @@ -25,7 +25,7 @@ #include #include -GenericChatroomWidget::GenericChatroomWidget(QWidget *parent) +GenericChatroomWidget::GenericChatroomWidget(QWidget* parent) : GenericChatItemWidget(parent), active{false} { // avatar diff --git a/src/widget/genericchatroomwidget.h b/src/widget/genericchatroomwidget.h index 7513d037c..46785ebbb 100644 --- a/src/widget/genericchatroomwidget.h +++ b/src/widget/genericchatroomwidget.h @@ -34,7 +34,7 @@ class GenericChatroomWidget : public GenericChatItemWidget { Q_OBJECT public: - explicit GenericChatroomWidget(QWidget *parent = 0); + explicit GenericChatroomWidget(QWidget* parent = 0); virtual void setAsActiveChatroom() = 0; virtual void setAsInactiveChatroom() = 0; diff --git a/src/widget/groupwidget.cpp b/src/widget/groupwidget.cpp index 84ca887c8..752990536 100644 --- a/src/widget/groupwidget.cpp +++ b/src/widget/groupwidget.cpp @@ -236,7 +236,7 @@ void GroupWidget::resetEventFlags() void GroupWidget::dragEnterEvent(QDragEnterEvent *ev) { ToxId toxId = ToxId(ev->mimeData()->text()); - Friend *frnd = FriendList::findFriend(toxId.getPublicKey()); + Friend* frnd = FriendList::findFriend(toxId.getPublicKey()); if (frnd) ev->acceptProposedAction(); @@ -253,7 +253,7 @@ void GroupWidget::dragLeaveEvent(QDragLeaveEvent *) void GroupWidget::dropEvent(QDropEvent *ev) { ToxId toxId = ToxId(ev->mimeData()->text()); - Friend *frnd = FriendList::findFriend(toxId.getPublicKey()); + Friend* frnd = FriendList::findFriend(toxId.getPublicKey()); if (!frnd) return; diff --git a/src/widget/gui.cpp b/src/widget/gui.cpp index 5971a7852..f8cdd4296 100644 --- a/src/widget/gui.cpp +++ b/src/widget/gui.cpp @@ -274,11 +274,10 @@ bool GUI::askQuestion(const QString& title, const QString& msg, * @param hints Is the input method hints that will be used if the combobox is editable and an input method is active. * @return This function returns the text of the current item, or if editable is true, the current text of the combobox. */ -QString GUI::itemInputDialog(QWidget * parent, const QString & title, - const QString & label, const QStringList & items, - int current, bool editable, bool * ok, - Qt::WindowFlags flags, - Qt::InputMethodHints hints) +QString GUI::itemInputDialog(QWidget* parent, const QString& title, + const QString& label, const QStringList& items, + int current, bool editable, bool* ok, + Qt::WindowFlags flags, Qt::InputMethodHints hints) { if (QThread::currentThread() == qApp->thread()) { @@ -395,11 +394,10 @@ bool GUI::_askQuestion(const QString& title, const QString& msg, return box.clickedButton() == pushButton1; } -QString GUI::_itemInputDialog(QWidget * parent, const QString & title, - const QString & label, const QStringList & items, - int current, bool editable, bool * ok, - Qt::WindowFlags flags, - Qt::InputMethodHints hints) +QString GUI::_itemInputDialog(QWidget* parent, const QString& title, + const QString& label, const QStringList& items, + int current, bool editable, bool* ok, + Qt::WindowFlags flags, Qt::InputMethodHints hints) { return QInputDialog::getItem(parent, title, label, items, current, editable, ok, flags, hints); } diff --git a/src/widget/gui.h b/src/widget/gui.h index 328c8b75a..cb766ade5 100644 --- a/src/widget/gui.h +++ b/src/widget/gui.h @@ -47,9 +47,9 @@ public: const QString& button1, const QString& button2, bool defaultAns = false, bool warning = true); - static QString itemInputDialog(QWidget * parent, const QString & title, - const QString & label, const QStringList & items, - int current = 0, bool editable = true, bool * ok = 0, + static QString itemInputDialog(QWidget* parent, const QString& title, + const QString& label, const QStringList& items, + int current = 0, bool editable = true, bool* ok = 0, Qt::WindowFlags flags = 0, Qt::InputMethodHints hints = Qt::ImhNone); @@ -77,9 +77,9 @@ private slots: bool _askQuestion(const QString& title, const QString& msg, const QString& button1, const QString& button2, bool defaultAns = false, bool warning = true); - QString _itemInputDialog(QWidget * parent, const QString & title, - const QString & label, const QStringList & items, - int current = 0, bool editable = true, bool * ok = 0, + QString _itemInputDialog(QWidget* parent, const QString& title, + const QString& label, const QStringList& items, + int current = 0, bool editable = true, bool* ok = 0, Qt::WindowFlags flags = 0, Qt::InputMethodHints inputMethodHints = Qt::ImhNone); QString _passwordDialog(const QString& cancel, const QString& body); diff --git a/src/widget/loginscreen.cpp b/src/widget/loginscreen.cpp index a194635cb..24dfb0c84 100644 --- a/src/widget/loginscreen.cpp +++ b/src/widget/loginscreen.cpp @@ -32,7 +32,7 @@ #include #include -LoginScreen::LoginScreen(QWidget *parent) : +LoginScreen::LoginScreen(QWidget* parent) : QWidget(parent), ui(new Ui::LoginScreen), quitShortcut{QKeySequence(Qt::CTRL + Qt::Key_Q), this} diff --git a/src/widget/loginscreen.h b/src/widget/loginscreen.h index 828b3884d..401f9a382 100644 --- a/src/widget/loginscreen.h +++ b/src/widget/loginscreen.h @@ -34,7 +34,7 @@ class LoginScreen : public QWidget Q_OBJECT public: - explicit LoginScreen(QWidget *parent = 0); + explicit LoginScreen(QWidget* parent = 0); ~LoginScreen(); void reset(); diff --git a/src/widget/maskablepixmapwidget.cpp b/src/widget/maskablepixmapwidget.cpp index baca43e8b..6a45cf548 100644 --- a/src/widget/maskablepixmapwidget.cpp +++ b/src/widget/maskablepixmapwidget.cpp @@ -25,7 +25,7 @@ * @brief pointer to dynamically call the constructor. */ -MaskablePixmapWidget::MaskablePixmapWidget(QWidget *parent, QSize size, QString maskName) +MaskablePixmapWidget::MaskablePixmapWidget(QWidget* parent, QSize size, QString maskName) : QWidget(parent) , renderTarget(nullptr) , maskName(maskName) diff --git a/src/widget/maskablepixmapwidget.h b/src/widget/maskablepixmapwidget.h index 0c7ec5586..e0e7d058f 100644 --- a/src/widget/maskablepixmapwidget.h +++ b/src/widget/maskablepixmapwidget.h @@ -26,7 +26,7 @@ class MaskablePixmapWidget final : public QWidget { Q_OBJECT public: - MaskablePixmapWidget(QWidget *parent, QSize size, QString maskName = QString()); + MaskablePixmapWidget(QWidget* parent, QSize size, QString maskName = QString()); ~MaskablePixmapWidget(); void autopickBackground(); void setClickable(bool clickable); diff --git a/src/widget/notificationedgewidget.cpp b/src/widget/notificationedgewidget.cpp index 0577bf364..e0a272220 100644 --- a/src/widget/notificationedgewidget.cpp +++ b/src/widget/notificationedgewidget.cpp @@ -24,7 +24,7 @@ #include -NotificationEdgeWidget::NotificationEdgeWidget(Position position, QWidget *parent) +NotificationEdgeWidget::NotificationEdgeWidget(Position position, QWidget* parent) : QWidget(parent) { setAttribute(Qt::WA_StyledBackground); // Show background. diff --git a/src/widget/notificationedgewidget.h b/src/widget/notificationedgewidget.h index 54e3cb20a..32c055492 100644 --- a/src/widget/notificationedgewidget.h +++ b/src/widget/notificationedgewidget.h @@ -34,7 +34,7 @@ public: Bottom }; - explicit NotificationEdgeWidget(Position position, QWidget *parent = 0); + explicit NotificationEdgeWidget(Position position, QWidget* parent = 0); void updateNotificationCount(int count); signals: diff --git a/src/widget/notificationscrollarea.cpp b/src/widget/notificationscrollarea.cpp index e3a146faf..2be38a09a 100644 --- a/src/widget/notificationscrollarea.cpp +++ b/src/widget/notificationscrollarea.cpp @@ -195,7 +195,7 @@ void NotificationScrollArea::findPreviousWidget() ensureWidgetVisible(next, 0, referencesAbove != 1 ? topEdge->height() : 0); } -NotificationScrollArea::Visibility NotificationScrollArea::widgetVisible(QWidget *widget) const +NotificationScrollArea::Visibility NotificationScrollArea::widgetVisible(QWidget* widget) const { int y = widget->mapTo(viewport(), QPoint()).y(); diff --git a/src/widget/passwordedit.h b/src/widget/passwordedit.h index c05eafa48..58513281d 100644 --- a/src/widget/passwordedit.h +++ b/src/widget/passwordedit.h @@ -8,7 +8,7 @@ class PasswordEdit : public QLineEdit { Q_OBJECT public: - explicit PasswordEdit(QWidget *parent); + explicit PasswordEdit(QWidget* parent); ~PasswordEdit(); protected: diff --git a/src/widget/qrwidget.cpp b/src/widget/qrwidget.cpp index 688983380..a7682adb7 100644 --- a/src/widget/qrwidget.cpp +++ b/src/widget/qrwidget.cpp @@ -36,7 +36,7 @@ * @link https://stackoverflow.com/questions/21400254/how-to-draw-a-qr-code-with-qt-in-native-c-c */ -QRWidget::QRWidget(QWidget *parent) : QWidget(parent), data("0") +QRWidget::QRWidget(QWidget* parent) : QWidget(parent), data("0") //Note: The encoding fails with empty string so I just default to something else. //Use the setQRData() call to change this. { diff --git a/src/widget/qrwidget.h b/src/widget/qrwidget.h index d0d169d75..5764b920c 100644 --- a/src/widget/qrwidget.h +++ b/src/widget/qrwidget.h @@ -28,7 +28,7 @@ class QRWidget : public QWidget Q_OBJECT public: - explicit QRWidget(QWidget *parent = 0); + explicit QRWidget(QWidget* parent = 0); ~QRWidget(); void setQRData(const QString& data); QImage* getImage(); diff --git a/src/widget/style.cpp b/src/widget/style.cpp index 704384916..01fc1f02d 100644 --- a/src/widget/style.cpp +++ b/src/widget/style.cpp @@ -182,7 +182,7 @@ QString Style::resolve(QString qss, const QFont& baseFont) return qss; } -void Style::repolish(QWidget *w) +void Style::repolish(QWidget* w) { w->style()->unpolish(w); w->style()->polish(w); diff --git a/src/widget/tool/activatedialog.cpp b/src/widget/tool/activatedialog.cpp index 4b927d678..b89977817 100644 --- a/src/widget/tool/activatedialog.cpp +++ b/src/widget/tool/activatedialog.cpp @@ -21,7 +21,7 @@ #include "activatedialog.h" #include -ActivateDialog::ActivateDialog(QWidget *parent, Qt::WindowFlags f) +ActivateDialog::ActivateDialog(QWidget* parent, Qt::WindowFlags f) : QDialog(parent, f) { diff --git a/src/widget/tool/adjustingscrollarea.cpp b/src/widget/tool/adjustingscrollarea.cpp index 251b5be9f..e3151d21a 100644 --- a/src/widget/tool/adjustingscrollarea.cpp +++ b/src/widget/tool/adjustingscrollarea.cpp @@ -24,7 +24,7 @@ #include #include -AdjustingScrollArea::AdjustingScrollArea(QWidget *parent) +AdjustingScrollArea::AdjustingScrollArea(QWidget* parent) : QScrollArea(parent) { diff --git a/src/widget/tool/adjustingscrollarea.h b/src/widget/tool/adjustingscrollarea.h index c02042ba1..8a1c3eb88 100644 --- a/src/widget/tool/adjustingscrollarea.h +++ b/src/widget/tool/adjustingscrollarea.h @@ -26,7 +26,7 @@ class AdjustingScrollArea : public QScrollArea { Q_OBJECT public: - explicit AdjustingScrollArea(QWidget *parent = 0); + explicit AdjustingScrollArea(QWidget* parent = 0); virtual ~AdjustingScrollArea() = default; protected: diff --git a/src/widget/tool/callconfirmwidget.cpp b/src/widget/tool/callconfirmwidget.cpp index da86c9c3f..d3c6777be 100644 --- a/src/widget/tool/callconfirmwidget.cpp +++ b/src/widget/tool/callconfirmwidget.cpp @@ -51,7 +51,7 @@ * @brief Used to correct the rounding factors on non-square rects */ -CallConfirmWidget::CallConfirmWidget(const QWidget *Anchor, const Friend& f) : +CallConfirmWidget::CallConfirmWidget(const QWidget* Anchor, const Friend& f) : QWidget(), anchor(Anchor), f(f), rectW{120}, rectH{85}, spikeW{30}, spikeH{15}, diff --git a/src/widget/tool/callconfirmwidget.h b/src/widget/tool/callconfirmwidget.h index a498e260e..0d7808f9d 100644 --- a/src/widget/tool/callconfirmwidget.h +++ b/src/widget/tool/callconfirmwidget.h @@ -34,7 +34,7 @@ class CallConfirmWidget final : public QWidget { Q_OBJECT public: - explicit CallConfirmWidget(const QWidget *Anchor, const Friend& f); + explicit CallConfirmWidget(const QWidget* Anchor, const Friend& f); signals: void accepted(); diff --git a/src/widget/tool/chattextedit.cpp b/src/widget/tool/chattextedit.cpp index a1d7f2be4..5cccb3dec 100644 --- a/src/widget/tool/chattextedit.cpp +++ b/src/widget/tool/chattextedit.cpp @@ -21,7 +21,7 @@ #include "src/widget/translator.h" #include -ChatTextEdit::ChatTextEdit(QWidget *parent) : +ChatTextEdit::ChatTextEdit(QWidget* parent) : QTextEdit(parent) { retranslateUi(); diff --git a/src/widget/tool/chattextedit.h b/src/widget/tool/chattextedit.h index a259058d5..f93338eaf 100644 --- a/src/widget/tool/chattextedit.h +++ b/src/widget/tool/chattextedit.h @@ -26,7 +26,7 @@ class ChatTextEdit final : public QTextEdit { Q_OBJECT public: - explicit ChatTextEdit(QWidget *parent = 0); + explicit ChatTextEdit(QWidget* parent = 0); ~ChatTextEdit(); void setLastMessage(QString lm); void sendKeyEvent(QKeyEvent * event); diff --git a/src/widget/tool/flyoutoverlaywidget.cpp b/src/widget/tool/flyoutoverlaywidget.cpp index 40b9ef592..02d62d5c3 100644 --- a/src/widget/tool/flyoutoverlaywidget.cpp +++ b/src/widget/tool/flyoutoverlaywidget.cpp @@ -26,7 +26,7 @@ #include #include -FlyoutOverlayWidget::FlyoutOverlayWidget(QWidget *parent) +FlyoutOverlayWidget::FlyoutOverlayWidget(QWidget* parent) : QWidget(parent) { setContentsMargins(0, 0, 0, 0); diff --git a/src/widget/tool/flyoutoverlaywidget.h b/src/widget/tool/flyoutoverlaywidget.h index 863c21acd..f20a0a560 100644 --- a/src/widget/tool/flyoutoverlaywidget.h +++ b/src/widget/tool/flyoutoverlaywidget.h @@ -30,7 +30,7 @@ class FlyoutOverlayWidget : public QWidget Q_OBJECT Q_PROPERTY(qreal flyoutPercent READ flyoutPercent WRITE setFlyoutPercent) public: - explicit FlyoutOverlayWidget(QWidget *parent = 0); + explicit FlyoutOverlayWidget(QWidget* parent = 0); ~FlyoutOverlayWidget(); int animationDuration() const; @@ -55,7 +55,7 @@ private: void finishedAnimation(); void startAnimation(bool forward); - QWidget *container; + QWidget* container; QPropertyAnimation *animation; qreal percent = 1.0f; QPoint startPos; diff --git a/src/widget/tool/friendrequestdialog.cpp b/src/widget/tool/friendrequestdialog.cpp index 8d2efc1be..d3363e20d 100644 --- a/src/widget/tool/friendrequestdialog.cpp +++ b/src/widget/tool/friendrequestdialog.cpp @@ -27,7 +27,7 @@ #include #include -FriendRequestDialog::FriendRequestDialog(QWidget *parent, const QString &userId, const QString &message) : +FriendRequestDialog::FriendRequestDialog(QWidget* parent, const QString &userId, const QString &message) : QDialog(parent) { setAttribute(Qt::WA_QuitOnClose, false); diff --git a/src/widget/tool/friendrequestdialog.h b/src/widget/tool/friendrequestdialog.h index 0c85994b7..64fec0bda 100644 --- a/src/widget/tool/friendrequestdialog.h +++ b/src/widget/tool/friendrequestdialog.h @@ -26,7 +26,7 @@ class FriendRequestDialog : public QDialog { Q_OBJECT public: - explicit FriendRequestDialog(QWidget *parent, const QString &userId, const QString &message); + explicit FriendRequestDialog(QWidget* parent, const QString &userId, const QString &message); }; #endif // FRIENDREQUESTDIALOG_HPP diff --git a/src/widget/tool/micfeedbackwidget.cpp b/src/widget/tool/micfeedbackwidget.cpp index 580d38a0d..5f24a0358 100644 --- a/src/widget/tool/micfeedbackwidget.cpp +++ b/src/widget/tool/micfeedbackwidget.cpp @@ -22,7 +22,7 @@ #include #include -MicFeedbackWidget::MicFeedbackWidget(QWidget *parent) +MicFeedbackWidget::MicFeedbackWidget(QWidget* parent) : QWidget(parent), mMeterListener(nullptr) { setFixedHeight(20); diff --git a/src/widget/tool/micfeedbackwidget.h b/src/widget/tool/micfeedbackwidget.h index 3e3236f6d..211dfdca4 100644 --- a/src/widget/tool/micfeedbackwidget.h +++ b/src/widget/tool/micfeedbackwidget.h @@ -28,7 +28,7 @@ class MicFeedbackWidget : public QWidget { Q_OBJECT public: - explicit MicFeedbackWidget(QWidget *parent = 0); + explicit MicFeedbackWidget(QWidget* parent = 0); protected: void paintEvent(QPaintEvent* event) override; diff --git a/src/widget/tool/movablewidget.cpp b/src/widget/tool/movablewidget.cpp index 99e825a7e..44d7213db 100644 --- a/src/widget/tool/movablewidget.cpp +++ b/src/widget/tool/movablewidget.cpp @@ -22,7 +22,7 @@ #include #include -MovableWidget::MovableWidget(QWidget *parent) +MovableWidget::MovableWidget(QWidget* parent) : QWidget(parent) { setMinimumHeight(64); diff --git a/src/widget/tool/profileimporter.cpp b/src/widget/tool/profileimporter.cpp index 069adbd3e..6cfc4c93a 100644 --- a/src/widget/tool/profileimporter.cpp +++ b/src/widget/tool/profileimporter.cpp @@ -35,7 +35,7 @@ * to create dialog forms. */ -ProfileImporter::ProfileImporter(QWidget *parent) : QWidget(parent) +ProfileImporter::ProfileImporter(QWidget* parent) : QWidget(parent) { } diff --git a/src/widget/tool/profileimporter.h b/src/widget/tool/profileimporter.h index 7aea94f50..755b20e86 100644 --- a/src/widget/tool/profileimporter.h +++ b/src/widget/tool/profileimporter.h @@ -27,7 +27,7 @@ class ProfileImporter : public QWidget Q_OBJECT public: - explicit ProfileImporter(QWidget *parent = 0); + explicit ProfileImporter(QWidget* parent = 0); bool importProfile(const QString &path); bool importProfile(); diff --git a/src/widget/tool/removefrienddialog.cpp b/src/widget/tool/removefrienddialog.cpp index d79928331..c3e1b6ee4 100644 --- a/src/widget/tool/removefrienddialog.cpp +++ b/src/widget/tool/removefrienddialog.cpp @@ -2,7 +2,7 @@ #include -RemoveFriendDialog::RemoveFriendDialog(QWidget *parent, const Friend *f) +RemoveFriendDialog::RemoveFriendDialog(QWidget* parent, const Friend* f) : QDialog(parent) { setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); diff --git a/src/widget/tool/removefrienddialog.h b/src/widget/tool/removefrienddialog.h index 4f99ccb59..389e1d582 100644 --- a/src/widget/tool/removefrienddialog.h +++ b/src/widget/tool/removefrienddialog.h @@ -11,7 +11,7 @@ class RemoveFriendDialog : public QDialog { Q_OBJECT public: - explicit RemoveFriendDialog(QWidget *parent, const Friend* f); + explicit RemoveFriendDialog(QWidget* parent, const Friend* f); inline bool removeHistory() { diff --git a/src/widget/widget.cpp b/src/widget/widget.cpp index 67c593c4e..d94f46814 100644 --- a/src/widget/widget.cpp +++ b/src/widget/widget.cpp @@ -84,7 +84,7 @@ bool toxActivateEventHandler(const QByteArray&) Widget *Widget::instance{nullptr}; -Widget::Widget(QWidget *parent) +Widget::Widget(QWidget* parent) : QMainWindow(parent), icon{nullptr}, trayMenu{nullptr}, @@ -1252,7 +1252,7 @@ void Widget::onReceiptRecieved(int friendId, int receipt) f->getChatForm()->getOfflineMsgEngine()->dischargeReceipt(receipt); } -void Widget::addFriendDialog(Friend *frnd, ContentDialog *dialog) +void Widget::addFriendDialog(Friend* frnd, ContentDialog *dialog) { ContentDialog *contentDialog = ContentDialog::getFriendDialog(frnd->getFriendId()); bool isSeparate = Settings::getInstance().getSeparateWindow(); @@ -1510,7 +1510,7 @@ void Widget::onFriendRequestReceived(const ToxPk& friendPk, const QString& messa } } -void Widget::updateFriendActivity(Friend *frnd) +void Widget::updateFriendActivity(Friend* frnd) { const ToxPk &pk = frnd->getPublicKey(); QDate date = Settings::getInstance().getFriendActivity(pk); @@ -2209,7 +2209,7 @@ void Widget::processOfflineMsgs() if (OfflineMsgEngine::globalMutex.tryLock()) { QList frnds = FriendList::getAllFriends(); - for (Friend *f : frnds) + for (Friend* f : frnds) { f->getChatForm()->getOfflineMsgEngine()->deliverOfflineMsgs(); } @@ -2221,7 +2221,7 @@ void Widget::processOfflineMsgs() void Widget::clearAllReceipts() { QList frnds = FriendList::getAllFriends(); - for (Friend *f : frnds) + for (Friend* f : frnds) { f->getChatForm()->getOfflineMsgEngine()->removeAllReceipts(); } diff --git a/src/widget/widget.h b/src/widget/widget.h index 0bd8ba23a..fcb1711cb 100644 --- a/src/widget/widget.h +++ b/src/widget/widget.h @@ -65,10 +65,10 @@ class Widget final : public QMainWindow { Q_OBJECT public: - explicit Widget(QWidget *parent = 0); + explicit Widget(QWidget* parent = 0); ~Widget(); void init(); - void setCentralWidget(QWidget *widget, const QString &widgetName); + void setCentralWidget(QWidget* widget, const QString &widgetName); QString getUsername(); Camera* getCamera(); static Widget* getInstance();