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
|
--- src/dialogs/tiledialog.h
+++ src/dialogs/tiledialog.h
@@ -58,7 +58,7 @@
/**
* Respond to selection change
*/
- void TileDialog::updateSelection();
+ void updateSelection();
/**
--- src/extension/internal/ps.h
+++ src/extension/internal/ps.h
@@ -36,10 +36,10 @@
void print_bpath (SVGOStringStream &os, const NArtBpath *bp);
- void PrintPS::print_fill_style (SVGOStringStream &os, const SPStyle *style, const NRRect *pbox);
- void PrintPS::print_stroke_style (SVGOStringStream &os, const SPStyle *style);
+ void print_fill_style (SVGOStringStream &os, const SPStyle *style, const NRRect *pbox);
+ void print_stroke_style (SVGOStringStream &os, const SPStyle *style);
- const char* PrintPS::PSFontName (const SPStyle *style);
+ const char* PSFontName (const SPStyle *style);
unsigned int print_image (FILE *ofp, guchar *px, unsigned int width, unsigned int height, unsigned int rs,
const NRMatrix *transform);
--- src/jabber_whiteboard/pedroxmpp.cpp
+++ src/jabber_whiteboard/pedroxmpp.cpp
@@ -614,7 +614,7 @@
static void hash(unsigned char *dataIn,
unsigned long len, unsigned char *digest);
- static DOMString Md5::hashHex(unsigned char *dataIn, unsigned long len);
+ static DOMString hashHex(unsigned char *dataIn, unsigned long len);
/**
* Initialize the context (also zeroizes contents)
--- src/jabber_whiteboard/pedroxmpp.h
+++ src/jabber_whiteboard/pedroxmpp.h
@@ -746,7 +746,7 @@
*
*/
virtual std::vector<XmppUser>
- XmppClient::groupChatGetUserList(const DOMString &groupJid);
+ groupChatGetUserList(const DOMString &groupJid);
/**
*
--- src/libavoid/connector.h
+++ src/libavoid/connector.h
@@ -59,7 +59,7 @@
bool isInitialised(void);
void unInitialise(void);
void setCallback(void (*cb)(void *), void *ptr);
- void ConnRef::handleInvalid(void);
+ void handleInvalid(void);
int generatePath(Point p0, Point p1);
void makePathInvalid(void);
--- src/livarot/Path.h
+++ src/livarot/Path.h
@@ -198,7 +198,7 @@
cut_position* CurvilignToPosition(int nbCv,double* cvAbs,int &nbCut);
cut_position PointToCurvilignPosition(NR::Point const &pos) const;
//Should this take a cut_position as a param?
- double Path::PositionToLength(int piece, double t);
+ double PositionToLength(int piece, double t);
// caution: not tested on quadratic b-splines, most certainly buggy
void ConvertPositionsToMoveTo(int nbPos,cut_position* poss);
--- src/ui/dialog/aboutbox.h
+++ src/ui/dialog/aboutbox.h
@@ -28,7 +28,7 @@
class AboutBoxChild: public Gtk::Dialog
{
public:
- AboutBoxChild::AboutBoxChild(Gtk::Window& parent, gchar * title)
+ AboutBoxChild(Gtk::Window& parent, gchar * title)
: Gtk::Dialog(title,parent) {};
protected:
virtual void on_response(int response_id);
--- src/ui/dialog/align-and-distribute.cpp
+++ src/ui/dialog/align-and-distribute.cpp
@@ -955,7 +955,7 @@
break;
} // end of switch statement
- return NULL;
+ return (std::list<SPItem *>::iterator)NULL;
}
AlignAndDistribute::AlignTarget AlignAndDistribute::getAlignTarget()const {
|
GitWeb