[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kstars/gsoc2012-spacetime] /: Moved ksparser.cpp to LibKSDataHandlers
From:       Rishab Arora <ra.rishab () gmail ! com>
Date:       2012-07-31 21:44:55
Message-ID: 20120731214455.6B859A6094 () git ! kde ! org
[Download RAW message or body]

Git commit bf1535e3dce16613fb0e4ae923ec959cc3dcdab6 by Rishab Arora.
Committed on 31/07/2012 at 22:44.
Pushed by rishabarora into branch 'gsoc2012-spacetime'.

Moved ksparser.cpp to LibKSDataHandlers

M  +2    -0    CMakeLists.txt
M  +4    -1    Tests/CMakeLists.txt
M  +1    -1    Tests/testksparser.h
R  +0    -0    datahandlers/ksparser.cpp [from: kstars/ksparser.cpp - 100% similarity]
R  +1    -1    datahandlers/ksparser.h [from: kstars/ksparser.h - 099% similarity]
M  +4    -3    kstars/CMakeLists.txt
M  +1    -1    kstars/skycomponents/asteroidscomponent.h
M  +1    -1    kstars/skycomponents/cometscomponent.h
M  +1    -1    kstars/skycomponents/deepskycomponent.h

http://commits.kde.org/kstars/bf1535e3dce16613fb0e4ae923ec959cc3dcdab6

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2665071..727a976 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -48,8 +48,10 @@ if (EIGEN2_FOUND)
    add_subdirectory( kstars )
 endif (EIGEN2_FOUND)
 
+add_subdirectory(datahandlers)
 add_subdirectory(Tests)
 
+
 if (${CMAKE_CURRENT_SOURCE_DIR} STREQUAL ${CMAKE_SOURCE_DIR})
    macro_display_feature_log()
 endif (${CMAKE_CURRENT_SOURCE_DIR} STREQUAL ${CMAKE_SOURCE_DIR})
\ No newline at end of file
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 18959be..d7f468e 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -5,15 +5,18 @@ include_directories( ${kstars_SOURCE_DIR} )
 
 FIND_PACKAGE(Qt4 REQUIRED)
 SET( TEST_LIBRARIES ${QT_QTTEST_LIBRARY} ${QT_LIBRARIES}
+      LibKSDataHandlers
     ${KDE4_KDECORE_LIBS}
         ${KDE4_KNEWSTUFF3_LIBS}
         ${KDE4_KIO_LIBS}
         htmesh
         ${ZLIB_LIBRARIES}
         ${QT_QTSQL_LIBRARY}
+          KStarsLib
 )
 
 SET( KSParserTests_SRCS testksparser.cpp )
 ADD_EXECUTABLE( testksparser ${KSParserTests_SRCS} )
-TARGET_LINK_LIBRARIES( testksparser ${TEST_LIBRARIES} ${QT_QTTEST_LIBRARY} KStarsLib)
+QT4_AUTOMOC( ${KSParserTests_SRCS} )
+TARGET_LINK_LIBRARIES( testksparser ${TEST_LIBRARIES} ${QT_QTTEST_LIBRARY})
 ADD_TEST( NAME KSParserTest COMMAND testksparser )
\ No newline at end of file
diff --git a/Tests/testksparser.h b/Tests/testksparser.h
index 519bc6e..4926d7b 100644
--- a/Tests/testksparser.h
+++ b/Tests/testksparser.h
@@ -20,7 +20,7 @@
 #define TESTKSPARSER_H
 #include <QtTest/QtTest>
 #include <KDebug>
-#include "kstars/ksparser.h"
+#include "datahandlers/ksparser.h"
 #include "kstars/ksfilereader.h"
 
 
diff --git a/kstars/ksparser.cpp b/datahandlers/ksparser.cpp
similarity index 100%
rename from kstars/ksparser.cpp
rename to datahandlers/ksparser.cpp
diff --git a/kstars/ksparser.h b/datahandlers/ksparser.h
similarity index 99%
rename from kstars/ksparser.h
rename to datahandlers/ksparser.h
index 01c594c..f86994b 100644
--- a/kstars/ksparser.h
+++ b/datahandlers/ksparser.h
@@ -17,7 +17,7 @@
 
 #ifndef KSTARS_KSPARSER_H
 #define KSTARS_KSPARSER_H
-#include "ksfilereader.h"
+#include "kstars/ksfilereader.h"
 #include <kstandarddirs.h>
 #include <QList>
 #include <QFile>
diff --git a/kstars/CMakeLists.txt b/kstars/CMakeLists.txt
index b98bc77..7cdc2a2 100644
--- a/kstars/CMakeLists.txt
+++ b/kstars/CMakeLists.txt
@@ -344,7 +344,7 @@ set(kstars_extra_SRCS
 	ksfilereader.cpp ksnumbers.cpp
 	kspopupmenu.cpp obslistpopupmenu.cpp ksalmanac.cpp
 	kstarsactions.cpp kstarsdata.cpp ksuserdb.cpp kstarsdatetime.cpp
-	ksparser.cpp kstarsdcop.cpp kstarsinit.cpp kstars.cpp
+	kstarsdcop.cpp kstarsinit.cpp kstars.cpp
 	kstarssplash.cpp ksutils.cpp kswizard.cpp main.cpp
 	simclock.cpp skymap.cpp skymapdrawabstract.cpp skymapqdraw.cpp skymapevents.cpp
 	skypainter.cpp skyqpainter.cpp
@@ -435,7 +435,8 @@ kde4_add_library( KStarsLib STATIC ${kstars_SRCS})
 # kde4_add_executable(kstars ${kstars_SRCS})
 
 target_link_libraries(KStarsLib
-    ${KDE4_KDECORE_LIBS}
+        LibKSDataHandlers
+        ${KDE4_KDECORE_LIBS}
 	${KDE4_KNEWSTUFF3_LIBS}
 	${KDE4_KIO_LIBS}
 	htmesh
@@ -481,4 +482,4 @@ if (WIN32)
   install( FILES kstarsui-win.rc  DESTINATION  ${DATA_INSTALL_DIR}/kstars/ )
 endif (WIN32)
 
-kde4_install_icons( ${ICON_INSTALL_DIR}   )
+kde4_install_icons( ${ICON_INSTALL_DIR}   )
\ No newline at end of file
diff --git a/kstars/skycomponents/asteroidscomponent.h b/kstars/skycomponents/asteroidscomponent.h
index b1c9a22..4ec1c44 100644
--- a/kstars/skycomponents/asteroidscomponent.h
+++ b/kstars/skycomponents/asteroidscomponent.h
@@ -19,7 +19,7 @@
 #define ASTEROIDSCOMPONENT_H
 
 #include "solarsystemlistcomponent.h"
-#include "ksparser.h"
+#include "datahandlers/ksparser.h"
 #include <QList>
 #include "typedef.h"
 
diff --git a/kstars/skycomponents/cometscomponent.h b/kstars/skycomponents/cometscomponent.h
index c739fc7..940b10c 100644
--- a/kstars/skycomponents/cometscomponent.h
+++ b/kstars/skycomponents/cometscomponent.h
@@ -21,7 +21,7 @@
 class SkyLabeler;
 
 #include "solarsystemlistcomponent.h"
-#include "ksparser.h"
+#include "datahandlers/ksparser.h"
 #include <QList>
 
 /**@class CometsComponent
diff --git a/kstars/skycomponents/deepskycomponent.h b/kstars/skycomponents/deepskycomponent.h
index a095859..8b82f76 100644
--- a/kstars/skycomponents/deepskycomponent.h
+++ b/kstars/skycomponents/deepskycomponent.h
@@ -23,7 +23,7 @@
 #include <QObject>
 #include "skycomponent.h"
 #include "skylabel.h"
-#include "ksparser.h"
+#include "datahandlers/ksparser.h"
 
 #define NNGCFILES 14
 
[prev in list] [next in list] [prev in thread] [next in thread]