Author: mir3x
Date: Tue Sep 9 14:42:04 2014
New Revision: 26303
URL: http://svn.gna.org/viewcvs/freeciv?rev=26303&view=rev
Log:
Added some destructors to keep valgrind happier.
See patch #5202
Modified:
trunk/client/gui-qt/fc_client.cpp
trunk/client/gui-qt/fc_client.h
trunk/client/gui-qt/mapview.cpp
trunk/client/gui-qt/mapview.h
Modified: trunk/client/gui-qt/fc_client.cpp
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-qt/fc_client.cpp?rev=26303&r1=26302&r2=26303&view=diff
==============================================================================
--- trunk/client/gui-qt/fc_client.cpp (original)
+++ trunk/client/gui-qt/fc_client.cpp Tue Sep 9 14:42:04 2014
@@ -166,6 +166,7 @@
connect(switch_page_mapper, SIGNAL(mapped( int)),
this, SLOT(switch_page(int)));
main_window->setVisible(true);
+
}
/****************************************************************************
@@ -173,6 +174,8 @@
****************************************************************************/
fc_client::~fc_client()
{
+ status_bar_queue.clear();
+ fc_fonts.release_fonts();
delete main_window;
}
@@ -664,6 +667,16 @@
}
/****************************************************************************
+ Deletes all fonts
+****************************************************************************/
+void fc_font::release_fonts()
+{
+ foreach (QFont *f, font_map) {
+ delete f;
+ }
+}
+
+/****************************************************************************
Adds new font or overwrite old one
****************************************************************************/
void fc_font::set_font(QString name, QFont * qf)
Modified: trunk/client/gui-qt/fc_client.h
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-qt/fc_client.h?rev=26303&r1=26302&r2=26303&view=diff
==============================================================================
--- trunk/client/gui-qt/fc_client.h (original)
+++ trunk/client/gui-qt/fc_client.h Tue Sep 9 14:42:04 2014
@@ -96,6 +96,7 @@
void set_font(QString name, QFont *qf);
QFont* get_font(QString name);
void init_fonts();
+ void release_fonts();
};
class fc_client : public QObject
Modified: trunk/client/gui-qt/mapview.cpp
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-qt/mapview.cpp?rev=26303&r1=26302&r2=26303&view=diff
==============================================================================
--- trunk/client/gui-qt/mapview.cpp (original)
+++ trunk/client/gui-qt/mapview.cpp Tue Sep 9 14:42:04 2014
@@ -395,6 +395,16 @@
cw->put_to_corner();
pix = new QPixmap;
scale_factor = 1.0;
+}
+
+/**************************************************************************
+ Minimap_view destructor
+**************************************************************************/
+minimap_view::~minimap_view()
+{
+ if (pix) {
+ delete pix;
+ }
}
/**************************************************************************
@@ -762,6 +772,17 @@
end_button_area.setWidth(0);
rates_area.setWidth(0);
indicator_area.setWidth(0);
+}
+
+/**************************************************************************
+ Destructor for information label
+**************************************************************************/
+info_label::~info_label()
+{
+ if (end_turn_pix)
+ delete end_turn_pix;
+ if (rates_label)
+ delete rates_label;
}
/**************************************************************************
Modified: trunk/client/gui-qt/mapview.h
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-qt/mapview.h?rev=26303&r1=26302&r2=26303&view=diff
==============================================================================
--- trunk/client/gui-qt/mapview.h (original)
+++ trunk/client/gui-qt/mapview.h Tue Sep 9 14:42:04 2014
@@ -206,6 +206,7 @@
Q_OBJECT
public:
minimap_view(QWidget * parent);
+ ~minimap_view();
void paint(QPainter * painter, QPaintEvent * event);
virtual void update_menu();
void update_image();
@@ -255,6 +256,7 @@
public:
info_label(QWidget *parent);
+ ~info_label();
void set_turn_info(QString);
void set_time_info(QString);
void set_eco_info(QString);
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
