summaryrefslogtreecommitdiffstats
path: root/src/core/download_manager_delegate_qt.h
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2017-04-12 11:58:21 +0200
committerAlexandru Croitor <alexandru.croitor@qt.io>2017-04-21 11:10:13 +0000
commita5c1754faa7bd9491fcf64dda34b479cdf62c9bd (patch)
tree61a093917f9c8308d2153335d49c58acc3836981 /src/core/download_manager_delegate_qt.h
parentd08524fbfbb78eca09bbab58d5a9840387d2d0e7 (diff)
Standardize override declaration
Update our overrides to Qt coding standard getting rid of Q_DECL_OVERRIDE and redundant virtual declarations. Change-Id: Id8b0750eb05c51fc8f50cac4000a811eebcbf918 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'src/core/download_manager_delegate_qt.h')
-rw-r--r--src/core/download_manager_delegate_qt.h14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/core/download_manager_delegate_qt.h b/src/core/download_manager_delegate_qt.h
index e603724e9..cd21d330c 100644
--- a/src/core/download_manager_delegate_qt.h
+++ b/src/core/download_manager_delegate_qt.h
@@ -43,7 +43,7 @@
#include "content/public/browser/download_manager_delegate.h"
#include <base/memory/weak_ptr.h>
-#include <QtCore/qcompilerdetection.h> // Needed for Q_DECL_OVERRIDE
+#include <QtGlobal>
namespace base {
class FilePath;
@@ -67,28 +67,28 @@ class DownloadManagerDelegateQt
public:
DownloadManagerDelegateQt(BrowserContextAdapter *contextAdapter);
~DownloadManagerDelegateQt();
- void GetNextId(const content::DownloadIdCallback& callback) Q_DECL_OVERRIDE;
+ void GetNextId(const content::DownloadIdCallback& callback) override;
bool DetermineDownloadTarget(content::DownloadItem* item,
- const content::DownloadTargetCallback& callback) Q_DECL_OVERRIDE;
+ const content::DownloadTargetCallback& callback) override;
void GetSaveDir(content::BrowserContext* browser_context,
base::FilePath* website_save_dir,
base::FilePath* download_save_dir,
- bool* skip_dir_check) Q_DECL_OVERRIDE;
+ bool* skip_dir_check) override;
void ChooseSavePath(content::WebContents *web_contents,
const base::FilePath &suggested_path,
const base::FilePath::StringType &default_extension,
bool can_save_as_complete,
- const content::SavePackagePathPickedCallback &callback) Q_DECL_OVERRIDE;
+ const content::SavePackagePathPickedCallback &callback) override;
void cancelDownload(quint32 downloadId);
void setDownloadType(int downloadType) { m_downloadType = downloadType; }
// Inherited from content::DownloadItem::Observer
- void OnDownloadUpdated(content::DownloadItem *download) Q_DECL_OVERRIDE;
- void OnDownloadDestroyed(content::DownloadItem *download) Q_DECL_OVERRIDE;
+ void OnDownloadUpdated(content::DownloadItem *download) override;
+ void OnDownloadDestroyed(content::DownloadItem *download) override;
private:
void cancelDownload(const content::DownloadTargetCallback& callback);