]>
Commit | Line | Data |
---|---|---|
a4713ebf AG |
1 | --- einstein-2.0/horhints.cpp~ 2005-08-22 23:36:12.000000000 +0200 |
2 | +++ einstein-2.0/horhints.cpp 2009-01-02 14:20:10.000000000 +0100 | |
3 | @@ -85,10 +85,12 @@ | |
4 | Rule *r = NULL; | |
5 | int no = row * HINTS_COLS + col; | |
6 | if (no < (int)rules.size()) | |
7 | + { | |
8 | if (showExcluded) | |
9 | r = excludedRules[no]; | |
10 | else | |
11 | r = rules[no]; | |
12 | + } | |
13 | if (r) | |
14 | r->draw(x, y, iconSet, no == highlighted); | |
15 | else | |
16 | --- einstein-2.0/lexal.h~ 2005-08-14 04:40:58.000000000 +0200 | |
17 | +++ einstein-2.0/lexal.h 2009-01-02 14:20:51.000000000 +0100 | |
18 | @@ -8,7 +8,7 @@ | |
19 | class Lexeme | |
20 | { | |
21 | public: | |
22 | - typedef enum Type { | |
23 | + enum Type { | |
24 | String, | |
25 | Integer, | |
26 | Float, | |
27 | --- einstein-2.0/table.h~ 2005-08-14 04:40:58.000000000 +0200 | |
28 | +++ einstein-2.0/table.h 2009-01-02 14:21:11.000000000 +0100 | |
29 | @@ -13,7 +13,7 @@ | |
30 | class Value | |
31 | { | |
32 | public: | |
33 | - typedef enum Type { | |
34 | + enum Type { | |
35 | Integer, | |
36 | Double, | |
37 | String, | |
38 | --- einstein-2.0/unicode.cpp~ 2009-01-02 14:25:36.000000000 +0100 | |
39 | +++ einstein-2.0/unicode.cpp 2009-01-02 14:25:59.000000000 +0100 | |
40 | @@ -240,11 +240,11 @@ | |
41 | break; | |
42 | else | |
43 | if (error) | |
44 | - *error = L"Partial character sequence at end of input"; | |
45 | + *error = (wchar_t *) L"Partial character sequence at end of input"; | |
46 | } | |
47 | else | |
48 | if (error) | |
49 | - *error = L"Invalid byte sequence in conversion input"; | |
50 | + *error = (wchar_t *) L"Invalid byte sequence in conversion input"; | |
51 | ||
52 | goto err_out; | |
53 | } | |
54 | @@ -381,7 +381,7 @@ | |
55 | if (items_read) | |
56 | *items_read = i; | |
57 | if (error) | |
58 | - *error = L"Character out of range for UTF-8"; | |
59 | + *error = (wchar_t *) L"Character out of range for UTF-8"; | |
60 | goto err_out; | |
61 | } | |
62 |