From 357cb198eee418674c16e5c35cc7ddb7f5eb1850 Mon Sep 17 00:00:00 2001 From: PatR Date: Sun, 2 Aug 2020 14:45:00 -0700 Subject: [PATCH] Qt 3 'about' Make the same change to outdated/win/Qt3/qt3_win.cpp for the "about nethack" popup that was just made to win/Qt/qt_main.cpp so that the out of date URLs won't be overlooked if the Qt 3 interface ever gets resurrected. Not tested and most likely will never matter. --- outdated/win/Qt3/qt3_win.cpp | 45 ++++++++++++++++++++++++++---------- 1 file changed, 33 insertions(+), 12 deletions(-) diff --git a/outdated/win/Qt3/qt3_win.cpp b/outdated/win/Qt3/qt3_win.cpp index f48c0d211..30b23370b 100644 --- a/outdated/win/Qt3/qt3_win.cpp +++ b/outdated/win/Qt3/qt3_win.cpp @@ -1,4 +1,4 @@ -// NetHack 3.6 qt_win.cpp $NHDT-Date: 1575917720 2019/12/09 18:55:20 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.0 $ +// NetHack 3.6 qt_win.cpp $NHDT-Date: 1596404695 2020/08/02 21:44:55 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.91 $ // Copyright (c) Warwick Allison, 1999. // NetHack may be freely redistributed. See license for details. @@ -146,23 +146,44 @@ static const char nh_attribution[] = "
NetHack" static QString aboutMsg() { + char vbuf[BUFSZ]; QString msg; msg.sprintf( - "Qt NetHack is a version of NetHack built\n" + // format + "Qt NetHack is a version of NetHack\n" + "built using" // no newline #ifdef KDE - "using KDE and the Qt GUI toolkit.\n" + " KDE and" // ditto +#endif + " the Qt %d GUI toolkit.\n" + "\nThis is NetHack %s%s.\n" + "\nNetHack's Qt interface originally developed by Warwick Allison.\n" + "\n" +#if 0 + "Homepage:\n http://trolls.troll.no/warwick/nethack/\n" //obsolete +#endif +#ifdef KDE + "KDE:\n https://kde.org/\n" +#endif +#if 1 + "Qt:\n https://qt.io/\n" #else - "using the Qt GUI toolkit.\n" + "Qt:\n http://www.troll.no/\n" // obsolete #endif - "This is version %d.%d.%d\n\n" - "Homepage:\n http://trolls.troll.no/warwick/nethack/\n\n" -#ifdef KDE - "KDE:\n http://www.kde.org\n" + "NetHack:\n %s\n", + // arguments +#ifdef QT_VERSION_MAJOR + QT_VERSION_MAJOR, +#else + 3, // Qt version macro should exist; if not, assume Qt3 #endif - "Qt:\n http://www.troll.no", - VERSION_MAJOR, - VERSION_MINOR, - PATCHLEVEL); + version_string(vbuf), /* nethack version */ +#ifdef QT_VERSION_STR + " with Qt " QT_VERSION_STR, +#else + "", +#endif + DEVTEAM_URL); return msg; }