Author: mir3x
Date: Sat Dec  3 00:44:29 2016
New Revision: 34689

URL: http://svn.gna.org/viewcvs/freeciv?rev=34689&view=rev
Log:
Qt client - fixed clang 3.9 errors

See bug #25352


Modified:
    trunk/client/gui-qt/chatline.h
    trunk/client/gui-qt/menu.h
    trunk/client/gui-qt/sprite.cpp

Modified: trunk/client/gui-qt/chatline.h
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-qt/chatline.h?rev=34689&r1=34688&r2=34689&view=diff
==============================================================================
--- trunk/client/gui-qt/chatline.h      (original)
+++ trunk/client/gui-qt/chatline.h      Sat Dec  3 00:44:29 2016
@@ -34,10 +34,10 @@
 #include <QCheckBox>
 
 class QPushButton;
-
+class chat_listener;
 QString apply_tags(QString str, const struct text_tag_list *tags,
                    QColor bg_color);
-
+template<> std::set<chat_listener *> listener<chat_listener>::instances;
 /***************************************************************************
   Listener for chat. See listener<> for information about how to use it
 ***************************************************************************/

Modified: trunk/client/gui-qt/menu.h
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-qt/menu.h?rev=34689&r1=34688&r2=34689&view=diff
==============================================================================
--- trunk/client/gui-qt/menu.h  (original)
+++ trunk/client/gui-qt/menu.h  Sat Dec  3 00:44:29 2016
@@ -33,7 +33,7 @@
 class QPushButton;
 class QSignalMapper;
 class QScrollArea;
-class fc_shortcut;
+struct fc_shortcut;
 
 void qt_start_turn();
 

Modified: trunk/client/gui-qt/sprite.cpp
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-qt/sprite.cpp?rev=34689&r1=34688&r2=34689&view=diff
==============================================================================
--- trunk/client/gui-qt/sprite.cpp      (original)
+++ trunk/client/gui-qt/sprite.cpp      Sat Dec  3 00:44:29 2016
@@ -48,7 +48,7 @@
     char *ext;
     cp = gfx_ext.takeFirst();
     ext = static_cast<char *>(fc_malloc(sizeof(cp.data())));
-    strncpy(ext, cp.data(), sizeof(cp.data()));
+    strncpy(ext, cp.data(), sizeof(cp));
     gfx_array_extensions[j] = ext;
     j++;
   }


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

Reply via email to