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

[Jasem Mutlaq]

SVN commit 569727 by mutlaqja:

- Fixed XML error in driver.xml
- setupUi(parent) --> setupUi(this) in indidriver.cpp

CCMAIL: kstars-devel at kde.org



 M  +6 -1      indi/drivers.xml  
 M  +5 -4      indidriver.cpp  


--- trunk/KDE/kdeedu/kstars/kstars/indi/drivers.xml #569726:569727
@@ -53,6 +53,7 @@
 	<device label="Celestron NexStar" focal_length="" aperture="">
 		<driver>celestrongps</driver>
 		<version>0.9</version>
+	</device>
 	<device label="Astro-Electronic FS-2" focal_length="" aperture="">
 		<driver>lx200basic</driver>
 		<version>0.1</version>
@@ -85,10 +86,14 @@
 		<driver>lx200basic</driver>
 		<version>1.0</version>
 	</device>
-	<device label="Intelliscope/Sky Wizard" focal_length="" aperture="">
+	<device label="Intelliscope" focal_length="" aperture="">
 		<driver>intelliscope</driver>
 		<version>0.2</version>
 	</device>
+	<device label="SkyWizard" focal_length="" aperture="">
+		<driver>intelliscope</driver>
+		<version>0.2</version>
+	</device>
 </devGroup>
 <devGroup group="CCDs">
 	<device label="SBIG CCD">
--- trunk/KDE/kdeedu/kstars/kstars/indidriver.cpp #569726:569727
@@ -53,7 +53,7 @@
 DeviceManagerUI::DeviceManagerUI(QWidget *parent) : QFrame(parent)
 {
 
-  setupUi(parent);
+  setupUi(this);
 
   localTreeWidget->setSortingEnabled(false);
   localTreeWidget->setRootIsDecorated(true);
@@ -583,11 +583,12 @@
     return false;
  }
 
- signed char c;
+ char c;
  LilXML *xmlParser = newLilXML();
  XMLEle *root = NULL;
 
- while ( (c = (signed char) file.getch()) != -1)
+ //while ( (c = (signed char) file.getch()) != -1)
+ while ( file.getChar(&c))
  {
     root = readXMLEle(xmlParser, c, errmsg);
 
@@ -600,7 +601,7 @@
     }
     else if (errmsg[0])
     {
-      kDebug() << QString(errmsg);
+      kDebug() << QString(errmsg) << endl;
       return false;
     }
   }