Author: cazfi
Date: Mon Nov 28 10:34:42 2016
New Revision: 34646

URL: http://svn.gna.org/viewcvs/freeciv?rev=34646&view=rev
Log:
Made city_map::sizeHint() and city_map::minimumSizeHint() const as the virtual
functions they should represent.

See bug #25327

Modified:
    trunk/client/gui-qt/citydlg.cpp
    trunk/client/gui-qt/citydlg.h

Modified: trunk/client/gui-qt/citydlg.cpp
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-qt/citydlg.cpp?rev=34646&r1=34645&r2=34646&view=diff
==============================================================================
--- trunk/client/gui-qt/citydlg.cpp     (original)
+++ trunk/client/gui-qt/citydlg.cpp     Mon Nov 28 10:34:42 2016
@@ -1162,7 +1162,7 @@
 /****************************************************************************
   Size hint for city map
 ****************************************************************************/
-QSize city_map::sizeHint()
+QSize city_map::sizeHint() const
 {
   return zoomed_pixmap.size();
 }
@@ -1170,7 +1170,7 @@
 /****************************************************************************
   Minimum size hint for city map
 ****************************************************************************/
-QSize city_map::minimumSizeHint()
+QSize city_map::minimumSizeHint() const
 {
   return zoomed_pixmap.size();
 }

Modified: trunk/client/gui-qt/citydlg.h
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-qt/citydlg.h?rev=34646&r1=34645&r2=34646&view=diff
==============================================================================
--- trunk/client/gui-qt/citydlg.h       (original)
+++ trunk/client/gui-qt/citydlg.h       Mon Nov 28 10:34:42 2016
@@ -243,8 +243,8 @@
   int delta_x;
   int delta_y;
 protected:
-  QSize sizeHint();
-  QSize minimumSizeHint();
+  QSize sizeHint() const;
+  QSize minimumSizeHint() const;
 private slots:
   void context_menu(QPoint point);
 };


_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

Reply via email to