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

List:       kde-commits
Subject:    [labplot] /: Cleanup
From:       Alexander Semke <alexander.semke () web ! de>
Date:       2014-02-14 7:44:37
Message-ID: E1WEDRt-0004Jz-L6 () scm ! kde ! org
[Download RAW message or body]

Git commit 50fa360c143b4dda19f507c50499f5ab39fa6952 by Alexander Semke.
Committed on 14/02/2014 at 07:44.
Pushed by asemke into branch 'master'.

Cleanup

M  +2    -5    AUTHORS
M  +4    -11   CMakeLists.txt
M  +1    -2    README
M  +1    -0    icons/CMakeLists.txt
M  +0    -5    src/CMakeLists.txt
M  +2    -1    src/kdefrontend/HistoryDialog.h

http://commits.kde.org/labplot/50fa360c143b4dda19f507c50499f5ab39fa6952

diff --git a/AUTHORS b/AUTHORS
index 8a39fe3..4f39cff 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,5 +1,2 @@
-Stefan Gerlach <stefan.gerlach*uni-konstanz.de>
-Alexander Semke <alexander.semke*web.de>
-Tilman Benkert <thzs*gmx.net> 
-Knut Franke <knut.franke*gmx.de>
-(use @ for *)
+Stefan Gerlach <stefan.gerlach@uni-konstanz.de>
+Alexander Semke <alexander.semke@web.de>
\ No newline at end of file
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e5ba290..31774c8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,28 +1,21 @@
 project(LabPlot2)
 cmake_minimum_required(VERSION 2.6) 
 find_package(KDE4 REQUIRED)
+include(KDE4Defaults)
+
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wundef -Wpointer-arith \
-Wcast-align -Wunreachable-code -fno-omit-frame-pointer -fstack-protector \
-fno-exceptions")  
 add_definitions (${QT_DEFINITIONS} ${QT_QTDBUS_DEFINITIONS} ${KDE4_DEFINITIONS})
-# build/src for finding ui_* in out-of-source build
-include_directories (${QDBUS_INCLUDE_DIRS} ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} \
${KDE4_INCLUDES} build/src) +include_directories (${QDBUS_INCLUDE_DIRS} \
${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES})  set(CMAKE_MODULE_PATH \
                ${CMAKE_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH})
-include_directories(${KDE4_INCLUDES})
 add_definitions(${KDE4_DEFINITIONS})
 add_definitions (-DLVERSION='\"2.0.1\"')
 # needed for qt_plugin_instance_scidavis_standardcurvesymbolfactory()
 add_definitions(-D QT_STATICPLUGIN )
 add_definitions(-DSUPPRESS_SCRIPTING_INIT)
-# add_definitions(${KDE4_ENABLE_EXCEPTIONS})
-# useful for debugging
-#set(CMAKE_VERBOSE_MAKEFILE true)
 set(BUILD_SHARED_LIBS true)
-# needed for shared libs
 add_definitions(-fvisibility=default)
 
-# FIND_PROGRAM(YACC_EXECUTABLE
-# 	NAMES yacc bison
-# 	PATHS /usr/bin /usr/local/bin
-# 	DOC "Yacc or Bison executable")
 
 ### GSL ######################################
 FIND_LIBRARY(GSL_LIBRARIES gsl
diff --git a/README b/README
index 63bdc4f..16d7938 100644
--- a/README
+++ b/README
@@ -18,5 +18,4 @@ our git repository:
 git clone git://anongit.kde.org/labplot
 
 If you're interested in following the development of the project or would like to \
                conribute,
-consider subscribing to labplot-devel. See \
                http://sourceforge.net/p/labplot/mailman/?source=navbar
-for more information.
\ No newline at end of file
+consider subscribing to kde-edu mailing list. See \
https://mail.kde.org/mailman/listinfo/kde-edu for more information. \ No newline at \
                end of file
diff --git a/icons/CMakeLists.txt b/icons/CMakeLists.txt
index 02e3c9e..33168c7 100644
--- a/icons/CMakeLists.txt
+++ b/icons/CMakeLists.txt
@@ -1 +1,2 @@
 kde4_install_icons(${ICON_INSTALL_DIR})
+kde4_update_iconcache()
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index aff714e..5c723ca 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -136,10 +136,6 @@ set(QTMOC_HDRS
 
 qt4_wrap_cpp(QTMOC_HDRS ${QTMOC_HDRS})
 
-# add_custom_command (OUTPUT parser/parser.tab.c
-#                    COMMAND ${YACC_EXECUTABLE} ARGS -b parser parser.y
-#                    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/parser)
-
 add_subdirectory( pics )
 
 ##############################################################################
@@ -158,4 +154,3 @@ install(FILES ${KDEFRONTEND_DIR}/LabPlot2ui.rc \
${KDEFRONTEND_DIR}/splash.png DES  install(PROGRAMS LabPlot2.desktop DESTINATION \
${XDG_APPS_INSTALL_DIR} )  install( FILES labplot2.xml DESTINATION \
${XDG_MIME_INSTALL_DIR} )  update_xdg_mimetypes( ${XDG_MIME_INSTALL_DIR} )
-kde4_update_iconcache()
diff --git a/src/kdefrontend/HistoryDialog.h b/src/kdefrontend/HistoryDialog.h
index 77d9335..6fd64cf 100644
--- a/src/kdefrontend/HistoryDialog.h
+++ b/src/kdefrontend/HistoryDialog.h
@@ -1,5 +1,5 @@
 
-class Project;/***************************************************************************
 +/***************************************************************************
     File                 : HistoryDialog.h
     Project              : LabPlot
     Description          : history dialog
@@ -32,6 +32,7 @@ class \
Project;/*****************************************************************  #define \
HISTORYDIALOG_H  
 #include <KDialog>
+class Project;
 class QUndoStack;
 
 class HistoryDialog: public KDialog {


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