Attachment #144717 for bug #211589

Lines 25-30 Link Here

(-)dasher-4.6.1-orig/Src/DasherCore/LanguageModelling/CTWLanguageModel.cpp (+1 lines)
25	//#include "stdafx.h"	25	//#include "stdafx.h"
26	#include "CTWLanguageModel.h"	26	#include "CTWLanguageModel.h"
27	#include <math.h> // not in use anymore? needed it for log	27	#include <math.h> // not in use anymore? needed it for log
		28	#include <cstring>
28		29
29	using namespace Dasher;	30	using namespace Dasher;
30		31

Lines 22-27 Link Here

(-)dasher-4.6.1-orig/Src/DasherCore/Alphabet/AlphIO.cpp (+1 lines)
22	#include "AlphIO.h"	22	#include "AlphIO.h"
23		23
24	#include <iostream>	24	#include <iostream>
		25	#include <cstring>
25		26
26	using namespace Dasher;	27	using namespace Dasher;
27	using namespace std;	28	using namespace std;

Lines 5-10 Link Here

(-)dasher-4.6.1-orig/Src/DasherCore/ColourIO.cpp (+2 lines)
5	#include "../Common/Common.h"	5	#include "../Common/Common.h"
6		6
7	#include "ColourIO.h"	7	#include "ColourIO.h"
		8	#include <cstring>
		9
8	using namespace Dasher;	10	using namespace Dasher;
9	using namespace std;	11	using namespace std;
10	//using namespace expat;	12	//using namespace expat;

Lines 21-26 Link Here

(-)dasher-4.6.1-orig/Src/DasherCore/ControlManager.cpp (+1 lines)
21	#include "../Common/Common.h"	21	#include "../Common/Common.h"
22		22
23	#include "ControlManager.h"	23	#include "ControlManager.h"
		24	#include <cstring>
24		25
25	using namespace Dasher;	26	using namespace Dasher;
26	using namespace std;	27	using namespace std;

Lines 31-36 Link Here

(-)dasher-4.6.1-orig/Src/DasherCore/ConversionManager.cpp (+1 lines)
31	#include <string>	31	#include <string>
32	#include <vector>	32	#include <vector>
33	#include <stdlib.h>	33	#include <stdlib.h>
		34	#include <cstring>
34		35
35	using namespace Dasher;	36	using namespace Dasher;
36		37

Lines 21-26 Link Here

(-)dasher-4.6.1-orig/Src/DasherCore/DasherModel.cpp (+1 lines)
21	#include "../Common/Common.h"	21	#include "../Common/Common.h"
22		22
23	#include <iostream>	23	#include <iostream>
		24	#include <cstring>
24	#include "../Common/Random.h"	25	#include "../Common/Random.h"
25	#include "DasherModel.h"	26	#include "DasherModel.h"
26	#include "DasherView.h"	27	#include "DasherView.h"

Lines 1-6 Link Here

(-)dasher-4.6.1-orig/Src/DasherCore/FileLogger.cpp (+1 lines)
1		1
2	#include "../Common/Common.h"	2	#include "../Common/Common.h"
3		3
		4	#include <cstring>
4	#include "FileLogger.h"	5	#include "FileLogger.h"
5		6
6	// Track memory leaks on Windows to the line that new'd the memory	7	// Track memory leaks on Windows to the line that new'd the memory

Lines 2-7 Link Here

(-)dasher-4.6.1-orig/Src/DasherCore/TimeSpan.cpp (+1 lines)
2	#include "../Common/Common.h"	2	#include "../Common/Common.h"
3		3
4	#include "TimeSpan.h"	4	#include "TimeSpan.h"
		5	#include <cstring>
5		6
6	#ifdef _WIN32	7	#ifdef _WIN32
7	#include <sys/timeb.h>	8	#include <sys/timeb.h>

Lines 2-7 Link Here

(-)dasher-4.6.1-orig/Src/DasherCore/UserLog.cpp (+1 lines)
2		2
3	#include "UserLog.h"	3	#include "UserLog.h"
4	#include <fstream>	4	#include <fstream>
		5	#include <cstring>
5		6
6	#ifdef _WIN32	7	#ifdef _WIN32
7	#include <sys/timeb.h>	8	#include <sys/timeb.h>

Lines 1-6 Link Here

(-)dasher-4.6.1-orig/Src/DasherCore/UserLogTrial.cpp (+1 lines)
1	#include "../Common/Common.h"	1	#include "../Common/Common.h"
2		2
3	#include "UserLogTrial.h"	3	#include "UserLogTrial.h"
		4	#include <cstring>
4		5
5	// Track memory leaks on Windows to the line that new'd the memory	6	// Track memory leaks on Windows to the line that new'd the memory
6	#ifdef _WIN32	7	#ifdef _WIN32

Lines 2-7 Link Here

(-)dasher-4.6.1-orig/Src/DasherCore/XMLUtil.cpp (+1 lines)
2	#include "../Common/Common.h"	2	#include "../Common/Common.h"
3		3
4	#include "XMLUtil.h"	4	#include "XMLUtil.h"
		5	#include <cstring>
5		6
6	#include <sys/types.h>	7	#include <sys/types.h>
7	#include <sys/stat.h>	8	#include <sys/stat.h>

Lines 13-18 Link Here

(-)dasher-4.6.1-orig/Src/DasherCore/SettingsStore.cpp (+1 lines)
13	#include "EventHandler.h"	13	#include "EventHandler.h"
14		14
15	#include <iostream>	15	#include <iostream>
		16	#include <cstdlib>
16		17
17	using namespace std;	18	using namespace std;
18		19

Lines 16-21 Link Here

(-)dasher-4.6.1-orig/Src/Gtk2/DasherAppSettings.cpp (+2 lines)
16	#include "dasher.h"	16	#include "dasher.h"
17	#include "GtkDasherControl.h"	17	#include "GtkDasherControl.h"
18		18
		19	#include <cstring>
		20
19	// FIXME - should really do something to make this a singleton class	21	// FIXME - should really do something to make this a singleton class
20		22
21	// TODO: Rename this file to fit in with naming conventions	23	// TODO: Rename this file to fit in with naming conventions

Lines 2-7 Link Here

(-)dasher-4.6.1-orig/Src/Gtk2/Preferences.cpp (+1 lines)
2		2
3	#include <glib/gi18n.h>	3	#include <glib/gi18n.h>
4	#include <libintl.h>	4	#include <libintl.h>
		5	#include <cstring>
5		6
6	#include "../Common/Common.h"	7	#include "../Common/Common.h"
7	#include "DasherTypes.h"	8	#include "DasherTypes.h"

Lines 8-13 Link Here

(-)dasher-4.6.1-orig/Src/Gtk2/dasher_action_speech.cpp (+1 lines)
8	#include <glib/gi18n.h>	8	#include <glib/gi18n.h>
9	#include <gnome-speech/gnome-speech.h>	9	#include <gnome-speech/gnome-speech.h>
10	#include <libbonobo.h>	10	#include <libbonobo.h>
		11	#include <cstring>
11	//#include <libintl.h>	12	//#include <libintl.h>
12	//#include <string.h>	13	//#include <string.h>
13		14

Lines 1-5 Link Here

(-)dasher-4.6.1-orig/Src/Gtk2/dasher_editor_internal.cpp (+1 lines)
1	#include "config.h"	1	#include "config.h"
2		2
		3	#include <cstring>
3	#include <glib/gi18n.h>	4	#include <glib/gi18n.h>
4	#include <gtk/gtk.h>	5	#include <gtk/gtk.h>
5	/* TODO: r4epair gnome libs flags (or get rid of entirely) */	6	/* TODO: r4epair gnome libs flags (or get rid of entirely) */

Lines 1-5 Link Here

(-)dasher-4.6.1-orig/Src/Gtk2/dasher_main.cpp (+1 lines)
1	#include "config.h"	1	#include "config.h"
2		2
		3	#include <cstring>
3	#include <gdk/gdk.h>	4	#include <gdk/gdk.h>
4	#include <gdk/gdkx.h>	5	#include <gdk/gdkx.h>
5	#include <glade/glade.h>	6	#include <glade/glade.h>

Lines 2-7 Link Here

(-)dasher-4.6.1-orig/Src/Gtk2/DasherControl.cpp (+1 lines)
2	#include "../../config.h"	2	#include "../../config.h"
3		3
4	#include <iostream>	4	#include <iostream>
		5	#include <cstring>
5	#include "DasherControl.h"	6	#include "DasherControl.h"
6	#include "Timer.h"	7	#include "Timer.h"
7	#include "../DasherCore/Event.h"	8	#include "../DasherCore/Event.h"

Lines 7-12 Link Here

(-)dasher-4.6.1-orig/Src/Gtk2/KeyboardHelper.cpp (+1 lines)
7	#include <iostream>	7	#include <iostream>
8	#include <sstream>	8	#include <sstream>
9	#include <string>	9	#include <string>
		10	#include <cstring>
10		11
11	CKeyboardHelper::CKeyboardHelper(DasherAppSettings *pAppSettings) {	12	CKeyboardHelper::CKeyboardHelper(DasherAppSettings *pAppSettings) {
12	m_pAppSettings = pAppSettings;	13	m_pAppSettings = pAppSettings;

Return to bug 211589