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
|
Index: stellarium-0.7.1/src/observator.h
===================================================================
--- stellarium-0.7.1.orig/src/observator.h
+++ stellarium-0.7.1/src/observator.h
@@ -112,8 +112,8 @@ private:
string s_time_format_to_string(S_TIME_FORMAT) const;
// Convert the date format enum to its associated string and reverse
- S_DATE_FORMAT Observator::string_to_s_date_format(const string& df) const;
- string Observator::s_date_format_to_string(S_DATE_FORMAT df) const;
+ S_DATE_FORMAT string_to_s_date_format(const string& df) const;
+ string s_date_format_to_string(S_DATE_FORMAT df) const;
// for changing position
bool flag_move_to;
Index: stellarium-0.7.1/src/projector.h
===================================================================
--- stellarium-0.7.1.orig/src/projector.h
+++ stellarium-0.7.1/src/projector.h
@@ -75,7 +75,7 @@ public:
virtual void set_viewport(int x, int y, int w, int h);
// Fill with black around the circle
- void Projector::draw_viewport_shape(void);
+ void draw_viewport_shape(void);
int viewW(void) const {return vec_viewport[2];}
int viewH(void) const {return vec_viewport[3];}
Index: stellarium-0.7.1/src/stel_command_interface.h
===================================================================
--- stellarium-0.7.1.orig/src/stel_command_interface.h
+++ stellarium-0.7.1/src/stel_command_interface.h
@@ -43,9 +43,9 @@ class StelCommandInterface : CommandInte
public:
StelCommandInterface(stel_core * core);
virtual ~StelCommandInterface();
- virtual int StelCommandInterface::execute_command(string commandline);
- virtual int StelCommandInterface::execute_command(string command, double arg);
- virtual int StelCommandInterface::execute_command(string command, int arg);
+ virtual int execute_command(string commandline);
+ virtual int execute_command(string command, double arg);
+ virtual int execute_command(string command, int arg);
virtual int execute_command(string command, unsigned long int &wait, bool trusted);
virtual int set_flag(string name, string value, bool &newval, bool trusted);
void update(int delta_time);
Index: stellarium-0.7.1/src/stel_ui.h
===================================================================
--- stellarium-0.7.1.orig/src/stel_ui.h
+++ stellarium-0.7.1/src/stel_ui.h
@@ -316,7 +316,7 @@ private:
void tui_cb_sky_time(); // change effect parameters
// Parse a file of type /usr/share/zoneinfo/zone.tab
- s_tui::MultiSet_item<string>* stel_ui::create_tree_from_time_zone_file(const string& zonetab);
+ s_tui::MultiSet_item<string>* create_tree_from_time_zone_file(const string& zonetab);
bool ScriptDirectoryRead;
};
|
GitWeb
