summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAkarsh Simha <akarsh@kde.org>2016-09-24 05:20:24 (GMT)
committerAkarsh Simha <akarsh@kde.org>2016-09-28 22:16:20 (GMT)
commit4549930403dbf94f891accb86139bf779b4ff326 (patch)
tree8143e5759d24794c2a6d3805e12b4608125f93ae
parentf1be36f39a00d3c86c5a192dba28136191ba2ddc (diff)
Fix include order; and cosmetic changes. (++krazy::happiness;)
-rw-r--r--kstars/auxiliary/dms.cpp4
-rw-r--r--kstars/auxiliary/dms.h7
-rw-r--r--kstars/kstars.cpp2
-rw-r--r--kstars/skyobjects/skypoint.cpp7
4 files changed, 11 insertions, 9 deletions
diff --git a/kstars/auxiliary/dms.cpp b/kstars/auxiliary/dms.cpp
index 8113308..bf30535 100644
--- a/kstars/auxiliary/dms.cpp
+++ b/kstars/auxiliary/dms.cpp
@@ -17,11 +17,11 @@
#include "dms.h"
-#include <stdlib.h>
+#include <KLocalizedString>
#include <QRegExp>
-#include <KLocalizedString>
+#include <cstdlib>
void dms::setD(const int &d, const int &m, const int &s, const int &ms) {
D = (double)abs(d) + ((double)m + ((double)s + (double)ms/1000.)/60.)/60.;
diff --git a/kstars/auxiliary/dms.h b/kstars/auxiliary/dms.h
index ba1646f..8ff8e8c 100644
--- a/kstars/auxiliary/dms.h
+++ b/kstars/auxiliary/dms.h
@@ -18,12 +18,13 @@
#ifndef DMS_H_
#define DMS_H_
-#include <QDebug>
+#include "../nan.h"
+#include <QDebug>
#include <QString>
#include <cmath>
-#include "../nan.h"
+
/** @class dms
* @short An angle, stored as degrees, but expressible in many ways.
@@ -37,7 +38,7 @@
* arcseconds or hours, minutes, seconds). There is also a method
* to set the angle according to a radian value, and to return the
* angle expressed in radians. Finally, a SinCos() method computes
- * the sin and cosine of the angle.
+ * the sin and cosine of the angle.
*/
class dms {
public:
diff --git a/kstars/kstars.cpp b/kstars/kstars.cpp
index 63ce484..d8ca2df 100644
--- a/kstars/kstars.cpp
+++ b/kstars/kstars.cpp
@@ -195,7 +195,7 @@ void KStars::applyConfig( bool doApplyFocus ) {
}
actionCollection()->action("coordsys")->setText(
- Options::useAltAz() ? i18n("Switch to star globe view (Equatorial &Coordinates)"): i18n("Switch to horizonal view (Horizontal &Coordinates)") );
+ Options::useAltAz() ? i18n("Switch to star globe view (Equatorial &Coordinates)"): i18n("Switch to horizonal view (Horizontal &Coordinates)") );
actionCollection()->action("show_time_box" )->setChecked( Options::showTimeBox() );
actionCollection()->action("show_location_box" )->setChecked( Options::showGeoBox() );
diff --git a/kstars/skyobjects/skypoint.cpp b/kstars/skyobjects/skypoint.cpp
index 01d2bd4..be4fdb8 100644
--- a/kstars/skyobjects/skypoint.cpp
+++ b/kstars/skyobjects/skypoint.cpp
@@ -19,9 +19,6 @@
#include "skypoint.h"
-#include <QDebug>
-#include <KLocalizedString>
-
#include "skyobject.h"
#include "dms.h"
#include "ksnumbers.h"
@@ -31,6 +28,10 @@
#include "Options.h"
#include "skycomponents/skymapcomposite.h"
+#include <KLocalizedString>
+
+#include <QDebug>
+
KSSun *SkyPoint::m_Sun = 0;
const double SkyPoint::altCrit = -1.0;