diff options
| author | 2015-04-14 19:13:33 -0400 | |
|---|---|---|
| committer | 2015-04-14 19:13:33 -0400 | |
| commit | 46ea6944c3f637efee013ecc4ac65fd4985031a8 (patch) | |
| tree | 803f60fa0ed6e8c244f3e0b4eef30b37a61f8e2f /src/citra_qt/debugger | |
| parent | Merge pull request #683 from bunnei/thread-priority (diff) | |
| parent | Core_ARM11: Replace debug prints with our own logging functions in vfpsingle. (diff) | |
| download | yuzu-46ea6944c3f637efee013ecc4ac65fd4985031a8.tar.gz yuzu-46ea6944c3f637efee013ecc4ac65fd4985031a8.tar.xz yuzu-46ea6944c3f637efee013ecc4ac65fd4985031a8.zip | |
Merge pull request #697 from linkmauve/clang<3
Fix a few warnings as reported by clang 3.6
Diffstat (limited to 'src/citra_qt/debugger')
| -rw-r--r-- | src/citra_qt/debugger/graphics_breakpoints_p.h | 2 | ||||
| -rw-r--r-- | src/citra_qt/debugger/profiler.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/citra_qt/debugger/graphics_breakpoints_p.h b/src/citra_qt/debugger/graphics_breakpoints_p.h index 232bfc863..34e72e859 100644 --- a/src/citra_qt/debugger/graphics_breakpoints_p.h +++ b/src/citra_qt/debugger/graphics_breakpoints_p.h | |||
| @@ -25,7 +25,7 @@ public: | |||
| 25 | QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override; | 25 | QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override; |
| 26 | QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override; | 26 | QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override; |
| 27 | 27 | ||
| 28 | bool setData(const QModelIndex& index, const QVariant& value, int role = Qt::EditRole); | 28 | bool setData(const QModelIndex& index, const QVariant& value, int role = Qt::EditRole) override; |
| 29 | 29 | ||
| 30 | public slots: | 30 | public slots: |
| 31 | void OnBreakPointHit(Pica::DebugContext::Event event); | 31 | void OnBreakPointHit(Pica::DebugContext::Event event); |
diff --git a/src/citra_qt/debugger/profiler.h b/src/citra_qt/debugger/profiler.h index a6d87aa0f..fabf279b8 100644 --- a/src/citra_qt/debugger/profiler.h +++ b/src/citra_qt/debugger/profiler.h | |||
| @@ -18,7 +18,7 @@ class ProfilerModel : public QAbstractItemModel | |||
| 18 | public: | 18 | public: |
| 19 | ProfilerModel(QObject* parent); | 19 | ProfilerModel(QObject* parent); |
| 20 | 20 | ||
| 21 | QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const; | 21 | QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override; |
| 22 | QModelIndex index(int row, int column, const QModelIndex& parent = QModelIndex()) const override; | 22 | QModelIndex index(int row, int column, const QModelIndex& parent = QModelIndex()) const override; |
| 23 | QModelIndex parent(const QModelIndex& child) const override; | 23 | QModelIndex parent(const QModelIndex& child) const override; |
| 24 | int columnCount(const QModelIndex& parent = QModelIndex()) const override; | 24 | int columnCount(const QModelIndex& parent = QModelIndex()) const override; |