From 31046826f51b1770a7644750c102119c77f67414 Mon Sep 17 00:00:00 2001 From: PatR Date: Sat, 23 Jan 2021 15:58:23 -0800 Subject: [PATCH] couple of missing Qt prototypes Shut up two missing prototype warnings. --- win/Qt/qt_bind.cpp | 5 ++++- win/Qt/qt_win.cpp | 13 +++++++------ win/Qt/qt_win.h | 2 ++ 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/win/Qt/qt_bind.cpp b/win/Qt/qt_bind.cpp index 96b308f90..dc2521b46 100644 --- a/win/Qt/qt_bind.cpp +++ b/win/Qt/qt_bind.cpp @@ -1062,7 +1062,10 @@ struct window_procs Qt_procs = { }; #ifndef WIN32 -extern "C" void +extern "C" void play_usersound(const char *, int); + +/* called from core, sounds.c */ +void play_usersound(const char *filename, int volume UNUSED) { #if defined(USER_SOUNDS) && !defined(QT_NO_SOUND) diff --git a/win/Qt/qt_win.cpp b/win/Qt/qt_win.cpp index eafcb5921..60f422261 100644 --- a/win/Qt/qt_win.cpp +++ b/win/Qt/qt_win.cpp @@ -76,13 +76,14 @@ extern "C" { namespace nethack_qt_ { void -centerOnMain( QWidget* w ) +centerOnMain(QWidget *w) { - QWidget* m = NetHackQtBind::mainWidget(); - if (!m) m = qApp->desktop(); - QPoint p = m->mapToGlobal(QPoint(0,0)); - w->move( p.x() + m->width()/2 - w->width()/2, - p.y() + m->height()/2 - w->height()/2 ); + QWidget *m = NetHackQtBind::mainWidget(); + if (!m) + m = qApp->desktop(); + QPoint p = m->mapToGlobal(QPoint(0, 0)); + w->move(p.x() + m->width() / 2 - w->width() / 2, + p.y() + m->height() / 2 - w->height() / 2); } NetHackQtWindow::NetHackQtWindow() diff --git a/win/Qt/qt_win.h b/win/Qt/qt_win.h index 15f432268..6227563f1 100644 --- a/win/Qt/qt_win.h +++ b/win/Qt/qt_win.h @@ -17,6 +17,8 @@ namespace nethack_qt_ { +void centerOnMain(QWidget *); /* in the namespace but not in any class */ + class NetHackQtWindow { public: NetHackQtWindow();