Rename Qt4 directory to Qt

sys/unix/Makefile.dat

@@ -65,11 +65,11 @@ rip.xpm: ../win/X11/rip.xpm
 mapbg.xpm: ../win/gnome/mapbg.xpm
 	cp ../win/gnome/mapbg.xpm mapbg.xpm
 
-nhsplash.xpm: ../win/Qt/nhsplash.xpm
+nhsplash.xpm: ../win/share/nhsplash.xpm
-	cp ../win/Qt/nhsplash.xpm nhsplash.xpm
+	cp ../win/share/nhsplash.xpm nhsplash.xpm
 
-nethack.icns: ../win/Qt/nhicns.uu
+nethack.icns: ../win/share/nhicns.uu
-	$(UUDECODE) ../win/Qt/nhicns.uu
+	$(UUDECODE) ../win/share/nhicns.uu
 
 Info.plist: ../win/Qt/Info.pli
 	cp ../win/Qt/Info.pli Info.plist

sys/unix/Makefile.src

@@ -231,19 +231,19 @@ WINQTOBJ = qt_win.o qt_clust.o qttableview.o tile.o
 #
 # Files for a Qt 4 or 5 port
 #
-WINQT4SRC = ../win/Qt4/qt4bind.cpp ../win/Qt4/qt4click.cpp \
+WINQTSRC = ../win/Qt/qt_bind.cpp ../win/Qt/qt_click.cpp \
-	../win/Qt4/qt4clust.cpp ../win/Qt4/qt4delay.cpp \
+	../win/Qt/qt_clust.cpp ../win/Qt/qt_delay.cpp \
-	../win/Qt4/qt4glyph.cpp ../win/Qt4/qt4icon.cpp ../win/Qt4/qt4inv.cpp \
+	../win/Qt/qt_glyph.cpp ../win/Qt/qt_icon.cpp ../win/Qt/qt_inv.cpp \
-	../win/Qt4/qt4key.cpp ../win/Qt4/qt4line.cpp ../win/Qt4/qt4main.cpp \
+	../win/Qt/qt_key.cpp ../win/Qt/qt_line.cpp ../win/Qt/qt_main.cpp \
-	../win/Qt4/qt4map.cpp ../win/Qt4/qt4menu.cpp ../win/Qt4/qt4msg.cpp \
+	../win/Qt/qt_map.cpp ../win/Qt/qt_menu.cpp ../win/Qt/qt_msg.cpp \
-	../win/Qt4/qt4plsel.cpp ../win/Qt4/qt4rip.cpp ../win/Qt4/qt4set.cpp \
+	../win/Qt/qt_plsel.cpp ../win/Qt/qt_rip.cpp ../win/Qt/qt_set.cpp \
-	../win/Qt4/qt4stat.cpp ../win/Qt4/qt4str.cpp ../win/Qt4/qt4streq.cpp \
+	../win/Qt/qt_stat.cpp ../win/Qt/qt_str.cpp ../win/Qt/qt_streq.cpp \
-	../win/Qt4/qt4svsel.cpp ../win/Qt4/qt4win.cpp ../win/Qt4/qt4xcmd.cpp \
+	../win/Qt/qt_svsel.cpp ../win/Qt/qt_win.cpp ../win/Qt/qt_xcmd.cpp \
-	../win/Qt4/qt4yndlg.cpp
+	../win/Qt/qt_yndlg.cpp
-WINQT4OBJ = qt4bind.o qt4click.o qt4clust.o qt4delay.o qt4glyph.o qt4icon.o \
+WINQTOBJ = qt_bind.o qt_click.o qt_clust.o qt_delay.o qt_glyph.o qt_icon.o \
-	qt4inv.o qt4key.o qt4line.o qt4main.o qt4map.o qt4menu.o qt4msg.o \
+	qt_inv.o qt_key.o qt_line.o qt_main.o qt_map.o qt_menu.o qt_msg.o \
-	qt4plsel.o qt4rip.o qt4set.o qt4stat.o qt4str.o qt4streq.o qt4svsel.o \
+	qt_plsel.o qt_rip.o qt_set.o qt_stat.o qt_str.o qt_streq.o qt_svsel.o \
-	qt4win.o qt4xcmd.o qt4yndlg.o tile.o
+	qt_win.o qt_xcmd.o qt_yndlg.o tile.o
 #
 # Files for a Gnome port
 #
@@ -302,12 +302,12 @@ WINBEOBJ =
 #
 #
 # libraries for Qt 3
-WINQTLIB = -L$(QTDIR)/lib -lqt
+WINQT3LIB = -L$(QTDIR)/lib -lqt
 #
 # libraries for Qt 4
 WINQT4LIB = `pkg-config QtGui --libs`
 #
-# libraries for Qt 5 (use with WINQT4SRC and WINQT4OBJ)
+# libraries for Qt 5 (use with WINQTSRC and WINQTOBJ)
 WINQT5LIB = `pkg-config Qt5Gui Qt5Widgets Qt5Multimedia --libs`
 #
 # libraries for KDE (with Qt)
@@ -474,7 +474,7 @@ GENCSRC = vis_tab.c	sfdata.c #tile.c
 # all windowing-system-dependent .c (for dependencies and such)
 WINCSRC = $(WINTTYSRC) $(WINCURSESSRC) $(WINX11SRC) $(WINGNOMESRC) $(WINGEMSRC)
 # all windowing-system-dependent .cpp (for dependencies and such)
-WINCXXSRC = $(WINQTSRC) $(WINQT4SRC) $(WINBESRC)
+WINCXXSRC = $(WINQTSRC) $(WINBESRC)
 
 # Files for window system chaining. Requires SYSCF; include via HINTSRC/HINTOBJ
 CHAINSRC = ../win/chain/wc_chainin.c ../win/chain/wc_chainout.c \
@@ -613,26 +613,26 @@ qttableview.moc: ../include/qttableview.h
 	$(QTDIR)/bin/moc -o qttableview.moc ../include/qttableview.h
 
 # Qt 4 windowport meta-object-compiler output
-qt4kde0.moc : ../win/Qt4/qt4kde0.h
+qt_kde0.moc : ../win/Qt/qt_kde0.h
-	$(QTDIR)/bin/$(MOC) -o qt4kde0.moc ../win/Qt4/qt4kde0.h
+	$(QTDIR)/bin/$(MOC) -o qt_kde0.moc ../win/Qt/qt_kde0.h
-qt4main.moc : ../win/Qt4/qt4main.h
+qt_main.moc : ../win/Qt/qt_main.h
-	$(QTDIR)/bin/$(MOC) -o qt4main.moc ../win/Qt4/qt4main.h
+	$(QTDIR)/bin/$(MOC) -o qt_main.moc ../win/Qt/qt_main.h
-qt4map.moc : ../win/Qt4/qt4map.h
+qt_map.moc : ../win/Qt/qt_map.h
-	$(QTDIR)/bin/$(MOC) -o qt4map.moc ../win/Qt4/qt4map.h
+	$(QTDIR)/bin/$(MOC) -o qt_map.moc ../win/Qt/qt_map.h
-qt4menu.moc : ../win/Qt4/qt4menu.h
+qt_menu.moc : ../win/Qt/qt_menu.h
-	$(QTDIR)/bin/$(MOC) -o qt4menu.moc ../win/Qt4/qt4menu.h
+	$(QTDIR)/bin/$(MOC) -o qt_menu.moc ../win/Qt/qt_menu.h
-qt4msg.moc : ../win/Qt4/qt4msg.h
+qt_msg.moc : ../win/Qt/qt_msg.h
-	$(QTDIR)/bin/$(MOC) -o qt4msg.moc ../win/Qt4/qt4msg.h
+	$(QTDIR)/bin/$(MOC) -o qt_msg.moc ../win/Qt/qt_msg.h
-qt4plsel.moc : ../win/Qt4/qt4plsel.h
+qt_plsel.moc : ../win/Qt/qt_plsel.h
-	$(QTDIR)/bin/$(MOC) -o qt4plsel.moc ../win/Qt4/qt4plsel.h
+	$(QTDIR)/bin/$(MOC) -o qt_plsel.moc ../win/Qt/qt_plsel.h
-qt4set.moc : ../win/Qt4/qt4set.h
+qt_set.moc : ../win/Qt/qt_set.h
-	$(QTDIR)/bin/$(MOC) -o qt4set.moc ../win/Qt4/qt4set.h
+	$(QTDIR)/bin/$(MOC) -o qt_set.moc ../win/Qt/qt_set.h
-qt4stat.moc : ../win/Qt4/qt4stat.h
+qt_stat.moc : ../win/Qt/qt_stat.h
-	$(QTDIR)/bin/$(MOC) -o qt4stat.moc ../win/Qt4/qt4stat.h
+	$(QTDIR)/bin/$(MOC) -o qt_stat.moc ../win/Qt/qt_stat.h
-qt4xcmd.moc : ../win/Qt4/qt4xcmd.h
+qt_xcmd.moc : ../win/Qt/qt_xcmd.h
-	$(QTDIR)/bin/$(MOC) -o qt4xcmd.moc ../win/Qt4/qt4xcmd.h
+	$(QTDIR)/bin/$(MOC) -o qt_xcmd.moc ../win/Qt/qt_xcmd.h
-qt4yndlg.moc : ../win/Qt4/qt4yndlg.h
+qt_yndlg.moc : ../win/Qt/qt_yndlg.h
-	$(QTDIR)/bin/$(MOC) -o qt4yndlg.moc ../win/Qt4/qt4yndlg.h
+	$(QTDIR)/bin/$(MOC) -o qt_yndlg.moc ../win/Qt/qt_yndlg.h
 
 #	build monst.o and objects.o before executing '$(MAKE) makedefs'
 $(MAKEDEFS): $(FIRSTOBJ) \
@@ -923,83 +923,83 @@ qt_clust.o: ../win/Qt/qt_clust.cpp ../include/qt_clust.h
 	$(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt/qt_clust.cpp
 qttableview.o: ../win/Qt/qttableview.cpp ../include/qttableview.h
 	$(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt/qttableview.cpp
-qt4bind.o: ../win/Qt4/qt4bind.cpp $(HACK_H) ../win/Qt4/qt4bind.h \
+qt_bind.o: ../win/Qt/qt_bind.cpp $(HACK_H) ../win/Qt/qt_bind.h \
-		../win/Qt4/qt4click.h ../win/Qt4/qt4delay.h \
+		../win/Qt/qt_click.h ../win/Qt/qt_delay.h \
-		../win/Qt4/qt4xcmd.h ../win/Qt4/qt4key.h ../win/Qt4/qt4map.h \
+		../win/Qt/qt_xcmd.h ../win/Qt/qt_key.h ../win/Qt/qt_map.h \
-		../win/Qt4/qt4menu.h ../win/Qt4/qt4msg.h ../win/Qt4/qt4plsel.h \
+		../win/Qt/qt_menu.h ../win/Qt/qt_msg.h ../win/Qt/qt_plsel.h \
-		../win/Qt4/qt4svsel.h ../win/Qt4/qt4set.h ../win/Qt4/qt4stat.h \
+		../win/Qt/qt_svsel.h ../win/Qt/qt_set.h ../win/Qt/qt_stat.h \
-		../win/Qt4/qt4streq.h ../win/Qt4/qt4yndlg.h \
+		../win/Qt/qt_streq.h ../win/Qt/qt_yndlg.h \
-		../win/Qt4/qt4str.h ../include/dlb.h
+		../win/Qt/qt_str.h ../include/dlb.h
-	$(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt4/qt4bind.cpp
+	$(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt/qt_bind.cpp
-qt4click.o: ../win/Qt4/qt4click.cpp $(HACK_H) ../win/Qt4/qt4click.h
+qt_click.o: ../win/Qt/qt_click.cpp $(HACK_H) ../win/Qt/qt_click.h
-	$(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt4/qt4click.cpp
+	$(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt/qt_click.cpp
-qt4clust.o: ../win/Qt4/qt4clust.cpp ../win/Qt4/qt4clust.h
+qt_clust.o: ../win/Qt/qt_clust.cpp ../win/Qt/qt_clust.h
-	$(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt4/qt4clust.cpp
+	$(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt/qt_clust.cpp
-qt4delay.o: ../win/Qt4/qt4delay.cpp $(HACK_H) ../win/Qt4/qt4delay.h
+qt_delay.o: ../win/Qt/qt_delay.cpp $(HACK_H) ../win/Qt/qt_delay.h
-	$(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt4/qt4delay.cpp
+	$(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt/qt_delay.cpp
-qt4glyph.o: ../win/Qt4/qt4glyph.cpp $(HACK_H) ../include/tile2x11.h \
+qt_glyph.o: ../win/Qt/qt_glyph.cpp $(HACK_H) ../include/tile2x11.h \
-		../win/Qt4/qt4glyph.h ../win/Qt4/qt4set.h ../win/Qt4/qt4str.h
+		../win/Qt/qt_glyph.h ../win/Qt/qt_set.h ../win/Qt/qt_str.h
-	$(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt4/qt4glyph.cpp
+	$(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt/qt_glyph.cpp
-qt4icon.o: ../win/Qt4/qt4icon.cpp $(HACK_H) ../win/Qt4/qt4icon.h
+qt_icon.o: ../win/Qt/qt_icon.cpp $(HACK_H) ../win/Qt/qt_icon.h
-	$(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt4/qt4icon.cpp
+	$(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt/qt_icon.cpp
-qt4inv.o: ../win/Qt4/qt4inv.cpp $(HACK_H) ../win/Qt4/qt4inv.h \
+qt_inv.o: ../win/Qt/qt_inv.cpp $(HACK_H) ../win/Qt/qt_inv.h \
-		../win/Qt4/qt4glyph.h ../win/Qt4/qt4set.h
+		../win/Qt/qt_glyph.h ../win/Qt/qt_set.h
-	$(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt4/qt4inv.cpp
+	$(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt/qt_inv.cpp
-qt4key.o: ../win/Qt4/qt4key.cpp $(HACK_H) ../win/Qt4/qt4key.h
+qt_key.o: ../win/Qt/qt_key.cpp $(HACK_H) ../win/Qt/qt_key.h
-	$(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt4/qt4key.cpp
+	$(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt/qt_key.cpp
-qt4line.o: ../win/Qt4/qt4line.cpp $(HACK_H) ../win/Qt4/qt4line.h
+qt_line.o: ../win/Qt/qt_line.cpp $(HACK_H) ../win/Qt/qt_line.h
-	$(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt4/qt4line.cpp
+	$(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt/qt_line.cpp
-qt4main.o: ../win/Qt4/qt4main.cpp $(HACK_H) ../include/patchlevel.h \
+qt_main.o: ../win/Qt/qt_main.cpp $(HACK_H) ../include/patchlevel.h \
-		../win/Qt4/qt4main.h qt4main.moc ../win/Qt4/qt4bind.h \
+		../win/Qt/qt_main.h qt_main.moc ../win/Qt/qt_bind.h \
-		../win/Qt4/qt4glyph.h ../win/Qt4/qt4inv.h ../win/Qt4/qt4key.h \
+		../win/Qt/qt_glyph.h ../win/Qt/qt_inv.h ../win/Qt/qt_key.h \
-		../win/Qt4/qt4map.h ../win/Qt4/qt4msg.h ../win/Qt4/qt4set.h \
+		../win/Qt/qt_map.h ../win/Qt/qt_msg.h ../win/Qt/qt_set.h \
-		../win/Qt4/qt4stat.h ../win/Qt4/qt4str.h qt4kde0.moc
+		../win/Qt/qt_stat.h ../win/Qt/qt_str.h qt_kde0.moc
-	$(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt4/qt4main.cpp
+	$(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt/qt_main.cpp
-qt4map.o: ../win/Qt4/qt4map.cpp $(HACK_H) ../win/Qt4/qt4map.h qt4map.moc \
+qt_map.o: ../win/Qt/qt_map.cpp $(HACK_H) ../win/Qt/qt_map.h qt_map.moc \
-		../win/Qt4/qt4click.h ../win/Qt4/qt4glyph.h \
+		../win/Qt/qt_click.h ../win/Qt/qt_glyph.h \
-		../include/qt_xpms.h ../win/Qt4/qt4set.h ../win/Qt4/qt4str.h
+		../include/qt_xpms.h ../win/Qt/qt_set.h ../win/Qt/qt_str.h
-	$(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt4/qt4map.cpp
+	$(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt/qt_map.cpp
-qt4menu.o: ../win/Qt4/qt4menu.cpp $(HACK_H) ../win/Qt4/qt4menu.h qt4menu.moc \
+qt_menu.o: ../win/Qt/qt_menu.cpp $(HACK_H) ../win/Qt/qt_menu.h qt_menu.moc \
-		../win/Qt4/qt4glyph.h ../win/Qt4/qt4set.h \
+		../win/Qt/qt_glyph.h ../win/Qt/qt_set.h \
-		../win/Qt4/qt4streq.h ../win/Qt4/qt4str.h
+		../win/Qt/qt_streq.h ../win/Qt/qt_str.h
-	$(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt4/qt4menu.cpp
+	$(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt/qt_menu.cpp
-qt4msg.o: ../win/Qt4/qt4msg.cpp $(HACK_H) ../win/Qt4/qt4msg.h qt4msg.moc \
+qt_msg.o: ../win/Qt/qt_msg.cpp $(HACK_H) ../win/Qt/qt_msg.h qt_msg.moc \
-		../win/Qt4/qt4map.h ../win/Qt4/qt4set.h ../win/Qt4/qt4str.h
+		../win/Qt/qt_map.h ../win/Qt/qt_set.h ../win/Qt/qt_str.h
-	$(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt4/qt4msg.cpp
+	$(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt/qt_msg.cpp
-qt4plsel.o: ../win/Qt4/qt4plsel.cpp $(HACK_H) ../win/Qt4/qt4plsel.h \
+qt_plsel.o: ../win/Qt/qt_plsel.cpp $(HACK_H) ../win/Qt/qt_plsel.h \
-		qt4plsel.moc ../win/Qt4/qt4bind.h ../win/Qt4/qt4glyph.h \
+		qt_plsel.moc ../win/Qt/qt_bind.h ../win/Qt/qt_glyph.h \
-		../win/Qt4/qt4set.h ../win/Qt4/qt4str.h
+		../win/Qt/qt_set.h ../win/Qt/qt_str.h
-	$(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt4/qt4plsel.cpp
+	$(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt/qt_plsel.cpp
-qt4rip.o: ../win/Qt4/qt4rip.cpp $(HACK_H) ../win/Qt4/qt4rip.h \
+qt_rip.o: ../win/Qt/qt_rip.cpp $(HACK_H) ../win/Qt/qt_rip.h \
-		../win/Qt4/qt4bind.h ../win/Qt4/qt4str.h
+		../win/Qt/qt_bind.h ../win/Qt/qt_str.h
-	$(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt4/qt4rip.cpp
+	$(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt/qt_rip.cpp
-qt4set.o: ../win/Qt4/qt4set.cpp $(HACK_H) ../win/Qt4/qt4set.h qt4set.moc \
+qt_set.o: ../win/Qt/qt_set.cpp $(HACK_H) ../win/Qt/qt_set.h qt_set.moc \
-		../win/Qt4/qt4glyph.h ../win/Qt4/qt4str.h
+		../win/Qt/qt_glyph.h ../win/Qt/qt_str.h
-	$(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt4/qt4set.cpp
+	$(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt/qt_set.cpp
-qt4stat.o: ../win/Qt4/qt4stat.cpp $(HACK_H) ../win/Qt4/qt4stat.h qt4stat.moc \
+qt_stat.o: ../win/Qt/qt_stat.cpp $(HACK_H) ../win/Qt/qt_stat.h qt_stat.moc \
-		../win/Qt4/qt4set.h ../win/Qt4/qt4str.h ../include/qt_xpms.h
+		../win/Qt/qt_set.h ../win/Qt/qt_str.h ../include/qt_xpms.h
-	$(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt4/qt4stat.cpp
+	$(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt/qt_stat.cpp
-qt4str.o: ../win/Qt4/qt4str.cpp ../win/Qt4/qt4str.h
+qt_str.o: ../win/Qt/qt_str.cpp ../win/Qt/qt_str.h
-	$(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt4/qt4str.cpp
+	$(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt/qt_str.cpp
-qt4streq.o: ../win/Qt4/qt4streq.cpp $(HACK_H) ../win/Qt4/qt4streq.h \
+qt_streq.o: ../win/Qt/qt_streq.cpp $(HACK_H) ../win/Qt/qt_streq.h \
-		../win/Qt4/qt4str.h
+		../win/Qt/qt_str.h
-	$(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt4/qt4streq.cpp
+	$(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt/qt_streq.cpp
-qt4svsel.o: ../win/Qt4/qt4svsel.cpp $(HACK_H) ../win/Qt4/qt4svsel.h \
+qt_svsel.o: ../win/Qt/qt_svsel.cpp $(HACK_H) ../win/Qt/qt_svsel.h \
-		../win/Qt4/qt4bind.h ../win/Qt4/qt4str.h
+		../win/Qt/qt_bind.h ../win/Qt/qt_str.h
-	$(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt4/qt4svsel.cpp
+	$(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt/qt_svsel.cpp
-qt4win.o: ../win/Qt4/qt4win.cpp $(HACK_H) ../win/Qt4/qt4win.h \
+qt_win.o: ../win/Qt/qt_win.cpp $(HACK_H) ../win/Qt/qt_win.h \
-		../win/Qt4/qt4bind.h ../win/Qt4/qt4click.h \
+		../win/Qt/qt_bind.h ../win/Qt/qt_click.h \
-		../win/Qt4/qt4glyph.h ../win/Qt4/qt4inv.h ../win/Qt4/qt4key.h \
+		../win/Qt/qt_glyph.h ../win/Qt/qt_inv.h ../win/Qt/qt_key.h \
-		../win/Qt4/qt4icon.h ../win/Qt4/qt4map.h ../win/Qt4/qt4menu.h \
+		../win/Qt/qt_icon.h ../win/Qt/qt_map.h ../win/Qt/qt_menu.h \
-		../win/Qt4/qt4msg.h ../win/Qt4/qt4set.h ../win/Qt4/qt4clust.h
+		../win/Qt/qt_msg.h ../win/Qt/qt_set.h ../win/Qt/qt_clust.h
-	$(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt4/qt4win.cpp
+	$(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt/qt_win.cpp
-qt4xcmd.o: ../win/Qt4/qt4xcmd.cpp $(HACK_H) ../include/func_tab.h \
+qt_xcmd.o: ../win/Qt/qt_xcmd.cpp $(HACK_H) ../include/func_tab.h \
-		../win/Qt4/qt4xcmd.h qt4xcmd.moc ../win/Qt4/qt4bind.h \
+		../win/Qt/qt_xcmd.h qt_xcmd.moc ../win/Qt/qt_bind.h \
-		../win/Qt4/qt4set.h ../win/Qt4/qt4str.h
+		../win/Qt/qt_set.h ../win/Qt/qt_str.h
-	$(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt4/qt4xcmd.cpp
+	$(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt/qt_xcmd.cpp
-qt4yndlg.o: ../win/Qt4/qt4yndlg.cpp $(HACK_H) ../win/Qt4/qt4yndlg.h \
+qt_yndlg.o: ../win/Qt/qt_yndlg.cpp $(HACK_H) ../win/Qt/qt_yndlg.h \
-		qt4yndlg.moc ../win/Qt4/qt4str.h
+		qt_yndlg.moc ../win/Qt/qt_str.h
-	$(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt4/qt4yndlg.cpp
+	$(CXX) $(CXXFLAGS) -c -o $@ ../win/Qt/qt_yndlg.cpp
 wc_chainin.o: ../win/chain/wc_chainin.c $(HACK_H)
 	$(CC) $(CFLAGS) -c -o $@ ../win/chain/wc_chainin.c
 wc_chainout.o: ../win/chain/wc_chainout.c $(HACK_H)

sys/unix/hints/linux-qt5

@@ -33,8 +33,8 @@ CFLAGS+=`pkg-config Qt5Gui Qt5Widgets Qt5Multimedia --cflags` -fPIC
 LINK=g++
 CXX=g++ -std=gnu++11
 
-WINSRC = $(WINQT4SRC)
+WINSRC = $(WINQTSRC)
-WINOBJ = $(WINQT4OBJ)
+WINOBJ = $(WINQTOBJ)
 WINLIB = $(WINQT5LIB)
 #MOC = moc
 MOC = moc-qt5

win/Qt/.gitattributes

@@ -1,4 +1 @@
-Install.Qt NHSUBST
+* NH_filestag=(file%s_for_the_Qt_4_or_5_widget_library_-_X11,_Windows,_Mac_OS_X)
-qpe-nethack.control NH_header=no
-knethack.lnk NH_header=no
-* NH_filestag=(file%s_for_the_Qt_3_widget_library_-_X11,_Windows,_Mac_OS_X,_or_Qtopia)

win/Qt/qt_bind.cpp

@@ -2,7 +2,7 @@
 // Qt4 conversion copyright (c) Ray Chason, 2012-2014.
 // NetHack may be freely redistributed.  See license for details.
 
-// qt4bind.cpp -- bindings between the Qt 4 interface and the main code
+// qt_bind.cpp -- bindings between the Qt 4 interface and the main code
 
 extern "C" {
 #include "hack.h"
@@ -25,23 +25,23 @@ extern "C" {
 #else
 #include <QtGui/QSound>
 #endif
-#include "qt4bind.h"
+#include "qt_bind.h"
-#include "qt4click.h"
+#include "qt_click.h"
 #ifdef TIMED_DELAY
-#include "qt4delay.h"
+#include "qt_delay.h"
 #endif
-#include "qt4xcmd.h"
+#include "qt_xcmd.h"
-#include "qt4key.h"
+#include "qt_key.h"
-#include "qt4map.h"
+#include "qt_map.h"
-#include "qt4menu.h"
+#include "qt_menu.h"
-#include "qt4msg.h"
+#include "qt_msg.h"
-#include "qt4plsel.h"
+#include "qt_plsel.h"
-#include "qt4svsel.h"
+#include "qt_svsel.h"
-#include "qt4set.h"
+#include "qt_set.h"
-#include "qt4stat.h"
+#include "qt_stat.h"
-#include "qt4streq.h"
+#include "qt_streq.h"
-#include "qt4yndlg.h"
+#include "qt_yndlg.h"
-#include "qt4str.h"
+#include "qt_str.h"
 
 extern "C" {
 #include "dlb.h"
@@ -51,7 +51,7 @@ extern "C" {
 extern int qt_compact_mode;
 // end temporary
 
-namespace nethack_qt4 {
+namespace nethack_qt_ {
 
 // XXX Should be from Options
 //
@@ -721,7 +721,7 @@ boolean NetHackQtBind::msgs_initd = false;
 
 static void Qt_positionbar(char *) {}
 
-} // namespace nethack_qt4
+} // namespace nethack_qt_
 
 struct window_procs Qt_procs = {
     "Qt",
@@ -731,48 +731,48 @@ struct window_procs Qt_procs = {
     | WC_PLAYER_SELECTION | WC_SPLASH_SCREEN,
     0L,
     {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1},   /* color availability */
-    nethack_qt4::NetHackQtBind::qt_init_nhwindows,
+    nethack_qt_::NetHackQtBind::qt_init_nhwindows,
-    nethack_qt4::NetHackQtBind::qt_player_selection,
+    nethack_qt_::NetHackQtBind::qt_player_selection,
-    nethack_qt4::NetHackQtBind::qt_askname,
+    nethack_qt_::NetHackQtBind::qt_askname,
-    nethack_qt4::NetHackQtBind::qt_get_nh_event,
+    nethack_qt_::NetHackQtBind::qt_get_nh_event,
-    nethack_qt4::NetHackQtBind::qt_exit_nhwindows,
+    nethack_qt_::NetHackQtBind::qt_exit_nhwindows,
-    nethack_qt4::NetHackQtBind::qt_suspend_nhwindows,
+    nethack_qt_::NetHackQtBind::qt_suspend_nhwindows,
-    nethack_qt4::NetHackQtBind::qt_resume_nhwindows,
+    nethack_qt_::NetHackQtBind::qt_resume_nhwindows,
-    nethack_qt4::NetHackQtBind::qt_create_nhwindow,
+    nethack_qt_::NetHackQtBind::qt_create_nhwindow,
-    nethack_qt4::NetHackQtBind::qt_clear_nhwindow,
+    nethack_qt_::NetHackQtBind::qt_clear_nhwindow,
-    nethack_qt4::NetHackQtBind::qt_display_nhwindow,
+    nethack_qt_::NetHackQtBind::qt_display_nhwindow,
-    nethack_qt4::NetHackQtBind::qt_destroy_nhwindow,
+    nethack_qt_::NetHackQtBind::qt_destroy_nhwindow,
-    nethack_qt4::NetHackQtBind::qt_curs,
+    nethack_qt_::NetHackQtBind::qt_curs,
-    nethack_qt4::NetHackQtBind::qt_putstr,
+    nethack_qt_::NetHackQtBind::qt_putstr,
     genl_putmixed,
-    nethack_qt4::NetHackQtBind::qt_display_file,
+    nethack_qt_::NetHackQtBind::qt_display_file,
-    nethack_qt4::NetHackQtBind::qt_start_menu,
+    nethack_qt_::NetHackQtBind::qt_start_menu,
-    nethack_qt4::NetHackQtBind::qt_add_menu,
+    nethack_qt_::NetHackQtBind::qt_add_menu,
-    nethack_qt4::NetHackQtBind::qt_end_menu,
+    nethack_qt_::NetHackQtBind::qt_end_menu,
-    nethack_qt4::NetHackQtBind::qt_select_menu,
+    nethack_qt_::NetHackQtBind::qt_select_menu,
     genl_message_menu,      /* no need for X-specific handling */
-    nethack_qt4::NetHackQtBind::qt_update_inventory,
+    nethack_qt_::NetHackQtBind::qt_update_inventory,
-    nethack_qt4::NetHackQtBind::qt_mark_synch,
+    nethack_qt_::NetHackQtBind::qt_mark_synch,
-    nethack_qt4::NetHackQtBind::qt_wait_synch,
+    nethack_qt_::NetHackQtBind::qt_wait_synch,
 #ifdef CLIPPING
-    nethack_qt4::NetHackQtBind::qt_cliparound,
+    nethack_qt_::NetHackQtBind::qt_cliparound,
 #endif
 #ifdef POSITIONBAR
-    nethack_qt4::Qt_positionbar,
+    nethack_qt_::Qt_positionbar,
 #endif
-    nethack_qt4::NetHackQtBind::qt_print_glyph,
+    nethack_qt_::NetHackQtBind::qt_print_glyph,
     //NetHackQtBind::qt_print_glyph_compose,
-    nethack_qt4::NetHackQtBind::qt_raw_print,
+    nethack_qt_::NetHackQtBind::qt_raw_print,
-    nethack_qt4::NetHackQtBind::qt_raw_print_bold,
+    nethack_qt_::NetHackQtBind::qt_raw_print_bold,
-    nethack_qt4::NetHackQtBind::qt_nhgetch,
+    nethack_qt_::NetHackQtBind::qt_nhgetch,
-    nethack_qt4::NetHackQtBind::qt_nh_poskey,
+    nethack_qt_::NetHackQtBind::qt_nh_poskey,
-    nethack_qt4::NetHackQtBind::qt_nhbell,
+    nethack_qt_::NetHackQtBind::qt_nhbell,
-    nethack_qt4::NetHackQtBind::qt_doprev_message,
+    nethack_qt_::NetHackQtBind::qt_doprev_message,
-    nethack_qt4::NetHackQtBind::qt_yn_function,
+    nethack_qt_::NetHackQtBind::qt_yn_function,
-    nethack_qt4::NetHackQtBind::qt_getlin,
+    nethack_qt_::NetHackQtBind::qt_getlin,
-    nethack_qt4::NetHackQtBind::qt_get_ext_cmd,
+    nethack_qt_::NetHackQtBind::qt_get_ext_cmd,
-    nethack_qt4::NetHackQtBind::qt_number_pad,
+    nethack_qt_::NetHackQtBind::qt_number_pad,
-    nethack_qt4::NetHackQtBind::qt_delay_output,
+    nethack_qt_::NetHackQtBind::qt_delay_output,
 #ifdef CHANGE_COLOR     /* only a Mac option currently */
     donull,
     donull,
@@ -780,17 +780,17 @@ struct window_procs Qt_procs = {
     donull,
 #endif
     /* other defs that really should go away (they're tty specific) */
-    nethack_qt4::NetHackQtBind::qt_start_screen,
+    nethack_qt_::NetHackQtBind::qt_start_screen,
-    nethack_qt4::NetHackQtBind::qt_end_screen,
+    nethack_qt_::NetHackQtBind::qt_end_screen,
 #ifdef GRAPHIC_TOMBSTONE
-    nethack_qt4::NetHackQtBind::qt_outrip,
+    nethack_qt_::NetHackQtBind::qt_outrip,
 #else
     genl_outrip,
 #endif
     genl_preference_update,
 
-    nethack_qt4::NetHackQtBind::qt_getmsghistory,
+    nethack_qt_::NetHackQtBind::qt_getmsghistory,
-    nethack_qt4::NetHackQtBind::qt_putmsghistory,
+    nethack_qt_::NetHackQtBind::qt_putmsghistory,
     genl_status_init,
     genl_status_finish, genl_status_enablefield,
 #ifdef STATUS_HILITES

win/Qt/qt_bind.h

@@ -2,14 +2,14 @@
 // Qt4 conversion copyright (c) Ray Chason, 2012-2014.
 // NetHack may be freely redistributed.  See license for details.
 
-// qt4bind.h -- bindings between the Qt 4 interface and the main code
+// qt_bind.h -- bindings between the Qt 4 interface and the main code
 
 #ifndef QT4BIND_H
 #define QT4BIND_H
 
-#include "qt4main.h"
+#include "qt_main.h"
 
-namespace nethack_qt4 {
+namespace nethack_qt_ {
 
 class NetHackQtClickBuffer;
 
@@ -94,6 +94,6 @@ private:
         static boolean msgs_initd;
 };
 
-} // namespace nethack_qt4
+} // namespace nethack_qt_
 
 #endif

win/Qt/qt_click.cpp

@@ -2,7 +2,7 @@
 // Qt4 conversion copyright (c) Ray Chason, 2012-2014.
 // NetHack may be freely redistributed.  See license for details.
 
-// qt4click.cpp -- a mouse click buffer
+// qt_click.cpp -- a mouse click buffer
 
 #include "hack.h"
 #undef Invisible
@@ -16,9 +16,9 @@
 #undef max
 
 #include <QtGui/QtGui>
-#include "qt4click.h"
+#include "qt_click.h"
 
-namespace nethack_qt4 {
+namespace nethack_qt_ {
 
 NetHackQtClickBuffer::NetHackQtClickBuffer() :
     in(0), out(0)
@@ -45,4 +45,4 @@ void NetHackQtClickBuffer::Get()
     out=(out+1)%maxclick;
 }
 
-} // namespace nethack_qt4
+} // namespace nethack_qt_

win/Qt/qt_click.h

@@ -2,12 +2,12 @@
 // Qt4 conversion copyright (c) Ray Chason, 2012-2014.
 // NetHack may be freely redistributed.  See license for details.
 
-// qt4click.h -- a mouse click buffer
+// qt_click.h -- a mouse click buffer
 
 #ifndef QT4CLICK_H
 #define QT4CLICK_H
 
-namespace nethack_qt4 {
+namespace nethack_qt_ {
 
 class NetHackQtClickBuffer {
 public:
@@ -32,6 +32,6 @@ private:
 	int in,out;
 };
 
-} // namespace nethack_qt4
+} // namespace nethack_qt_
 
 #endif

win/Qt/qt_clust.cpp

@@ -1,10 +1,9 @@
-/* NetHack 3.6	qt_clust.cpp	$NHDT-Date: 1524684507 2018/04/25 19:28:27 $  $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.8 $ */
+/*	SCCS Id: @(#)qt_clust.cpp	3.4	1999/11/19	*/
 /* Copyright (c) Warwick Allison, 1999. */
 /* NetHack may be freely redistributed.  See license for details. */
 #include "qt_clust.h"
 
-static
+static void include(QRect& r, const QRect& rect)
-void include(QRect& r, const QRect& rect)
 {
 	if (rect.left()<r.left()) {
 			r.setLeft(rect.left());
@@ -75,7 +74,7 @@ void Clusterizer::add(const QRect& rect)
 					- cluster[cursor].width()*cluster[cursor].height();
 
 			if (cost < lowestcost) {
-				bool bad=FALSE;
+				bool bad=false;
 				for (int c=0; c<count && !bad; c++) {
 					bad=cluster[c].intersects(larger) && c!=cursor;
 				}
@@ -108,7 +107,7 @@ void Clusterizer::add(const QRect& rect)
 		int cost=larger.width()*larger.height()
 				- cluster[cursor].width()*cluster[cursor].height();
 		if (cost < lowestcost) {
-			bool bad=FALSE;
+			bool bad=false;
 			for (int c=0; c<count && !bad; c++) {
 				bad=cluster[c].intersects(larger) && c!=cursor;
 			}
@@ -134,7 +133,7 @@ void Clusterizer::add(const QRect& rect)
 					- cluster[merge1].width()*cluster[merge1].height()
 					- cluster[merge2].width()*cluster[merge2].height();
 				if (cost < lowestcost) {
-					bool bad=FALSE;
+					bool bad=false;
 					for (int c=0; c<count && !bad; c++) {
 						bad=cluster[c].intersects(larger) && c!=cursor;
 					}

win/Qt/qt_delay.cpp

@@ -2,7 +2,7 @@
 // Qt4 conversion copyright (c) Ray Chason, 2012-2014.
 // NetHack may be freely redistributed.  See license for details.
 
-// qt4delay.cpp -- implement a delay
+// qt_delay.cpp -- implement a delay
 
 #include "hack.h"
 #undef Invisible
@@ -16,9 +16,9 @@
 #undef max
 
 #include <QtGui/QtGui>
-#include "qt4delay.h"
+#include "qt_delay.h"
 
-namespace nethack_qt4 {
+namespace nethack_qt_ {
 
 // RLC Can we use QTimer::single_shot for this?
 NetHackQtDelay::NetHackQtDelay(int ms) :
@@ -39,4 +39,4 @@ void NetHackQtDelay::timerEvent(QTimerEvent* timer)
     m_timer = 0;
 }
 
-} // namespace nethack_qt4
+} // namespace nethack_qt_

win/Qt/qt_delay.h

@@ -2,12 +2,12 @@
 // Qt4 conversion copyright (c) Ray Chason, 2012-2014.
 // NetHack may be freely redistributed.  See license for details.
 
-// qt4delay.h -- implement a delay
+// qt_delay.h -- implement a delay
 
 #ifndef QT4DELAY_H
 #define QT4DELAY_H
 
-namespace nethack_qt4 {
+namespace nethack_qt_ {
 
 class NetHackQtDelay : QObject {
 private:
@@ -21,6 +21,6 @@ public:
 	virtual void timerEvent(QTimerEvent* timer);
 };
 
-} // namespace nethack_qt4
+} // namespace nethack_qt_
 
 #endif

win/Qt/qt_glyph.cpp

@@ -2,7 +2,7 @@
 // Qt4 conversion copyright (c) Ray Chason, 2012-2014.
 // NetHack may be freely redistributed.  See license for details.
 
-// qt4glyph.cpp -- class to manage the glyphs in a tile set
+// qt_glyph.cpp -- class to manage the glyphs in a tile set
 
 extern "C" {
 #include "hack.h"
@@ -22,13 +22,13 @@ extern "C" {
 #if QT_VERSION >= 0x050000
 #include <QtWidgets/QtWidgets>
 #endif
-#include "qt4glyph.h"
+#include "qt_glyph.h"
-#include "qt4set.h"
+#include "qt_set.h"
-#include "qt4str.h"
+#include "qt_str.h"
 
 extern short glyph2tile[]; // from tile.c
 
-namespace nethack_qt4 {
+namespace nethack_qt_ {
 
 static int tilefile_tile_W=16;
 static int tilefile_tile_H=16;
@@ -138,4 +138,4 @@ void NetHackQtGlyphs::setSize(int w, int h)
     (was1 ? pm2 : pm1) = pm;
 }
 
-} // namespace nethack_qt4
+} // namespace nethack_qt_

win/Qt/qt_glyph.h

@@ -2,12 +2,12 @@
 // Qt4 conversion copyright (c) Ray Chason, 2012-2014.
 // NetHack may be freely redistributed.  See license for details.
 
-// qt4glyph.h -- class to manage the glyphs in a tile set
+// qt_glyph.h -- class to manage the glyphs in a tile set
 
 #ifndef QT4GLYPH_H
 #define QT4GLYPH_H
 
-namespace nethack_qt4 {
+namespace nethack_qt_ {
 
 class NetHackQtGlyphs {
 public:
@@ -29,6 +29,6 @@ private:
 	int tiles_per_row;
 };
 
-} // namespace nethack_qt4
+} // namespace nethack_qt_
 
 #endif

win/Qt/qt_icon.cpp

@@ -2,7 +2,7 @@
 // Qt4 conversion copyright (c) Ray Chason, 2012-2014.
 // NetHack may be freely redistributed.  See license for details.
 
-// qt4icon.cpp -- a labelled icon
+// qt_icon.cpp -- a labelled icon
 
 #include "hack.h"
 #undef Invisible
@@ -19,9 +19,9 @@
 #if QT_VERSION >= 0x050000
 #include <QtWidgets/QtWidgets>
 #endif
-#include "qt4icon.h"
+#include "qt_icon.h"
 
-namespace nethack_qt4 {
+namespace nethack_qt_ {
 
 NetHackQtLabelledIcon::NetHackQtLabelledIcon(QWidget* parent, const char* l) :
     QWidget(parent),
@@ -200,4 +200,4 @@ void NetHackQtLabelledIcon::setAlignments()
     if (icon) icon->setAlignment(Qt::AlignHCenter|Qt::AlignVCenter);
 }
 
-} // namespace nethack_qt4
+} // namespace nethack_qt_

win/Qt/qt_icon.h

@@ -2,12 +2,12 @@
 // Qt4 conversion copyright (c) Ray Chason, 2012-2014.
 // NetHack may be freely redistributed.  See license for details.
 
-// qt4icon.cpp -- a labelled icon
+// qt_icon.cpp -- a labelled icon
 
 #ifndef QT4ICON_H
 #define QT4ICON_H
 
-namespace nethack_qt4 {
+namespace nethack_qt_ {
 
 class NetHackQtLabelledIcon : public QWidget {
 public:
@@ -48,6 +48,6 @@ private:
 	QLabel* icon;
 };
 
-} // namespace nethack_qt4
+} // namespace nethack_qt_
 
 #endif

win/Qt/qt_inv.cpp

@@ -2,7 +2,7 @@
 // Qt4 conversion copyright (c) Ray Chason, 2012-2014.
 // NetHack may be freely redistributed.  See license for details.
 
-// qt4inv.cpp -- inventory usage window
+// qt_inv.cpp -- inventory usage window
 // This is at the top center of the main window
 
 extern "C" {
@@ -22,11 +22,11 @@ extern "C" {
 #if QT_VERSION >= 0x050000
 #include <QtWidgets/QtWidgets>
 #endif
-#include "qt4inv.h"
+#include "qt_inv.h"
-#include "qt4glyph.h"
+#include "qt_glyph.h"
-#include "qt4set.h"
+#include "qt_set.h"
 
-namespace nethack_qt4 {
+namespace nethack_qt_ {
 
 NetHackQtInvUsageWindow::NetHackQtInvUsageWindow(QWidget* parent) :
     QWidget(parent)
@@ -96,4 +96,4 @@ QSize NetHackQtInvUsageWindow::sizeHint(void) const
     }
 }
 
-} // namespace nethack_qt4
+} // namespace nethack_qt_

win/Qt/qt_inv.h

@@ -2,13 +2,13 @@
 // Qt4 conversion copyright (c) Ray Chason, 2012-2014.
 // NetHack may be freely redistributed.  See license for details.
 
-// qt4inv.h -- inventory usage window
+// qt_inv.h -- inventory usage window
 // This is at the top center of the main window
 
 #ifndef QT4INV_H
 #define QT4INV_H
 
-namespace nethack_qt4 {
+namespace nethack_qt_ {
 
 class NetHackQtInvUsageWindow : public QWidget {
 public:
@@ -20,6 +20,6 @@ private:
 	void drawWorn(QPainter& painter, obj*, int x, int y, bool canbe=true);
 };
 
-} // namespace nethack_qt4
+} // namespace nethack_qt_
 
 #endif

win/Qt/qt_kde0.h

@@ -4,7 +4,7 @@
 
 #ifndef QT_DUMMYKDE
 #define QT_DUMMYKDE
-namespace nethack_qt4 {
+namespace nethack_qt_ {
 
 class KTopLevelWidget : public QMainWindow {
         Q_OBJECT

win/Qt/qt_key.cpp

@@ -2,7 +2,7 @@
 // Qt4 conversion copyright (c) Ray Chason, 2012-2014.
 // NetHack may be freely redistributed.  See license for details.
 
-// qt4key.cpp -- a key buffer
+// qt_key.cpp -- a key buffer
 
 #include "hack.h"
 #undef Invisible
@@ -16,9 +16,9 @@
 #undef max
 
 #include <QtGui/QtGui>
-#include "qt4key.h"
+#include "qt_key.h"
 
-namespace nethack_qt4 {
+namespace nethack_qt_ {
 
 NetHackQtKeyBuffer::NetHackQtKeyBuffer() :
     in(0), out(0)
@@ -88,4 +88,4 @@ Qt::KeyboardModifiers NetHackQtKeyBuffer::TopState() const
     return state[out];
 }
 
-} // namespace nethack_qt4
+} // namespace nethack_qt_

win/Qt/qt_key.h

@@ -2,12 +2,12 @@
 // Qt4 conversion copyright (c) Ray Chason, 2012-2014.
 // NetHack may be freely redistributed.  See license for details.
 
-// qt4key.h -- a key buffer
+// qt_key.h -- a key buffer
 
 #ifndef QT4KEY_H
 #define QT4KEY_H
 
-namespace nethack_qt4 {
+namespace nethack_qt_ {
 
 class NetHackQtKeyBuffer {
 public:
@@ -35,6 +35,6 @@ private:
 	int in,out;
 };
 
-} // namespace nethack_qt4
+} // namespace nethack_qt_
 
 #endif

win/Qt/qt_line.cpp

@@ -2,7 +2,7 @@
 // Qt4 conversion copyright (c) Ray Chason, 2012-2014.
 // NetHack may be freely redistributed.  See license for details.
 
-// qt4line.cpp -- a one line input window
+// qt_line.cpp -- a one line input window
 
 #include "hack.h"
 #undef Invisible
@@ -19,9 +19,9 @@
 #if QT_VERSION >= 0x050000
 #include <QtWidgets/QtWidgets>
 #endif
-#include "qt4line.h"
+#include "qt_line.h"
 
-namespace nethack_qt4 {
+namespace nethack_qt_ {
 
 NetHackQtLineEdit::NetHackQtLineEdit() :
     QLineEdit(0)
@@ -39,4 +39,4 @@ void NetHackQtLineEdit::fakeEvent(int key, int ascii, Qt::KeyboardModifiers stat
     keyPressEvent(&fake);
 }
 
-} // namespace nethack_qt4
+} // namespace nethack_qt_

win/Qt/qt_line.h

@@ -2,12 +2,12 @@
 // Qt4 conversion copyright (c) Ray Chason, 2012-2014.
 // NetHack may be freely redistributed.  See license for details.
 
-// qt4line.h -- a one line input window
+// qt_line.h -- a one line input window
 
 #ifndef QT4LINE_H
 #define QT4LINE_H
 
-namespace nethack_qt4 {
+namespace nethack_qt_ {
 
 class NetHackQtLineEdit : public QLineEdit {
 public:
@@ -17,6 +17,6 @@ public:
 	void fakeEvent(int key, int ascii, Qt::KeyboardModifiers state);
 };
 
-} // namespace nethack_qt4
+} // namespace nethack_qt_
 
 #endif

win/Qt/qt_main.cpp

@@ -2,7 +2,7 @@
 // Qt4 conversion copyright (c) Ray Chason, 2012-2014.
 // NetHack may be freely redistributed.  See license for details.
 
-// qt4main.cpp -- the main window
+// qt_main.cpp -- the main window
 
 extern "C" {
 #include "hack.h"
@@ -22,20 +22,20 @@ extern "C" {
 #if QT_VERSION >= 0x050000
 #include <QtWidgets/QtWidgets>
 #endif
-#include "qt4main.h"
+#include "qt_main.h"
-#include "qt4main.moc"
+#include "qt_main.moc"
-#include "qt4bind.h"
+#include "qt_bind.h"
-#include "qt4glyph.h"
+#include "qt_glyph.h"
-#include "qt4inv.h"
+#include "qt_inv.h"
-#include "qt4key.h"
+#include "qt_key.h"
-#include "qt4map.h"
+#include "qt_map.h"
-#include "qt4msg.h"
+#include "qt_msg.h"
-#include "qt4set.h"
+#include "qt_set.h"
-#include "qt4stat.h"
+#include "qt_stat.h"
-#include "qt4str.h"
+#include "qt_str.h"
 
 #ifndef KDE
-#include "qt4kde0.moc"
+#include "qt_kde0.moc"
 #endif
 
 // temporary
@@ -44,7 +44,7 @@ extern char *qt_tileheight;
 extern int qt_compact_mode;
 // end temporary
 
-namespace nethack_qt4 {
+namespace nethack_qt_ {
 
 // temporary
 void centerOnMain( QWidget* w );
@@ -1073,4 +1073,4 @@ void NetHackQtMainWindow::ShowIfReady()
     }
 }
 
-} // namespace nethack_qt4
+} // namespace nethack_qt_

win/Qt/qt_main.h

@@ -2,7 +2,7 @@
 // Qt4 conversion copyright (c) Ray Chason, 2012-2014.
 // NetHack may be freely redistributed.  See license for details.
 
-// qt4main.h -- the main window
+// qt_main.h -- the main window
 
 #ifndef QT4MAIN_H
 #define QT4MAIN_H
@@ -11,10 +11,10 @@
 #include <kapp.h>
 #include <ktopwidget.h>
 #else
-#include "qt4kde0.h"
+#include "qt_kde0.h"
 #endif
 
-namespace nethack_qt4 {
+namespace nethack_qt_ {
 
 class NetHackQtInvUsageWindow;
 class NetHackQtKeyBuffer;
@@ -90,6 +90,6 @@ private:
 	int dirkey;
 };
 
-} // namespace nethack_qt4
+} // namespace nethack_qt_
 
 #endif

win/Qt/qt_map.cpp

@@ -2,7 +2,7 @@
 // Qt4 conversion copyright (c) Ray Chason, 2012-2014.
 // NetHack may be freely redistributed.  See license for details.
 
-// qt4map.cpp -- the map window
+// qt_map.cpp -- the map window
 
 extern "C" {
 #include "hack.h"
@@ -21,19 +21,19 @@ extern "C" {
 #if QT_VERSION >= 0x050000
 #include <QtWidgets/QtWidgets>
 #endif
-#include "qt4map.h"
+#include "qt_map.h"
-#include "qt4map.moc"
+#include "qt_map.moc"
-#include "qt4click.h"
+#include "qt_click.h"
-#include "qt4glyph.h"
+#include "qt_glyph.h"
 #include "qt_xpms.h"
-#include "qt4set.h"
+#include "qt_set.h"
-#include "qt4str.h"
+#include "qt_str.h"
 
 // temporary
 extern int qt_compact_mode;
 // end temporary
 
-namespace nethack_qt4 {
+namespace nethack_qt_ {
 
 #ifdef TEXTCOLOR
 static const QPen& nhcolor_to_pen(int c)
@@ -971,4 +971,4 @@ void NetHackQtMapWindow::Changed(int x, int y)
 }
 #endif
 
-} // namespace nethack_qt4
+} // namespace nethack_qt_

win/Qt/qt_map.h

@@ -2,15 +2,15 @@
 // Qt4 conversion copyright (c) Ray Chason, 2012-2014.
 // NetHack may be freely redistributed.  See license for details.
 
-// qt4map.h -- the map window
+// qt_map.h -- the map window
 
 #ifndef QT4MAP_H
 #define QT4MAP_H
 
-#include "qt4win.h"
+#include "qt_win.h"
-#include "qt4clust.h"
+#include "qt_clust.h"
 
-namespace nethack_qt4 {
+namespace nethack_qt_ {
 
 class NetHackQtClickBuffer;
 
@@ -77,6 +77,6 @@ private:
 	QString messages;
 };
 
-} // namespace nethack_qt4
+} // namespace nethack_qt_
 
 #endif

win/Qt/qt_menu.cpp

@@ -2,7 +2,7 @@
 // Qt4 conversion copyright (c) Ray Chason, 2012-2014.
 // NetHack may be freely redistributed.  See license for details.
 
-// qt4menu.cpp -- a menu or text-list widget
+// qt_menu.cpp -- a menu or text-list widget
 
 extern "C" {
 #include "hack.h"
@@ -21,12 +21,12 @@ extern "C" {
 #if QT_VERSION >= 0x050000
 #include <QtWidgets/QtWidgets>
 #endif
-#include "qt4menu.h"
+#include "qt_menu.h"
-#include "qt4menu.moc"
+#include "qt_menu.moc"
-#include "qt4glyph.h"
+#include "qt_glyph.h"
-#include "qt4set.h"
+#include "qt_set.h"
-#include "qt4streq.h"
+#include "qt_streq.h"
-#include "qt4str.h"
+#include "qt_str.h"
 
 // temporary
 extern "C" int qt_compact_mode;
@@ -34,7 +34,7 @@ extern "C" int qt_compact_mode;
 
 extern "C" struct menucoloring *menu_colorings;
 
-namespace nethack_qt4 {
+namespace nethack_qt_ {
 
 // temporary
 void centerOnMain( QWidget* w );
@@ -827,4 +827,4 @@ int NetHackQtMenuOrTextWindow::SelectMenu(int how, MENU_ITEM_P **menu_list)
     return actual->SelectMenu(how,menu_list);
 }
 
-} // namespace nethack_qt4
+} // namespace nethack_qt_

win/Qt/qt_menu.h

@@ -2,15 +2,15 @@
 // Qt4 conversion copyright (c) Ray Chason, 2012-2014.
 // NetHack may be freely redistributed.  See license for details.
 
-// qt4menu.cpp -- a menu or text-list widget
+// qt_menu.cpp -- a menu or text-list widget
 
 #ifndef QT4MENU_H
 #define QT4MENU_H
 
-#include "qt4win.h"
+#include "qt_win.h"
-#include "qt4rip.h"
+#include "qt_rip.h"
 
-namespace nethack_qt4 {
+namespace nethack_qt_ {
 
 class NetHackQtTextListBox : public QListWidget {
 public:
@@ -178,6 +178,6 @@ public:
 
 };
 
-} // namespace nethack_qt4
+} // namespace nethack_qt_
 
 #endif

win/Qt/qt_msg.cpp

@@ -2,7 +2,7 @@
 // Qt4 conversion copyright (c) Ray Chason, 2012-2014.
 // NetHack may be freely redistributed.  See license for details.
 
-// qt4msg.cpp -- a message window
+// qt_msg.cpp -- a message window
 
 extern "C" {
 #include "hack.h"
@@ -21,13 +21,13 @@ extern "C" {
 #if QT_VERSION >= 0x050000
 #include <QtWidgets/QtWidgets>
 #endif
-#include "qt4msg.h"
+#include "qt_msg.h"
-#include "qt4msg.moc"
+#include "qt_msg.moc"
-#include "qt4map.h"
+#include "qt_map.h"
-#include "qt4set.h"
+#include "qt_set.h"
-#include "qt4str.h"
+#include "qt_str.h"
 
-namespace nethack_qt4 {
+namespace nethack_qt_ {
 
 NetHackQtMessageWindow::NetHackQtMessageWindow() :
     list(new QListWidget())
@@ -152,4 +152,4 @@ void NetHackQtMessageWindow::PutStr(int attr, const QString& text)
 	map->putMessage(attr, text2);
 }
 
-} // namespace nethack_qt4
+} // namespace nethack_qt_

win/Qt/qt_msg.h

@@ -2,14 +2,14 @@
 // Qt4 conversion copyright (c) Ray Chason, 2012-2014.
 // NetHack may be freely redistributed.  See license for details.
 
-// qt4msg.h -- a message window
+// qt_msg.h -- a message window
 
 #ifndef QT4MSG_H
 #define QT4MSG_H
 
-#include "qt4win.h"
+#include "qt_win.h"
 
-namespace nethack_qt4 {
+namespace nethack_qt_ {
 
 class NetHackQtMapWindow2;
 
@@ -40,6 +40,6 @@ private slots:
 	void updateFont();
 };
 
-} // namespace nethack_qt4
+} // namespace nethack_qt_
 
 #endif

win/Qt/qt_plsel.cpp

@@ -2,7 +2,7 @@
 // Qt4 conversion copyright (c) Ray Chason, 2012-2014.
 // NetHack may be freely redistributed.  See license for details.
 
-// qt4plsel.cpp -- player selector dialog
+// qt_plsel.cpp -- player selector dialog
 
 extern "C" {
 #include "hack.h"
@@ -21,17 +21,17 @@ extern "C" {
 #if QT_VERSION >= 0x050000
 #include <QtWidgets/QtWidgets>
 #endif
-#include "qt4plsel.h"
+#include "qt_plsel.h"
-#include "qt4plsel.moc"
+#include "qt_plsel.moc"
-#include "qt4bind.h"
+#include "qt_bind.h"
-#include "qt4glyph.h"
+#include "qt_glyph.h"
-#include "qt4set.h"
+#include "qt_set.h"
-#include "qt4str.h"
+#include "qt_str.h"
 
 // Warwick prefers it this way...
 #define QT_CHOOSE_RACE_FIRST
 
-namespace nethack_qt4 {
+namespace nethack_qt_ {
 
 // temporary
 void centerOnMain( QWidget* w );
@@ -533,4 +533,4 @@ bool NetHackQtPlayerSelector::Choose()
     }
 }
 
-} // namespace nethack_qt4
+} // namespace nethack_qt_

win/Qt/qt_plsel.h

@@ -2,12 +2,12 @@
 // Qt4 conversion copyright (c) Ray Chason, 2012-2014.
 // NetHack may be freely redistributed.  See license for details.
 
-// qt4plsel.h -- player selector dialog
+// qt_plsel.h -- player selector dialog
 
 #ifndef QT4PLSEL_H
 #define QT4PLSEL_H
 
-namespace nethack_qt4 {
+namespace nethack_qt_ {
 
 class NetHackQtKeyBuffer;
 
@@ -43,6 +43,6 @@ private:
         int chosen_align;
 };
 
-} // namespace nethack_qt4
+} // namespace nethack_qt_
 
 #endif

win/Qt/qt_rip.cpp

@@ -2,7 +2,7 @@
 // Qt4 conversion copyright (c) Ray Chason, 2012-2014.
 // NetHack may be freely redistributed.  See license for details.
 
-// qt4rip.cpp -- tombstone window
+// qt_rip.cpp -- tombstone window
 
 #include "hack.h"
 #undef Invisible
@@ -19,11 +19,11 @@
 #if QT_VERSION >= 0x050000
 #include <QtWidgets/QtWidgets>
 #endif
-#include "qt4rip.h"
+#include "qt_rip.h"
-#include "qt4bind.h"
+#include "qt_bind.h"
-#include "qt4str.h"
+#include "qt_str.h"
 
-namespace nethack_qt4 {
+namespace nethack_qt_ {
 
 QPixmap* NetHackQtRIP::pixmap=0;
 
@@ -91,4 +91,4 @@ void NetHackQtRIP::paintEvent(QPaintEvent* event)
     }
 }
 
-} // namespace nethack_qt4
+} // namespace nethack_qt_

win/Qt/qt_rip.h

@@ -2,12 +2,12 @@
 // Qt4 conversion copyright (c) Ray Chason, 2012-2014.
 // NetHack may be freely redistributed.  See license for details.
 
-// qt4rip.h -- tombstone window
+// qt_rip.h -- tombstone window
 
 #ifndef QT4RIP_H
 #define QT4RIP_H
 
-namespace nethack_qt4 {
+namespace nethack_qt_ {
 
 class NetHackQtRIP : public QWidget {
 private:
@@ -25,6 +25,6 @@ protected:
 	QSize sizeHint() const;
 };
 
-} // namespace nethack_qt4
+} // namespace nethack_qt_
 
 #endif

win/Qt/qt_set.cpp

@@ -2,7 +2,7 @@
 // Qt4 conversion copyright (c) Ray Chason, 2012-2014.
 // NetHack may be freely redistributed.  See license for details.
 
-// qt4set.cpp -- the Qt settings
+// qt_set.cpp -- the Qt settings
 
 #include "hack.h"
 #undef Invisible
@@ -19,10 +19,10 @@
 #if QT_VERSION >= 0x050000
 #include <QtWidgets/QtWidgets>
 #endif
-#include "qt4set.h"
+#include "qt_set.h"
-#include "qt4set.moc"
+#include "qt_set.moc"
-#include "qt4glyph.h"
+#include "qt_glyph.h"
-#include "qt4str.h"
+#include "qt_str.h"
 
 /* Used by tile/font-size patch below and in ../../src/files.c */
 char *qt_tilewidth=NULL;
@@ -34,7 +34,7 @@ int qt_compact_mode = 1;
 int qt_compact_mode = 0;
 #endif
 
-namespace nethack_qt4 {
+namespace nethack_qt_ {
 
 #define TILEWMIN 6
 #define TILEHMIN 6
@@ -192,4 +192,4 @@ bool NetHackQtSettings::ynInMessages()
 
 NetHackQtSettings* qt_settings;
 
-} // namespace nethack_qt4
+} // namespace nethack_qt_

win/Qt/qt_set.h

@@ -2,12 +2,12 @@
 // Qt4 conversion copyright (c) Ray Chason, 2012-2014.
 // NetHack may be freely redistributed.  See license for details.
 
-// qt4set.h -- the Qt settings
+// qt_set.h -- the Qt settings
 
 #ifndef QT4SET_H
 #define QT4SET_H
 
-namespace nethack_qt4 {
+namespace nethack_qt_ {
 
 class NetHackQtGlyphs;
 
@@ -54,6 +54,6 @@ private slots:
 
 extern NetHackQtSettings* qt_settings;
 
-} // namespace nethack_qt4
+} // namespace nethack_qt_
 
 #endif

win/Qt/qt_stat.cpp

@@ -2,7 +2,7 @@
 // Qt4 conversion copyright (c) Ray Chason, 2012-2014.
 // NetHack may be freely redistributed.  See license for details.
 
-// qt4stat.cpp -- bindings between the Qt 4 interface and the main code
+// qt_stat.cpp -- bindings between the Qt 4 interface and the main code
 
 extern "C" {
 #include "hack.h"
@@ -21,16 +21,16 @@ extern "C" {
 #if QT_VERSION >= 0x050000
 #include <QtWidgets/QtWidgets>
 #endif
-#include "qt4stat.h"
+#include "qt_stat.h"
-#include "qt4stat.moc"
+#include "qt_stat.moc"
-#include "qt4set.h"
+#include "qt_set.h"
-#include "qt4str.h"
+#include "qt_str.h"
 #include "qt_xpms.h"
 
 extern const char *enc_stat[]; /* from botl.c */
 extern const char *hu_stat[]; /* from eat.c */
 
-namespace nethack_qt4 {
+namespace nethack_qt_ {
 
 NetHackQtStatusWindow::NetHackQtStatusWindow() :
     // Notes:
@@ -537,4 +537,4 @@ void NetHackQtStatusWindow::checkTurnEvents()
 {
 }
 
-} // namespace nethack_qt4
+} // namespace nethack_qt_

win/Qt/qt_stat.h

@@ -2,15 +2,15 @@
 // Qt4 conversion copyright (c) Ray Chason, 2012-2014.
 // NetHack may be freely redistributed.  See license for details.
 
-// qt4stat.h -- bindings between the Qt 4 interface and the main code
+// qt_stat.h -- bindings between the Qt 4 interface and the main code
 
 #ifndef QT4STAT_H
 #define QT4STAT_H
 
-#include "qt4win.h"
+#include "qt_win.h"
-#include "qt4icon.h"
+#include "qt_icon.h"
 
-namespace nethack_qt4 {
+namespace nethack_qt_ {
 
 class NetHackQtStatusWindow : QWidget, public NetHackQtWindow {
 	Q_OBJECT
@@ -101,6 +101,6 @@ private:
 	void checkTurnEvents();
 };
 
-} // namespace nethack_qt4
+} // namespace nethack_qt_
 
 #endif

win/Qt/qt_str.cpp

@@ -2,13 +2,13 @@
 // Qt4 conversion copyright (c) Ray Chason, 2012-2014.
 // NetHack may be freely redistributed.  See license for details.
 
-// qt4str.cpp -- some string functions
+// qt_str.cpp -- some string functions
 
 #include <QtCore/QString>
 #include <QtCore/QStringList>
-#include "qt4str.h"
+#include "qt_str.h"
 
-namespace nethack_qt4 {
+namespace nethack_qt_ {
 
 // Bounded string copy
 size_t str_copy(char *dest, const char *src, size_t max)
@@ -80,4 +80,4 @@ int cp437(int ch)
     return cp437table[(unsigned char)ch];
 }
 
-} // namespace nethack_qt4
+} // namespace nethack_qt_

win/Qt/qt_str.h

@@ -2,12 +2,12 @@
 // Qt4 conversion copyright (c) Ray Chason, 2012-2014.
 // NetHack may be freely redistributed.  See license for details.
 
-// qt4str.h -- various string functions
+// qt_str.h -- various string functions
 
 #ifndef QT4STR_H
 #define QT4STR_H
 
-namespace nethack_qt4 {
+namespace nethack_qt_ {
 
 // Bounded string copy
 extern size_t str_copy(char *dest, const char *src, size_t max);
@@ -19,6 +19,6 @@ extern QString nh_capitalize_words(const QString& str);
 // Map symbol conversion
 extern int cp437(int ch);
 
-} // namespace nethack_qt4
+} // namespace nethack_qt_
 
 #endif

win/Qt/qt_streq.cpp

@@ -2,7 +2,7 @@
 // Qt4 conversion copyright (c) Ray Chason, 2012-2014.
 // NetHack may be freely redistributed.  See license for details.
 
-// qt4streq.cpp -- string requestor
+// qt_streq.cpp -- string requestor
 
 #include "hack.h"
 #undef Invisible
@@ -19,10 +19,10 @@
 #if QT_VERSION >= 0x050000
 #include <QtWidgets/QtWidgets>
 #endif
-#include "qt4streq.h"
+#include "qt_streq.h"
-#include "qt4str.h"
+#include "qt_str.h"
 
-namespace nethack_qt4 {
+namespace nethack_qt_ {
 
 // temporary
 void centerOnMain(QWidget *);
@@ -99,4 +99,4 @@ bool NetHackQtStringRequestor::Get(char* buffer, int maxchar)
     }
 }
 
-} // namespace nethack_qt4
+} // namespace nethack_qt_

win/Qt/qt_streq.h

@@ -2,14 +2,14 @@
 // Qt4 conversion copyright (c) Ray Chason, 2012-2014.
 // NetHack may be freely redistributed.  See license for details.
 
-// qt4streq.h -- string requestor
+// qt_streq.h -- string requestor
 
 #ifndef QT4STREQ_H
 #define QT4STREQ_H
 
-#include "qt4line.h"
+#include "qt_line.h"
 
-namespace nethack_qt4 {
+namespace nethack_qt_ {
 
 class NetHackQtStringRequestor : QDialog {
 private:
@@ -25,6 +25,6 @@ public:
 	virtual void resizeEvent(QResizeEvent*);
 };
 
-} // namespace nethack_qt4
+} // namespace nethack_qt_
 
 #endif

win/Qt/qt_svsel.cpp

@@ -2,7 +2,7 @@
 // Qt4 conversion copyright (c) Ray Chason, 2012-2014.
 // NetHack may be freely redistributed.  See license for details.
 
-// qt4svsel.cpp -- saved game selector
+// qt_svsel.cpp -- saved game selector
 
 #include "hack.h"
 #undef Invisible
@@ -19,11 +19,11 @@
 #if QT_VERSION >= 0x050000
 #include <QtWidgets/QtWidgets>
 #endif
-#include "qt4svsel.h"
+#include "qt_svsel.h"
-#include "qt4bind.h"
+#include "qt_bind.h"
-#include "qt4str.h"
+#include "qt_str.h"
 
-namespace nethack_qt4 {
+namespace nethack_qt_ {
 
 NetHackQtSavedGameSelector::NetHackQtSavedGameSelector(const char** saved) :
     QDialog(NetHackQtBind::mainWidget())
@@ -77,4 +77,4 @@ int NetHackQtSavedGameSelector::choose()
     return exec()-2;
 }
 
-} // namespace nethack_qt4
+} // namespace nethack_qt_

win/Qt/qt_svsel.h

@@ -2,12 +2,12 @@
 // Qt4 conversion copyright (c) Ray Chason, 2012-2014.
 // NetHack may be freely redistributed.  See license for details.
 
-// qt4svsel.h -- saved game selector
+// qt_svsel.h -- saved game selector
 
 #ifndef QT4SVSEL_H
 #define QT4SVSEL_H
 
-namespace nethack_qt4 {
+namespace nethack_qt_ {
 
 class NetHackQtSavedGameSelector : public QDialog {
 public:
@@ -16,6 +16,6 @@ public:
 	int choose();
 };
 
-} // namespace nethack_qt4
+} // namespace nethack_qt_
 
 #endif

win/Qt/qt_win.h

@@ -11,10 +11,10 @@
 // major application of Qt.
 //
 
-#ifndef qt4win_h
+#ifndef qt_win_h
-#define qt4win_h
+#define qt_win_h
 
-namespace nethack_qt4 {
+namespace nethack_qt_ {
 
 class NetHackQtWindow {
 public:
@@ -44,6 +44,6 @@ public:
 	int nhid;
 };
 
-} // namespace nethack_qt4
+} // namespace nethack_qt_
 
 #endif

win/Qt/qt_xcmd.cpp

@@ -2,7 +2,7 @@
 // Qt4 conversion copyright (c) Ray Chason, 2012-2014.
 // NetHack may be freely redistributed.  See license for details.
 
-// qt4xcmd.cpp -- extended command widget
+// qt_xcmd.cpp -- extended command widget
 
 #include "hack.h"
 #include "func_tab.h"
@@ -20,13 +20,13 @@
 #if QT_VERSION >= 0x050000
 #include <QtWidgets/QtWidgets>
 #endif
-#include "qt4xcmd.h"
+#include "qt_xcmd.h"
-#include "qt4xcmd.moc"
+#include "qt_xcmd.moc"
-#include "qt4bind.h"
+#include "qt_bind.h"
-#include "qt4set.h"
+#include "qt_set.h"
-#include "qt4str.h"
+#include "qt_str.h"
 
-namespace nethack_qt4 {
+namespace nethack_qt_ {
 
 // temporary
 void centerOnMain(QWidget *);
@@ -145,4 +145,4 @@ void NetHackQtExtCmdRequestor::enableButtons()
     }
 }
 
-} // namespace nethack_qt4
+} // namespace nethack_qt_

win/Qt/qt_xcmd.h

@@ -2,12 +2,12 @@
 // Qt4 conversion copyright (c) Ray Chason, 2012-2014.
 // NetHack may be freely redistributed.  See license for details.
 
-// qt4xcmd.h -- extended command widget
+// qt_xcmd.h -- extended command widget
 
 #ifndef QT4XCMD_H
 #define QT4XCMD_H
 
-namespace nethack_qt4 {
+namespace nethack_qt_ {
 
 class NetHackQtExtCmdRequestor : public QDialog {
     Q_OBJECT
@@ -28,6 +28,6 @@ private slots:
     void cancel();
 };
 
-} // namespace nethack_qt4
+} // namespace nethack_qt_
 
 #endif

win/Qt/qt_yndlg.cpp

@@ -2,7 +2,7 @@
 // Qt4 conversion copyright (c) Ray Chason, 2012-2014.
 // NetHack may be freely redistributed.  See license for details.
 
-// qt4yndlg.cpp -- yes/no dialog
+// qt_yndlg.cpp -- yes/no dialog
 
 #include "hack.h"
 #undef Invisible
@@ -19,15 +19,15 @@
 #if QT_VERSION >= 0x050000
 #include <QtWidgets/QtWidgets>
 #endif
-#include "qt4yndlg.h"
+#include "qt_yndlg.h"
-#include "qt4yndlg.moc"
+#include "qt_yndlg.moc"
-#include "qt4str.h"
+#include "qt_str.h"
 
 // temporary
 extern int qt_compact_mode;
 // end temporary
 
-namespace nethack_qt4 {
+namespace nethack_qt_ {
 
 // temporary
 void centerOnMain(QWidget *);
@@ -241,4 +241,4 @@ void NetHackQtYnDialog::doneItem(int i)
     done(i+1000);
 }
 
-} // namespace nethack_qt4
+} // namespace nethack_qt_

win/Qt/qt_yndlg.h

@@ -2,12 +2,12 @@
 // Qt4 conversion copyright (c) Ray Chason, 2012-2014.
 // NetHack may be freely redistributed.  See license for details.
 
-// qt4yndlg.h -- yes/no dialog
+// qt_yndlg.h -- yes/no dialog
 
 #ifndef QT4YNDLG_H
 #define QT4YNDLG_H
 
-namespace nethack_qt4 {
+namespace nethack_qt_ {
 
 class NetHackQtYnDialog : QDialog {
 	Q_OBJECT
@@ -29,6 +29,6 @@ public:
 	char Exec();
 };
 
-} // namespace nethack_qt4
+} // namespace nethack_qt_
 
 #endif

win/Qt3/.gitattributes

@@ -0,0 +1,4 @@
+Install.Qt NHSUBST
+qpe-nethack.control NH_header=no
+knethack.lnk NH_header=no
+* NH_filestag=(file%s_for_the_Qt_3_widget_library_-_X11,_Windows,_Mac_OS_X,_or_Qtopia)

win/Qt3/qt_clust.cpp

@@ -1,9 +1,10 @@
-/*	SCCS Id: @(#)qt_clust.cpp	3.4	1999/11/19	*/
+/* NetHack 3.6	qt_clust.cpp	$NHDT-Date: 1524684507 2018/04/25 19:28:27 $  $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.8 $ */
 /* Copyright (c) Warwick Allison, 1999. */
 /* NetHack may be freely redistributed.  See license for details. */
-#include "qt4clust.h"
+#include "qt_clust.h"
 
-static void include(QRect& r, const QRect& rect)
+static
+void include(QRect& r, const QRect& rect)
 {
 	if (rect.left()<r.left()) {
 			r.setLeft(rect.left());
@@ -74,7 +75,7 @@ void Clusterizer::add(const QRect& rect)
 					- cluster[cursor].width()*cluster[cursor].height();
 
 			if (cost < lowestcost) {
-				bool bad=false;
+				bool bad=FALSE;
 				for (int c=0; c<count && !bad; c++) {
 					bad=cluster[c].intersects(larger) && c!=cursor;
 				}
@@ -107,7 +108,7 @@ void Clusterizer::add(const QRect& rect)
 		int cost=larger.width()*larger.height()
 				- cluster[cursor].width()*cluster[cursor].height();
 		if (cost < lowestcost) {
-			bool bad=false;
+			bool bad=FALSE;
 			for (int c=0; c<count && !bad; c++) {
 				bad=cluster[c].intersects(larger) && c!=cursor;
 			}
@@ -133,7 +134,7 @@ void Clusterizer::add(const QRect& rect)
 					- cluster[merge1].width()*cluster[merge1].height()
 					- cluster[merge2].width()*cluster[merge2].height();
 				if (cost < lowestcost) {
-					bool bad=false;
+					bool bad=FALSE;
 					for (int c=0; c<count && !bad; c++) {
 						bad=cluster[c].intersects(larger) && c!=cursor;
 					}

win/Qt4/.gitattributes

@@ -1 +0,0 @@
-* NH_filestag=(file%s_for_the_Qt_4_widget_library_-_X11,_Windows,_Mac_OS_X)

win/Qt4/qt4win.cpp

@@ -1,136 +0,0 @@
-// Copyright (c) Warwick Allison, 1999.
-// Qt4 conversion copyright (c) Ray Chason, 2012-2014.
-// NetHack may be freely redistributed.  See license for details.
-
-// Qt Binding for NetHack 3.4
-//
-// Copyright (C) 1996-2001 by Warwick W. Allison (warwick@troll.no)
-// 
-// Contributors:
-//    Michael Hohmuth <hohmuth@inf.tu-dresden.de>
-//       - Userid control
-//    Svante Gerhard <svante@algonet.se>
-//       - .nethackrc tile and font size settings
-//    Dirk Schoenberger <schoenberger@signsoft.com>
-//       - KDE support
-//       - SlashEm support
-//    and many others for bug reports.
-// 
-// Unfortunately, this doesn't use Qt as well as I would like,
-// primarily because NetHack is fundamentally a getkey-type program
-// rather than being event driven (hence the ugly key and click buffer)
-// and also because this is my first major application of Qt.  
-// 
-// The problem of NetHack's getkey requirement is solved by intercepting
-// key events by overiding QApplicion::notify(...), and putting them in
-// a buffer.  Mouse clicks on the map window are treated with a similar
-// buffer.  When the NetHack engine calls for a key, one is taken from
-// the buffer, or if that is empty, QApplication::exec() is called.
-// Whenever keys or clicks go into the buffer, QApplication::exit()
-// is called.
-//
-// Another problem is that some NetHack players are decade-long players who
-// demand complete keyboard control (while Qt and X11 conspire to make this
-// difficult by having widget-based focus rather than application based -
-// a good thing in general).  This problem is solved by again using the key
-// event buffer.
-//
-// Out of all this hackery comes a silver lining however, as macros for
-// the super-expert and menus for the ultra-newbie are also made possible
-// by the key event buffer.
-//
-
-// This includes all the definitions we need from the NetHack main
-// engine.  We pretend MSC is a STDC compiler, because C++ is close
-// enough, and we undefine NetHack macros which conflict with Qt
-// identifiers.
-
-#define QT_DEPRECATED_WARNINGS
-#include "hack.h"
-#undef Invisible
-#undef Warning
-#undef index
-#undef msleep
-#undef rindex
-#undef wizard
-#undef yn
-#undef min
-#undef max
-
-#include <QtGui/QtGui>
-#if QT_VERSION >= 0x050000
-#include <QtWidgets/QtWidgets>
-#endif
-#include "qt4win.h"
-#include "qt4bind.h"
-#include "qt4click.h"
-#include "qt4glyph.h"
-#include "qt4inv.h"
-#include "qt4key.h"
-#include "qt4icon.h"
-#include "qt4map.h"
-#include "qt4menu.h"
-#include "qt4msg.h"
-#include "qt4set.h"
-
-#include <ctype.h>
-
-#include "qt4clust.h"
-
-#include <dirent.h>
-
-#ifdef _WS_X11_
-// For userid control
-#include <unistd.h>
-#endif
-
-#ifdef USER_SOUNDS
-#if QT_VERSION >= 0x050000
-#  include <QtMultimedia/QSound>
-# else
-#  include <QtGui/QSound>
-# endif
-#endif
-
-
-#ifdef USER_SOUNDS
-extern void play_sound_for_message(const std::string& str);
-#endif
-
-namespace nethack_qt4 {
-
-void
-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 );
-}
-
-NetHackQtWindow::NetHackQtWindow()
-{
-}
-NetHackQtWindow::~NetHackQtWindow()
-{
-}
-
-// XXX Use "expected ..." for now, abort or default later.
-//
-void NetHackQtWindow::Clear() { puts("unexpected Clear"); }
-void NetHackQtWindow::Display(bool block) { puts("unexpected Display"); }
-bool NetHackQtWindow::Destroy() { return true; }
-void NetHackQtWindow::CursorTo(int x,int y) { puts("unexpected CursorTo"); }
-void NetHackQtWindow::PutStr(int attr, const QString& text) { puts("unexpected PutStr"); }
-void NetHackQtWindow::StartMenu() { puts("unexpected StartMenu"); }
-void NetHackQtWindow::AddMenu(int glyph, const ANY_P* identifier, char ch, char gch, int attr,
-    const QString& str, bool presel) { puts("unexpected AddMenu"); }
-void NetHackQtWindow::EndMenu(const QString& prompt) { puts("unexpected EndMenu"); }
-int NetHackQtWindow::SelectMenu(int how, MENU_ITEM_P **menu_list) { puts("unexpected SelectMenu"); return 0; }
-void NetHackQtWindow::ClipAround(int x,int y) { puts("unexpected ClipAround"); }
-void NetHackQtWindow::PrintGlyph(int x,int y,int glyph) { puts("unexpected PrintGlyph"); }
-//void NetHackQtWindow::PrintGlyphCompose(int x,int y,int,int) { puts("unexpected PrintGlyphCompose"); }
-void NetHackQtWindow::UseRIP(int how, time_t when) { puts("unexpected UseRIP"); }
-
-} // namespace nethack_qt4