Replace signals/slots with Q_SIGNALS/Q_SLOTS

autotests/adblocktest.h

@@ -24,7 +24,7 @@ class AdBlockTest : public QObject
 {
     Q_OBJECT
 
-private slots:
+private Q_SLOTS:
     void isMatchingCookieTest_data();
     void isMatchingCookieTest();
     void parseRegExpFilterTest_data();

autotests/cookiestest.h

@@ -45,7 +45,7 @@ class CookiesTest : public QObject
 {
     Q_OBJECT
 
-private slots:
+private Q_SLOTS:
     void initTestCase();
     void cleanupTestCase();
 

autotests/locationbartest.h

@@ -23,7 +23,7 @@ class LocationBarTest : public QObject
 {
     Q_OBJECT
 
-private slots:
+private Q_SLOTS:
     void initTestCase();
     void cleanupTestCase();
     void init();

autotests/passwordbackendtest.h

@@ -30,7 +30,7 @@ class PasswordBackendTest : public QObject
 public:
     explicit PasswordBackendTest();
 
-private slots:
+private Q_SLOTS:
     void initTestCase();
     void cleanupTestCase();
 

autotests/qztoolstest.h

@@ -24,7 +24,7 @@ class QzToolsTest : public QObject
 {
     Q_OBJECT
 
-private slots:
+private Q_SLOTS:
     void initTestCase();
     void cleanupTestCase();
 

autotests/tabmodeltest.h

@@ -23,7 +23,7 @@ class TabModelTest : public QObject
 {
     Q_OBJECT
 
-private slots:
+private Q_SLOTS:
     void initTestCase();
     void cleanupTestCase();
 

autotests/updatertest.h

@@ -24,7 +24,7 @@ class UpdaterTest : public QObject
 {
     Q_OBJECT
 
-private slots:
+private Q_SLOTS:
     void parseVersionsTest_data();
     void parseVersionsTest();
 

autotests/webtabtest.h

@@ -23,7 +23,7 @@ class WebTabTest : public QObject
 {
     Q_OBJECT
 
-private slots:
+private Q_SLOTS:
     void initTestCase();
     void cleanupTestCase();
     void init();

autotests/webviewtest.h

@@ -23,7 +23,7 @@ class WebViewTest : public QObject
 {
     Q_OBJECT
 
-private slots:
+private Q_SLOTS:
     void initTestCase();
     void cleanupTestCase();
 

src/lib/3rdparty/fancytabwidget.h

@@ -128,10 +128,10 @@ public:
     int count() const {return m_tabs.count(); }
     QRect tabRect(int index) const;
 
-signals:
+Q_SIGNALS:
     void currentChanged(int);
 
-public slots:
+public Q_SLOTS:
     void emitCurrentIndex();
 
 private:
@@ -190,12 +190,12 @@ public:
     Mode mode() const { return mode_; }
     QPixmap bgPixmap() { return background_pixmap_; }
 
-public slots:
+public Q_SLOTS:
     void SetCurrentIndex(int index);
     void SetMode(Mode mode);
     void SetMode(int mode) { SetMode(Mode(mode)); }
 
-signals:
+Q_SIGNALS:
     void CurrentChanged(int index);
     void ModeChanged(FancyTabWidget::Mode mode);
 
@@ -203,7 +203,7 @@ protected:
     void paintEvent(QPaintEvent* event);
     void contextMenuEvent(QContextMenuEvent* e);
 
-private slots:
+private Q_SLOTS:
     void ShowWidget(int index);
 
 private:

src/lib/3rdparty/lineedit.h

@@ -109,7 +109,7 @@ public:
     QSize sizeHint() const override;
     QAction* editAction(EditAction action) const;
 
-public slots:
+public Q_SLOTS:
     void setLeftMargin(int margin);
     void updateTextMargins();
 
@@ -123,7 +123,7 @@ protected:
 
     QMenu* createContextMenu();
 
-private slots:
+private Q_SLOTS:
     void updateActions();
     void updatePasteActions();
     void slotDelete();
@@ -148,7 +148,7 @@ class FALKON_EXPORT SideWidget : public QWidget
 {
     Q_OBJECT
 
-signals:
+Q_SIGNALS:
     void sizeHintChanged();
 
 public:

src/lib/3rdparty/squeezelabelv2.h

@@ -33,7 +33,7 @@ public:
     QString originalText();
     void setText(const QString &txt);
 
-private slots:
+private Q_SLOTS:
     void copy();
 
 protected:

src/lib/adblock/adblockaddsubscriptiondialog.h

@@ -39,7 +39,7 @@ public:
     QString title() const;
     QString url() const;
 
-private slots:
+private Q_SLOTS:
     void indexChanged(int index);
 
 private:

src/lib/adblock/adblockdialog.h

@@ -37,7 +37,7 @@ public:
 
     void showRule(const AdBlockRule* rule) const;
 
-private slots:
+private Q_SLOTS:
     void addRule();
     void removeRule();
 

src/lib/adblock/adblockicon.h

@@ -33,7 +33,7 @@ public:
     QString id() const override;
     QString name() const override;
 
-private slots:
+private Q_SLOTS:
     void toggleCustomFilter();
 
 private:

src/lib/adblock/adblockmanager.h

@@ -87,11 +87,11 @@ public:
 
     static AdBlockManager* instance();
 
-signals:
+Q_SIGNALS:
     void enabledChanged(bool enabled);
     void blockedRequestsChanged(const QUrl &url);
 
-public slots:
+public Q_SLOTS:
     void setEnabled(bool enabled);
     void showRule();
 

src/lib/adblock/adblockmatcher.h

@@ -44,7 +44,7 @@ public:
     QString elementHidingRules() const;
     QString elementHidingRulesForDomain(const QString &domain) const;
 
-public slots:
+public Q_SLOTS:
     void update();
     void clear();
 

src/lib/adblock/adblocksubscription.h

@@ -87,15 +87,15 @@ public:
     virtual bool removeRule(int offset);
     virtual const AdBlockRule* replaceRule(AdBlockRule* rule, int offset);
 
-public slots:
+public Q_SLOTS:
     void updateSubscription();
 
-signals:
+Q_SIGNALS:
     void subscriptionChanged();
     void subscriptionUpdated();
     void subscriptionError(const QString &message);
 
-protected slots:
+protected Q_SLOTS:
     void subscriptionDownloaded();
 
 protected:

src/lib/adblock/adblocktreewidget.h

@@ -35,11 +35,11 @@ public:
     void showRule(const AdBlockRule* rule);
     void refresh();
 
-public slots:
+public Q_SLOTS:
     void addRule();
     void removeRule();
 
-private slots:
+private Q_SLOTS:
     void contextMenuRequested(const QPoint &pos);
     void itemChanged(QTreeWidgetItem* item);
     void copyFilter();

src/lib/adblock/adblockurlinterceptor.h

@@ -34,7 +34,7 @@ public:
 
     void interceptRequest(QWebEngineUrlRequestInfo &request);
 
-signals:
+Q_SIGNALS:
     void requestBlocked(const AdBlockedRequest &request);
 
 private:

src/lib/app/autosaver.h

@@ -33,11 +33,11 @@ public:
     // Emits save() if timer is running. Call this from destructor.
     void saveIfNecessary();
 
-public slots:
+public Q_SLOTS:
     // Tells AutoSaver that change occurred. Signal save() will be emitted after a delay
     void changeOccurred();
 
-signals:
+Q_SIGNALS:
     void save();
 
 private:

src/lib/app/browserwindow.h

@@ -125,11 +125,11 @@ public:
     TabModel *tabModel() const;
     TabMruModel *tabMruModel() const;
 
-signals:
+Q_SIGNALS:
     void startingCompleted();
     void aboutToClose();
 
-public slots:
+public Q_SLOTS:
     void goHome();
     void goHomeInNewTab();
     void goBack();
@@ -161,7 +161,7 @@ public slots:
     void loadAddress(const QUrl &url);
     void showSource(WebView *view = Q_NULLPTR);
 
-private slots:
+private Q_SLOTS:
     void addTab();
     void openLocation();
     void openFile();

src/lib/app/mainapplication.h

@@ -121,7 +121,7 @@ public:
     static bool isTestModeEnabled();
     static void setTestModeEnabled(bool enabled);
 
-public slots:
+public Q_SLOTS:
     void addNewTab(const QUrl &url = QUrl());
     void startPrivateBrowsing(const QUrl &startUrl = QUrl());
 
@@ -131,11 +131,11 @@ public slots:
     void changeOccurred();
     void quitApplication();
 
-signals:
+Q_SIGNALS:
     void settingsReloaded();
     void activeWindowChanged(BrowserWindow* window);
 
-private slots:
+private Q_SLOTS:
     void postLaunch();
 
     void saveSettings();

src/lib/app/mainmenu.h

@@ -44,10 +44,10 @@ public:
 
     QAction* action(const QString &name) const;
 
-public slots:
+public Q_SLOTS:
     void setWindow(BrowserWindow* window);
 
-private slots:
+private Q_SLOTS:
     // Standard actions
     void showAboutDialog();
     void showPreferences();

src/lib/autofill/autofillicon.h

@@ -33,7 +33,7 @@ public:
     void setWebView(WebView* view);
     void setUsernames(const QStringList &usernames);
 
-private slots:
+private Q_SLOTS:
     void iconClicked();
 
 private:

src/lib/autofill/autofillnotification.h

@@ -42,7 +42,7 @@ public:
                                   const PasswordEntry &updateData);
     ~AutoFillNotification();
 
-private slots:
+private Q_SLOTS:
     void update();
     void remember();
     void never();

src/lib/autofill/passwordbackends/databaseencryptedpasswordbackend.h

@@ -106,7 +106,7 @@ public:
 
     void delayedExec();
 
-public slots:
+public Q_SLOTS:
     void accept();
     void reject();
     void showSettingPage();
@@ -130,7 +130,7 @@ class AskMasterPassword : public QDialog
 public:
     explicit AskMasterPassword(DatabaseEncryptedPasswordBackend* backend, QWidget* parent = 0);
 
-private slots:
+private Q_SLOTS:
     void verifyPassword();
 
 private:

src/lib/autofill/passwordmanager.h

@@ -95,7 +95,7 @@ private:
 
     QHash<QString, PasswordBackend*> m_backends;
 
-signals:
+Q_SIGNALS:
     void passwordBackendChanged();
 };
 

src/lib/bookmarks/bookmarks.h

@@ -64,11 +64,11 @@ public:
     bool removeBookmark(BookmarkItem* item);
     void changeBookmark(BookmarkItem* item);
 
-public slots:
+public Q_SLOTS:
     void setShowOnlyIconsInToolbar(bool state);
     void setShowOnlyTextInToolbar(bool state);
 
-signals:
+Q_SIGNALS:
     // Item was added to bookmarks
     void bookmarkAdded(BookmarkItem* item);
     // Item was removed from bookmarks
@@ -79,7 +79,7 @@ signals:
     void showOnlyIconsInToolbarChanged(bool show);
     void showOnlyTextInToolbarChanged(bool show);
 
-private slots:
+private Q_SLOTS:
     void saveSettings();
 
 private:

src/lib/bookmarks/bookmarksexport/bookmarksexportdialog.h

@@ -37,7 +37,7 @@ public:
     explicit BookmarksExportDialog(QWidget* parent = 0);
     ~BookmarksExportDialog();
 
-private slots:
+private Q_SLOTS:
     void setPath();
     void exportBookmarks();
 

src/lib/bookmarks/bookmarksicon.h

@@ -35,7 +35,7 @@ public:
     void setWebView(WebView* view);
     void checkBookmark(const QUrl &url, bool forceCheck = false);
 
-private slots:
+private Q_SLOTS:
     void bookmarksChanged();
     void speedDialChanged();
 

src/lib/bookmarks/bookmarksimport/bookmarksimportdialog.h

@@ -39,7 +39,7 @@ public:
     explicit BookmarksImportDialog(QWidget* parent = 0);
     ~BookmarksImportDialog();
 
-private slots:
+private Q_SLOTS:
     void nextPage();
     void previousPage();
     void setFile();

src/lib/bookmarks/bookmarksmanager.h

@@ -44,10 +44,10 @@ public:
 
     void setMainWindow(BrowserWindow* window);
 
-public slots:
+public Q_SLOTS:
     void search(const QString &string);
 
-private slots:
+private Q_SLOTS:
     void bookmarkActivated(BookmarkItem* item);
     void bookmarkCtrlActivated(BookmarkItem* item);
     void bookmarkShiftActivated(BookmarkItem* item);

src/lib/bookmarks/bookmarksmenu.h

@@ -35,7 +35,7 @@ public:
 
     void setMainWindow(BrowserWindow* window);
 
-private slots:
+private Q_SLOTS:
     void bookmarkPage();
     void bookmarkAllTabs();
     void showBookmarksManager();

src/lib/bookmarks/bookmarksmodel.h

@@ -70,7 +70,7 @@ public:
 
     BookmarkItem* item(const QModelIndex &index) const;
 
-private slots:
+private Q_SLOTS:
     void bookmarkChanged(BookmarkItem* item);
 
 private:
@@ -85,13 +85,13 @@ class FALKON_EXPORT BookmarksFilterModel : public QSortFilterProxyModel
 public:
     explicit BookmarksFilterModel(QAbstractItemModel* parent);
 
-public slots:
+public Q_SLOTS:
     void setFilterFixedString(const QString &pattern);
 
 protected:
     bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const;
 
-private slots:
+private Q_SLOTS:
     void startFiltering();
 
 private:

src/lib/bookmarks/bookmarkstoolbar.h

@@ -36,7 +36,7 @@ class FALKON_EXPORT BookmarksToolbar : public QWidget
 public:
     explicit BookmarksToolbar(BrowserWindow* window, QWidget* parent = 0);
 
-private slots:
+private Q_SLOTS:
     void contextMenuRequested(const QPoint &pos);
 
     void refresh();

src/lib/bookmarks/bookmarkstoolbarbutton.h

@@ -45,7 +45,7 @@ public:
     QSize sizeHint() const override;
     QSize minimumSizeHint() const override;
 
-private slots:
+private Q_SLOTS:
     void createMenu();
 
     void menuAboutToShow();

src/lib/bookmarks/bookmarkstools.h

@@ -35,10 +35,10 @@ public:
 
     BookmarkItem* selectedFolder() const;
 
-signals:
+Q_SIGNALS:
     void folderSelected(BookmarkItem* folder);
 
-private slots:
+private Q_SLOTS:
     void folderChoosed();
 
 private:
@@ -57,10 +57,10 @@ public:
 
     BookmarkItem* selectedFolder() const;
 
-signals:
+Q_SIGNALS:
     void selectedFolderChanged(BookmarkItem* folder);
 
-public slots:
+public Q_SLOTS:
     void setSelectedFolder(BookmarkItem* folder);
 
 private:

src/lib/bookmarks/bookmarkstreeview.h

@@ -51,10 +51,10 @@ public:
     // Expand up to root item
     void ensureBookmarkVisible(BookmarkItem* item);
 
-public slots:
+public Q_SLOTS:
     void search(const QString &string);
 
-signals:
+Q_SIGNALS:
     // Open bookmark in current tab
     void bookmarkActivated(BookmarkItem* item);
     // Open bookmark in new tab
@@ -66,7 +66,7 @@ signals:
     // If all bookmarks have been deselected, items is empty
     void bookmarksSelected(QList<BookmarkItem*> items);
 
-private slots:
+private Q_SLOTS:
     void indexExpanded(const QModelIndex &parent);
     void indexCollapsed(const QModelIndex &parent);
 

src/lib/bookmarks/bookmarkswidget.h

@@ -40,7 +40,7 @@ public:
     explicit BookmarksWidget(WebView* view, BookmarkItem* bookmark, QWidget* parent = 0);
     ~BookmarksWidget();
 
-private slots:
+private Q_SLOTS:
     void toggleSpeedDial();
     void toggleBookmark();
     void bookmarkEdited();

src/lib/cookies/cookiejar.h

@@ -42,7 +42,7 @@ public:
     QVector<QNetworkCookie> getAllCookies() const;
     void deleteAllCookies();
 
-signals:
+Q_SIGNALS:
     void cookieAdded(const QNetworkCookie &cookie);
     void cookieRemoved(const QNetworkCookie &cookie);
 

src/lib/cookies/cookiemanager.h

@@ -40,7 +40,7 @@ public:
     explicit CookieManager(QWidget *parent = nullptr);
     ~CookieManager();
 
-private slots:
+private Q_SLOTS:
     void currentItemChanged(QTreeWidgetItem* current, QTreeWidgetItem* parent);
     void remove();
     void removeAll();

src/lib/downloads/downloaditem.h

@@ -53,11 +53,11 @@ public:
     static QString remaingTimeToString(QTime time);
     static QString currentSpeedToString(double speed);
 
-signals:
+Q_SIGNALS:
     void deleteItem(DownloadItem*);
     void downloadFinished(bool success);
 
-private slots:
+private Q_SLOTS:
     void parentResized(const QSize &size);
     void finished();
     void downloadProgress(qint64 received, qint64 total);

src/lib/downloads/downloadmanager.h

@@ -76,15 +76,15 @@ public:
     void setLastDownloadPath(const QString &lastPath) { m_lastDownloadPath = lastPath; }
     void setLastDownloadOption(const DownloadOption &option) { m_lastDownloadOption = option; }
 
-public slots:
+public Q_SLOTS:
     void show();
 
-private slots:
+private Q_SLOTS:
     void clearList();
     void deleteItem(DownloadItem* item);
     void downloadFinished(bool success);
 
-signals:
+Q_SIGNALS:
     void resized(QSize);
     void downloadsCountChanged();
 

src/lib/downloads/downloadoptionsdialog.h

@@ -46,11 +46,11 @@ public:
 
     int exec();
 
-private slots:
+private Q_SLOTS:
     void copyDownloadLink();
     void emitDialogFinished(int status);
 
-signals:
+Q_SIGNALS:
     void dialogFinished(int);
 
 private:

src/lib/history/history.h

@@ -68,7 +68,7 @@ public:
 
     void loadSettings();
 
-signals:
+Q_SIGNALS:
     void historyEntryAdded(const HistoryEntry &entry);
     void historyEntryDeleted(const HistoryEntry &entry);
     void historyEntryEdited(const HistoryEntry &before, const HistoryEntry &after);

src/lib/history/historymanager.h

@@ -46,10 +46,10 @@ public:
     void restoreState(const QByteArray &state);
     QByteArray saveState();
 
-public slots:
+public Q_SLOTS:
     void search(const QString &searchText);
 
-private slots:
+private Q_SLOTS:
     void urlActivated(const QUrl &url);
     void urlCtrlActivated(const QUrl &url);
     void urlShiftActivated(const QUrl &url);

src/lib/history/historymenu.h

@@ -34,9 +34,7 @@ public:
 
     void setMainWindow(BrowserWindow* window);
 
-signals:
+private Q_SLOTS:
-
-private slots:
     void goBack();
     void goForward();
     void goHome();

src/lib/history/historymodel.h

@@ -67,9 +67,7 @@ public:
 
     void removeTopLevelIndexes(const QList<QPersistentModelIndex> &indexes);
 
-signals:
+private Q_SLOTS:
-
-private slots:
     void resetHistory();
 
     void historyEntryAdded(const HistoryEntry &entry);
@@ -92,17 +90,17 @@ class FALKON_EXPORT HistoryFilterModel : public QSortFilterProxyModel
 public:
     explicit HistoryFilterModel(QAbstractItemModel* parent);
 
-public slots:
+public Q_SLOTS:
     void setFilterFixedString(const QString &pattern);
 
-signals:
+Q_SIGNALS:
     void expandAllItems();
     void collapseAllItems();
 
 protected:
     bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const;
 
-private slots:
+private Q_SLOTS:
     void startFiltering();
 
 private:

src/lib/history/historytreeview.h

@@ -43,7 +43,7 @@ public:
 
     HeaderView* header() const;
 
-signals:
+Q_SIGNALS:
     // Open url in current tab
     void urlActivated(const QUrl &url);
     // Open url in new tab
@@ -53,7 +53,7 @@ signals:
     // Context menu signal with point mapped to global
     void contextMenuRequested(const QPoint &point);
 
-public slots:
+public Q_SLOTS:
     void search(const QString &string);
     void removeSelectedItems();
 

src/lib/navigation/completer/locationcompleter.h

@@ -44,11 +44,11 @@ public:
     bool isVisible() const;
     void closePopup();
 
-public slots:
+public Q_SLOTS:
     void complete(const QString &string);
     void showMostVisited();
 
-signals:
+Q_SIGNALS:
     void showCompletion(const QString &completion, bool completeDomain);
     void showDomainCompletion(const QString &completion);
     void clearCompletion();
@@ -56,7 +56,7 @@ signals:
     void cancelRefreshJob();
     void loadRequested(const LoadRequest &request);
 
-private slots:
+private Q_SLOTS:
     void refreshJobFinished();
     void slotPopupClosed();
     void addSuggestions(const QStringList &suggestions);

src/lib/navigation/completer/locationcompleterrefreshjob.h

@@ -39,10 +39,10 @@ public:
     QList<QStandardItem*> completions() const;
     QString domainCompletion() const;
 
-signals:
+Q_SIGNALS:
     void finished();
 
-private slots:
+private Q_SLOTS:
     void slotFinished();
     void jobCancelled();
 

src/lib/navigation/completer/locationcompleterview.h

@@ -48,7 +48,7 @@ public:
 
     bool eventFilter(QObject* object, QEvent* event);
 
-signals:
+Q_SIGNALS:
     void closed();
     void searchEnginesDialogRequested();
     void loadRequested(const LoadRequest &request);
@@ -58,7 +58,7 @@ signals:
     void indexShiftActivated(const QModelIndex &index);
     void indexDeleteRequested(const QModelIndex &index);
 
-public slots:
+public Q_SLOTS:
     void close();
 
 private:

src/lib/navigation/locationbar.h

@@ -66,12 +66,12 @@ public:
     static SearchEngine searchEngine();
     static LoadAction loadAction(const QString &text);
 
-public slots:
+public Q_SLOTS:
     void setText(const QString &text);
     void showUrl(const QUrl &url);
     void loadRequest(const LoadRequest &request);
 
-private slots:
+private Q_SLOTS:
     void textEdited(const QString &text);
     void requestLoadUrl();
     void pasteAndGo();

src/lib/navigation/navigationbar.h

@@ -72,7 +72,7 @@ public:
     void addToolButton(AbstractButtonInterface *button);
     void removeToolButton(AbstractButtonInterface *button);
 
-public slots:
+public Q_SLOTS:
     void refreshHistory();
 
     void stop();
@@ -82,7 +82,7 @@ public slots:
     void goForward();
     void goForwardInNewTab();
 
-private slots:
+private Q_SLOTS:
     void aboutToShowHistoryNextMenu();
     void aboutToShowHistoryBackMenu();
     void aboutToShowToolsMenu();

src/lib/navigation/navigationbartoolbutton.h

@@ -33,7 +33,7 @@ public:
 
     void updateVisibility();
 
-signals:
+Q_SIGNALS:
     void visibilityChangeRequested();
 
 private:

src/lib/navigation/reloadstopbutton.h

@@ -33,11 +33,11 @@ public:
     void showStopButton();
     void showReloadButton();
 
-signals:
+Q_SIGNALS:
     void stopClicked();
     void reloadClicked();
 
-private slots:
+private Q_SLOTS:
     void updateButton();
     void buttonClicked();
 

src/lib/navigation/siteicon.h

@@ -38,7 +38,7 @@ public:
     void setWebView(WebView* view);
     void setIcon(const QIcon &icon);
 
-private slots:
+private Q_SLOTS:
     void updateIcon();
     void popupClosed();
 

src/lib/navigation/websearchbar.h

@@ -51,7 +51,7 @@ class FALKON_EXPORT WebSearchBar : public LineEdit
 public:
     explicit WebSearchBar(BrowserWindow* window);
 
-private slots:
+private Q_SLOTS:
     void searchChanged(const ButtonWithMenu::Item &item);
     void setupEngines();
 

src/lib/network/schemehandlers/falkonschemehandler.h

@@ -46,7 +46,7 @@ public:
     qint64 readData(char *data, qint64 maxSize) Q_DECL_OVERRIDE;
     qint64 writeData(const char *data, qint64 len) Q_DECL_OVERRIDE;
 
-private slots:
+private Q_SLOTS:
     void loadPage();
 
 private:

src/lib/network/sslerrordialog.h

@@ -42,7 +42,7 @@ public:
     void setText(const QString &text);
     Result result();
 
-private slots:
+private Q_SLOTS:
     void buttonClicked(QAbstractButton* button);
 
 private:

src/lib/notifications/desktopnotificationsfactory.h

@@ -47,7 +47,7 @@ public:
     void showNotification(const QPixmap &icon, const QString &heading, const QString &text);
     void nativeNotificationPreview();
 
-private slots:
+private Q_SLOTS:
 #if defined(Q_OS_UNIX) && !defined(DISABLE_DBUS)
     void updateLastId(const QDBusMessage &msg);
     void error(const QDBusError &error);

src/lib/opensearch/editsearchengine.h

@@ -47,11 +47,9 @@ public:
 
     void hideIconLabels();
 
-signals:
+public Q_SLOTS:
 
-public slots:
+private Q_SLOTS:
-
-private slots:
     void chooseIcon();
 
 private:

src/lib/opensearch/opensearchengine.h

@@ -53,7 +53,7 @@ class FALKON_EXPORT OpenSearchEngine : public QObject
 {
     Q_OBJECT
 
-signals:
+Q_SIGNALS:
     void imageChanged();
     void suggestions(const QStringList &suggestions);
 
@@ -129,7 +129,7 @@ public:
     bool operator==(const OpenSearchEngine &other) const;
     bool operator<(const OpenSearchEngine &other) const;
 
-public slots:
+public Q_SLOTS:
     void requestSuggestions(const QString &searchTerm);
     void requestSearchResults(const QString &searchTerm);
 
@@ -137,7 +137,7 @@ protected:
     static QString parseTemplate(const QString &searchTerm, const QString &searchTemplate);
     void loadImage() const;
 
-private slots:
+private Q_SLOTS:
     void imageObtained();
     void suggestionsObtained();
 

src/lib/opensearch/searchenginesdialog.h

@@ -38,10 +38,10 @@ public:
     explicit SearchEnginesDialog(QWidget* parent = 0);
     ~SearchEnginesDialog();
 
-public slots:
+public Q_SLOTS:
     void accept() override;
 
-private slots:
+private Q_SLOTS:
     void addEngine();
     void removeEngine();
     void editEngine();

src/lib/opensearch/searchenginesmanager.h

@@ -90,14 +90,14 @@ public:
 
     static QIcon iconForSearchEngine(const QUrl &url);
 
-signals:
+Q_SIGNALS:
     void enginesChanged();
     void activeEngineChanged();
     void defaultEngineChanged();
 
-public slots:
+public Q_SLOTS:
 
-private slots:
+private Q_SLOTS:
     void engineChangedImage();
     void replyFinished();
 

src/lib/other/aboutdialog.h

@@ -35,7 +35,7 @@ public:
     explicit AboutDialog(QWidget* parent = 0);
     ~AboutDialog();
 
-private slots:
+private Q_SLOTS:
     void showAbout();
 
 private:

src/lib/other/browsinglibrary.h

@@ -46,7 +46,7 @@ public:
     HistoryManager* historyManager() { return m_historyManager; }
     BookmarksManager* bookmarksManager() { return m_bookmarksManager; }
 
-private slots:
+private Q_SLOTS:
     void search();
 
     void importBookmarks();

src/lib/other/clearprivatedata.h

@@ -37,7 +37,7 @@ public:
     static void clearWebDatabases();
     static void clearCache();
 
-private slots:
+private Q_SLOTS:
     void historyClicked(bool state);
     void dialogAccepted();
     void optimizeDb();

src/lib/other/iconchooser.h

@@ -40,7 +40,7 @@ public:
 
     QIcon getIcon();
 
-private slots:
+private Q_SLOTS:
     void chooseFile();
     void searchIcon(const QString &string);
 

src/lib/other/siteinfo.h

@@ -44,7 +44,7 @@ public:
 
     static bool canShowSiteInfo(const QUrl &url);
 
-private slots:
+private Q_SLOTS:
     void showImagePreview(QTreeWidgetItem *item);
     void imagesCustomContextMenuRequested(const QPoint &p);
     void copyActionData();

src/lib/other/updater.h

@@ -51,7 +51,7 @@ public:
         QString versionString() const;
     };
 
-private slots:
+private Q_SLOTS:
     void downCompleted();
     void start();
     void downloadNewVersion();

src/lib/plugins/pluginproxy.h

@@ -60,14 +60,14 @@ public:
     void emitMainWindowCreated(BrowserWindow* window);
     void emitMainWindowDeleted(BrowserWindow* window);
 
-signals:
+Q_SIGNALS:
     void webPageCreated(WebPage* page);
     void webPageDeleted(WebPage* page);
 
     void mainWindowCreated(BrowserWindow* window);
     void mainWindowDeleted(BrowserWindow* window);
 
-private slots:
+private Q_SLOTS:
     void pluginUnloaded(PluginInterface* plugin);
 
 private:

src/lib/plugins/plugins.h

@@ -89,7 +89,7 @@ public:
     // SpeedDial
     SpeedDial* speedDial() { return m_speedDial; }
 
-public slots:
+public Q_SLOTS:
     void loadSettings();
 
     void loadPlugins();
@@ -97,7 +97,7 @@ public slots:
 protected:
     QList<PluginInterface*> m_loadedPlugins;
 
-signals:
+Q_SIGNALS:
     void pluginUnloaded(PluginInterface* plugin);
 
 private:

src/lib/plugins/speeddial.h

@@ -68,12 +68,12 @@ public:
     QString backgroundImageSize();
     QString initialScript();
 
-signals:
+Q_SIGNALS:
     void pagesChanged();
     void thumbnailLoaded(const QString &url, const QString &src);
     void pageTitleLoaded(const QString &url, const QString &title);
 
-public slots:
+public Q_SLOTS:
     void changed(const QString &allPages);
     void loadThumbnail(const QString &url, bool loadTitle);
     void removeImageForUrl(const QString &url);
@@ -86,7 +86,7 @@ public slots:
     void setSdSize(int count);
     void setSdCentered(bool centered);
 
-private slots:
+private Q_SLOTS:
     void thumbnailCreated(const QPixmap &pixmap);
     void saveSettings();
 

src/lib/popupwindow/popuplocationbar.h

@@ -43,7 +43,7 @@ public:
     void startLoading();
     void stopLoading();
 
-public slots:
+public Q_SLOTS:
     void showUrl(const QUrl &url);
     void showSiteIcon();
 

src/lib/popupwindow/popupwebview.h

@@ -40,7 +40,7 @@ public:
     bool isFullScreen() Q_DECL_OVERRIDE;
     void requestFullScreen(bool enable) Q_DECL_OVERRIDE;
 
-public slots:
+public Q_SLOTS:
     void inspectElement();
 
 private:

src/lib/popupwindow/popupwindow.h

@@ -44,10 +44,10 @@ public:
     QStatusBar* statusBar();
     PopupWebView* webView();
 
-public slots:
+public Q_SLOTS:
     void setWindowGeometry(QRect newRect);
 
-private slots:
+private Q_SLOTS:
     void titleChanged();
     void showNotification(QWidget* notif);
     void showStatusBarMessage(const QString &message);

src/lib/preferences/acceptlanguage.h

@@ -39,10 +39,10 @@ public:
     static QStringList defaultLanguage();
     static QByteArray generateHeader(const QStringList &langs);
 
-public slots:
+public Q_SLOTS:
     void accept();
 
-private slots:
+private Q_SLOTS:
     void addLanguage();
     void removeLanguage();
     void upLanguage();

src/lib/preferences/autofillmanager.h

@@ -39,7 +39,7 @@ public:
 
     void showExceptions();
 
-private slots:
+private Q_SLOTS:
     void loadPasswords();
     void changePasswordBackend();
     void showBackendOptions();

src/lib/preferences/jsoptions.h

@@ -36,7 +36,7 @@ public:
     explicit JsOptions(QWidget* parent = 0);
     ~JsOptions();
 
-public slots:
+public Q_SLOTS:
     void accept();
 
 private:

src/lib/preferences/pluginsmanager.h

@@ -40,7 +40,7 @@ public:
     void load();
     void save();
 
-private slots:
+private Q_SLOTS:
     void settingsClicked();
     void currentChanged(QListWidgetItem* item);
     void itemChanged(QListWidgetItem* item);

src/lib/preferences/preferences.h

@@ -46,7 +46,7 @@ public:
     explicit Preferences(BrowserWindow* window);
     ~Preferences();
 
-private slots:
+private Q_SLOTS:
     void saveSettings();
 
     void buttonClicked(QAbstractButton* button);

src/lib/preferences/thememanager.h

@@ -42,7 +42,7 @@ public:
 
     void save();
 
-private slots:
+private Q_SLOTS:
     void currentChanged();
     void showLicense();
 

src/lib/preferences/useragentdialog.h

@@ -38,7 +38,7 @@ public:
     explicit UserAgentDialog(QWidget* parent = 0);
     ~UserAgentDialog();
 
-private slots:
+private Q_SLOTS:
     void addSite();
     void removeSite();
     void editSite();

src/lib/session/recoveryjsobject.h

@@ -38,7 +38,7 @@ public:
 
     QJsonArray restoreData() const;
 
-public slots:
+public Q_SLOTS:
     void startNewSession();
     void restoreSession(const QStringList &excludeWin, const QStringList &excludeTab);
 

src/lib/session/sessionmanager.h

@@ -56,14 +56,14 @@ public:
     void backupSavedSessions();
     void writeCurrentSession(const QString &filePath);
 
-signals:
+Q_SIGNALS:
     void sessionsMetaDataChanged();
 
-public slots:
+public Q_SLOTS:
     void autoSaveLastSession();
     void openSessionManagerDialog();
 
-private slots:
+private Q_SLOTS:
     void aboutToShowSessionsMenu();
     void sessionsDirectoryChanged();
     void openSession(QString sessionFilePath = QString(), SessionFlags flags = nullptr);

src/lib/sidebar/bookmarkssidebar.h

@@ -39,7 +39,7 @@ public:
     explicit BookmarksSidebar(BrowserWindow* window, QWidget* parent = 0);
     ~BookmarksSidebar();
 
-private slots:
+private Q_SLOTS:
     void bookmarkActivated(BookmarkItem* item);
     void bookmarkCtrlActivated(BookmarkItem* item);
     void bookmarkShiftActivated(BookmarkItem* item);

src/lib/sidebar/historysidebar.h

@@ -38,7 +38,7 @@ public:
     explicit HistorySideBar(BrowserWindow* window, QWidget* parent = 0);
     ~HistorySideBar();
 
-private slots:
+private Q_SLOTS:
     void urlActivated(const QUrl &url);
     void urlCtrlActivated(const QUrl &url);
     void urlShiftActivated(const QUrl &url);

src/lib/sidebar/sidebar.h

@@ -44,7 +44,7 @@ public:
     void setTitle(const QString &title);
     void setWidget(QWidget* widget);
 
-public slots:
+public Q_SLOTS:
     void close();
 
 private:
@@ -72,7 +72,7 @@ public:
     static void addSidebar(const QString &id, SideBarInterface* interface);
     static void removeSidebar(const QString &id);
 
-private slots:
+private Q_SLOTS:
     void slotShowSideBar();
 
 private:

src/lib/tabwidget/combotabbar.h

@@ -158,19 +158,19 @@ public:
     // Duration of tab slide animation when releasing dragged tab
     static int slideAnimationDuration();
 
-public slots:
+public Q_SLOTS:
     void setUpLayout();
     void ensureVisible(int index = -1, int xmargin = -1);
     void setCurrentIndex(int index);
 
-signals:
+Q_SIGNALS:
     void overFlowChanged(bool overFlow);
     void currentChanged(int index);
     void tabCloseRequested(int index);
     void tabMoved(int from, int to);
     void scrollBarValueChanged(int value);
 
-private slots:
+private Q_SLOTS:
     void setMinimumWidths();
     void slotCurrentChanged(int index);
     void slotTabCloseRequested(int index);
@@ -264,7 +264,7 @@ public:
 
     static void initStyleBaseOption(QStyleOptionTabBarBase* optTabBase, QTabBar* tabbar, QSize size);
 
-public slots:
+public Q_SLOTS:
     void setCurrentIndex(int index);
 
 private:
@@ -328,7 +328,7 @@ public:
     bool isOverflowed() const;
     int tabAt(const QPoint &pos) const;
 
-public slots:
+public Q_SLOTS:
     void ensureVisible(int index = -1, int xmargin = 132);
     void scrollToLeft(int n = 5, QEasingCurve::Type type = QEasingCurve::OutQuad);
     void scrollToRight(int n = 5, QEasingCurve::Type type = QEasingCurve::OutQuad);
@@ -336,7 +336,7 @@ public slots:
     void scrollToRightEdge();
     void setUpLayout();
 
-private slots:
+private Q_SLOTS:
     void overFlowChanged(bool overflowed);
     void scrollStart();
     void updateScrollButtonsState();

src/lib/tabwidget/tabbar.h

@@ -43,10 +43,10 @@ public:
 
     void wheelEvent(QWheelEvent* event);
 
-signals:
+Q_SIGNALS:
     void moveAddTabButton(int posX);
 
-private slots:
+private Q_SLOTS:
     void currentTabChanged(int index);
     void overflowChanged(bool overflowed);
     void closeTabFromButton();

src/lib/tabwidget/tabcontextmenu.h

@@ -43,7 +43,7 @@ public:
 
     explicit TabContextMenu(int index, BrowserWindow *window, Options options = DefaultOptions);
 
-signals:
+Q_SIGNALS:
     void reloadTab(int index);
     void stopTab(int index);
     void tabCloseRequested(int index);
@@ -55,7 +55,7 @@ signals:
     void loadTab(int index);
     void unloadTab(int index);
 
-private slots:
+private Q_SLOTS:
     void reloadTab() { emit reloadTab(m_clickedTab); }
     void stopTab() { emit stopTab(m_clickedTab); }
     void closeTab() { emit tabCloseRequested(m_clickedTab); }

src/lib/tabwidget/tabicon.h

@@ -46,10 +46,10 @@ public:
 
     static Data *data();
 
-signals:
+Q_SIGNALS:
     void resized();
 
-private slots:
+private Q_SLOTS:
     void showLoadingAnimation();
     void hideLoadingAnimation();
 

src/lib/tabwidget/tabstackedwidget.h

@@ -62,17 +62,17 @@ public:
     int indexOf(QWidget* widget) const;
     int count() const;
 
-signals:
+Q_SIGNALS:
     void currentChanged(int index);
     void tabCloseRequested(int index);
     void pinStateChanged(int index, bool pinned);
 
-public slots:
+public Q_SLOTS:
     void setCurrentIndex(int index);
     void setCurrentWidget(QWidget* widget);
     void setUpLayout();
 
-private slots:
+private Q_SLOTS:
     void showTab(int index);
     void tabWasMoved(int from, int to);
     void tabWasRemoved(int index);

src/lib/tabwidget/tabwidget.h

@@ -55,7 +55,7 @@ class FALKON_EXPORT MenuTabs : public QMenu
 public:
     explicit MenuTabs(QWidget* parent = 0) : QMenu(parent) {}
 
-signals:
+Q_SIGNALS:
     void closeTab(int);
 
 private:
@@ -101,7 +101,7 @@ public:
 
     void detachTab(WebTab* tab);
 
-public slots:
+public Q_SLOTS:
     int addView(const LoadRequest &req, const Qz::NewTabPositionFlags &openFlags, bool selectLine = false, bool pinned = false);
     int addView(const LoadRequest &req, const QString &title = tr("New tab"), const Qz::NewTabPositionFlags &openFlags = Qz::NT_SelectedTab, bool selectLine = false, int position = -1, bool pinned = false);
     int addView(WebTab *tab, const Qz::NewTabPositionFlags &openFlags);
@@ -132,13 +132,13 @@ public slots:
 
     void tabBarOverFlowChanged(bool overflowed);
 
-signals:
+Q_SIGNALS:
     void changed();
     void tabInserted(int index);
     void tabRemoved(int index);
     void tabMoved(int from, int to);
 
-private slots:
+private Q_SLOTS:
     void loadSettings();
 
     void aboutToShowTabsMenu();

src/lib/tools/abstractbuttoninterface.h

@@ -66,7 +66,7 @@ public:
     WebView *webView() const;
     void setWebView(WebView *view);
 
-signals:
+Q_SIGNALS:
     void activeChanged(bool active);
     void visibleChanged(bool visible);
     void titleChanged(const QString &title);

src/lib/tools/animatedwidget.h

@@ -34,11 +34,11 @@ public:
 
     QWidget* widget() { return m_widget; }
 
-public slots:
+public Q_SLOTS:
     void hide();
     void startAnimation();
 
-private slots:
+private Q_SLOTS:
     void animateFrame(int frame);
 
 private:

src/lib/tools/buttonbox.h

@@ -31,11 +31,7 @@ public:
     explicit ButtonBox(QWidget* parent = 0);
     ButtonRole clickedButtonRole();
 
-signals:
+private Q_SLOTS:
-
-public slots:
-
-private slots:
     void buttonClicked(QAbstractButton* button);
 
 private:

src/lib/tools/buttonwithmenu.h

@@ -66,18 +66,18 @@ public:
     QVector<Item> allItems() { return m_items; }
     QMenu* menu() const;
 
-signals:
+Q_SIGNALS:
     void activeItemChanged(const ButtonWithMenu::Item &item);
     void itemAdded(const ButtonWithMenu::Item &item);
     void itemRemoved(const ButtonWithMenu::Item &item);
 
-public slots:
+public Q_SLOTS:
     void clearItems();
 
     void selectNextItem();
     void selectPreviousItem();
 
-private slots:
+private Q_SLOTS:
     void setCurrentItem();
     void generateMenu();