[Kstars-devel] KDE/kdeedu/kstars/kstars [POSSIBLY UNSAFE]

[Médéric Boquien]

SVN commit 930690 by mboquien:

Reorganisation of the sources, part 2: move indi related files to the indi directory.

P.S: I forgot to CC the list for part 1 which was about xplanet.

CCMAIL: kstars-devel at kde.org


 M  +20 -20    CMakeLists.txt  
 M  +6 -6      detaildialog.cpp  
 D             devicemanager.cpp  
 D             devicemanager.h  
 D             devmanager.ui  
 D             imagesequence.cpp  
 D             imagesequence.h  
 D             imgsequencedlg.ui  
 A             indi (directory)  
 AM            indi/devicemanager.cpp   devicemanager.cpp#930679 [License: GPL (v2+)]
 AM            indi/devicemanager.h   devicemanager.h#930679 [License: GPL (v2+)]
 AM            indi/devmanager.ui   devmanager.ui#930679
 AM            indi/imagesequence.cpp   imagesequence.cpp#930679 [License: GPL (v2+)]
 AM            indi/imagesequence.h   imagesequence.h#930679 [License: GPL (v2+)]
 AM            indi/imgsequencedlg.ui   imgsequencedlg.ui#930679
 AM            indi/indidevice.cpp   indidevice.cpp#930679 [License: GPL (v2+)]
 AM            indi/indidevice.h   indidevice.h#930679 [License: GPL (v2+)]
 AM            indi/indidriver.cpp   indidriver.cpp#930679 [License: GPL (v2+)]
 AM            indi/indidriver.h   indidriver.h#930679 [License: GPL (v2+)]
 AM            indi/indielement.cpp   indielement.cpp#930679 [License: GPL (v2+)]
 AM            indi/indielement.h   indielement.h#930679 [License: GPL (v2+)]
 AM            indi/indigroup.cpp   indigroup.cpp#930679 [License: GPL (v2+)]
 AM            indi/indigroup.h   indigroup.h#930679 [License: GPL (v2+)]
 AM            indi/indihostconf.ui   indihostconf.ui#930679
 AM            indi/indimenu.cpp   indimenu.cpp#930679 [License: GPL (v2+)]
 AM            indi/indimenu.h   indimenu.h#930679 [License: GPL (v2+)]
 AM            indi/indiproperty.cpp   indiproperty.cpp#930679 [License: GPL (v2+)]
 AM            indi/indiproperty.h   indiproperty.h#930679 [License: GPL (v2+)]
 AM            indi/indistd.cpp   indistd.cpp#930679 [POSSIBLY UNSAFE: mkstemp,scanf] [License: GPL (v2+)]
 AM            indi/indistd.h   indistd.h#930679 [License: GPL (v2+)]
 AM            indi/opsindi.cpp   opsindi.cpp#930679 [License: GPL (v2+)]
 AM            indi/opsindi.h   opsindi.h#930679 [License: GPL (v2+)]
 AM            indi/opsindi.ui   opsindi.ui#930679
 AM            indi/streamform.ui   streamform.ui#930679
 AM            indi/streamwg.cpp   streamwg.cpp#930679 [License: GPL (v2+)]
 AM            indi/streamwg.h   streamwg.h#930679 [License: GPL (v2+)]
 AM            indi/telescopeprop.cpp   telescopeprop.cpp#930679 [License: GPL (v2+)]
 AM            indi/telescopeprop.h   telescopeprop.h#930679 [License: GPL (v2+)]
 AM            indi/telescopeprop.ui   telescopeprop.ui#930679
 AM            indi/telescopewizard.ui   telescopewizard.ui#930679
 AM            indi/telescopewizardprocess.cpp   telescopewizardprocess.cpp#930679 [License: GPL (v2+)]
 AM            indi/telescopewizardprocess.h   telescopewizardprocess.h#930679 [License: GPL (v2+)]
 D             indidevice.cpp  
 D             indidevice.h  
 D             indidriver.cpp  
 D             indidriver.h  
 D             indielement.cpp  
 D             indielement.h  
 D             indigroup.cpp  
 D             indigroup.h  
 D             indihostconf.ui  
 D             indimenu.cpp  
 D             indimenu.h  
 D             indiproperty.cpp  
 D             indiproperty.h  
 D             indistd.cpp  
 D             indistd.h  
 M  +5 -5      kspopupmenu.cpp  
 M  +3 -3      kstars.cpp  
 M  +6 -6      kstarsactions.cpp  
 M  +2 -2      kstarsdata.cpp  
 M  +6 -6      kstarsdcop.cpp  
 M  +1 -1      kstarsinit.cpp  
 D             opsindi.cpp  
 D             opsindi.h  
 D             opsindi.ui  
 M  +5 -5      skymapdraw.cpp  
 D             streamform.ui  
 D             streamwg.cpp  
 D             streamwg.h  
 D             telescopeprop.cpp  
 D             telescopeprop.h  
 D             telescopeprop.ui  
 D             telescopewizard.ui  
 D             telescopewizardprocess.cpp  
 D             telescopewizardprocess.h  
 M  +6 -6      tools/observinglist.cpp  


--- trunk/KDE/kdeedu/kstars/kstars/CMakeLists.txt #930689:930690
@@ -22,28 +22,28 @@
 
 if (INDI_FOUND)
   set (indi_SRCS
-	devicemanager.cpp
-	indidevice.cpp
-	indidriver.cpp
-	indielement.cpp
-	opsindi.cpp
-	indigroup.cpp
-	indimenu.cpp
-	indiproperty.cpp
-	indistd.cpp
-	streamwg.cpp
-	telescopewizardprocess.cpp
-	telescopeprop.cpp
-	imagesequence.cpp
+	indi/devicemanager.cpp
+	indi/indidevice.cpp
+	indi/indidriver.cpp
+	indi/indielement.cpp
+	indi/opsindi.cpp
+	indi/indigroup.cpp
+	indi/indimenu.cpp
+	indi/indiproperty.cpp
+	indi/indistd.cpp
+	indi/streamwg.cpp
+	indi/telescopewizardprocess.cpp
+	indi/telescopeprop.cpp
+	indi/imagesequence.cpp
 )
 set(indiui_SRCS
-	devmanager.ui
-        imgsequencedlg.ui
-        opsindi.ui
-        indihostconf.ui
-        streamform.ui
-        telescopewizard.ui
-        telescopeprop.ui
+	indi/devmanager.ui
+        indi/imgsequencedlg.ui
+        indi/opsindi.ui
+        indi/indihostconf.ui
+        indi/streamform.ui
+        indi/telescopewizard.ui
+        indi/telescopeprop.ui
 )
 
   include_directories(${INDI_INCLUDE_DIR})
--- trunk/KDE/kdeedu/kstars/kstars/detaildialog.cpp #930689:930690
@@ -50,12 +50,12 @@
 #include <config-kstars.h>
 
 #ifdef HAVE_INDI_H
-#include "indielement.h"
-#include "indiproperty.h"
-#include "indidevice.h"
-#include "indimenu.h"
-#include "devicemanager.h"
-#include "indistd.h"
+#include "indi/indielement.h"
+#include "indi/indiproperty.h"
+#include "indi/indidevice.h"
+#include "indi/indimenu.h"
+#include "indi/devicemanager.h"
+#include "indi/indistd.h"
 #endif
 
 #include "skycomponents/constellationboundary.h"
** trunk/KDE/kdeedu/kstars/kstars/indi/devicemanager.cpp #property svn:eol-style
   + native
** trunk/KDE/kdeedu/kstars/kstars/indi/devicemanager.cpp #property svn:keywords
   + Author Date Id Revision
** trunk/KDE/kdeedu/kstars/kstars/indi/devicemanager.cpp #property svn:mergeinfo
   + 
** trunk/KDE/kdeedu/kstars/kstars/indi/devicemanager.cpp #property svn:mime-type
   + text/x-c++src
** trunk/KDE/kdeedu/kstars/kstars/indi/devicemanager.h #property svn:eol-style
   + native
** trunk/KDE/kdeedu/kstars/kstars/indi/devicemanager.h #property svn:keywords
   + Author Date Id Revision
** trunk/KDE/kdeedu/kstars/kstars/indi/devicemanager.h #property svn:mergeinfo
   + 
** trunk/KDE/kdeedu/kstars/kstars/indi/devicemanager.h #property svn:mime-type
   + text/x-chdr
** trunk/KDE/kdeedu/kstars/kstars/indi/devmanager.ui #property svn:eol-style
   + native
** trunk/KDE/kdeedu/kstars/kstars/indi/devmanager.ui #property svn:keywords
   + Author Date Id Revision
** trunk/KDE/kdeedu/kstars/kstars/indi/devmanager.ui #property svn:mergeinfo
   + 
** trunk/KDE/kdeedu/kstars/kstars/indi/devmanager.ui #property svn:mime-type
   + text/x-designer
** trunk/KDE/kdeedu/kstars/kstars/indi/imagesequence.cpp #property svn:eol-style
   + native
** trunk/KDE/kdeedu/kstars/kstars/indi/imagesequence.cpp #property svn:keywords
   + Author Date Id Revision
** trunk/KDE/kdeedu/kstars/kstars/indi/imagesequence.cpp #property svn:mergeinfo
   + 
** trunk/KDE/kdeedu/kstars/kstars/indi/imagesequence.cpp #property svn:mime-type
   + text/x-c++src
** trunk/KDE/kdeedu/kstars/kstars/indi/imagesequence.h #property svn:eol-style
   + native
** trunk/KDE/kdeedu/kstars/kstars/indi/imagesequence.h #property svn:keywords
   + Author Date Id Revision
** trunk/KDE/kdeedu/kstars/kstars/indi/imagesequence.h #property svn:mergeinfo
   + 
** trunk/KDE/kdeedu/kstars/kstars/indi/imagesequence.h #property svn:mime-type
   + text/x-chdr
** trunk/KDE/kdeedu/kstars/kstars/indi/imgsequencedlg.ui #property svn:mergeinfo
   + 
** trunk/KDE/kdeedu/kstars/kstars/indi/indidevice.cpp #property svn:eol-style
   + native
** trunk/KDE/kdeedu/kstars/kstars/indi/indidevice.cpp #property svn:keywords
   + Author Date Id Revision
** trunk/KDE/kdeedu/kstars/kstars/indi/indidevice.cpp #property svn:mergeinfo
   + 
** trunk/KDE/kdeedu/kstars/kstars/indi/indidevice.cpp #property svn:mime-type
   + text/x-c++src
** trunk/KDE/kdeedu/kstars/kstars/indi/indidevice.h #property svn:eol-style
   + native
** trunk/KDE/kdeedu/kstars/kstars/indi/indidevice.h #property svn:keywords
   + Author Date Id Revision
** trunk/KDE/kdeedu/kstars/kstars/indi/indidevice.h #property svn:mergeinfo
   + 
** trunk/KDE/kdeedu/kstars/kstars/indi/indidevice.h #property svn:mime-type
   + text/x-chdr
** trunk/KDE/kdeedu/kstars/kstars/indi/indidriver.cpp #property svn:eol-style
   + native
** trunk/KDE/kdeedu/kstars/kstars/indi/indidriver.cpp #property svn:keywords
   + Author Date Id Revision
** trunk/KDE/kdeedu/kstars/kstars/indi/indidriver.cpp #property svn:mergeinfo
   + 
** trunk/KDE/kdeedu/kstars/kstars/indi/indidriver.cpp #property svn:mime-type
   + text/x-c++src
** trunk/KDE/kdeedu/kstars/kstars/indi/indidriver.h #property svn:eol-style
   + native
** trunk/KDE/kdeedu/kstars/kstars/indi/indidriver.h #property svn:keywords
   + Author Date Id Revision
** trunk/KDE/kdeedu/kstars/kstars/indi/indidriver.h #property svn:mergeinfo
   + 
** trunk/KDE/kdeedu/kstars/kstars/indi/indidriver.h #property svn:mime-type
   + text/x-chdr
** trunk/KDE/kdeedu/kstars/kstars/indi/indielement.cpp #property svn:eol-style
   + native
** trunk/KDE/kdeedu/kstars/kstars/indi/indielement.cpp #property svn:keywords
   + Author Date Id Revision
** trunk/KDE/kdeedu/kstars/kstars/indi/indielement.cpp #property svn:mergeinfo
   + 
** trunk/KDE/kdeedu/kstars/kstars/indi/indielement.cpp #property svn:mime-type
   + text/x-c++src
** trunk/KDE/kdeedu/kstars/kstars/indi/indielement.h #property svn:eol-style
   + native
** trunk/KDE/kdeedu/kstars/kstars/indi/indielement.h #property svn:keywords
   + Author Date Id Revision
** trunk/KDE/kdeedu/kstars/kstars/indi/indielement.h #property svn:mergeinfo
   + 
** trunk/KDE/kdeedu/kstars/kstars/indi/indielement.h #property svn:mime-type
   + text/x-chdr
** trunk/KDE/kdeedu/kstars/kstars/indi/indigroup.cpp #property svn:eol-style
   + native
** trunk/KDE/kdeedu/kstars/kstars/indi/indigroup.cpp #property svn:keywords
   + Author Date Id Revision
** trunk/KDE/kdeedu/kstars/kstars/indi/indigroup.cpp #property svn:mergeinfo
   + 
** trunk/KDE/kdeedu/kstars/kstars/indi/indigroup.cpp #property svn:mime-type
   + text/x-c++src
** trunk/KDE/kdeedu/kstars/kstars/indi/indigroup.h #property svn:eol-style
   + native
** trunk/KDE/kdeedu/kstars/kstars/indi/indigroup.h #property svn:keywords
   + Author Date Id Revision
** trunk/KDE/kdeedu/kstars/kstars/indi/indigroup.h #property svn:mergeinfo
   + 
** trunk/KDE/kdeedu/kstars/kstars/indi/indigroup.h #property svn:mime-type
   + text/x-chdr
** trunk/KDE/kdeedu/kstars/kstars/indi/indihostconf.ui #property svn:eol-style
   + native
** trunk/KDE/kdeedu/kstars/kstars/indi/indihostconf.ui #property svn:keywords
   + Author Date Id Revision
** trunk/KDE/kdeedu/kstars/kstars/indi/indihostconf.ui #property svn:mergeinfo
   + 
** trunk/KDE/kdeedu/kstars/kstars/indi/indihostconf.ui #property svn:mime-type
   + text/x-designer
** trunk/KDE/kdeedu/kstars/kstars/indi/indimenu.cpp #property svn:eol-style
   + native
** trunk/KDE/kdeedu/kstars/kstars/indi/indimenu.cpp #property svn:keywords
   + Author Date Id Revision
** trunk/KDE/kdeedu/kstars/kstars/indi/indimenu.cpp #property svn:mergeinfo
   + 
** trunk/KDE/kdeedu/kstars/kstars/indi/indimenu.cpp #property svn:mime-type
   + text/x-c++src
** trunk/KDE/kdeedu/kstars/kstars/indi/indimenu.h #property svn:eol-style
   + native
** trunk/KDE/kdeedu/kstars/kstars/indi/indimenu.h #property svn:keywords
   + Author Date Id Revision
** trunk/KDE/kdeedu/kstars/kstars/indi/indimenu.h #property svn:mergeinfo
   + 
** trunk/KDE/kdeedu/kstars/kstars/indi/indimenu.h #property svn:mime-type
   + text/x-chdr
** trunk/KDE/kdeedu/kstars/kstars/indi/indiproperty.cpp #property svn:eol-style
   + native
** trunk/KDE/kdeedu/kstars/kstars/indi/indiproperty.cpp #property svn:keywords
   + Author Date Id Revision
** trunk/KDE/kdeedu/kstars/kstars/indi/indiproperty.cpp #property svn:mergeinfo
   + 
** trunk/KDE/kdeedu/kstars/kstars/indi/indiproperty.cpp #property svn:mime-type
   + text/x-c++src
** trunk/KDE/kdeedu/kstars/kstars/indi/indiproperty.h #property svn:eol-style
   + native
** trunk/KDE/kdeedu/kstars/kstars/indi/indiproperty.h #property svn:keywords
   + Author Date Id Revision
** trunk/KDE/kdeedu/kstars/kstars/indi/indiproperty.h #property svn:mergeinfo
   + 
** trunk/KDE/kdeedu/kstars/kstars/indi/indiproperty.h #property svn:mime-type
   + text/x-chdr
** trunk/KDE/kdeedu/kstars/kstars/indi/indistd.cpp #property svn:eol-style
   + native
** trunk/KDE/kdeedu/kstars/kstars/indi/indistd.cpp #property svn:keywords
   + Author Date Id Revision
** trunk/KDE/kdeedu/kstars/kstars/indi/indistd.cpp #property svn:mergeinfo
   + 
** trunk/KDE/kdeedu/kstars/kstars/indi/indistd.cpp #property svn:mime-type
   + text/x-c++src
** trunk/KDE/kdeedu/kstars/kstars/indi/indistd.h #property svn:eol-style
   + native
** trunk/KDE/kdeedu/kstars/kstars/indi/indistd.h #property svn:keywords
   + Author Date Id Revision
** trunk/KDE/kdeedu/kstars/kstars/indi/indistd.h #property svn:mergeinfo
   + 
** trunk/KDE/kdeedu/kstars/kstars/indi/indistd.h #property svn:mime-type
   + text/x-chdr
** trunk/KDE/kdeedu/kstars/kstars/indi/opsindi.cpp #property svn:mergeinfo
   + 
** trunk/KDE/kdeedu/kstars/kstars/indi/opsindi.h #property svn:mergeinfo
   + 
** trunk/KDE/kdeedu/kstars/kstars/indi/opsindi.ui #property svn:mergeinfo
   + 
** trunk/KDE/kdeedu/kstars/kstars/indi/streamform.ui #property svn:mergeinfo
   + 
** trunk/KDE/kdeedu/kstars/kstars/indi/streamwg.cpp #property svn:eol-style
   + native
** trunk/KDE/kdeedu/kstars/kstars/indi/streamwg.cpp #property svn:keywords
   + Author Date Id Revision
** trunk/KDE/kdeedu/kstars/kstars/indi/streamwg.cpp #property svn:mergeinfo
   + 
** trunk/KDE/kdeedu/kstars/kstars/indi/streamwg.cpp #property svn:mime-type
   + text/x-c++src
** trunk/KDE/kdeedu/kstars/kstars/indi/streamwg.h #property svn:eol-style
   + native
** trunk/KDE/kdeedu/kstars/kstars/indi/streamwg.h #property svn:keywords
   + Author Date Id Revision
** trunk/KDE/kdeedu/kstars/kstars/indi/streamwg.h #property svn:mergeinfo
   + 
** trunk/KDE/kdeedu/kstars/kstars/indi/streamwg.h #property svn:mime-type
   + text/x-chdr
** trunk/KDE/kdeedu/kstars/kstars/indi/telescopeprop.cpp #property svn:mergeinfo
   + 
** trunk/KDE/kdeedu/kstars/kstars/indi/telescopeprop.h #property svn:mergeinfo
   + 
** trunk/KDE/kdeedu/kstars/kstars/indi/telescopeprop.ui #property svn:mergeinfo
   + 
** trunk/KDE/kdeedu/kstars/kstars/indi/telescopewizard.ui #property svn:eol-style
   + native
** trunk/KDE/kdeedu/kstars/kstars/indi/telescopewizard.ui #property svn:keywords
   + Author Date Id Revision
** trunk/KDE/kdeedu/kstars/kstars/indi/telescopewizard.ui #property svn:mergeinfo
   + 
** trunk/KDE/kdeedu/kstars/kstars/indi/telescopewizard.ui #property svn:mime-type
   + text/x-designer
** trunk/KDE/kdeedu/kstars/kstars/indi/telescopewizardprocess.cpp #property svn:eol-style
   + native
** trunk/KDE/kdeedu/kstars/kstars/indi/telescopewizardprocess.cpp #property svn:keywords
   + Author Date Id Revision
** trunk/KDE/kdeedu/kstars/kstars/indi/telescopewizardprocess.cpp #property svn:mergeinfo
   + 
** trunk/KDE/kdeedu/kstars/kstars/indi/telescopewizardprocess.cpp #property svn:mime-type
   + text/x-c++src
** trunk/KDE/kdeedu/kstars/kstars/indi/telescopewizardprocess.h #property svn:eol-style
   + native
** trunk/KDE/kdeedu/kstars/kstars/indi/telescopewizardprocess.h #property svn:keywords
   + Author Date Id Revision
** trunk/KDE/kdeedu/kstars/kstars/indi/telescopewizardprocess.h #property svn:mergeinfo
   + 
** trunk/KDE/kdeedu/kstars/kstars/indi/telescopewizardprocess.h #property svn:mime-type
   + text/x-chdr
--- trunk/KDE/kdeedu/kstars/kstars/kspopupmenu.cpp #930689:930690
@@ -31,11 +31,11 @@
 #include <config-kstars.h>
 
 #ifdef HAVE_INDI_H
-#include "indimenu.h"
-#include "devicemanager.h"
-#include "indidevice.h"
-#include "indigroup.h"
-#include "indiproperty.h"
+#include "indi/indimenu.h"
+#include "indi/devicemanager.h"
+#include "indi/indidevice.h"
+#include "indi/indigroup.h"
+#include "indi/indiproperty.h"
 #endif
 
 #include "skycomponents/constellationboundary.h"
--- trunk/KDE/kdeedu/kstars/kstars/kstars.cpp #930689:930690
@@ -52,9 +52,9 @@
 #include <config-kstars.h>
 
 #ifdef HAVE_INDI_H
-#include "indimenu.h"
-#include "indidriver.h"
-#include "imagesequence.h"
+#include "indi/indimenu.h"
+#include "indi/indidriver.h"
+#include "indi/imagesequence.h"
 #endif
 
 KStars::KStars( bool doSplash, bool clockrun, const QString &startdate ) :
--- trunk/KDE/kdeedu/kstars/kstars/kstarsactions.cpp #930689:930690
@@ -86,12 +86,12 @@
 
 #ifdef HAVE_INDI_H
 #include "ui_devmanager.h"
-#include "indimenu.h"
-#include "indidriver.h"
-#include "telescopewizardprocess.h"
-#include "telescopeprop.h"
-#include "opsindi.h"
-#include "imagesequence.h"
+#include "indi/indimenu.h"
+#include "indi/indidriver.h"
+#include "indi/telescopewizardprocess.h"
+#include "indi/telescopeprop.h"
+#include "indi/opsindi.h"
+#include "indi/imagesequence.h"
 #endif
 
 #include "skycomponents/customcatalogcomponent.h"
--- trunk/KDE/kdeedu/kstars/kstars/kstarsdata.cpp #930689:930690
@@ -44,9 +44,9 @@
 #include <config-kstars.h>
 
 #ifdef HAVE_INDI_H
-#include "indidriver.h"
+#include "indi/indidriver.h"
 #include "lilxml.h"
-#include "indistd.h"
+#include "indi/indistd.h"
 #endif
 
 #include "detaildialog.h"
--- trunk/KDE/kdeedu/kstars/kstars/kstarsdcop.cpp #930689:930690
@@ -50,12 +50,12 @@
 #include <config-kstars.h>
 
 #ifdef HAVE_INDI_H
-#include "indidriver.h"
-#include "indimenu.h"
-#include "indielement.h"
-#include "indidevice.h"
-#include "indiproperty.h"
-#include "devicemanager.h"
+#include "indi/indidriver.h"
+#include "indi/indimenu.h"
+#include "indi/indielement.h"
+#include "indi/indidevice.h"
+#include "indi/indiproperty.h"
+#include "indi/devicemanager.h"
 #endif
 
 void KStars::setRaDec( double ra, double dec ) {
--- trunk/KDE/kdeedu/kstars/kstars/kstarsinit.cpp #930689:930690
@@ -51,7 +51,7 @@
 #include <config-kstars.h>
 
 #ifdef HAVE_INDI_H
-#include "indimenu.h"
+#include "indi/indimenu.h"
 #endif
 
 //This file contains functions that kstars calls at startup (except constructors).
--- trunk/KDE/kdeedu/kstars/kstars/skymapdraw.cpp #930689:930690
@@ -46,11 +46,11 @@
 #include <config-kstars.h>
 
 #ifdef HAVE_INDI_H
-#include "devicemanager.h"
-#include "indimenu.h"
-#include "indiproperty.h"
-#include "indielement.h"
-#include "indidevice.h"
+#include "indi/devicemanager.h"
+#include "indi/indimenu.h"
+#include "indi/indiproperty.h"
+#include "indi/indielement.h"
+#include "indi/indidevice.h"
 #endif
 
 void toXYZ(SkyPoint* p, double *x, double *y, double *z) {
--- trunk/KDE/kdeedu/kstars/kstars/tools/observinglist.cpp #930689:930690
@@ -51,12 +51,12 @@
 #include <config-kstars.h>
 
 #ifdef HAVE_INDI_H
-#include "indimenu.h"
-#include "indielement.h"
-#include "indiproperty.h"
-#include "indidevice.h"
-#include "devicemanager.h"
-#include "indistd.h"
+#include "../indi/indimenu.h"
+#include "../indi/indielement.h"
+#include "../indi/indiproperty.h"
+#include "../indi/indidevice.h"
+#include "../indi/devicemanager.h"
+#include "../indi/indistd.h"
 #endif
 
 //