Author: mir3x
Date: Sat Oct 15 00:25:55 2016
New Revision: 34122

URL: http://svn.gna.org/viewcvs/freeciv?rev=34122&view=rev
Log:
Qt client - Fixed clang warnings

Reported by Marko Lindqvist <cazfi>

See bug #25166


Modified:
    branches/S2_6/client/gui-qt/fc_client.h
    branches/S2_6/client/gui-qt/menu.cpp
    branches/S2_6/client/gui-qt/shortcuts.cpp
    branches/S2_6/client/gui-qt/shortcuts.h

Modified: branches/S2_6/client/gui-qt/fc_client.h
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-qt/fc_client.h?rev=34122&r1=34121&r2=34122&view=diff
==============================================================================
--- branches/S2_6/client/gui-qt/fc_client.h     (original)
+++ branches/S2_6/client/gui-qt/fc_client.h     Sat Oct 15 00:25:55 2016
@@ -61,7 +61,7 @@
   WAITING_TYPE
 };
 
-class fc_shortcut;
+struct fc_shortcut;
 class fc_sidebar;
 class fc_sidetax;
 class fc_sidewidget;

Modified: branches/S2_6/client/gui-qt/menu.cpp
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-qt/menu.cpp?rev=34122&r1=34121&r2=34122&view=diff
==============================================================================
--- branches/S2_6/client/gui-qt/menu.cpp        (original)
+++ branches/S2_6/client/gui-qt/menu.cpp        Sat Oct 15 00:25:55 2016
@@ -174,7 +174,7 @@
 void trade_generator::clear_trade_planing()
 {
   struct city *pcity;
-  struct trade_city *tc;
+  trade_city *tc;
   foreach(pcity, virtual_cities) {
     destroy_city_virtual(pcity);
   }

Modified: branches/S2_6/client/gui-qt/shortcuts.cpp
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-qt/shortcuts.cpp?rev=34122&r1=34121&r2=34122&view=diff
==============================================================================
--- branches/S2_6/client/gui-qt/shortcuts.cpp   (original)
+++ branches/S2_6/client/gui-qt/shortcuts.cpp   Sat Oct 15 00:25:55 2016
@@ -288,7 +288,7 @@
 /**************************************************************************
   Popups line edit for setting shortcut
 **************************************************************************/
-void fc_shortcut_popup::exec(fc_shortcut *s)
+void fc_shortcut_popup::run(fc_shortcut *s)
 {
   QPoint p(50, 20);
   edit.setReadOnly(true);
@@ -519,7 +519,7 @@
   fc_sc_button *pb;
   pb = qobject_cast<fc_sc_button *>(sender());
   fc_shortcut_popup *sb = new fc_shortcut_popup(pb);
-  sb->exec(pb->sc);
+  sb->run(pb->sc);
 }
 
 /**************************************************************************

Modified: branches/S2_6/client/gui-qt/shortcuts.h
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-qt/shortcuts.h?rev=34122&r1=34121&r2=34122&view=diff
==============================================================================
--- branches/S2_6/client/gui-qt/shortcuts.h     (original)
+++ branches/S2_6/client/gui-qt/shortcuts.h     Sat Oct 15 00:25:55 2016
@@ -19,8 +19,7 @@
 #include <QLineEdit>
 
 class QVBoxLayout;
-class fc_shortcut;
-class fc_shortcut;
+struct fc_shortcut;
 class QDialogButtonBox;
 class QSignalMapper;
 
@@ -118,7 +117,7 @@
 {
 public:
   fc_shortcut_popup(QWidget *parent);
-  void exec(fc_shortcut *s);
+  void run(fc_shortcut *s);
   fc_shortcut *sc;
 protected:
  void closeEvent(QCloseEvent*);


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

Reply via email to