summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAkarsh Simha <akarsh@kde.org>2016-10-01 10:03:32 (GMT)
committerAkarsh Simha <akarsh@kde.org>2016-10-01 10:03:32 (GMT)
commit922657abf4471555088d953578356d800f98d1df (patch)
tree72fc09a9164cd2923c37da11fda5e6463080a389
parenta10ba5ed81e43545b4398dbb09047389940517d9 (diff)
Replace includes by forward delcarations, change include order etc.
Jasem, could you please look at the guide.h self-include and make sure I didn't do anything bad? CCMAIL: mutlaqja@ikarustech.com
-rw-r--r--kstars/auxiliary/ksutils.cpp1
-rw-r--r--kstars/auxiliary/ksutils.h3
-rw-r--r--kstars/ekos/guide.h3
-rw-r--r--kstars/ekos/scheduler.cpp1
-rw-r--r--kstars/tools/observinglist.cpp1
-rw-r--r--kstars/tools/observinglist.h4
6 files changed, 9 insertions, 4 deletions
diff --git a/kstars/auxiliary/ksutils.cpp b/kstars/auxiliary/ksutils.cpp
index 44301cd..2a8d721 100644
--- a/kstars/auxiliary/ksutils.cpp
+++ b/kstars/auxiliary/ksutils.cpp
@@ -19,6 +19,7 @@
#include "deepskyobject.h"
#include "skyobject.h"
+#include "starobject.h"
#include "Options.h"
#include <QFile>
diff --git a/kstars/auxiliary/ksutils.h b/kstars/auxiliary/ksutils.h
index b75405a..547b8b8 100644
--- a/kstars/auxiliary/ksutils.h
+++ b/kstars/auxiliary/ksutils.h
@@ -31,11 +31,12 @@
#include <Eigen/Core>
#include <QPointF>
#include "dms.h"
-#include "skyobjects/starobject.h"
class QFile;
class QString;
class SkyPoint;
+class SkyObject;
+class StarObject;
namespace KSUtils {
/** Attempt to open the data file named filename, using the QFile object "file".
diff --git a/kstars/ekos/guide.h b/kstars/ekos/guide.h
index 0642ddf..19ec277 100644
--- a/kstars/ekos/guide.h
+++ b/kstars/ekos/guide.h
@@ -13,11 +13,10 @@
#include <QTimer>
#include <QtDBus/QtDBus>
+#include "indi/indistd.h"
#include "ekos.h"
#include "guide/common.h"
-#include "guide.h"
#include "fitsviewer/fitscommon.h"
-#include "indi/indistd.h"
#include "indi/inditelescope.h"
#include "indi/indiccd.h"
#include "ui_guide.h"
diff --git a/kstars/ekos/scheduler.cpp b/kstars/ekos/scheduler.cpp
index 9211f23..ff2cffb 100644
--- a/kstars/ekos/scheduler.cpp
+++ b/kstars/ekos/scheduler.cpp
@@ -32,6 +32,7 @@
#include "ksalmanac.h"
#include "ksutils.h"
#include "mosaic.h"
+#include "skyobjects/starobject.h"
#define BAD_SCORE -1000
#define MAX_FAILURE_ATTEMPTS 3
diff --git a/kstars/tools/observinglist.cpp b/kstars/tools/observinglist.cpp
index ed8e708..11b34b3 100644
--- a/kstars/tools/observinglist.cpp
+++ b/kstars/tools/observinglist.cpp
@@ -65,6 +65,7 @@
#include <QDir>
#include <QFrame>
#include <QTextStream>
+#include <QStandardItem>
#include <QStandardItemModel>
#include <QSortFilterProxyModel>
#include <QHeaderView>
diff --git a/kstars/tools/observinglist.h b/kstars/tools/observinglist.h
index 619fb5e..6022cfa 100644
--- a/kstars/tools/observinglist.h
+++ b/kstars/tools/observinglist.h
@@ -18,6 +18,8 @@
#ifndef OBSERVINGLIST_H_
#define OBSERVINGLIST_H_
+#include "kstarsdatetime.h"
+
#include <QList>
#include <QAbstractTableModel>
@@ -25,7 +27,6 @@
//#include <KIO/CopyJob>
#include "ui_observinglist.h"
-#include "kstarsdatetime.h"
class KSAlmanac;
class QSortFilterProxyModel;
@@ -37,6 +38,7 @@ class ObsListPopupMenu;
class SkyPoint;
class SkyObject;
class KSDssDownloader;
+class QStandardItem;
class ObservingListUI : public QFrame, public Ui::ObservingList {
Q_OBJECT