summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJasem Mutlaq <mutlaqja@ikarustech.com>2016-11-15 07:09:55 (GMT)
committerJasem Mutlaq <mutlaqja@ikarustech.com>2016-11-15 07:09:55 (GMT)
commitcb99a35f6e6b56e3bbb5e9012af263c0f23d266b (patch)
tree2c4261c70d46c5e824060ef35c421834056e3541
parent7e9dccd87456fa48953667f22336e7e49cecf77e (diff)
KStars now depends on INDI v1.3.1
-rw-r--r--CMakeLists.txt2
-rw-r--r--kstars/indi/indilistener.cpp2
-rw-r--r--kstars/indi/indistd.cpp8
-rw-r--r--kstars/indi/indistd.h11
4 files changed, 1 insertions, 22 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a4603d3..09bc769 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -94,7 +94,7 @@ set(HAVE_CFITSIO 0)
endif(CFITSIO_FOUND)
set_package_properties(CFitsio PROPERTIES DESCRIPTION "FITS IO Library" URL "http://heasarc.gsfc.nasa.gov/fitsio/fitsio.html" TYPE OPTIONAL PURPOSE "Support for the FITS (Flexible Image Transport System) data format in KStars.")
-find_package(INDI 1.2.0)
+find_package(INDI 1.3.1)
#FIXME is there a better way to do this?
if (INDI_FOUND)
SET(HAVE_INDI 1)
diff --git a/kstars/indi/indilistener.cpp b/kstars/indi/indilistener.cpp
index d602dea..6172c5a 100644
--- a/kstars/indi/indilistener.cpp
+++ b/kstars/indi/indilistener.cpp
@@ -257,7 +257,6 @@ void INDIListener::registerProperty(INDI::Property *prop)
}
else if (!strcmp(prop->getName(), "FLAT_LIGHT_CONTROL"))
{
- #if (INDI_VERSION_MAJOR >= 1 && INDI_VERSION_MINOR >= 2)
// If light box part of dust cap
if (gd->getType() == KSTARS_UNKNOWN)
{
@@ -279,7 +278,6 @@ void INDIListener::registerProperty(INDI::Property *prop)
emit newLightBox(gd);
}
}
- #endif
}
if (!strcmp(prop->getName(), "TELESCOPE_TIMED_GUIDE_WE"))
diff --git a/kstars/indi/indistd.cpp b/kstars/indi/indistd.cpp
index 7438e74..4502d6b 100644
--- a/kstars/indi/indistd.cpp
+++ b/kstars/indi/indistd.cpp
@@ -35,15 +35,7 @@ const int MAX_FILENAME_LEN = 1024;
namespace ISD
{
-#ifdef INDI_VERSION_MAJOR
-#if (INDI_VERSION_MAJOR >= 1 && INDI_VERSION_MINOR >= 1)
GDSetCommand::GDSetCommand(INDI_PROPERTY_TYPE inPropertyType, const QString &inProperty, const QString &inElement, QVariant qValue, QObject *parent) : QObject(parent)
-#else
-GDSetCommand::GDSetCommand(INDI_TYPE inPropertyType, const QString &inProperty, const QString &inElement, QVariant qValue, QObject *parent) : QObject(parent)
-#endif
-#else
-GDSetCommand::GDSetCommand(INDI_TYPE inPropertyType, const QString &inProperty, const QString &inElement, QVariant qValue, QObject *parent) : QObject(parent)
-#endif
{
propType = inPropertyType;
indiProperty = inProperty;
diff --git a/kstars/indi/indistd.h b/kstars/indi/indistd.h
index 56c754a..e1b91f8 100644
--- a/kstars/indi/indistd.h
+++ b/kstars/indi/indistd.h
@@ -38,19 +38,8 @@ class GDSetCommand : public QObject
Q_OBJECT
public:
-#ifdef INDI_VERSION_MAJOR
-#if (INDI_VERSION_MAJOR >= 1 && INDI_VERSION_MINOR >= 1)
GDSetCommand(INDI_PROPERTY_TYPE inPropertyType, const QString & inProperty, const QString & inElement, QVariant qValue, QObject *parent);
INDI_PROPERTY_TYPE propType;
-#else
- GDSetCommand(INDI_TYPE inPropertyType, const QString & inProperty, const QString & inElement, QVariant qValue, QObject *parent);
- INDI_TYPE propType;
-#endif
-#else
- GDSetCommand(INDI_TYPE inPropertyType, const QString & inProperty, const QString & inElement, QVariant qValue, QObject *parent);
- INDI_TYPE propType;
-#endif
-
QString indiProperty;
QString indiElement;