nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

Merge branch 'qt6-buttons' of https://github.com/chasonr/NetHack into pr913

Browse Source
This commit is contained in:
nhmall
2022-10-27 22:14:13 -04:00
parent e121eee867 5c001d3a32
commit 1c0261a397
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
win/Qt/qt_svsel.cpp
+4
View File
@@ -99,7 +99,11 @@ QLayout: Attempting to add QLayout "" to QDialog "", which already has a layout
QGroupBox *box = new QGroupBox("Saved Characters", this); QGroupBox *box = new QGroupBox("Saved Characters", this);
QVBoxLayout *bgl = new QVBoxLayout(); QVBoxLayout *bgl = new QVBoxLayout();
QButtonGroup *bg = new QButtonGroup(); QButtonGroup *bg = new QButtonGroup();
#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)
connect(bg, SIGNAL(idPressed(int)), this, SLOT(done(int)));
#else
connect(bg, SIGNAL(buttonPressed(int)), this, SLOT(done(int))); connect(bg, SIGNAL(buttonPressed(int)), this, SLOT(done(int)));
#endif
for (int i = 0; saved[i]; ++i) { for (int i = 0; saved[i]; ++i) {
QPushButton *b = new QPushButton(saved[i]); QPushButton *b = new QPushButton(saved[i]);
bgl->addWidget(b); bgl->addWidget(b);
win/Qt/qt_xcmd.cpp
+4
View File
@@ -335,7 +335,11 @@ NetHackQtExtCmdRequestor::NetHackQtExtCmdRequestor(QWidget *parent) :
} }
} }
#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)
connect(group, SIGNAL(idPressed(int)), this, SLOT(Button(int)));
#else
connect(group, SIGNAL(buttonPressed(int)), this, SLOT(Button(int))); connect(group, SIGNAL(buttonPressed(int)), this, SLOT(Button(int)));
#endif
bl->activate(); bl->activate();
xl->activate(); xl->activate();