]> granicus.if.org Git - nethack/commitdiff
Qt compatibility fixes
authorwarwick <warwick>
Mon, 21 Jan 2002 05:17:40 +0000 (05:17 +0000)
committerwarwick <warwick>
Mon, 21 Jan 2002 05:17:40 +0000 (05:17 +0000)
Fixes for Qt version 2.0 (old).

win/Qt/qt_win.cpp

index 5d1660a9ff24789f6892d390088d11c383f2c06d..f739c94168b0c66cad7c7eaebadb2b1beef673fb 100644 (file)
@@ -3446,7 +3446,13 @@ public:
                  const QString& grouptext,
                  QObject * receiver, const char* slot,
                  QToolBar * parent) :
-       QToolButton(pm, textLabel, grouptext, receiver, slot, parent)
+       QToolButton(pm, textLabel,
+#if QT_VERSION < 210
+               QString::null,
+#else
+               grouptext,
+#endif
+                   receiver, slot, parent)
     {
     }
 
@@ -3462,10 +3468,12 @@ NetHackQtMainWindow::NetHackQtMainWindow(NetHackQtKeyBuffer& ks) :
     message(0), map(0), status(0), invusage(0),
     keysink(ks)
 {
-    setToolBarsMovable(FALSE);
     QToolBar* toolbar = new QToolBar(this);
+#if QT_VERSION >= 210
+    setToolBarsMovable(FALSE);
     toolbar->setHorizontalStretchable(TRUE);
     toolbar->setVerticalStretchable(TRUE);
+#endif
     addToolBar(toolbar);
     menubar = menuBar();