]>
Commit | Line | Data |
---|---|---|
9c77557f ER |
1 | --- earth3d/listViewServiceItem.cpp~ 2005-08-20 06:44:35.000000000 +0300 |
2 | +++ earth3d/listViewServiceItem.cpp 2011-06-23 11:20:34.264065874 +0300 | |
3 | @@ -1,6 +1,7 @@ | |
4 | #include "listViewServiceItem.h" | |
5 | #include <qdom.h> | |
6 | #include <qpixmap.h> | |
7 | +#include <stdlib.h> | |
8 | ||
9 | ListViewServiceItem::ListViewServiceItem ( QListViewItem *parent, QListViewItem *after, QDomNode text, const char *connection, const char *sender, int countParts, struct part_t *parts, ConnectNetworkService *cns, QString form ) | |
10 | : QListViewItem(parent, after) { | |
38ee8c8a ER |
11 | --- earth3d/network/urlDownload.cpp~ 2011-06-23 11:30:30.000000000 +0300 |
12 | +++ earth3d/network/urlDownload.cpp 2011-06-23 11:30:36.608535852 +0300 | |
13 | @@ -12,7 +12,7 @@ | |
14 | #include "downloadFinishedEvent.h" | |
15 | ||
16 | #ifndef WIN32 | |
17 | -#include <alloc.h> | |
18 | +#include <stdlib.h> | |
19 | #endif | |
20 | ||
21 | using namespace std; | |
22 | --- earth3d/network/urlTools.cpp~ 2005-10-29 02:50:24.000000000 +0300 | |
23 | +++ earth3d/network/urlTools.cpp 2011-06-23 11:31:17.987112367 +0300 | |
24 | @@ -4,6 +4,7 @@ | |
25 | #include <iostream> | |
26 | #include <qstringlist.h> | |
27 | #include <qregexp.h> | |
28 | +#include <stdlib.h> | |
29 | ||
30 | namespace UrlTools { | |
31 | void rewrite(QDomNode n, QString baseurlstring); | |
32 | --- earth3d/network/serviceFoundLister.cpp~ 2005-08-20 06:44:35.000000000 +0300 | |
33 | +++ earth3d/network/serviceFoundLister.cpp 2011-06-23 11:31:46.151745645 +0300 | |
34 | @@ -3,6 +3,7 @@ | |
35 | #include "listViewServiceItem.h" | |
36 | #include <qdom.h> | |
37 | #include <assert.h> | |
38 | +#include <stdlib.h> | |
39 | #include "formview.h" | |
40 | #include "insertListViewItemEvent.h" | |
41 | QMutex serviceFoundGlobalMutex; | |
42 | --- earth3d/draw/treeDrawPOI.cpp~ 2004-08-20 18:26:55.000000000 +0300 | |
43 | +++ earth3d/draw/treeDrawPOI.cpp 2011-06-23 11:32:36.330728317 +0300 | |
44 | @@ -1,6 +1,7 @@ | |
45 | #define GL_GLEXT_PROTOTYPES | |
46 | #include "treeDrawPOI.h" | |
47 | #include <stdio.h> | |
48 | +#include <stdlib.h> | |
49 | #include <GL/glext.h> | |
50 | #include "treeDrawPOISign.h" | |
51 | ||
52 | --- earth3d/draw/treeDrawFactory.cpp~ 2004-08-20 18:26:55.000000000 +0300 | |
53 | +++ earth3d/draw/treeDrawFactory.cpp 2011-06-23 11:33:15.022514116 +0300 | |
54 | @@ -1,4 +1,5 @@ | |
55 | #include "treeDrawFactory.h" | |
56 | +#include <stdlib.h> | |
57 | #include <qtextstream.h> | |
58 | #include <qdom.h> | |
59 | #include "treeDraw.h" | |
60 | --- earth3d/draw/drawSceneObjectTriangle.cpp~ 2004-08-20 18:26:55.000000000 +0300 | |
61 | +++ earth3d/draw/drawSceneObjectTriangle.cpp 2011-06-23 11:33:50.617490305 +0300 | |
62 | @@ -1,3 +1,4 @@ | |
63 | +#include <stdlib.h> | |
64 | #include "drawSceneObjectTriangle.h" | |
65 | ||
66 | DrawSceneObjectTriangle::DrawSceneObjectTriangle(DrawScene *scene) | |
67 | --- earth3d/draw/drawSceneObjectQuad.cpp~ 2004-08-20 18:26:55.000000000 +0300 | |
68 | +++ earth3d/draw/drawSceneObjectQuad.cpp 2011-06-23 11:34:16.101999849 +0300 | |
69 | @@ -1,3 +1,4 @@ | |
70 | +#include <stdlib.h> | |
71 | #include "drawSceneObjectQuad.h" | |
72 | ||
73 | DrawSceneObjectQuad::DrawSceneObjectQuad(DrawScene *scene) | |
74 | --- earth3d/draw/drawSceneObjectTranslate.cpp~ 2004-08-20 18:26:55.000000000 +0300 | |
75 | +++ earth3d/draw/drawSceneObjectTranslate.cpp 2011-06-23 11:34:42.013195746 +0300 | |
76 | @@ -1,3 +1,4 @@ | |
77 | +#include <stdlib.h> | |
78 | #include "drawSceneObjectTranslate.h" | |
79 | ||
80 | DrawSceneObjectTranslate::DrawSceneObjectTranslate(DrawScene *scene) | |
81 | --- earth3d/draw/drawSceneObjectScale.cpp~ 2004-08-20 18:26:55.000000000 +0300 | |
82 | +++ earth3d/draw/drawSceneObjectScale.cpp 2011-06-23 11:35:07.481037842 +0300 | |
83 | @@ -1,3 +1,4 @@ | |
84 | +#include <stdlib.h> | |
85 | #include "drawSceneObjectScale.h" | |
86 | ||
87 | DrawSceneObjectScale::DrawSceneObjectScale(DrawScene *scene) | |
88 | --- earth3d/draw/drawSceneObjectRotatequaternion.cpp~ 2004-08-20 18:26:55.000000000 +0300 | |
89 | +++ earth3d/draw/drawSceneObjectRotatequaternion.cpp 2011-06-23 11:36:04.330328282 +0300 | |
90 | @@ -1,3 +1,4 @@ | |
91 | +#include <stdlib.h> | |
92 | #include "drawSceneObjectRotatequaternion.h" | |
93 | ||
94 | DrawSceneObjectRotatequaternion::DrawSceneObjectRotatequaternion(DrawScene *scene) | |
95 | --- earth3d/geometry/geometry2d3dFactory.cpp~ 2004-08-19 02:48:59.000000000 +0300 | |
96 | +++ earth3d/geometry/geometry2d3dFactory.cpp 2011-06-23 11:37:08.293280247 +0300 | |
97 | @@ -1,3 +1,4 @@ | |
98 | +#include <stdlib.h> | |
99 | #include "geometry2d3dFactory.h" | |
100 | ||
101 | Geometry2D3DFactory::Geometry2D3DFactory() { | |
950aa51f ER |
102 | --- earth3d/formview.ui~ 2006-08-04 19:22:09.000000000 +0300 |
103 | +++ earth3d/formview.ui 2011-06-23 11:58:43.679723350 +0300 | |
104 | @@ -464,6 +464,7 @@ | |
105 | </connections> | |
106 | <includes> | |
107 | <include location="global" impldecl="in implementation">iostream</include> | |
108 | + <include location="global" impldecl="in implementation">stdlib.h</include> | |
109 | <include location="local" impldecl="in implementation">listBoxServiceItem.h</include> | |
110 | <include location="local" impldecl="in declaration">connectNetworkService.h</include> | |
111 | <include location="local" impldecl="in declaration">serviceFoundLister.h</include> |