[Marble-commits] KDE/kdeedu/marble/src

[Bastian Holst]

SVN commit 1001966 by bholst:

Moved MarbleGraphicsItems to src/lib/graphicsview

 M  +1 -0      CMakeLists.txt  
 M  +5 -11     lib/CMakeLists.txt  
 D             lib/FrameGraphicsItem.cpp  
 D             lib/FrameGraphicsItem.h  
 D             lib/FrameGraphicsItem_p.h  
 D             lib/GeoGraphicsItem.cpp  
 D             lib/GeoGraphicsItem.h  
 D             lib/GeoGraphicsItem_p.h  
 D             lib/LabelGraphicsItem.cpp  
 D             lib/LabelGraphicsItem.h  
 D             lib/LabelGraphicsItem_p.h  
 D             lib/MarbleGraphicsItem.cpp  
 D             lib/MarbleGraphicsItem.h  
 D             lib/MarbleGraphicsItem_p.h  
 D             lib/ScreenGraphicsItem.cpp  
 D             lib/ScreenGraphicsItem.h  
 D             lib/ScreenGraphicsItem_p.h  
 A             lib/graphicsview (directory)  
 A             lib/graphicsview/FrameGraphicsItem.cpp   lib/FrameGraphicsItem.cpp#1001931 [License: LGPL]
 A             lib/graphicsview/FrameGraphicsItem.h   lib/FrameGraphicsItem.h#1001931 [License: LGPL]
 A             lib/graphicsview/FrameGraphicsItem_p.h   lib/FrameGraphicsItem_p.h#1001931 [License: LGPL]
 A             lib/graphicsview/GeoGraphicsItem.cpp   lib/GeoGraphicsItem.cpp#1001931 [License: LGPL]
 A             lib/graphicsview/GeoGraphicsItem.h   lib/GeoGraphicsItem.h#1001925 [License: LGPL]
 A             lib/graphicsview/GeoGraphicsItem_p.h   lib/GeoGraphicsItem_p.h#1001931 [License: LGPL]
 A             lib/graphicsview/LabelGraphicsItem.cpp   lib/LabelGraphicsItem.cpp#1001931 [License: LGPL]
 A             lib/graphicsview/LabelGraphicsItem.h   lib/LabelGraphicsItem.h#1001931 [License: LGPL]
 A             lib/graphicsview/LabelGraphicsItem_p.h   lib/LabelGraphicsItem_p.h#1001931 [License: LGPL]
 A             lib/graphicsview/MarbleGraphicsItem.cpp   lib/MarbleGraphicsItem.cpp#1001931 [License: LGPL]
 A             lib/graphicsview/MarbleGraphicsItem.h   lib/MarbleGraphicsItem.h#1001931 [License: LGPL]
 A             lib/graphicsview/MarbleGraphicsItem_p.h   lib/MarbleGraphicsItem_p.h#1001931 [License: LGPL]
 A             lib/graphicsview/ScreenGraphicsItem.cpp   lib/ScreenGraphicsItem.cpp#1001931 [License: LGPL]
 A             lib/graphicsview/ScreenGraphicsItem.h   lib/ScreenGraphicsItem.h#1001931 [License: LGPL]
 A             lib/graphicsview/ScreenGraphicsItem_p.h   lib/ScreenGraphicsItem_p.h#1001931 [License: LGPL]


--- trunk/KDE/kdeedu/marble/src/CMakeLists.txt #1001965:1001966
@@ -19,6 +19,7 @@
   ${CMAKE_CURRENT_SOURCE_DIR}/lib/geodata/handlers/dgml
   ${CMAKE_CURRENT_SOURCE_DIR}/lib/geodata/parser
   ${CMAKE_CURRENT_SOURCE_DIR}/lib/geodata/scene
+  ${CMAKE_CURRENT_SOURCE_DIR}/lib/graphicsview
   ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_CURRENT_BINARY_DIR}/lib
 )
--- trunk/KDE/kdeedu/marble/src/lib/CMakeLists.txt #1001965:1001966
@@ -20,10 +20,12 @@
  ${CMAKE_CURRENT_SOURCE_DIR}/geodata/handlers/kml
  ${CMAKE_CURRENT_SOURCE_DIR}/geodata/handlers/dgml
  ${CMAKE_CURRENT_SOURCE_DIR}/geodata/parser
+ ${CMAKE_CURRENT_SOURCE_DIR}/graphicsview
  ${QT_INCLUDE_DIR}
 )
 INCLUDE(${QT_USE_FILE})
 INCLUDE(geodata/CMakeLists.txt)
+INCLUDE(graphicsview/CMakeLists.txt)
 
 if (QTONLY)
   set(GENERIC_LIB_VERSION "0.7.0")
@@ -54,6 +56,7 @@
 
 set(marblewidget_SRCS
     ${geodata_SRCS}
+    ${graphicsview_SRCS}
     MarbleWidget.cpp
     MarbleModel.cpp
     MarbleMap.cpp
@@ -152,12 +155,7 @@
     AbstractDataPlugin.cpp
     AbstractDataPluginModel.cpp
     AbstractDataPluginItem.cpp
-    MarbleGraphicsItem.cpp
-    GeoGraphicsItem.cpp
-    ScreenGraphicsItem.cpp
-    FrameGraphicsItem.cpp
-    LabelGraphicsItem.cpp
-
+    
     PluginInterface.cpp
     NetworkPluginInterface.cpp
     RenderPlugin.cpp
@@ -272,6 +270,7 @@
   # do nothing because we dont put .h files in the bundle
 else (APPLE AND QTONLY)
   install( FILES
+    ${graphicsview_HDRS}
     MarbleWidget.h
     MarbleMap.h
     MarbleModel.h
@@ -315,11 +314,6 @@
     AbstractDataPlugin.h
     AbstractDataPluginModel.h
     AbstractDataPluginItem.h
-    MarbleGraphicsItem.h
-    GeoGraphicsItem.h
-    ScreenGraphicsItem.h
-    FrameGraphicsItem.h
-    LabelGraphicsItem.h
 
     LatLonEdit.h
     DESTINATION ${CMAKE_INSTALL_PREFIX}/include/marble