From 2fb0da554770756f41c70f5a620a7f151f3aab0a Mon Sep 17 00:00:00 2001 From: David Rosca Date: Mon, 26 Feb 2018 13:56:43 +0100 Subject: [PATCH] Fix various issues when generating Python bindings --- src/lib/downloads/downloadmanager.h | 2 +- src/lib/sidebar/sidebar.cpp | 2 +- src/lib/sidebar/sidebar.h | 1 - src/lib/tabwidget/combotabbar.h | 1 - src/lib/tabwidget/tabcontextmenu.h | 14 +++++++------- 5 files changed, 9 insertions(+), 11 deletions(-) diff --git a/src/lib/downloads/downloadmanager.h b/src/lib/downloads/downloadmanager.h index 8a6dea979..585a50c6a 100644 --- a/src/lib/downloads/downloadmanager.h +++ b/src/lib/downloads/downloadmanager.h @@ -74,7 +74,7 @@ public: void startExternalManager(const QUrl &url); void setLastDownloadPath(const QString &lastPath) { m_lastDownloadPath = lastPath; } - void setLastDownloadOption(const DownloadOption &option) { m_lastDownloadOption = option; } + void setLastDownloadOption(DownloadOption option) { m_lastDownloadOption = option; } public Q_SLOTS: void show(); diff --git a/src/lib/sidebar/sidebar.cpp b/src/lib/sidebar/sidebar.cpp index 0414298df..8d489dde9 100644 --- a/src/lib/sidebar/sidebar.cpp +++ b/src/lib/sidebar/sidebar.cpp @@ -26,7 +26,7 @@ #include -QHash > SideBarManager::s_sidebars; +QHash > s_sidebars; SideBar::SideBar(SideBarManager* manager, BrowserWindow* window) : QWidget(window) diff --git a/src/lib/sidebar/sidebar.h b/src/lib/sidebar/sidebar.h index f9c0d048a..f4c4594e9 100644 --- a/src/lib/sidebar/sidebar.h +++ b/src/lib/sidebar/sidebar.h @@ -68,7 +68,6 @@ public: void sideBarRemoved(const QString &id); void closeSideBar(); - static QHash > s_sidebars; static void addSidebar(const QString &id, SideBarInterface* interface); static void removeSidebar(const QString &id); diff --git a/src/lib/tabwidget/combotabbar.h b/src/lib/tabwidget/combotabbar.h index cf9fc0cfb..489140971 100644 --- a/src/lib/tabwidget/combotabbar.h +++ b/src/lib/tabwidget/combotabbar.h @@ -122,7 +122,6 @@ public: int pinnedTabsCount() const; int normalTabsCount() const; bool isPinned(int index) const; - void setMaxVisiblePinnedTab(int max); void setFocusPolicy(Qt::FocusPolicy policy); void setObjectName(const QString &name); diff --git a/src/lib/tabwidget/tabcontextmenu.h b/src/lib/tabwidget/tabcontextmenu.h index 8ea0018e0..301a060af 100644 --- a/src/lib/tabwidget/tabcontextmenu.h +++ b/src/lib/tabwidget/tabcontextmenu.h @@ -56,13 +56,13 @@ Q_SIGNALS: void unloadTab(int index); private Q_SLOTS: - void reloadTab() { emit reloadTab(m_clickedTab); } - void stopTab() { emit stopTab(m_clickedTab); } - void closeTab() { emit tabCloseRequested(m_clickedTab); } - void duplicateTab() { emit duplicateTab(m_clickedTab); } - void detachTab() { emit detachTab(m_clickedTab); } - void loadTab() { emit loadTab(m_clickedTab); } - void unloadTab() { emit unloadTab(m_clickedTab); } + void reloadTab() { Q_EMIT reloadTab(m_clickedTab); } + void stopTab() { Q_EMIT stopTab(m_clickedTab); } + void closeTab() { Q_EMIT tabCloseRequested(m_clickedTab); } + void duplicateTab() { Q_EMIT duplicateTab(m_clickedTab); } + void detachTab() { Q_EMIT detachTab(m_clickedTab); } + void loadTab() { Q_EMIT loadTab(m_clickedTab); } + void unloadTab() { Q_EMIT unloadTab(m_clickedTab); } void pinTab(); void muteTab();