Skip to content
Permalink
Browse files

Add override keyword to functions

  • Loading branch information...
Chocobo1 committed Jul 18, 2019
1 parent 45eba9e commit 4a90716843dd043750660c37909469fad59c3241
@@ -91,7 +91,7 @@ before_install:
fi
- |
if [ "$TRAVIS_OS_NAME" = "osx" ]; then
CXXFLAGS="$CXXFLAGS -Wno-unused-local-typedefs -Wno-inconsistent-missing-override"
CXXFLAGS="$CXXFLAGS -Wno-unused-local-typedefs"
openssl_root_path="/usr/local/opt/openssl"
qmake_conf="$qmake_conf PKG_CONFIG_PATH=$openssl_root_path/lib/pkgconfig:$PKG_CONFIG_PATH"
@@ -61,7 +61,7 @@ macro(qbt_set_compiler_options)
endif (_STRICT_NULL_SENTINEL_IS_SUPPORTED)

# Code should be improved to render this not needed
list(APPEND _GCC_COMMON_CXX_FLAGS "-Wno-error=unused-function -Wno-error=inconsistent-missing-override")
list(APPEND _GCC_COMMON_CXX_FLAGS "-Wno-error=unused-function")
else ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
# GCC supports it
list(APPEND _GCC_COMMON_CXX_FLAGS "-Wstrict-null-sentinel")
@@ -57,7 +57,7 @@ class QtLockedFile : public QFile
QtLockedFile(const QString &name);
~QtLockedFile();

bool open(OpenMode mode);
bool open(OpenMode mode) override;

bool lock(LockMode mode, bool block = true);
bool unlock();
@@ -50,7 +50,7 @@ class FilterParserThread : public QThread
void IPFilterError();

protected:
void run();
void run() override;

private:
int findAndNullDelimiter(char *const data, char delimiter, int start, int end, bool reverse = false);
@@ -60,7 +60,7 @@ namespace BitTorrent
static int calculateTotalPieces(const QString &inputPath, int pieceSize, bool isAlignmentOptimized);

protected:
void run();
void run() override;

signals:
void creationFailure(const QString &msg);
@@ -83,7 +83,7 @@ namespace BitTorrent
~Tracker();

bool start();
Http::Response processRequest(const Http::Request &request, const Http::Environment &env);
Http::Response processRequest(const Http::Request &request, const Http::Environment &env) override;

private:
void respondToAnnounceRequest();
@@ -56,7 +56,7 @@ namespace Http
void dropTimedOutConnection();

private:
void incomingConnection(qintptr socketDescriptor);
void incomingConnection(qintptr socketDescriptor) override;
void removeConnection(Connection *connection);

IRequestHandler *m_requestHandler;
@@ -71,11 +71,11 @@ class ScanFoldersModel : public QAbstractListModel

static QString pathTypeDisplayName(PathType type);

int rowCount(const QModelIndex &parent = {}) const;
int columnCount(const QModelIndex &parent = {}) const;
QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const;
Qt::ItemFlags flags(const QModelIndex &index) const;
int rowCount(const QModelIndex &parent = {}) const override;
int columnCount(const QModelIndex &parent = {}) const override;
QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override;
Qt::ItemFlags flags(const QModelIndex &index) const override;

// TODO: removePaths(); singular version becomes private helper functions;
// also: remove functions should take modelindexes
@@ -99,7 +99,7 @@ private slots:
explicit ScanFoldersModel(QObject *parent = nullptr);
~ScanFoldersModel();

virtual bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole);
virtual bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) override;
bool downloadInWatchFolder(const QString &filePath) const;
bool downloadInDefaultFolder(const QString &filePath) const;
QString downloadPathTorrentFolder(const QString &filePath) const;
@@ -65,8 +65,8 @@ private slots:
void handleItemAboutToBeRemoved(RSS::Item *rssItem);

private:
void dragMoveEvent(QDragMoveEvent *event);
void dropEvent(QDropEvent *event);
void dragMoveEvent(QDragMoveEvent *event) override;
void dropEvent(QDropEvent *event) override;
QTreeWidgetItem *createItem(RSS::Item *rssItem, QTreeWidgetItem *parentItem = nullptr);
void fill(QTreeWidgetItem *parent, RSS::Folder *rssParent);

@@ -44,7 +44,7 @@ class HtmlBrowser : public QTextBrowser
explicit HtmlBrowser(QWidget* parent = nullptr);
~HtmlBrowser();

virtual QVariant loadResource(int type, const QUrl &name);
virtual QVariant loadResource(int type, const QUrl &name) override;

protected:
QNetworkAccessManager *m_netManager;

0 comments on commit 4a90716

Please sign in to comment.
You can’t perform that action at this time.