ShuriZma
/
mgba
mirror of https://github.com/mgba-emu/mgba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Qt: Fix some warnings

This commit is contained in:
Vicki Pfau 2022-05-13 00:24:59 -07:00
parent 8f5e755c09
commit b3ec5cca98
5 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/platform/qt/DisplayQt.cpp
View File

@ -87,8 +87,8 @@ void DisplayQt::resizeContext() {
if (m_width != size.width() || m_height != size.height()) { if (m_width != size.width() || m_height != size.height()) {
m_width = size.width(); m_width = size.width();
m_height = size.height(); m_height = size.height();
m_oldBacking = std::move(QImage()); m_oldBacking = QImage();
m_backing = std::move(QImage()); m_backing = QImage();
} }
} }

2
src/platform/qt/GBAApp.h
View File

@ -61,7 +61,6 @@ public:
QFont monospaceFont() { return m_monospace; } QFont monospaceFont() { return m_monospace; }
QList<Window*> windows() { return m_windows; } QList<Window*> windows() { return m_windows; }
Window* newWindow();
QString getOpenFileName(QWidget* owner, const QString& title, const QString& filter = {}); QString getOpenFileName(QWidget* owner, const QString& title, const QString& filter = {});
QStringList getOpenFileNames(QWidget* owner, const QString& title, const QString& filter = {}); QStringList getOpenFileNames(QWidget* owner, const QString& title, const QString& filter = {});
@ -81,6 +80,7 @@ public:
public slots: public slots:
void restartForUpdate(); void restartForUpdate();
Window* newWindow();
signals: signals:
void jobFinished(qint64 jobId); void jobFinished(qint64 jobId);

2
src/platform/qt/MemoryModel.cpp
View File

@ -678,7 +678,7 @@ void MemoryModel::adjustCursor(int adjust, bool shift) {
} }
int cursorPosition = m_top; int cursorPosition = m_top;
if (shift) { if (shift) {
uint32_t absolute; uint32_t absolute = adjust;
if (m_selectionAnchor == m_selection.first) { if (m_selectionAnchor == m_selection.first) {
if (adjust < 0 && m_base - adjust > m_selection.second) { if (adjust < 0 && m_base - adjust > m_selection.second) {
absolute = m_base - m_selection.second + m_align; absolute = m_base - m_selection.second + m_align;

6
src/platform/qt/Window.cpp
View File

@ -1373,9 +1373,7 @@ void Window::setupMenu(QMenuBar* menubar) {
} }
m_actions.addSeparator("file"); m_actions.addSeparator("file");
m_multiWindow = m_actions.addAction(tr("New multiplayer window"), "multiWindow", [this]() { m_multiWindow = m_actions.addAction(tr("New multiplayer window"), "multiWindow", GBAApp::app(), &GBAApp::newWindow, "file");
GBAApp::app()->newWindow();
}, "file");
#ifdef M_CORE_GBA #ifdef M_CORE_GBA
Action* dolphin = m_actions.addAction(tr("Connect to Dolphin..."), "connectDolphin", openNamedTView<DolphinConnector>(&m_dolphinView, this), "file"); Action* dolphin = m_actions.addAction(tr("Connect to Dolphin..."), "connectDolphin", openNamedTView<DolphinConnector>(&m_dolphinView, this), "file");
@ -1933,7 +1931,7 @@ Action* Window::addGameAction(const QString& visibleName, const QString& name, A
template<typename T, typename V> template<typename T, typename V>
Action* Window::addGameAction(const QString& visibleName, const QString& name, T* obj, V (T::*method)(), const QString& menu, const QKeySequence& shortcut) { Action* Window::addGameAction(const QString& visibleName, const QString& name, T* obj, V (T::*method)(), const QString& menu, const QKeySequence& shortcut) {
return addGameAction(visibleName, name, [this, obj, method]() { return addGameAction(visibleName, name, [obj, method]() {
(obj->*method)(); (obj->*method)();
}, menu, shortcut); }, menu, shortcut);
} }

2
src/util/configuration.c
View File

@ -183,7 +183,7 @@ bool ConfigurationWrite(const struct Configuration* configuration, const char* p
} }
bool res = ConfigurationWriteVFile(configuration, vf); bool res = ConfigurationWriteVFile(configuration, vf);
vf->close(vf); vf->close(vf);
return true; return res;
} }
bool ConfigurationWriteVFile(const struct Configuration* configuration, struct VFile* vf) { bool ConfigurationWriteVFile(const struct Configuration* configuration, struct VFile* vf) {