diff --git a/autotests/adblocktest.h b/autotests/adblocktest.h index e88759550..c19c4c063 100644 --- a/autotests/adblocktest.h +++ b/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(); diff --git a/autotests/cookiestest.h b/autotests/cookiestest.h index ed196dcfd..3014b463c 100644 --- a/autotests/cookiestest.h +++ b/autotests/cookiestest.h @@ -45,7 +45,7 @@ class CookiesTest : public QObject { Q_OBJECT -private slots: +private Q_SLOTS: void initTestCase(); void cleanupTestCase(); diff --git a/autotests/locationbartest.h b/autotests/locationbartest.h index 441eff839..29cc6e845 100644 --- a/autotests/locationbartest.h +++ b/autotests/locationbartest.h @@ -23,7 +23,7 @@ class LocationBarTest : public QObject { Q_OBJECT -private slots: +private Q_SLOTS: void initTestCase(); void cleanupTestCase(); void init(); diff --git a/autotests/passwordbackendtest.h b/autotests/passwordbackendtest.h index 7eddb15dc..ed273c414 100644 --- a/autotests/passwordbackendtest.h +++ b/autotests/passwordbackendtest.h @@ -30,7 +30,7 @@ class PasswordBackendTest : public QObject public: explicit PasswordBackendTest(); -private slots: +private Q_SLOTS: void initTestCase(); void cleanupTestCase(); diff --git a/autotests/qztoolstest.h b/autotests/qztoolstest.h index 7caa0e2a6..479123f1f 100644 --- a/autotests/qztoolstest.h +++ b/autotests/qztoolstest.h @@ -24,7 +24,7 @@ class QzToolsTest : public QObject { Q_OBJECT -private slots: +private Q_SLOTS: void initTestCase(); void cleanupTestCase(); diff --git a/autotests/tabmodeltest.h b/autotests/tabmodeltest.h index 5bdc0ac81..33522297f 100644 --- a/autotests/tabmodeltest.h +++ b/autotests/tabmodeltest.h @@ -23,7 +23,7 @@ class TabModelTest : public QObject { Q_OBJECT -private slots: +private Q_SLOTS: void initTestCase(); void cleanupTestCase(); diff --git a/autotests/updatertest.h b/autotests/updatertest.h index 4d3d547f5..f59a051ee 100644 --- a/autotests/updatertest.h +++ b/autotests/updatertest.h @@ -24,7 +24,7 @@ class UpdaterTest : public QObject { Q_OBJECT -private slots: +private Q_SLOTS: void parseVersionsTest_data(); void parseVersionsTest(); diff --git a/autotests/webtabtest.h b/autotests/webtabtest.h index f63ec600d..64de77f63 100644 --- a/autotests/webtabtest.h +++ b/autotests/webtabtest.h @@ -23,7 +23,7 @@ class WebTabTest : public QObject { Q_OBJECT -private slots: +private Q_SLOTS: void initTestCase(); void cleanupTestCase(); void init(); diff --git a/autotests/webviewtest.h b/autotests/webviewtest.h index 5dd25743c..ceac2cf99 100644 --- a/autotests/webviewtest.h +++ b/autotests/webviewtest.h @@ -23,7 +23,7 @@ class WebViewTest : public QObject { Q_OBJECT -private slots: +private Q_SLOTS: void initTestCase(); void cleanupTestCase(); diff --git a/src/lib/3rdparty/fancytabwidget.h b/src/lib/3rdparty/fancytabwidget.h index 68e8ffbf7..ecd76fafa 100644 --- a/src/lib/3rdparty/fancytabwidget.h +++ b/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: diff --git a/src/lib/3rdparty/lineedit.h b/src/lib/3rdparty/lineedit.h index f47d4353c..fc8d35d09 100644 --- a/src/lib/3rdparty/lineedit.h +++ b/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: diff --git a/src/lib/3rdparty/squeezelabelv2.h b/src/lib/3rdparty/squeezelabelv2.h index ce5cbe320..78f4117cc 100644 --- a/src/lib/3rdparty/squeezelabelv2.h +++ b/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: diff --git a/src/lib/adblock/adblockaddsubscriptiondialog.h b/src/lib/adblock/adblockaddsubscriptiondialog.h index 7fbea8264..9d78d5799 100644 --- a/src/lib/adblock/adblockaddsubscriptiondialog.h +++ b/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: diff --git a/src/lib/adblock/adblockdialog.h b/src/lib/adblock/adblockdialog.h index d559a1e2f..448a43678 100644 --- a/src/lib/adblock/adblockdialog.h +++ b/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(); diff --git a/src/lib/adblock/adblockicon.h b/src/lib/adblock/adblockicon.h index b8c82651f..8b4b44637 100644 --- a/src/lib/adblock/adblockicon.h +++ b/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: diff --git a/src/lib/adblock/adblockmanager.h b/src/lib/adblock/adblockmanager.h index 7369dd9bb..f05e4750e 100644 --- a/src/lib/adblock/adblockmanager.h +++ b/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(); diff --git a/src/lib/adblock/adblockmatcher.h b/src/lib/adblock/adblockmatcher.h index 32892f969..0c7825300 100644 --- a/src/lib/adblock/adblockmatcher.h +++ b/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(); diff --git a/src/lib/adblock/adblocksubscription.h b/src/lib/adblock/adblocksubscription.h index 505e3d6d1..4e9e282a7 100644 --- a/src/lib/adblock/adblocksubscription.h +++ b/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: diff --git a/src/lib/adblock/adblocktreewidget.h b/src/lib/adblock/adblocktreewidget.h index aa0567147..35fb2d543 100644 --- a/src/lib/adblock/adblocktreewidget.h +++ b/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(); diff --git a/src/lib/adblock/adblockurlinterceptor.h b/src/lib/adblock/adblockurlinterceptor.h index eca82ef5a..9cc4b049f 100644 --- a/src/lib/adblock/adblockurlinterceptor.h +++ b/src/lib/adblock/adblockurlinterceptor.h @@ -34,7 +34,7 @@ public: void interceptRequest(QWebEngineUrlRequestInfo &request); -signals: +Q_SIGNALS: void requestBlocked(const AdBlockedRequest &request); private: diff --git a/src/lib/app/autosaver.h b/src/lib/app/autosaver.h index 01d82d14e..0e31b7a35 100644 --- a/src/lib/app/autosaver.h +++ b/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: diff --git a/src/lib/app/browserwindow.h b/src/lib/app/browserwindow.h index 02bf3fcff..8ec64d0d6 100644 --- a/src/lib/app/browserwindow.h +++ b/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(); diff --git a/src/lib/app/mainapplication.h b/src/lib/app/mainapplication.h index 41e67a818..c672ec67f 100644 --- a/src/lib/app/mainapplication.h +++ b/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(); diff --git a/src/lib/app/mainmenu.h b/src/lib/app/mainmenu.h index eed2e7b35..8fa5115f5 100644 --- a/src/lib/app/mainmenu.h +++ b/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(); diff --git a/src/lib/autofill/autofillicon.h b/src/lib/autofill/autofillicon.h index 96bf2e77a..160b51f76 100644 --- a/src/lib/autofill/autofillicon.h +++ b/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: diff --git a/src/lib/autofill/autofillnotification.h b/src/lib/autofill/autofillnotification.h index f519b17b0..ed94f2d32 100644 --- a/src/lib/autofill/autofillnotification.h +++ b/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(); diff --git a/src/lib/autofill/passwordbackends/databaseencryptedpasswordbackend.h b/src/lib/autofill/passwordbackends/databaseencryptedpasswordbackend.h index f375e8a6b..eae74ed94 100644 --- a/src/lib/autofill/passwordbackends/databaseencryptedpasswordbackend.h +++ b/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: diff --git a/src/lib/autofill/passwordmanager.h b/src/lib/autofill/passwordmanager.h index fab769484..467f8a6ba 100644 --- a/src/lib/autofill/passwordmanager.h +++ b/src/lib/autofill/passwordmanager.h @@ -95,7 +95,7 @@ private: QHash m_backends; -signals: +Q_SIGNALS: void passwordBackendChanged(); }; diff --git a/src/lib/bookmarks/bookmarks.h b/src/lib/bookmarks/bookmarks.h index 92db92857..24da3f296 100644 --- a/src/lib/bookmarks/bookmarks.h +++ b/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: diff --git a/src/lib/bookmarks/bookmarksexport/bookmarksexportdialog.h b/src/lib/bookmarks/bookmarksexport/bookmarksexportdialog.h index ef5650ce9..21d9a4447 100644 --- a/src/lib/bookmarks/bookmarksexport/bookmarksexportdialog.h +++ b/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(); diff --git a/src/lib/bookmarks/bookmarksicon.h b/src/lib/bookmarks/bookmarksicon.h index 2c4314bea..ee6715eb9 100644 --- a/src/lib/bookmarks/bookmarksicon.h +++ b/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(); diff --git a/src/lib/bookmarks/bookmarksimport/bookmarksimportdialog.h b/src/lib/bookmarks/bookmarksimport/bookmarksimportdialog.h index b41e778d7..502be35b4 100644 --- a/src/lib/bookmarks/bookmarksimport/bookmarksimportdialog.h +++ b/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(); diff --git a/src/lib/bookmarks/bookmarksmanager.h b/src/lib/bookmarks/bookmarksmanager.h index 3e173766b..69a787245 100644 --- a/src/lib/bookmarks/bookmarksmanager.h +++ b/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); diff --git a/src/lib/bookmarks/bookmarksmenu.h b/src/lib/bookmarks/bookmarksmenu.h index edb6c4124..bf52e7277 100644 --- a/src/lib/bookmarks/bookmarksmenu.h +++ b/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(); diff --git a/src/lib/bookmarks/bookmarksmodel.h b/src/lib/bookmarks/bookmarksmodel.h index e5bccc4ae..dc9dd01e1 100644 --- a/src/lib/bookmarks/bookmarksmodel.h +++ b/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: diff --git a/src/lib/bookmarks/bookmarkstoolbar.h b/src/lib/bookmarks/bookmarkstoolbar.h index fa34977dc..0381946b3 100644 --- a/src/lib/bookmarks/bookmarkstoolbar.h +++ b/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(); diff --git a/src/lib/bookmarks/bookmarkstoolbarbutton.h b/src/lib/bookmarks/bookmarkstoolbarbutton.h index 07a83c8cc..58d85223a 100644 --- a/src/lib/bookmarks/bookmarkstoolbarbutton.h +++ b/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(); diff --git a/src/lib/bookmarks/bookmarkstools.h b/src/lib/bookmarks/bookmarkstools.h index d0710d7f2..8f9ff3bf7 100644 --- a/src/lib/bookmarks/bookmarkstools.h +++ b/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: diff --git a/src/lib/bookmarks/bookmarkstreeview.h b/src/lib/bookmarks/bookmarkstreeview.h index 1dcf00cdb..109173f55 100644 --- a/src/lib/bookmarks/bookmarkstreeview.h +++ b/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 items); -private slots: +private Q_SLOTS: void indexExpanded(const QModelIndex &parent); void indexCollapsed(const QModelIndex &parent); diff --git a/src/lib/bookmarks/bookmarkswidget.h b/src/lib/bookmarks/bookmarkswidget.h index 6ee371824..aa319d8cf 100644 --- a/src/lib/bookmarks/bookmarkswidget.h +++ b/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(); diff --git a/src/lib/cookies/cookiejar.h b/src/lib/cookies/cookiejar.h index 5c8633ec3..27011f3cd 100644 --- a/src/lib/cookies/cookiejar.h +++ b/src/lib/cookies/cookiejar.h @@ -42,7 +42,7 @@ public: QVector getAllCookies() const; void deleteAllCookies(); -signals: +Q_SIGNALS: void cookieAdded(const QNetworkCookie &cookie); void cookieRemoved(const QNetworkCookie &cookie); diff --git a/src/lib/cookies/cookiemanager.h b/src/lib/cookies/cookiemanager.h index 914fe2e21..948ed18f5 100644 --- a/src/lib/cookies/cookiemanager.h +++ b/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(); diff --git a/src/lib/downloads/downloaditem.h b/src/lib/downloads/downloaditem.h index db7b4ba32..0fe2a7414 100644 --- a/src/lib/downloads/downloaditem.h +++ b/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); diff --git a/src/lib/downloads/downloadmanager.h b/src/lib/downloads/downloadmanager.h index 1ce3f8952..8a6dea979 100644 --- a/src/lib/downloads/downloadmanager.h +++ b/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(); diff --git a/src/lib/downloads/downloadoptionsdialog.h b/src/lib/downloads/downloadoptionsdialog.h index 208c8d900..3e2e47347 100644 --- a/src/lib/downloads/downloadoptionsdialog.h +++ b/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: diff --git a/src/lib/history/history.h b/src/lib/history/history.h index e6730ae71..b0d0171ac 100644 --- a/src/lib/history/history.h +++ b/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); diff --git a/src/lib/history/historymanager.h b/src/lib/history/historymanager.h index 524f4fa67..65284a476 100644 --- a/src/lib/history/historymanager.h +++ b/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); diff --git a/src/lib/history/historymenu.h b/src/lib/history/historymenu.h index fdb5a9a62..34af164d1 100644 --- a/src/lib/history/historymenu.h +++ b/src/lib/history/historymenu.h @@ -34,9 +34,7 @@ public: void setMainWindow(BrowserWindow* window); -signals: - -private slots: +private Q_SLOTS: void goBack(); void goForward(); void goHome(); diff --git a/src/lib/history/historymodel.h b/src/lib/history/historymodel.h index 1d663c38c..49b0662fb 100644 --- a/src/lib/history/historymodel.h +++ b/src/lib/history/historymodel.h @@ -67,9 +67,7 @@ public: void removeTopLevelIndexes(const QList &indexes); -signals: - -private slots: +private Q_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: diff --git a/src/lib/history/historytreeview.h b/src/lib/history/historytreeview.h index 47fd58364..18e78e0f0 100644 --- a/src/lib/history/historytreeview.h +++ b/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(); diff --git a/src/lib/navigation/completer/locationcompleter.h b/src/lib/navigation/completer/locationcompleter.h index 9ba1b6a56..d33d495be 100644 --- a/src/lib/navigation/completer/locationcompleter.h +++ b/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); diff --git a/src/lib/navigation/completer/locationcompleterrefreshjob.h b/src/lib/navigation/completer/locationcompleterrefreshjob.h index 650be0362..81da45166 100644 --- a/src/lib/navigation/completer/locationcompleterrefreshjob.h +++ b/src/lib/navigation/completer/locationcompleterrefreshjob.h @@ -39,10 +39,10 @@ public: QList completions() const; QString domainCompletion() const; -signals: +Q_SIGNALS: void finished(); -private slots: +private Q_SLOTS: void slotFinished(); void jobCancelled(); diff --git a/src/lib/navigation/completer/locationcompleterview.h b/src/lib/navigation/completer/locationcompleterview.h index e69c2ba81..05be6f14d 100644 --- a/src/lib/navigation/completer/locationcompleterview.h +++ b/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: diff --git a/src/lib/navigation/locationbar.h b/src/lib/navigation/locationbar.h index ac44d097b..e130600a5 100644 --- a/src/lib/navigation/locationbar.h +++ b/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(); diff --git a/src/lib/navigation/navigationbar.h b/src/lib/navigation/navigationbar.h index f1719634d..e14789196 100644 --- a/src/lib/navigation/navigationbar.h +++ b/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(); diff --git a/src/lib/navigation/navigationbartoolbutton.h b/src/lib/navigation/navigationbartoolbutton.h index 68ab555e3..c77754853 100644 --- a/src/lib/navigation/navigationbartoolbutton.h +++ b/src/lib/navigation/navigationbartoolbutton.h @@ -33,7 +33,7 @@ public: void updateVisibility(); -signals: +Q_SIGNALS: void visibilityChangeRequested(); private: diff --git a/src/lib/navigation/reloadstopbutton.h b/src/lib/navigation/reloadstopbutton.h index f91556f2b..4dca9a2ad 100644 --- a/src/lib/navigation/reloadstopbutton.h +++ b/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(); diff --git a/src/lib/navigation/siteicon.h b/src/lib/navigation/siteicon.h index 6e398665f..9b7b68d18 100644 --- a/src/lib/navigation/siteicon.h +++ b/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(); diff --git a/src/lib/navigation/websearchbar.h b/src/lib/navigation/websearchbar.h index 04c9972ec..342a4c715 100644 --- a/src/lib/navigation/websearchbar.h +++ b/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(); diff --git a/src/lib/network/schemehandlers/falkonschemehandler.h b/src/lib/network/schemehandlers/falkonschemehandler.h index 2ca4131b2..2c071a737 100644 --- a/src/lib/network/schemehandlers/falkonschemehandler.h +++ b/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: diff --git a/src/lib/network/sslerrordialog.h b/src/lib/network/sslerrordialog.h index a6bdde247..d36faaf91 100644 --- a/src/lib/network/sslerrordialog.h +++ b/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: diff --git a/src/lib/notifications/desktopnotificationsfactory.h b/src/lib/notifications/desktopnotificationsfactory.h index fbe28e8d9..e843683b3 100644 --- a/src/lib/notifications/desktopnotificationsfactory.h +++ b/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); diff --git a/src/lib/opensearch/editsearchengine.h b/src/lib/opensearch/editsearchengine.h index df46cf5fc..f4f58b201 100644 --- a/src/lib/opensearch/editsearchengine.h +++ b/src/lib/opensearch/editsearchengine.h @@ -47,11 +47,9 @@ public: void hideIconLabels(); -signals: +public Q_SLOTS: -public slots: - -private slots: +private Q_SLOTS: void chooseIcon(); private: diff --git a/src/lib/opensearch/opensearchengine.h b/src/lib/opensearch/opensearchengine.h index e32689c31..83d24ef16 100644 --- a/src/lib/opensearch/opensearchengine.h +++ b/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(); diff --git a/src/lib/opensearch/searchenginesdialog.h b/src/lib/opensearch/searchenginesdialog.h index 70a197f0e..0a4bc7bc6 100644 --- a/src/lib/opensearch/searchenginesdialog.h +++ b/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(); diff --git a/src/lib/opensearch/searchenginesmanager.h b/src/lib/opensearch/searchenginesmanager.h index 1229fa9b7..f4491e655 100644 --- a/src/lib/opensearch/searchenginesmanager.h +++ b/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(); diff --git a/src/lib/other/aboutdialog.h b/src/lib/other/aboutdialog.h index a7411352b..a881a69f1 100644 --- a/src/lib/other/aboutdialog.h +++ b/src/lib/other/aboutdialog.h @@ -35,7 +35,7 @@ public: explicit AboutDialog(QWidget* parent = 0); ~AboutDialog(); -private slots: +private Q_SLOTS: void showAbout(); private: diff --git a/src/lib/other/browsinglibrary.h b/src/lib/other/browsinglibrary.h index 8ced5bc90..e0ca84232 100644 --- a/src/lib/other/browsinglibrary.h +++ b/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(); diff --git a/src/lib/other/clearprivatedata.h b/src/lib/other/clearprivatedata.h index daf2cb730..8388d87f0 100644 --- a/src/lib/other/clearprivatedata.h +++ b/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(); diff --git a/src/lib/other/iconchooser.h b/src/lib/other/iconchooser.h index 463f5d397..a11f42dd9 100644 --- a/src/lib/other/iconchooser.h +++ b/src/lib/other/iconchooser.h @@ -40,7 +40,7 @@ public: QIcon getIcon(); -private slots: +private Q_SLOTS: void chooseFile(); void searchIcon(const QString &string); diff --git a/src/lib/other/siteinfo.h b/src/lib/other/siteinfo.h index 0a4b50173..2a90109d8 100644 --- a/src/lib/other/siteinfo.h +++ b/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(); diff --git a/src/lib/other/updater.h b/src/lib/other/updater.h index 0e7a05cc7..c91b7f1ca 100644 --- a/src/lib/other/updater.h +++ b/src/lib/other/updater.h @@ -51,7 +51,7 @@ public: QString versionString() const; }; -private slots: +private Q_SLOTS: void downCompleted(); void start(); void downloadNewVersion(); diff --git a/src/lib/plugins/pluginproxy.h b/src/lib/plugins/pluginproxy.h index 2002e8f6b..a7ae9a874 100644 --- a/src/lib/plugins/pluginproxy.h +++ b/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: diff --git a/src/lib/plugins/plugins.h b/src/lib/plugins/plugins.h index 8db1508f1..c07a46aad 100644 --- a/src/lib/plugins/plugins.h +++ b/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 m_loadedPlugins; -signals: +Q_SIGNALS: void pluginUnloaded(PluginInterface* plugin); private: diff --git a/src/lib/plugins/speeddial.h b/src/lib/plugins/speeddial.h index 95fc2e126..36e2449ff 100644 --- a/src/lib/plugins/speeddial.h +++ b/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(); diff --git a/src/lib/popupwindow/popuplocationbar.h b/src/lib/popupwindow/popuplocationbar.h index 1f122fe82..41c2a29f7 100644 --- a/src/lib/popupwindow/popuplocationbar.h +++ b/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(); diff --git a/src/lib/popupwindow/popupwebview.h b/src/lib/popupwindow/popupwebview.h index f70f61c54..87bd62e4f 100644 --- a/src/lib/popupwindow/popupwebview.h +++ b/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: diff --git a/src/lib/popupwindow/popupwindow.h b/src/lib/popupwindow/popupwindow.h index 671bda11d..3cb05d72d 100644 --- a/src/lib/popupwindow/popupwindow.h +++ b/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); diff --git a/src/lib/preferences/acceptlanguage.h b/src/lib/preferences/acceptlanguage.h index 16182e0ae..27e2ae818 100644 --- a/src/lib/preferences/acceptlanguage.h +++ b/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(); diff --git a/src/lib/preferences/autofillmanager.h b/src/lib/preferences/autofillmanager.h index 3516a114e..02b96da0f 100644 --- a/src/lib/preferences/autofillmanager.h +++ b/src/lib/preferences/autofillmanager.h @@ -39,7 +39,7 @@ public: void showExceptions(); -private slots: +private Q_SLOTS: void loadPasswords(); void changePasswordBackend(); void showBackendOptions(); diff --git a/src/lib/preferences/jsoptions.h b/src/lib/preferences/jsoptions.h index bf0618c43..8f715a8d3 100644 --- a/src/lib/preferences/jsoptions.h +++ b/src/lib/preferences/jsoptions.h @@ -36,7 +36,7 @@ public: explicit JsOptions(QWidget* parent = 0); ~JsOptions(); -public slots: +public Q_SLOTS: void accept(); private: diff --git a/src/lib/preferences/pluginsmanager.h b/src/lib/preferences/pluginsmanager.h index 2a9a37eee..789361d41 100644 --- a/src/lib/preferences/pluginsmanager.h +++ b/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); diff --git a/src/lib/preferences/preferences.h b/src/lib/preferences/preferences.h index c77d037d0..a183488ac 100644 --- a/src/lib/preferences/preferences.h +++ b/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); diff --git a/src/lib/preferences/thememanager.h b/src/lib/preferences/thememanager.h index 7e4247c10..a483612e9 100644 --- a/src/lib/preferences/thememanager.h +++ b/src/lib/preferences/thememanager.h @@ -42,7 +42,7 @@ public: void save(); -private slots: +private Q_SLOTS: void currentChanged(); void showLicense(); diff --git a/src/lib/preferences/useragentdialog.h b/src/lib/preferences/useragentdialog.h index aa0838a38..9968e15cf 100644 --- a/src/lib/preferences/useragentdialog.h +++ b/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(); diff --git a/src/lib/session/recoveryjsobject.h b/src/lib/session/recoveryjsobject.h index 3567125a0..89c038124 100644 --- a/src/lib/session/recoveryjsobject.h +++ b/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); diff --git a/src/lib/session/sessionmanager.h b/src/lib/session/sessionmanager.h index bf6179c56..5652e7af8 100644 --- a/src/lib/session/sessionmanager.h +++ b/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); diff --git a/src/lib/sidebar/bookmarkssidebar.h b/src/lib/sidebar/bookmarkssidebar.h index c4a6ed797..3d72ff7d8 100644 --- a/src/lib/sidebar/bookmarkssidebar.h +++ b/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); diff --git a/src/lib/sidebar/historysidebar.h b/src/lib/sidebar/historysidebar.h index c6f63d280..369da57ea 100644 --- a/src/lib/sidebar/historysidebar.h +++ b/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); diff --git a/src/lib/sidebar/sidebar.h b/src/lib/sidebar/sidebar.h index 8ed603d5a..f9c0d048a 100644 --- a/src/lib/sidebar/sidebar.h +++ b/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: diff --git a/src/lib/tabwidget/combotabbar.h b/src/lib/tabwidget/combotabbar.h index 1018aa793..cf9fc0cfb 100644 --- a/src/lib/tabwidget/combotabbar.h +++ b/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(); diff --git a/src/lib/tabwidget/tabbar.h b/src/lib/tabwidget/tabbar.h index 73fe3c702..a55f2665b 100644 --- a/src/lib/tabwidget/tabbar.h +++ b/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(); diff --git a/src/lib/tabwidget/tabcontextmenu.h b/src/lib/tabwidget/tabcontextmenu.h index 79683e491..8ea0018e0 100644 --- a/src/lib/tabwidget/tabcontextmenu.h +++ b/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); } diff --git a/src/lib/tabwidget/tabicon.h b/src/lib/tabwidget/tabicon.h index f776059c0..5dce255ec 100644 --- a/src/lib/tabwidget/tabicon.h +++ b/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(); diff --git a/src/lib/tabwidget/tabstackedwidget.h b/src/lib/tabwidget/tabstackedwidget.h index e0071df37..e42d3c325 100644 --- a/src/lib/tabwidget/tabstackedwidget.h +++ b/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); diff --git a/src/lib/tabwidget/tabwidget.h b/src/lib/tabwidget/tabwidget.h index e90e88960..fb8772a48 100644 --- a/src/lib/tabwidget/tabwidget.h +++ b/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(); diff --git a/src/lib/tools/abstractbuttoninterface.h b/src/lib/tools/abstractbuttoninterface.h index b438872d1..a8cbcffa7 100644 --- a/src/lib/tools/abstractbuttoninterface.h +++ b/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); diff --git a/src/lib/tools/animatedwidget.h b/src/lib/tools/animatedwidget.h index dfab5c9e0..f5142600b 100644 --- a/src/lib/tools/animatedwidget.h +++ b/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: diff --git a/src/lib/tools/buttonbox.h b/src/lib/tools/buttonbox.h index ffe53a3f7..37f7ab2e9 100644 --- a/src/lib/tools/buttonbox.h +++ b/src/lib/tools/buttonbox.h @@ -31,11 +31,7 @@ public: explicit ButtonBox(QWidget* parent = 0); ButtonRole clickedButtonRole(); -signals: - -public slots: - -private slots: +private Q_SLOTS: void buttonClicked(QAbstractButton* button); private: diff --git a/src/lib/tools/buttonwithmenu.h b/src/lib/tools/buttonwithmenu.h index 612cbf2cb..14c25d4e0 100644 --- a/src/lib/tools/buttonwithmenu.h +++ b/src/lib/tools/buttonwithmenu.h @@ -66,18 +66,18 @@ public: QVector 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(); diff --git a/src/lib/tools/clickablelabel.h b/src/lib/tools/clickablelabel.h index 97e480319..b2434c376 100644 --- a/src/lib/tools/clickablelabel.h +++ b/src/lib/tools/clickablelabel.h @@ -43,7 +43,7 @@ public: QIcon fallbackIcon() const; void setFallbackIcon(const QIcon &fallbackIcon); -signals: +Q_SIGNALS: void clicked(QPoint); void middleClicked(QPoint); diff --git a/src/lib/tools/closedwindowsmanager.h b/src/lib/tools/closedwindowsmanager.h index b76571ec4..4f57184dc 100644 --- a/src/lib/tools/closedwindowsmanager.h +++ b/src/lib/tools/closedwindowsmanager.h @@ -53,7 +53,7 @@ public: QByteArray saveState() const; void restoreState(const QByteArray &state); -public slots: +public Q_SLOTS: void restoreClosedWindow(); void restoreAllClosedWindows(); void clearClosedWindows(); diff --git a/src/lib/tools/delayedfilewatcher.h b/src/lib/tools/delayedfilewatcher.h index 499fba420..8d421f091 100644 --- a/src/lib/tools/delayedfilewatcher.h +++ b/src/lib/tools/delayedfilewatcher.h @@ -32,11 +32,11 @@ public: explicit DelayedFileWatcher(QObject* parent = 0); explicit DelayedFileWatcher(const QStringList &paths, QObject* parent = 0); -signals: +Q_SIGNALS: void delayedDirectoryChanged(const QString &path); void delayedFileChanged(const QString &path); -private slots: +private Q_SLOTS: void slotDirectoryChanged(const QString &path); void slotFileChanged(const QString &path); diff --git a/src/lib/tools/emptynetworkreply.h b/src/lib/tools/emptynetworkreply.h index 923e1e29b..dc35391f3 100644 --- a/src/lib/tools/emptynetworkreply.h +++ b/src/lib/tools/emptynetworkreply.h @@ -28,7 +28,7 @@ class FALKON_EXPORT EmptyNetworkReply : public QNetworkReply public: explicit EmptyNetworkReply(QObject* parent = 0); -private slots: +private Q_SLOTS: void delayedFinish(); protected: diff --git a/src/lib/tools/enhancedmenu.h b/src/lib/tools/enhancedmenu.h index c4556650e..d079c612f 100644 --- a/src/lib/tools/enhancedmenu.h +++ b/src/lib/tools/enhancedmenu.h @@ -36,10 +36,10 @@ public: bool closeOnMiddleClick() const; void setCloseOnMiddleClick(bool close); -signals: +Q_SIGNALS: void menuMiddleClicked(Menu*); -public slots: +public Q_SLOTS: private: void mouseReleaseEvent(QMouseEvent* e); @@ -58,11 +58,11 @@ public: explicit Action(const QString &text, QObject* parent = 0); explicit Action(const QIcon &icon, const QString &text, QObject* parent = 0); -signals: +Q_SIGNALS: void ctrlTriggered(); void shiftTriggered(); -public slots: +public Q_SLOTS: void emitCtrlTriggered(); void emitShiftTriggered(); diff --git a/src/lib/tools/focusselectlineedit.h b/src/lib/tools/focusselectlineedit.h index f50abe32a..b00b5d2b1 100644 --- a/src/lib/tools/focusselectlineedit.h +++ b/src/lib/tools/focusselectlineedit.h @@ -28,7 +28,7 @@ class FALKON_EXPORT FocusSelectLineEdit : public QLineEdit public: explicit FocusSelectLineEdit(QWidget* parent = 0); -public slots: +public Q_SLOTS: void setFocus(); protected: diff --git a/src/lib/tools/headerview.h b/src/lib/tools/headerview.h index 691a19dfd..87ec2aa12 100644 --- a/src/lib/tools/headerview.h +++ b/src/lib/tools/headerview.h @@ -35,7 +35,7 @@ public: bool restoreState(const QByteArray &state); -private slots: +private Q_SLOTS: void toggleSectionVisibility(); private: diff --git a/src/lib/tools/html5permissions/html5permissionsdialog.h b/src/lib/tools/html5permissions/html5permissionsdialog.h index 82bae0c7f..b3d8c8f71 100644 --- a/src/lib/tools/html5permissions/html5permissionsdialog.h +++ b/src/lib/tools/html5permissions/html5permissionsdialog.h @@ -37,7 +37,7 @@ public: void showFeaturePermissions(QWebEnginePage::Feature feature); -private slots: +private Q_SLOTS: void removeEntry(); void featureIndexChanged(); diff --git a/src/lib/tools/html5permissions/html5permissionsnotification.h b/src/lib/tools/html5permissions/html5permissionsnotification.h index 07be76a59..274f8a689 100644 --- a/src/lib/tools/html5permissions/html5permissionsnotification.h +++ b/src/lib/tools/html5permissions/html5permissionsnotification.h @@ -38,7 +38,7 @@ public: explicit HTML5PermissionsNotification(const QUrl &origin, QWebEnginePage* page, const QWebEnginePage::Feature &feature); ~HTML5PermissionsNotification(); -private slots: +private Q_SLOTS: void grantPermissions(); void denyPermissions(); diff --git a/src/lib/tools/iconprovider.h b/src/lib/tools/iconprovider.h index aa1a47f70..6731660e3 100644 --- a/src/lib/tools/iconprovider.h +++ b/src/lib/tools/iconprovider.h @@ -68,7 +68,7 @@ public: static IconProvider* instance(); -public slots: +public Q_SLOTS: void saveIconsToDatabase(); void clearOldIconsInDatabase(); diff --git a/src/lib/tools/menubar.h b/src/lib/tools/menubar.h index aa86d38cb..2843b8bcb 100644 --- a/src/lib/tools/menubar.h +++ b/src/lib/tools/menubar.h @@ -30,7 +30,7 @@ class FALKON_EXPORT MenuBar : public QMenuBar public: explicit MenuBar(BrowserWindow* parent); -private slots: +private Q_SLOTS: void contextMenuRequested(const QPoint &pos); private: diff --git a/src/lib/tools/pagethumbnailer.h b/src/lib/tools/pagethumbnailer.h index ed7eaf514..39dee4da5 100644 --- a/src/lib/tools/pagethumbnailer.h +++ b/src/lib/tools/pagethumbnailer.h @@ -46,10 +46,10 @@ public: void start(); -signals: +Q_SIGNALS: void thumbnailCreated(const QPixmap &); -public slots: +public Q_SLOTS: QString afterLoadScript() const; void createThumbnail(bool status); diff --git a/src/lib/tools/progressbar.h b/src/lib/tools/progressbar.h index e8260a438..6bc29c424 100644 --- a/src/lib/tools/progressbar.h +++ b/src/lib/tools/progressbar.h @@ -30,9 +30,7 @@ class FALKON_EXPORT ProgressBar : public QWidget public: explicit ProgressBar(QWidget* parent = 0); -signals: - -public slots: +public Q_SLOTS: void setValue(int value); protected: diff --git a/src/lib/tools/toolbutton.h b/src/lib/tools/toolbutton.h index 844b63d52..6ab017699 100644 --- a/src/lib/tools/toolbutton.h +++ b/src/lib/tools/toolbutton.h @@ -73,7 +73,7 @@ public: bool toolbarButtonLook() const; void setToolbarButtonLook(bool enable); -signals: +Q_SIGNALS: void middleMouseClicked(); void controlClicked(); void doubleClicked(); @@ -82,7 +82,7 @@ signals: void aboutToShowMenu(); void aboutToHideMenu(); -private slots: +private Q_SLOTS: void menuAboutToHide(); void showMenu(); diff --git a/src/lib/tools/treewidget.h b/src/lib/tools/treewidget.h index f046a78d2..1d2cfadbc 100644 --- a/src/lib/tools/treewidget.h +++ b/src/lib/tools/treewidget.h @@ -45,15 +45,15 @@ public: void deleteItem(QTreeWidgetItem* item); void deleteItems(const QList &items); -signals: +Q_SIGNALS: void itemControlClicked(QTreeWidgetItem* item); void itemMiddleButtonClicked(QTreeWidgetItem* item); -public slots: +public Q_SLOTS: void filterString(const QString &string); void clear(); -private slots: +private Q_SLOTS: void sheduleRefresh(); private: diff --git a/src/lib/tools/widget.h b/src/lib/tools/widget.h index 4b65b0ef3..defe467d4 100644 --- a/src/lib/tools/widget.h +++ b/src/lib/tools/widget.h @@ -29,9 +29,7 @@ class FALKON_EXPORT Widget : public QWidget public: explicit Widget(QWidget* parent = 0); -signals: - -public slots: +public Q_SLOTS: void slotResize(const QSize &size); }; @@ -42,9 +40,7 @@ class FALKON_EXPORT ResizableFrame : public QFrame public: explicit ResizableFrame(QWidget* parent = 0); -signals: - -public slots: +public Q_SLOTS: void slotResize(const QSize &size); }; diff --git a/src/lib/webengine/javascript/autofilljsobject.h b/src/lib/webengine/javascript/autofilljsobject.h index 4143d3e05..86c17a5e4 100644 --- a/src/lib/webengine/javascript/autofilljsobject.h +++ b/src/lib/webengine/javascript/autofilljsobject.h @@ -29,7 +29,7 @@ class AutoFillJsObject : public QObject public: explicit AutoFillJsObject(ExternalJsObject *parent); -public slots: +public Q_SLOTS: void formSubmitted(const QString &frameUrl, const QString &username, const QString &password, const QByteArray &data); private: diff --git a/src/lib/webengine/webinspector.h b/src/lib/webengine/webinspector.h index 07e0ffb67..fdc5836c0 100644 --- a/src/lib/webengine/webinspector.h +++ b/src/lib/webengine/webinspector.h @@ -40,7 +40,7 @@ public: static void registerView(QWebEngineView *view); static void unregisterView(QWebEngineView *view); -private slots: +private Q_SLOTS: void loadFinished(); private: diff --git a/src/lib/webengine/webpage.h b/src/lib/webengine/webpage.h index 63d7bcc0e..c11c6ccd2 100644 --- a/src/lib/webengine/webpage.h +++ b/src/lib/webengine/webpage.h @@ -67,16 +67,16 @@ public: bool isLoading() const; -signals: +Q_SIGNALS: void privacyChanged(bool status); void printRequested(); void navigationRequestAccepted(const QUrl &url, NavigationType type, bool isMainFrame); -protected slots: +protected Q_SLOTS: void progress(int prog); void finished(); -private slots: +private Q_SLOTS: void urlChanged(const QUrl &url); void watchedFileChanged(const QString &file); void windowCloseRequested(); diff --git a/src/lib/webengine/webview.h b/src/lib/webengine/webview.h index 2cf9ee553..6e7e76bb8 100644 --- a/src/lib/webengine/webview.h +++ b/src/lib/webengine/webview.h @@ -72,7 +72,7 @@ public: static bool forceContextMenuOnMouseRelease(); static void setForceContextMenuOnMouseRelease(bool force); -signals: +Q_SIGNALS: void pageChanged(WebPage *page); void focusChanged(bool); void viewportResized(QSize); @@ -81,7 +81,7 @@ signals: void zoomLevelChanged(int); void backgroundActivityChanged(bool); -public slots: +public Q_SLOTS: void zoomIn(); void zoomOut(); void zoomReset(); @@ -111,7 +111,7 @@ public slots: virtual bool isFullScreen() = 0; virtual void requestFullScreen(bool enable) = 0; -protected slots: +protected Q_SLOTS: void slotLoadStarted(); void slotLoadProgress(int progress); void slotLoadFinished(bool ok); @@ -166,7 +166,7 @@ protected: void checkForForm(QAction *action, const QPoint &pos); void createSearchEngine(); -private slots: +private Q_SLOTS: void addSpeedDial(); void configureSpeedDial(); void reloadAllSpeedDials(); diff --git a/src/lib/webtab/searchtoolbar.h b/src/lib/webtab/searchtoolbar.h index b7cd9fbcd..06a60ea42 100644 --- a/src/lib/webtab/searchtoolbar.h +++ b/src/lib/webtab/searchtoolbar.h @@ -44,9 +44,7 @@ public: void focusSearchLine(); bool eventFilter(QObject* obj, QEvent* event); -signals: - -public slots: +public Q_SLOTS: void searchText(const QString &text); void updateFindFlags(); void caseSensitivityChanged(); diff --git a/src/lib/webtab/tabbedwebview.h b/src/lib/webtab/tabbedwebview.h index 0739e8e3a..4461fe18c 100644 --- a/src/lib/webtab/tabbedwebview.h +++ b/src/lib/webtab/tabbedwebview.h @@ -55,15 +55,15 @@ public: bool isFullScreen() Q_DECL_OVERRIDE; void requestFullScreen(bool enable) Q_DECL_OVERRIDE; -signals: +Q_SIGNALS: void wantsCloseTab(int); void ipChanged(QString); -public slots: +public Q_SLOTS: void setAsCurrentTab(); void userLoadAction(const LoadRequest &req); -private slots: +private Q_SLOTS: void slotLoadStarted(); void slotLoadFinished(); void slotLoadProgress(int prog); diff --git a/src/lib/webtab/webtab.h b/src/lib/webtab/webtab.h index c53d17527..5c83b9d00 100644 --- a/src/lib/webtab/webtab.h +++ b/src/lib/webtab/webtab.h @@ -133,11 +133,11 @@ public: static AddChildBehavior addChildBehavior(); static void setAddChildBehavior(AddChildBehavior behavior); -private slots: +private Q_SLOTS: void showNotification(QWidget* notif); void loadFinished(); -signals: +Q_SIGNALS: void titleChanged(const QString &title); void iconChanged(const QIcon &icon); void pinnedChanged(bool pinned); diff --git a/src/plugins/AutoScroll/autoscrollsettings.h b/src/plugins/AutoScroll/autoscrollsettings.h index 369d54624..31b087ac7 100644 --- a/src/plugins/AutoScroll/autoscrollsettings.h +++ b/src/plugins/AutoScroll/autoscrollsettings.h @@ -35,7 +35,7 @@ public: explicit AutoScrollSettings(AutoScroller* scroller, QWidget* parent = 0); ~AutoScrollSettings(); -private slots: +private Q_SLOTS: void accepted(); private: diff --git a/src/plugins/AutoScroll/framescroller.h b/src/plugins/AutoScroll/framescroller.h index b06f7e614..165924de6 100644 --- a/src/plugins/AutoScroll/framescroller.h +++ b/src/plugins/AutoScroll/framescroller.h @@ -39,7 +39,7 @@ public: void startScrolling(int lengthX, int lengthY); void stopScrolling(); -private slots: +private Q_SLOTS: void scrollStep(); private: diff --git a/src/plugins/FlashCookieManager/fcm_dialog.h b/src/plugins/FlashCookieManager/fcm_dialog.h index 03fa089fc..5400290c6 100644 --- a/src/plugins/FlashCookieManager/fcm_dialog.h +++ b/src/plugins/FlashCookieManager/fcm_dialog.h @@ -45,7 +45,7 @@ public: void refreshView(bool forceReload = false); void showPage(int index); -private slots: +private Q_SLOTS: void currentItemChanged(QTreeWidgetItem* current, QTreeWidgetItem* parent); void removeCookie(); void removeAll(); diff --git a/src/plugins/FlashCookieManager/fcm_plugin.h b/src/plugins/FlashCookieManager/fcm_plugin.h index 2675567cf..78c606f3d 100644 --- a/src/plugins/FlashCookieManager/fcm_plugin.h +++ b/src/plugins/FlashCookieManager/fcm_plugin.h @@ -71,7 +71,7 @@ public: void removeCookie(const FlashCookie &flashCookie); -private slots: +private Q_SLOTS: void autoRefresh(); void showFlashCookieManager(); void mainWindowCreated(BrowserWindow* window); diff --git a/src/plugins/GreaseMonkey/gm_addscriptdialog.h b/src/plugins/GreaseMonkey/gm_addscriptdialog.h index 0ad8c07a3..2fad0893d 100644 --- a/src/plugins/GreaseMonkey/gm_addscriptdialog.h +++ b/src/plugins/GreaseMonkey/gm_addscriptdialog.h @@ -36,7 +36,7 @@ public: explicit GM_AddScriptDialog(GM_Manager *manager, GM_Script *script, QWidget *parent = Q_NULLPTR); ~GM_AddScriptDialog(); -private slots: +private Q_SLOTS: void showSource(); void accepted(); diff --git a/src/plugins/GreaseMonkey/gm_downloader.h b/src/plugins/GreaseMonkey/gm_downloader.h index 8a656e104..5c424427a 100644 --- a/src/plugins/GreaseMonkey/gm_downloader.h +++ b/src/plugins/GreaseMonkey/gm_downloader.h @@ -39,11 +39,11 @@ public: void updateScript(const QString& fileName); -signals: +Q_SIGNALS: void finished(const QString& fileName); void error(); -private slots: +private Q_SLOTS: void scriptDownloaded(); void requireDownloaded(); diff --git a/src/plugins/GreaseMonkey/gm_icon.h b/src/plugins/GreaseMonkey/gm_icon.h index 2017800cd..c3d768f9f 100644 --- a/src/plugins/GreaseMonkey/gm_icon.h +++ b/src/plugins/GreaseMonkey/gm_icon.h @@ -32,7 +32,7 @@ public: QString id() const override; QString name() const override; -private slots: +private Q_SLOTS: void openSettings(); private: diff --git a/src/plugins/GreaseMonkey/gm_jsobject.h b/src/plugins/GreaseMonkey/gm_jsobject.h index 255a08b4a..3d207df0c 100644 --- a/src/plugins/GreaseMonkey/gm_jsobject.h +++ b/src/plugins/GreaseMonkey/gm_jsobject.h @@ -32,7 +32,7 @@ public: void setSettingsFile(const QString &name); -public slots: +public Q_SLOTS: QString getValue(const QString &nspace, const QString &name, const QString &dValue); bool setValue(const QString &nspace, const QString &name, const QString &value); bool deleteValue(const QString &nspace, const QString &name); diff --git a/src/plugins/GreaseMonkey/gm_manager.h b/src/plugins/GreaseMonkey/gm_manager.h index cae1bc991..176db815c 100644 --- a/src/plugins/GreaseMonkey/gm_manager.h +++ b/src/plugins/GreaseMonkey/gm_manager.h @@ -63,14 +63,14 @@ public: static bool canRunOnScheme(const QString &scheme); -signals: +Q_SIGNALS: void scriptsChanged(); -public slots: +public Q_SLOTS: void mainWindowCreated(BrowserWindow* window); void mainWindowDeleted(BrowserWindow* window); -private slots: +private Q_SLOTS: void load(); void scriptChanged(); diff --git a/src/plugins/GreaseMonkey/gm_notification.h b/src/plugins/GreaseMonkey/gm_notification.h index c030e4a2f..ef7d68154 100644 --- a/src/plugins/GreaseMonkey/gm_notification.h +++ b/src/plugins/GreaseMonkey/gm_notification.h @@ -36,7 +36,7 @@ public: explicit GM_Notification(GM_Manager* manager, const QString &tmpfileName, const QString &fileName); ~GM_Notification(); -private slots: +private Q_SLOTS: void installScript(); private: diff --git a/src/plugins/GreaseMonkey/gm_script.h b/src/plugins/GreaseMonkey/gm_script.h index 1061cd4df..ea4a12be0 100644 --- a/src/plugins/GreaseMonkey/gm_script.h +++ b/src/plugins/GreaseMonkey/gm_script.h @@ -68,11 +68,11 @@ public: bool isUpdating(); void updateScript(); -signals: +Q_SIGNALS: void scriptChanged(); void updatingChanged(bool updating); -private slots: +private Q_SLOTS: void watchedFileChanged(const QString &file); private: diff --git a/src/plugins/GreaseMonkey/settings/gm_settings.h b/src/plugins/GreaseMonkey/settings/gm_settings.h index e10784522..c20070541 100644 --- a/src/plugins/GreaseMonkey/settings/gm_settings.h +++ b/src/plugins/GreaseMonkey/settings/gm_settings.h @@ -38,7 +38,7 @@ public: explicit GM_Settings(GM_Manager* manager, QWidget* parent = 0); ~GM_Settings(); -private slots: +private Q_SLOTS: void showItemInfo(QListWidgetItem* item); void updateItem(QListWidgetItem* item); void removeItem(QListWidgetItem* item); diff --git a/src/plugins/GreaseMonkey/settings/gm_settingslistwidget.h b/src/plugins/GreaseMonkey/settings/gm_settingslistwidget.h index ae3e87dce..0c38b2ac4 100644 --- a/src/plugins/GreaseMonkey/settings/gm_settingslistwidget.h +++ b/src/plugins/GreaseMonkey/settings/gm_settingslistwidget.h @@ -28,11 +28,11 @@ class GM_SettingsListWidget : public QListWidget public: explicit GM_SettingsListWidget(QWidget* parent = 0); -signals: +Q_SIGNALS: void removeItemRequested(QListWidgetItem* item); void updateItemRequested(QListWidgetItem* item); -public slots: +public Q_SLOTS: private: bool containsRemoveIcon(const QPoint &pos) const; diff --git a/src/plugins/GreaseMonkey/settings/gm_settingsscriptinfo.h b/src/plugins/GreaseMonkey/settings/gm_settingsscriptinfo.h index e22707980..460cf5480 100644 --- a/src/plugins/GreaseMonkey/settings/gm_settingsscriptinfo.h +++ b/src/plugins/GreaseMonkey/settings/gm_settingsscriptinfo.h @@ -35,7 +35,7 @@ public: explicit GM_SettingsScriptInfo(GM_Script* script, QWidget* parent = 0); ~GM_SettingsScriptInfo(); -private slots: +private Q_SLOTS: void editInTextEditor(); void loadScript(); diff --git a/src/plugins/ImageFinder/imagefindersettings.h b/src/plugins/ImageFinder/imagefindersettings.h index 7b8b3ab95..cbdc77d18 100644 --- a/src/plugins/ImageFinder/imagefindersettings.h +++ b/src/plugins/ImageFinder/imagefindersettings.h @@ -36,7 +36,7 @@ public: ~ImageFinderSettings(); -private slots: +private Q_SLOTS: void accepted(); private: diff --git a/src/plugins/MouseGestures/3rdparty/QjtMouseGesture.h b/src/plugins/MouseGestures/3rdparty/QjtMouseGesture.h index 41ade6b06..c7819f4dd 100644 --- a/src/plugins/MouseGestures/3rdparty/QjtMouseGesture.h +++ b/src/plugins/MouseGestures/3rdparty/QjtMouseGesture.h @@ -97,7 +97,7 @@ public: const DirectionList directions() const; -signals: +Q_SIGNALS: void gestured(); private: diff --git a/src/plugins/MouseGestures/mousegestures.h b/src/plugins/MouseGestures/mousegestures.h index ea1b3c088..e4874a7b3 100644 --- a/src/plugins/MouseGestures/mousegestures.h +++ b/src/plugins/MouseGestures/mousegestures.h @@ -52,7 +52,7 @@ public: void loadSettings(); void saveSettings(); -private slots: +private Q_SLOTS: void upGestured(); void downGestured(); void leftGestured(); diff --git a/src/plugins/MouseGestures/mousegesturessettingsdialog.h b/src/plugins/MouseGestures/mousegesturessettingsdialog.h index 96b01d400..cde3496f4 100644 --- a/src/plugins/MouseGestures/mousegesturessettingsdialog.h +++ b/src/plugins/MouseGestures/mousegesturessettingsdialog.h @@ -36,7 +36,7 @@ public: explicit MouseGesturesSettingsDialog(MouseGestures* gestures, QWidget* parent = 0); ~MouseGesturesSettingsDialog(); -private slots: +private Q_SLOTS: void showLicense(); void accepted(); diff --git a/src/plugins/PIM/PIM_handler.h b/src/plugins/PIM/PIM_handler.h index e85357007..cc38dbbbf 100644 --- a/src/plugins/PIM/PIM_handler.h +++ b/src/plugins/PIM/PIM_handler.h @@ -42,13 +42,11 @@ public: void unloadPlugin(); -signals: - -public slots: +public Q_SLOTS: void webPageCreated(WebPage* page); void showSettings(QWidget* parent = 0); -private slots: +private Q_SLOTS: void loadSettings(); void pimInsert(); diff --git a/src/plugins/PIM/PIM_settings.h b/src/plugins/PIM/PIM_settings.h index 60b6a411b..cb38cbcef 100644 --- a/src/plugins/PIM/PIM_settings.h +++ b/src/plugins/PIM/PIM_settings.h @@ -36,7 +36,7 @@ public: explicit PIM_Settings(const QString &settingsFile, QWidget* parent = 0); ~PIM_Settings(); -private slots: +private Q_SLOTS: void dialogAccepted(); private: diff --git a/src/plugins/StatusBarIcons/sbi_iconsmanager.h b/src/plugins/StatusBarIcons/sbi_iconsmanager.h index fe0d9b47f..fa252ba9a 100644 --- a/src/plugins/StatusBarIcons/sbi_iconsmanager.h +++ b/src/plugins/StatusBarIcons/sbi_iconsmanager.h @@ -48,9 +48,7 @@ public: void reloadIcons(); void destroyIcons(); -signals: - -public slots: +public Q_SLOTS: void mainWindowCreated(BrowserWindow* window); void mainWindowDeleted(BrowserWindow* window); diff --git a/src/plugins/StatusBarIcons/sbi_imagesicon.h b/src/plugins/StatusBarIcons/sbi_imagesicon.h index 378e4b329..110ce10f1 100644 --- a/src/plugins/StatusBarIcons/sbi_imagesicon.h +++ b/src/plugins/StatusBarIcons/sbi_imagesicon.h @@ -29,7 +29,7 @@ class SBI_ImagesIcon : public SBI_Icon public: explicit SBI_ImagesIcon(BrowserWindow* window, const QString &settingsPath); -private slots: +private Q_SLOTS: void showMenu(const QPoint &point); void updateIcon(); diff --git a/src/plugins/StatusBarIcons/sbi_javascripticon.h b/src/plugins/StatusBarIcons/sbi_javascripticon.h index 900f22e7c..82439f0f5 100644 --- a/src/plugins/StatusBarIcons/sbi_javascripticon.h +++ b/src/plugins/StatusBarIcons/sbi_javascripticon.h @@ -30,7 +30,7 @@ class SBI_JavaScriptIcon : public SBI_Icon public: explicit SBI_JavaScriptIcon(BrowserWindow* window); -private slots: +private Q_SLOTS: void showMenu(const QPoint &point); void updateIcon(); diff --git a/src/plugins/StatusBarIcons/sbi_networkicon.h b/src/plugins/StatusBarIcons/sbi_networkicon.h index b4c8a0e08..710df4456 100644 --- a/src/plugins/StatusBarIcons/sbi_networkicon.h +++ b/src/plugins/StatusBarIcons/sbi_networkicon.h @@ -31,7 +31,7 @@ class SBI_NetworkIcon : public SBI_Icon public: explicit SBI_NetworkIcon(BrowserWindow* window); -private slots: +private Q_SLOTS: void onlineStateChanged(bool online); void showDialog(); diff --git a/src/plugins/StatusBarIcons/sbi_networkicondialog.h b/src/plugins/StatusBarIcons/sbi_networkicondialog.h index 54a418bc1..b0ff7511e 100644 --- a/src/plugins/StatusBarIcons/sbi_networkicondialog.h +++ b/src/plugins/StatusBarIcons/sbi_networkicondialog.h @@ -35,7 +35,7 @@ public: explicit SBI_NetworkIconDialog(QWidget* parent = 0); ~SBI_NetworkIconDialog(); -private slots: +private Q_SLOTS: void addProxy(); void removeProxy(); void saveProxy(); diff --git a/src/plugins/StatusBarIcons/sbi_settingsdialog.h b/src/plugins/StatusBarIcons/sbi_settingsdialog.h index 16545f344..a42c6d66c 100644 --- a/src/plugins/StatusBarIcons/sbi_settingsdialog.h +++ b/src/plugins/StatusBarIcons/sbi_settingsdialog.h @@ -35,7 +35,7 @@ public: explicit SBI_SettingsDialog(SBI_IconsManager* manager, QWidget* parent = 0); ~SBI_SettingsDialog(); -private slots: +private Q_SLOTS: void saveSettings(); private: diff --git a/src/plugins/StatusBarIcons/sbi_zoomwidget.h b/src/plugins/StatusBarIcons/sbi_zoomwidget.h index c2e583baf..7bcf652bc 100644 --- a/src/plugins/StatusBarIcons/sbi_zoomwidget.h +++ b/src/plugins/StatusBarIcons/sbi_zoomwidget.h @@ -29,7 +29,7 @@ class SBI_ZoomWidget : public QSlider public: explicit SBI_ZoomWidget(BrowserWindow* parent = 0); -private slots: +private Q_SLOTS: void valueChanged(int value); void currentViewChanged(); diff --git a/src/plugins/TabManager/tabmanagerplugin.h b/src/plugins/TabManager/tabmanagerplugin.h index 9265c239f..3ff6f4aa8 100644 --- a/src/plugins/TabManager/tabmanagerplugin.h +++ b/src/plugins/TabManager/tabmanagerplugin.h @@ -65,10 +65,10 @@ public: bool asTabBarReplacement() const; void setAsTabBarReplacement(bool yes); -public slots: +public Q_SLOTS: void insertManagerWidget(); -private slots: +private Q_SLOTS: void mainWindowCreated(BrowserWindow* window, bool refresh = true); private: diff --git a/src/plugins/TabManager/tabmanagersettings.h b/src/plugins/TabManager/tabmanagersettings.h index c0c1b0178..caf2c32c3 100644 --- a/src/plugins/TabManager/tabmanagersettings.h +++ b/src/plugins/TabManager/tabmanagersettings.h @@ -16,7 +16,7 @@ public: explicit TabManagerSettings(TabManagerPlugin* plugin, QWidget *parent = 0); ~TabManagerSettings(); -public slots: +public Q_SLOTS: void accept(); private: diff --git a/src/plugins/TabManager/tabmanagerwidget.h b/src/plugins/TabManager/tabmanagerwidget.h index db99ac16e..68dbac829 100644 --- a/src/plugins/TabManager/tabmanagerwidget.h +++ b/src/plugins/TabManager/tabmanagerwidget.h @@ -49,7 +49,7 @@ public: void setEnableDragTabs(bool enable); -signals: +Q_SIGNALS: void requestRefreshTree(); }; @@ -77,7 +77,7 @@ public: static QString domainFromUrl(const QUrl &url, bool useHostName = false); -public slots: +public Q_SLOTS: void delayedRefreshTree(WebPage* p = 0); void changeGroupType(); @@ -100,7 +100,7 @@ private: static TLDExtractor* s_tldExtractor; -private slots: +private Q_SLOTS: void refreshTree(); void processActions(); void onItemActivated(QTreeWidgetItem* item, int column); @@ -112,7 +112,7 @@ private slots: protected: bool eventFilter(QObject* obj, QEvent* event); -signals: +Q_SIGNALS: void showSideBySide(); void groupTypeChanged(TabManagerWidget::GroupType); }; @@ -137,7 +137,7 @@ public: bool isTab() const; -public slots: +public Q_SLOTS: void updateIcon(); void setTitle(const QString& title); void setIsActiveOrCaption(bool yes); diff --git a/src/plugins/TabManager/tabmanagerwidgetcontroller.h b/src/plugins/TabManager/tabmanagerwidgetcontroller.h index d6f144f6a..4f7ada950 100644 --- a/src/plugins/TabManager/tabmanagerwidgetcontroller.h +++ b/src/plugins/TabManager/tabmanagerwidgetcontroller.h @@ -46,7 +46,7 @@ public: void addStatusBarIcon(BrowserWindow* window); void removeStatusBarIcon(BrowserWindow* window); -public slots: +public Q_SLOTS: void setGroupType(TabManagerWidget::GroupType type); void mainWindowDeleted(BrowserWindow* window); void raiseTabManager(); @@ -60,7 +60,7 @@ private: QHash m_statusBarIcons; QHash m_actions; -signals: +Q_SIGNALS: void requestRefreshTree(WebPage* p = 0); }; diff --git a/src/plugins/TestPlugin/testplugin.h b/src/plugins/TestPlugin/testplugin.h index 9b181c363..7af9bcfd3 100644 --- a/src/plugins/TestPlugin/testplugin.h +++ b/src/plugins/TestPlugin/testplugin.h @@ -45,7 +45,7 @@ public: void populateWebViewMenu(QMenu *menu, WebView *view, const WebHitTestResult &r) override; bool mousePress(const Qz::ObjectName &type, QObject *obj, QMouseEvent *event) override; -private slots: +private Q_SLOTS: void actionSlot(); private: diff --git a/src/plugins/VerticalTabs/loadinganimator.h b/src/plugins/VerticalTabs/loadinganimator.h index bf7674228..9d2dabb92 100644 --- a/src/plugins/VerticalTabs/loadinganimator.h +++ b/src/plugins/VerticalTabs/loadinganimator.h @@ -32,7 +32,7 @@ public: QPixmap pixmap(const QModelIndex &index); -signals: +Q_SIGNALS: void updateIndex(const QModelIndex &index); private: diff --git a/src/plugins/VerticalTabs/verticaltabsplugin.h b/src/plugins/VerticalTabs/verticaltabsplugin.h index 17f1b714d..4d683aae2 100644 --- a/src/plugins/VerticalTabs/verticaltabsplugin.h +++ b/src/plugins/VerticalTabs/verticaltabsplugin.h @@ -65,7 +65,7 @@ public: QString styleSheet() const; -signals: +Q_SIGNALS: void viewTypeChanged(ViewType type); void styleSheetChanged(const QString &styleSheet); diff --git a/src/plugins/VerticalTabs/verticaltabssettings.h b/src/plugins/VerticalTabs/verticaltabssettings.h index 88a844847..fb31699c3 100644 --- a/src/plugins/VerticalTabs/verticaltabssettings.h +++ b/src/plugins/VerticalTabs/verticaltabssettings.h @@ -32,7 +32,7 @@ public: explicit VerticalTabsSettings(VerticalTabsPlugin *plugin, QWidget *parent = nullptr); ~VerticalTabsSettings(); -private slots: +private Q_SLOTS: void themeValueChanged(int index); private: diff --git a/tests/benchmarks/adblockparserule.cpp b/tests/benchmarks/adblockparserule.cpp index d987db402..14e300c29 100644 --- a/tests/benchmarks/adblockparserule.cpp +++ b/tests/benchmarks/adblockparserule.cpp @@ -24,7 +24,7 @@ class AdBlockParseRule : public QObject { Q_OBJECT -private slots: +private Q_SLOTS: void parseEasyList(); };