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

[Jason Harris]

SVN commit 485916 by harris:

Remove class CustomCatalog, which has been deprecated by 
CustomCatalogComponent

CCMAIL: kstars-devel at kde.org


 M  +1 -1      Makefile.am  
 D             customcatalog.cpp  
 D             customcatalog.h  
 M  +8 -8      opscatalog.cpp  


--- trunk/KDE/kdeedu/kstars/kstars/Makefile.am #485915:485916
@@ -2,7 +2,7 @@
 
 kstars_SOURCES = addcatdialog.cpp addlinkdialog.cpp colorscheme.cpp \
 			conbridlg.cpp csegment.cpp deepskyobject.cpp detaildialog.cpp devicemanager.cpp \
-			dms.cpp finddialog.cpp fitshistogram.cpp ccdpreviewwg.cpp customcatalog.cpp \
+			dms.cpp finddialog.cpp fitshistogram.cpp ccdpreviewwg.cpp \
 			fitsimage.cpp fitsprocess.cpp fitsviewer.cpp focusdialog.cpp fov.cpp fovdialog.cpp \
 			geolocation.cpp imagereductiondlg.cpp imagesequence.cpp imageviewer.cpp indidevice.cpp \
 			indidriver.cpp indielement.cpp indifitsconf.cpp indigroup.cpp indimenu.cpp \
--- trunk/KDE/kdeedu/kstars/kstars/opscatalog.cpp #485915:485916
@@ -125,22 +125,22 @@
 	QString filename = KFileDialog::getOpenFileName( QDir::homePath(), "*");
 	if ( ! filename.isEmpty() ) {
 		//test integrity of file before trying to add it
-		CustomCatalog *newCat = ksw->data()->createCustomCatalog( filename, true ); //true = show errors
-		if ( newCat ) {
-			int nObjects = newCat->objList().count();
-			delete newCat;
-			if ( nObjects )
-				insertCatalog( filename );
-		}
+		CustomCatalogComponent newCat( 0, filename, true, Options::showOther );
+		newCat.init( ksw->data() );
+		if ( newCat->objectList().size() )
+			insertCatalog( filename );
 	}
 }
 
 void OpsCatalog::insertCatalog( const QString &filename ) {
 	//Add new custom catalog, based on the list of SkyObjects we just parsed
-	ksw->data()->addCatalog( filename );
+	//FIXME: need function SkyMapComposite::addCustomCatalog()
+	ksw->data()->skyComposite()->addCustomCatalog( filename, Options::showOther );
 
 	//Get the new catalog's name, add entry to the listbox
+	//FIXME: Need name of new catalog
 	QString name = ksw->data()->customCatalogs().current()->name();
+
 	Q3CheckListItem *newCat = new Q3CheckListItem( CatalogList, name, Q3CheckListItem::CheckBox );
 	newCat->setOn( true );
 	CatalogList->insertItem( newCat );