1 |
mr_bones_ 10/04/29 00:20:36 |
2 |
|
3 |
Added: stellarium-0.10.4-gcc45.patch |
4 |
Log: |
5 |
Add gcc45 patch submitted by Philipp via bug #317465 |
6 |
(Portage version: 2.1.8.3/cvs/Linux i686) |
7 |
|
8 |
Revision Changes Path |
9 |
1.1 sci-astronomy/stellarium/files/stellarium-0.10.4-gcc45.patch |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-astronomy/stellarium/files/stellarium-0.10.4-gcc45.patch?rev=1.1&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-astronomy/stellarium/files/stellarium-0.10.4-gcc45.patch?rev=1.1&content-type=text/plain |
13 |
|
14 |
Index: stellarium-0.10.4-gcc45.patch |
15 |
=================================================================== |
16 |
--- plugins/Oculars/src/Oculars.cpp.old 2010-04-16 18:32:41.000000000 +0200 |
17 |
+++ plugins/Oculars/src/Oculars.cpp 2010-04-16 18:34:15.000000000 +0200 |
18 |
@@ -227,8 +227,8 @@ double Oculars::getCallOrder(StelModuleA |
19 |
|
20 |
void Oculars::handleMouseClicks(class QMouseEvent* event) |
21 |
{ |
22 |
- StelCore::StelCore *core = StelApp::getInstance().getCore(); |
23 |
- StelMovementMgr::StelMovementMgr *movementManager = core->getMovementMgr(); |
24 |
+ StelCore *core = StelApp::getInstance().getCore(); |
25 |
+ StelMovementMgr *movementManager = core->getMovementMgr(); |
26 |
if (StelApp::getInstance().getStelObjectMgr().getWasSelected()){ |
27 |
LabelMgr *labelManager = GETSTELMODULE(LabelMgr); |
28 |
|
29 |
@@ -384,7 +384,7 @@ void Oculars::enableOcular(bool b) |
30 |
loadDatabaseObjects(); |
31 |
} |
32 |
|
33 |
- StelCore::StelCore *core = StelApp::getInstance().getCore(); |
34 |
+ StelCore *core = StelApp::getInstance().getCore(); |
35 |
LabelMgr* labelManager = GETSTELMODULE(LabelMgr); |
36 |
// Toggle the plugin on & off. To toggle on, we want to ensure there is a selected object. |
37 |
if (!flagShowOculars && !StelApp::getInstance().getStelObjectMgr().getWasSelected()) { |
38 |
@@ -466,7 +466,7 @@ void Oculars::toggleCrosshair() |
39 |
void Oculars::drawCrosshairs() |
40 |
{ |
41 |
const StelProjectorP projector = StelApp::getInstance().getCore()->getProjection(StelCore::FrameEquinoxEqu); |
42 |
- StelCore::StelCore *core = StelApp::getInstance().getCore(); |
43 |
+ StelCore *core = StelApp::getInstance().getCore(); |
44 |
StelProjector::StelProjectorParams params = core->getCurrentStelProjectorParams(); |
45 |
// Center of screen |
46 |
Vec2i centerScreen(projector->getViewportPosX()+projector->getViewportWidth()/2, |
47 |
@@ -588,8 +588,8 @@ void Oculars::interceptMovementKey(QKeyE |
48 |
// We onle care about the arrow keys. This flag tracks that. |
49 |
bool consumeEvent = false; |
50 |
|
51 |
- StelCore::StelCore *core = StelApp::getInstance().getCore(); |
52 |
- StelMovementMgr::StelMovementMgr *movementManager = core->getMovementMgr(); |
53 |
+ StelCore *core = StelApp::getInstance().getCore(); |
54 |
+ StelMovementMgr *movementManager = core->getMovementMgr(); |
55 |
|
56 |
if (event->type() == QEvent::KeyPress) |
57 |
{ |
58 |
@@ -693,7 +693,7 @@ void Oculars::loadDatabaseObjects() |
59 |
|
60 |
void Oculars::paintMask() |
61 |
{ |
62 |
- StelCore::StelCore *core = StelApp::getInstance().getCore(); |
63 |
+ StelCore *core = StelApp::getInstance().getCore(); |
64 |
StelProjector::StelProjectorParams params = core->getCurrentStelProjectorParams(); |
65 |
|
66 |
glDisable(GL_BLEND); |
67 |
@@ -774,9 +774,9 @@ void Oculars::validateIniFile() |
68 |
|
69 |
void Oculars::unzoomOcular() |
70 |
{ |
71 |
- StelCore::StelCore *core = StelApp::getInstance().getCore(); |
72 |
- StelMovementMgr::StelMovementMgr *movementManager = core->getMovementMgr(); |
73 |
- GridLinesMgr::GridLinesMgr *gridManager = (GridLinesMgr *)StelApp::getInstance().getModuleMgr().getModule("GridLinesMgr"); |
74 |
+ StelCore *core = StelApp::getInstance().getCore(); |
75 |
+ StelMovementMgr *movementManager = core->getMovementMgr(); |
76 |
+ GridLinesMgr *gridManager = (GridLinesMgr *)StelApp::getInstance().getModuleMgr().getModule("GridLinesMgr"); |
77 |
|
78 |
gridManager->setFlagAzimuthalGrid(flagAzimuthalGrid); |
79 |
gridManager->setFlagEquatorGrid(flagEquatorGrid); |
80 |
@@ -801,7 +801,7 @@ void Oculars::zoom(bool rezoom) |
81 |
|
82 |
if (flagShowOculars) { |
83 |
if (!rezoom) { |
84 |
- GridLinesMgr::GridLinesMgr *gridManager = (GridLinesMgr *)StelApp::getInstance().getModuleMgr().getModule("GridLinesMgr"); |
85 |
+ GridLinesMgr *gridManager = (GridLinesMgr *)StelApp::getInstance().getModuleMgr().getModule("GridLinesMgr"); |
86 |
// Current state |
87 |
flagAzimuthalGrid = gridManager->getFlagAzimuthalGrid(); |
88 |
flagEquatorGrid = gridManager->getFlagEquatorGrid(); |
89 |
@@ -821,9 +821,9 @@ void Oculars::zoom(bool rezoom) |
90 |
|
91 |
void Oculars::zoomOcular() |
92 |
{ |
93 |
- StelCore::StelCore *core = StelApp::getInstance().getCore(); |
94 |
- StelMovementMgr::StelMovementMgr *movementManager = core->getMovementMgr(); |
95 |
- GridLinesMgr::GridLinesMgr *gridManager = |
96 |
+ StelCore *core = StelApp::getInstance().getCore(); |
97 |
+ StelMovementMgr *movementManager = core->getMovementMgr(); |
98 |
+ GridLinesMgr *gridManager = |
99 |
(GridLinesMgr *)StelApp::getInstance().getModuleMgr().getModule("GridLinesMgr"); |
100 |
|
101 |
gridManager->setFlagAzimuthalGrid(false); |