SVN_SILENT indent and cleanup

svn path=/trunk/KDE/kdeedu/libkdeedu/; revision=528382

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ad67381c04f740814b7a0719283282402bfa7345..db9e6f1c54e16b7423a12b5ade68b040ccc8ec8a 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,25 +1,15 @@
 kde4_header()
 project(libkdeedu)
 
-add_subdirectory( kdeeducore ) 
-add_subdirectory( kdeeduui ) 
-add_subdirectory( kdeeduplot ) 
-add_subdirectory( extdate ) 
-add_subdirectory( libscience ) 
-add_subdirectory( widgets ) 
-
-include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}  )
-
-
-########### install files ###############
-
-
-kde4_create_doxygen_docs(  )
+add_subdirectory(kdeeducore)
+add_subdirectory(kdeeduui)
+add_subdirectory(kdeeduplot)
+add_subdirectory(extdate)
+add_subdirectory(libscience)
+add_subdirectory(widgets)
 
 kde4_footer()
 
-
-
 #original Makefile.am contents follow:
 
 #SUBDIRS = kdeeducore kdeeduui kdeeduplot extdate libscience widgets

diff --git a/kdeeducore/CMakeLists.txt b/kdeeducore/CMakeLists.txt
index 20e193a695db916d0c38aad9496a1d43b9fa8767..bfbcfd8aaa72f6a7d7685204a6d6ae2fa3aac8c5 100644 (file)
--- a/kdeeducore/CMakeLists.txt
+++ b/kdeeducore/CMakeLists.txt
@@ -1,27 +1,34 @@
 kde4_header()
 
-include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}  )
+include_directories(
+   ${KDE4_INCLUDE_DIR}
+   ${QT_INCLUDES}
+   ${CMAKE_CURRENT_SOURCE_DIR}
+   ${CMAKE_CURRENT_BINARY_DIR}
+)
 
 
 ########### next target ###############
 
-set(kdeeducore_LIB_SRCS 
-   keduvocdocument.cpp 
-   keduvocexpression.cpp 
-   keduvocgrammar.cpp 
-   keduvockvtmlreader.cpp 
-   keduvockvtmlwriter.cpp 
-   keduvocmultiplechoice.cpp 
-   keduvowqlreader.cpp 
-   keduvowqlwriter.cpp 
-   leitnerbox.cpp 
-   leitnersystem.cpp 
-   leitnersystemview.cpp 
+set(kdeeducore_LIB_SRCS
+   keduvocdocument.cpp
+   keduvocexpression.cpp
+   keduvocgrammar.cpp
+   keduvockvtmlreader.cpp
+   keduvockvtmlwriter.cpp
+   keduvocmultiplechoice.cpp
+   keduvowqlreader.cpp
+   keduvowqlwriter.cpp
+   leitnerbox.cpp
+   leitnersystem.cpp
+   leitnersystemview.cpp
    prefleitner.cpp )
 
 kde4_automoc(${kdeeducore_LIB_SRCS})
 
-kde4_add_ui_files(kdeeducore_LIB_SRCS prefleitnerbase.ui )
+kde4_add_ui_files(kdeeducore_LIB_SRCS
+   prefleitnerbase.ui
+)
 
 kde4_add_library(kdeeducore SHARED ${kdeeducore_LIB_SRCS})
 
@@ -33,12 +40,23 @@ install_targets(${LIB_INSTALL_DIR} kdeeducore )
 
 ########### install files ###############
 
-install_files( /include/libkdeedu FILES keduvocdocument.h keduvocexpression.h          keduvocgrammar.h keduvockvtmlreader.h keduvockvtmlwriter.h keduvocmultiplechoice.h      keduvowqlreader.h keduvowqlwriter.h leitnerbox.h leitnersystem.h leitnersystemview.h    prefleitner.h )
+install_files(/include/libkdeedu FILES
+   keduvocdocument.h
+   keduvocexpression.h
+   keduvocgrammar.h
+   keduvockvtmlreader.h
+   keduvockvtmlwriter.h
+   keduvocmultiplechoice.h
+   keduvowqlreader.h
+   keduvowqlwriter.h
+   leitnerbox.h
+   leitnersystem.h
+   leitnersystemview.h
+   prefleitner.h
+)
 
 kde4_footer()
 
-
-
 #original Makefile.am contents follow:
 
 #INCLUDES = $(all_includes)

diff --git a/kdeeduplot/CMakeLists.txt b/kdeeduplot/CMakeLists.txt
index 46a0cb2837881c3984acf4f15ac13dbacf60e9c1..d4652c56f0601942664d784f136464edb7e73078 100644 (file)
--- a/kdeeduplot/CMakeLists.txt
+++ b/kdeeduplot/CMakeLists.txt
@@ -1,11 +1,20 @@
 kde4_header()
 
-include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}  )
+include_directories(
+   ${KDE4_INCLUDE_DIR}
+   ${QT_INCLUDES}
+   ${CMAKE_CURRENT_SOURCE_DIR}
+   ${CMAKE_CURRENT_BINARY_DIR}
+)
 
 
 ########### next target ###############
 
-set(kdeeduplot_LIB_SRCS kplotobject.cpp kplotaxis.cpp kplotwidget.cpp )
+set(kdeeduplot_LIB_SRCS
+   kplotobject.cpp
+   kplotaxis.cpp
+   kplotwidget.cpp
+)
 
 kde4_automoc(${kdeeduplot_LIB_SRCS})
 
@@ -19,12 +28,14 @@ install_targets(${LIB_INSTALL_DIR} kdeeduplot )
 
 ########### install files ###############
 
-install_files( /include/libkdeedu FILES kplotobject.h kplotaxis.h kplotwidget.h )
+install_files(/include/libkdeedu FILES
+   kplotobject.h
+   kplotaxis.h
+   kplotwidget.h
+)
 
 kde4_footer()
 
-
-
 #original Makefile.am contents follow:
 
 #INCLUDES= $(all_includes)

diff --git a/kdeeduui/CMakeLists.txt b/kdeeduui/CMakeLists.txt
index fa358b3ea676331b44d6bc4ea49a5a646c8dfc4f..ec958ac057d5e34bf8a869f160283cc1d9647be5 100644 (file)
--- a/kdeeduui/CMakeLists.txt
+++ b/kdeeduui/CMakeLists.txt
@@ -1,13 +1,20 @@
 kde4_header()
 
-add_subdirectory( tests ) 
+#add_subdirectory(tests)
 
-include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}  )
+include_directories(
+   ${KDE4_INCLUDE_DIR}
+   ${QT_INCLUDES}
+   ${CMAKE_CURRENT_SOURCE_DIR}
+   ${CMAKE_CURRENT_BINARY_DIR}
+)
 
 
 ########### next target ###############
 
-set(kdeeduui_LIB_SRCS kdeeduglossary.cpp )
+set(kdeeduui_LIB_SRCS
+   kdeeduglossary.cpp
+)
 
 kde4_automoc(${kdeeduui_LIB_SRCS})
 
@@ -21,12 +28,12 @@ install_targets(${LIB_INSTALL_DIR} kdeeduui )
 
 ########### install files ###############
 
-install_files( /include/libkdeedu FILES kdeeduglossary.h )
+install_files(/include/libkdeedu FILES
+   kdeeduglossary.h
+)
 
 kde4_footer()
 
-
-
 #original Makefile.am contents follow:
 
 #INCLUDES= $(all_includes)

diff --git a/libscience/CMakeLists.txt b/libscience/CMakeLists.txt
index b620755c59c8f58db0e0c06d6c20fbe94e65c17e..6cb27afa0a4e03341ddf8489a88caee2499a037a 100644 (file)
--- a/libscience/CMakeLists.txt
+++ b/libscience/CMakeLists.txt
@@ -1,24 +1,30 @@
 kde4_header()
 
-add_subdirectory( data ) 
-add_subdirectory( tests ) 
+add_subdirectory(data)
+add_subdirectory(tests)
 
-include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}  )
+include_directories(
+   ${KDE4_INCLUDE_DIR}
+   ${QT_INCLUDES}
+   ${CMAKE_CURRENT_SOURCE_DIR}
+   ${CMAKE_CURRENT_BINARY_DIR}
+)
 
 
 ########### next target ###############
 
-set(science_LIB_SRCS 
-   element.cpp 
-   spectrum.cpp 
-   isotope.cpp 
-   spectrumparser.cpp 
-   elementparser.cpp 
-   isotopeparser.cpp 
-   tempunit.cpp 
-   chemicaldataobject.cpp 
-   moleculeparser.cpp 
-   parser.cpp )
+set(science_LIB_SRCS
+   element.cpp
+   spectrum.cpp
+   isotope.cpp
+   spectrumparser.cpp
+   elementparser.cpp
+   isotopeparser.cpp
+   tempunit.cpp
+   chemicaldataobject.cpp
+   moleculeparser.cpp
+   parser.cpp
+)
 
 kde4_automoc(${science_LIB_SRCS})
 
@@ -35,8 +41,6 @@ install_targets(${LIB_INSTALL_DIR} science )
 
 kde4_footer()
 
-
-
 #original Makefile.am contents follow:
 
 #SUBDIRS = . data tests

diff --git a/libscience/data/CMakeLists.txt b/libscience/data/CMakeLists.txt
index 4f11ad465fe762b0487c8da56d6c2c0c3986889f..32d97614bda0b4459c154409219c367e4d7da199 100644 (file)
--- a/libscience/data/CMakeLists.txt
+++ b/libscience/data/CMakeLists.txt
@@ -1,16 +1,12 @@
 kde4_header()
 
-include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}  )
-
-
-########### install files ###############
-
-install_files( ${DATA_INSTALL_DIR}/libkdeedu/data/ FILES elements.xml isotopes.xml )
+install_files(${DATA_INSTALL_DIR}/libkdeedu/data/ FILES
+   elements.xml
+   isotopes.xml
+)
 
 kde4_footer()
 
-
-
 #original Makefile.am contents follow:
 
 #xml_DATA = elements.xml isotopes.xml

diff --git a/widgets/CMakeLists.txt b/widgets/CMakeLists.txt
index 7126d56fcc62ad71e14def6a776abcfd3cdeda79..cc335ef0a3c7ac26e5ee3cdf5d116a81df3810a4 100644 (file)
--- a/widgets/CMakeLists.txt
+++ b/widgets/CMakeLists.txt
@@ -1,6 +1,13 @@
 kde4_header()
 
-include_directories(${CMAKE_SOURCE_DIR}/libkdeedu/kdeeduplot/ ${CMAKE_SOURCE_DIR}/libkdeedu/extdate/  ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}  )
+include_directories(
+  ${KDE4_INCLUDE_DIR}
+  ${QT_INCLUDES}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}/libkdeedu/kdeeduplot/
+  ${CMAKE_SOURCE_DIR}/libkdeedu/extdate/
+)
 
 add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/kdeeduwidgets.cpp
   COMMAND ${CMAKE_INSTALL_PREFIX}/bin/makekdewidgets
@@ -9,7 +16,9 @@ add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/kdeeduwidgets.cpp
 
 ########### next target ###############
 
-set(kdeeduwidgets_PART_SRCS kdeeduwidgets.cpp )
+set(kdeeduwidgets_PART_SRCS
+  kdeeduwidgets.cpp
+)
 
 qt4_generate_moc(${CMAKE_CURRENT_BINARY_DIR}/kdeeduwidgets.cpp ${CMAKE_CURRENT_BINARY_DIR}/kdeeduwidgets.moc)
 
@@ -27,8 +36,6 @@ install_targets(${LIB_INSTALL_DIR}/kde4 kdeeduwidgets )
 
 kde4_footer()
 
-
-
 #original Makefile.am contents follow:
 
 #INCLUDES = -I$(srcdir)/../kdeeduplot $(all_includes)