1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
|
--- src/point.h.old 2006-01-28 00:06:55.000000000 -0700
+++ src/point.h 2006-01-28 00:08:28.000000000 -0700
@@ -111,35 +111,35 @@
// default constructor
template <class _T> inline
-Point3D<_T>::Point3D<_T>()
+Point3D<_T>::Point3D()
{
setPoint(0, 0, 0);
}
// copy constructor
template <class _T> inline
-Point3D<_T>::Point3D<_T>(const Point3D<_T>& point)
+Point3D<_T>::Point3D(const Point3D<_T>& point)
{
setPoint(point.x(), point.y(), point.z());
}
// copy constructor
template <class _T> inline
-Point3D<_T>::Point3D<_T>(const QPoint& point)
+Point3D<_T>::Point3D(const QPoint& point)
{
setPoint(point.x(), point.y(), 0);
}
// convenience constructor
template <class _T> inline
-Point3D<_T>::Point3D<_T>(_T x, _T y, _T z)
+Point3D<_T>::Point3D(_T x, _T y, _T z)
{
setPoint(x, y, z);
}
// obligatory virtual destructor
template <class _T> inline
-Point3D<_T>::~Point3D<_T>()
+Point3D<_T>::~Point3D()
{
}
--- src/spawnmonitor.h.old 2006-01-27 23:52:51.000000000 -0700
+++ src/spawnmonitor.h 2006-01-27 23:53:20.000000000 -0700
@@ -98,7 +98,7 @@
{
Q_OBJECT
public:
- SpawnMonitor::SpawnMonitor(const DataLocationMgr* dataLocMgr,
+ SpawnMonitor(const DataLocationMgr* dataLocMgr,
ZoneMgr* zoneMgr, SpawnShell* spawnShell,
QObject* parent = 0,
const char* name = "spawnmonitor" );
--- src/pointarray.h.old 2006-01-28 00:11:28.000000000 -0700
+++ src/pointarray.h 2006-01-28 00:11:43.000000000 -0700
@@ -57,7 +57,7 @@
};
template <class _T> inline
-Point3DArray<_T>::Point3DArray<_T>(uint32_t nPoints, const _T* points)
+Point3DArray<_T>::Point3DArray(uint32_t nPoints, const _T* points)
{
setPoints(nPoints, points);
}
--- src/messages.h.old 2009-01-12 19:39:32.000000000 +0100
+++ src/messages.h 2009-01-12 19:39:51.000000000 +0100
@@ -49,7 +49,7 @@
protected slots:
void removedFilter(uint32_t mask, uint8_t filter);
- void addedFilter(uint32_t mask, uint8_t filter, const MessageFilter& filter);
+ void addedFilter(uint32_t mask, uint8_t filter1, const MessageFilter& filter2);
signals:
void newMessage(const MessageEntry& message);
--- src/messagefilter.h.old 2009-01-12 19:39:11.000000000 +0100
+++ src/messagefilter.h 2009-01-12 19:39:27.000000000 +0100
@@ -99,7 +99,7 @@
signals:
void removed(uint32_t mask, uint8_t filter);
- void added(uint32_t mask, uint8_t filter, const MessageFilter& filter);
+ void added(uint32_t mask, uint8_t filter1, const MessageFilter& filter2);
protected:
MessageFilter* m_filters[maxMessageFilters];
--- src/mapicon.h.old 2009-01-12 20:11:23.000000000 +0100
+++ src/mapicon.h 2009-01-12 20:11:46.000000000 +0100
@@ -206,7 +206,7 @@
protected:
// static paint methods
typedef void (*IconImageFunction)(QPainter&p, const QPoint& point,
- int size, int size);
+ int size1, int size2);
static void paintNone(QPainter&p, const QPoint& point,
int size, int sizeWH);
static void paintCircle(QPainter&p, const QPoint& point,
--- src/messagewindow.h.old 2009-01-12 20:12:25.000000000 +0100
+++ src/messagewindow.h 2009-01-12 20:12:46.000000000 +0100
@@ -180,7 +180,7 @@
void setCaption();
virtual void restoreFont();
void removedFilter(uint32_t mask, uint8_t filter);
- void addedFilter(uint32_t mask, uint8_t filter, const MessageFilter& filter);
+ void addedFilter(uint32_t mask, uint8_t filter1, const MessageFilter& filter2);
protected:
void addMessage(const MessageEntry& message);
--- src/messagefilterdialog.h.old 2009-01-12 20:13:15.000000000 +0100
+++ src/messagefilterdialog.h 2009-01-12 20:13:35.000000000 +0100
@@ -46,7 +46,7 @@
void messageTypeSelectionChanged();
void existingFilterSelectionChanged(QListBoxItem * item);
void removedFilter(uint32_t mask, uint8_t filter);
- void addedFilter(uint32_t mask, uint8_t filter, const MessageFilter& filter);
+ void addedFilter(uint32_t mask, uint8_t filter1, const MessageFilter& filter2);
protected:
void clearFilter();
|
GitWeb