Commit cb99a35f authored by Jasem Mutlaq's avatar Jasem Mutlaq
Browse files

KStars now depends on INDI v1.3.1

parent 7e9dccd8
......@@ -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)
......
......@@ -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"))
......
......@@ -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;
......
......@@ -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;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment