Changes work with Qt 3.0 (basically just use obsoleted QTableView class

until I get around to replacing it properly).

include/qt_win.h

@@ -36,7 +36,13 @@
 #include <qarray.h>
 #include <qcombobox.h>
 #include <qscrollview.h>
+#if QT_VERSION >= 300
+#include <qttableview.h>
+// Should stop using QTableView
+#define QTableView QtTableView
+#else
 #include <qtableview.h>
+#endif
 #include <qmainwindow.h>
 #include <qwidgetstack.h>
 

include/qttableview.h

@@ -0,0 +1,251 @@
+/**********************************************************************
+** $Id$
+**
+** Definition of QtTableView class
+**
+** Created : 941115
+**
+** Copyright (C) 1992-2000 Trolltech AS.  All rights reserved.
+**
+** This file contains a class moved out of the Qt GUI Toolkit API. It
+** may be used, distributed and modified without limitation.
+**
+**********************************************************************/
+
+#ifndef QTTABLEVIEW_H
+#define QTTABLEVIEW_H
+
+#ifndef QT_H
+#include "qframe.h"
+#endif // QT_H
+
+#ifndef QT_NO_QTTABLEVIEW
+
+class QScrollBar;
+class QCornerSquare;
+
+
+class QtTableView : public QFrame
+{
+    Q_OBJECT
+public:
+    virtual void setBackgroundColor( const QColor & );
+    virtual void setPalette( const QPalette & );
+    void	show();
+
+    void	repaint( bool erase=TRUE );
+    void	repaint( int x, int y, int w, int h, bool erase=TRUE );
+    void	repaint( const QRect &, bool erase=TRUE );
+
+protected:
+    QtTableView( QWidget *parent=0, const char *name=0, WFlags f=0 );
+   ~QtTableView();
+
+    int		numRows()	const;
+    virtual void setNumRows( int );
+    int		numCols()	const;
+    virtual void setNumCols( int );
+
+    int		topCell()	const;
+    virtual void setTopCell( int row );
+    int		leftCell()	const;
+    virtual void setLeftCell( int col );
+    virtual void setTopLeftCell( int row, int col );
+
+    int		xOffset()	const;
+    virtual void setXOffset( int );
+    int		yOffset()	const;
+    virtual void setYOffset( int );
+    virtual void setOffset( int x, int y, bool updateScrBars = TRUE );
+
+    virtual int cellWidth( int col );
+    virtual int cellHeight( int row );
+    int		cellWidth()	const;
+    int		cellHeight()	const;
+    virtual void setCellWidth( int );
+    virtual void setCellHeight( int );
+
+    virtual int totalWidth();
+    virtual int totalHeight();
+
+    uint	tableFlags()	const;
+    bool	testTableFlags( uint f ) const;
+    virtual void setTableFlags( uint f );
+    void	clearTableFlags( uint f = ~0 );
+
+    bool	autoUpdate()	 const;
+    virtual void setAutoUpdate( bool );
+
+    void	updateCell( int row, int column, bool erase=TRUE );
+
+    QRect	cellUpdateRect() const;
+    QRect	viewRect()	 const;
+
+    int		lastRowVisible() const;
+    int		lastColVisible() const;
+
+    bool	rowIsVisible( int row ) const;
+    bool	colIsVisible( int col ) const;
+
+    QScrollBar *verticalScrollBar() const;
+    QScrollBar *horizontalScrollBar() const;
+
+private slots:
+    void	horSbValue( int );
+    void	horSbSliding( int );
+    void	horSbSlidingDone();
+    void	verSbValue( int );
+    void	verSbSliding( int );
+    void	verSbSlidingDone();
+
+protected:
+    virtual void paintCell( QPainter *, int row, int col ) = 0;
+    virtual void setupPainter( QPainter * );
+
+    void	paintEvent( QPaintEvent * );
+    void	resizeEvent( QResizeEvent * );
+
+    int		findRow( int yPos ) const;
+    int		findCol( int xPos ) const;
+
+    bool	rowYPos( int row, int *yPos ) const;
+    bool	colXPos( int col, int *xPos ) const;
+
+    int		maxXOffset();
+    int		maxYOffset();
+    int		maxColOffset();
+    int		maxRowOffset();
+
+    int		minViewX()	const;
+    int		minViewY()	const;
+    int		maxViewX()	const;
+    int		maxViewY()	const;
+    int		viewWidth()	const;
+    int		viewHeight()	const;
+
+    void	scroll( int xPixels, int yPixels );
+    void	updateScrollBars();
+    void	updateTableSize();
+
+private:
+    void	coverCornerSquare( bool );
+    void	snapToGrid( bool horizontal, bool vertical );
+    virtual void	setHorScrollBar( bool on, bool update = TRUE );
+    virtual void	setVerScrollBar( bool on, bool update = TRUE );
+    void	updateView();
+    int		findRawRow( int yPos, int *cellMaxY, int *cellMinY = 0,
+			    bool goOutsideView = FALSE ) const;
+    int		findRawCol( int xPos, int *cellMaxX, int *cellMinX = 0,
+			    bool goOutsideView = FALSE ) const;
+    int		maxColsVisible() const;
+
+    void	updateScrollBars( uint );
+    void	updateFrameSize();
+
+    void	doAutoScrollBars();
+    void	showOrHideScrollBars();
+
+    int		nRows;
+    int		nCols;
+    int		xOffs, yOffs;
+    int		xCellOffs, yCellOffs;
+    short	xCellDelta, yCellDelta;
+    short	cellH, cellW;
+
+    uint	eraseInPaint		: 1;
+    uint	verSliding		: 1;
+    uint	verSnappingOff		: 1;
+    uint	horSliding		: 1;
+    uint	horSnappingOff		: 1;
+    uint	coveringCornerSquare	: 1;
+    uint	sbDirty			: 8;
+    uint	inSbUpdate		: 1;
+
+    uint	tFlags;
+    QRect	cellUpdateR;
+
+    QScrollBar *vScrollBar;
+    QScrollBar *hScrollBar;
+    QCornerSquare *cornerSquare;
+
+private:	// Disabled copy constructor and operator=
+#if defined(Q_DISABLE_COPY)
+    QtTableView( const QtTableView & );
+    QtTableView &operator=( const QtTableView & );
+#endif
+};
+
+
+const uint Tbl_vScrollBar	= 0x00000001;
+const uint Tbl_hScrollBar	= 0x00000002;
+const uint Tbl_autoVScrollBar	= 0x00000004;
+const uint Tbl_autoHScrollBar	= 0x00000008;
+const uint Tbl_autoScrollBars	= 0x0000000C;
+
+const uint Tbl_clipCellPainting = 0x00000100;
+const uint Tbl_cutCellsV	= 0x00000200;
+const uint Tbl_cutCellsH	= 0x00000400;
+const uint Tbl_cutCells		= 0x00000600;
+
+const uint Tbl_scrollLastHCell	= 0x00000800;
+const uint Tbl_scrollLastVCell	= 0x00001000;
+const uint Tbl_scrollLastCell	= 0x00001800;
+
+const uint Tbl_smoothHScrolling = 0x00002000;
+const uint Tbl_smoothVScrolling = 0x00004000;
+const uint Tbl_smoothScrolling	= 0x00006000;
+
+const uint Tbl_snapToHGrid	= 0x00008000;
+const uint Tbl_snapToVGrid	= 0x00010000;
+const uint Tbl_snapToGrid	= 0x00018000;
+
+
+inline int QtTableView::numRows() const
+{ return nRows; }
+
+inline int QtTableView::numCols() const
+{ return nCols; }
+
+inline int QtTableView::topCell() const
+{ return yCellOffs; }
+
+inline int QtTableView::leftCell() const
+{ return xCellOffs; }
+
+inline int QtTableView::xOffset() const
+{ return xOffs; }
+
+inline int QtTableView::yOffset() const
+{ return yOffs; }
+
+inline int QtTableView::cellHeight() const
+{ return cellH; }
+
+inline int QtTableView::cellWidth() const
+{ return cellW; }
+
+inline uint QtTableView::tableFlags() const
+{ return tFlags; }
+
+inline bool QtTableView::testTableFlags( uint f ) const
+{ return (tFlags & f) != 0; }
+
+inline QRect QtTableView::cellUpdateRect() const
+{ return cellUpdateR; }
+
+inline bool QtTableView::autoUpdate() const
+{ return isUpdatesEnabled(); }
+
+inline void QtTableView::repaint( bool erase )
+{ repaint( 0, 0, width(), height(), erase ); }
+
+inline void QtTableView::repaint( const QRect &r, bool erase )
+{ repaint( r.x(), r.y(), r.width(), r.height(), erase ); }
+
+inline void QtTableView::updateScrollBars()
+{ updateScrollBars( 0 ); }
+
+
+#endif // QT_NO_QTTABLEVIEW
+
+#endif // QTTABLEVIEW_H

sys/unix/Makefile.src

@@ -175,8 +175,8 @@ WINX11OBJ = Window.o dialogs.o winX.o winmap.o winmenu.o winmesg.o \
 #
 # Files for a Qt port
 #
-WINQTSRC = ../win/Qt/qt_win.cpp ../win/Qt/qt_clust.cpp
+WINQTSRC = ../win/Qt/qt_win.cpp ../win/Qt/qt_clust.cpp ../win/Qt/qttableview.cpp
-WINQTOBJ = qt_win.o qt_clust.o tile.o
+WINQTOBJ = qt_win.o qt_clust.o tile.o qttableview.o
 #
 # Files for a Gnome port
 #
@@ -453,6 +453,9 @@ qt_kde0.moc: ../include/qt_kde0.h
 qt_win.moc: ../include/qt_win.h
 	$(QTDIR)/bin/moc ../include/qt_win.h > qt_win.moc
 
+qttableview.moc: ../include/qttableview.h
+	$(QTDIR)/bin/moc ../include/qttableview.h > qttableview.moc
+
 $(MAKEDEFS): ../util/makedefs.c  $(CONFIG_H) ../include/permonst.h \
 		../include/objclass.h ../include/monsym.h \
 		../include/artilist.h ../include/dungeon.h ../include/obj.h \
@@ -665,10 +668,12 @@ tile.o: tile.c $(HACK_H)
 qt_win.o: ../win/Qt/qt_win.cpp $(HACK_H) ../include/func_tab.h \
 		../include/dlb.h ../include/patchlevel.h ../include/qt_win.h \
 		../include/qt_clust.h ../include/qt_kde0.h \
-		../include/qt_xpms.h qt_win.moc qt_kde0.moc
+		../include/qt_xpms.h qt_win.moc qt_kde0.moc qttableview.moc
 	$(CXX) $(CXXFLAGS) -c ../win/Qt/qt_win.cpp
 qt_clust.o: ../win/Qt/qt_clust.cpp ../include/qt_clust.h
 	$(CXX) $(CXXFLAGS) -c ../win/Qt/qt_clust.cpp
+qttableview.o: ../win/Qt/qttableview.cpp ../include/qttableview.h
+	$(CXX) $(CXXFLAGS) -c ../win/Qt/qttableview.cpp
 monstr.o: monstr.c $(CONFIG_H)
 vis_tab.o: vis_tab.c $(CONFIG_H)
 allmain.o: allmain.c $(HACK_H)

win/Qt/qt_win.cpp

@@ -51,6 +51,8 @@ extern "C" {
 // enough, and we undefine NetHack macros which conflict with Qt
 // identifiers.
 
+#define alloc hide_alloc // avoid treading on STL symbol
+#define lock hide_lock // avoid treading on STL symbol
 #ifdef _MSC_VER
 #define NHSTDC
 #endif
@@ -68,10 +70,13 @@ extern "C" {
 #undef FALSE
 #undef min
 #undef max
+#undef alloc
+#undef lock
 
 }
 
 #include "qt_win.h"
+#include <qregexp.h>
 #include <qpainter.h>
 #include <qdir.h>
 #include <qbitmap.h>
@@ -5099,3 +5104,6 @@ extern "C" void play_usersound(const char* filename, int volume)
 #ifndef KDE
 #include "qt_kde0.moc"
 #endif
+#if QT_VERSION >= 300
+#include "qttableview.moc"
+#endif