[rkward/frameworks] rkward: Remove more kdelibs4support code

[Thomas Friedrichsmeier]

Git commit d65582adc9158da96e065af06dc27fb3e3ee96a9 by Thomas Friedrichsmeier.
Committed on 28/01/2016 at 12:35.
Pushed by tfry into branch 'frameworks'.

Remove more kdelibs4support code

M  +1    -18   rkward/core/CMakeLists.txt
M  +0    -5    rkward/core/rkvariable.cpp
M  +1    -1    rkward/dataeditor/CMakeLists.txt

http://commits.kde.org/rkward/d65582adc9158da96e065af06dc27fb3e3ee96a9

diff --git a/rkward/core/CMakeLists.txt b/rkward/core/CMakeLists.txt
index c366ead..e6983e7 100644
--- a/rkward/core/CMakeLists.txt
+++ b/rkward/core/CMakeLists.txt
@@ -1,8 +1,5 @@
 INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}    )
 
-
-########### next target ###############
-
 SET(core_STAT_SRCS
    rkvariable.cpp
    robjectlist.cpp
@@ -16,19 +13,5 @@ SET(core_STAT_SRCS
    )
 
 ADD_LIBRARY(core STATIC ${core_STAT_SRCS})
-TARGET_LINK_LIBRARIES(core Qt5::Core KF5::KDELibs4Support)
-
-########### install files ###############
-
-
-
-
-#original Makefile.am contents follow:
+TARGET_LINK_LIBRARIES(core Qt5::Core Qt5::Widgets KF5::WidgetsAddons)
 
-#INCLUDES = $(all_includes)
-#METASOURCES = AUTO
-#noinst_LIBRARIES =  libcore.a
-#libcore_a_SOURCES = rkvariable.cpp robjectlist.cpp robject.cpp rcontainerobject.cpp rkmodificationtracker.cpp \
-#	rfunctionobject.cpp renvironmentobject.cpp
-#noinst_HEADERS = rkvariable.h robjectlist.h robject.h rcontainerobject.h rkmodificationtracker.h \
-#	rfunctionobject.h renvironmentobject.h
diff --git a/rkward/core/rkvariable.cpp b/rkward/core/rkvariable.cpp
index 5f8e3ad..b2ab526 100644
--- a/rkward/core/rkvariable.cpp
+++ b/rkward/core/rkvariable.cpp
@@ -871,7 +871,6 @@ RKVariable::FormattingOptions RKVariable::parseFormattingOptionsString (const QS
 	formatting_options.alignment = FormattingOptions::AlignDefault;
 	formatting_options.precision_mode = FormattingOptions::PrecisionDefault;
 	formatting_options.precision = 0;
-	bool empty = true;
 
 	QStringList list = string.split ('#', QString::SkipEmptyParts);
 	QString option, parameter;
@@ -884,20 +883,16 @@ RKVariable::FormattingOptions RKVariable::parseFormattingOptionsString (const QS
 		if (option == "align") {
 			int al = parameter.toInt ();
 			if ((al >= (int) FormattingOptions::AlignDefault) && (al <= (int) FormattingOptions::AlignRight)) {
-				empty = false;
 				formatting_options.alignment = (FormattingOptions::Alignment) al;
 			}
 		} else if (option == "prec") {
 			if (parameter == "d") {
-				empty = false;
 				formatting_options.precision_mode = FormattingOptions::PrecisionDefault;
 			} else if (parameter == "v") {
-				empty = false;
 				formatting_options.precision_mode = FormattingOptions::PrecisionRequired;
 			} else {
 				int digits = parameter.toInt ();
 				if ((digits >= 0) && (digits <= 15)) {
-					empty = false;
 					formatting_options.precision_mode = FormattingOptions::PrecisionFixed;
 					formatting_options.precision = digits;
 				}
diff --git a/rkward/dataeditor/CMakeLists.txt b/rkward/dataeditor/CMakeLists.txt
index 571f627..a6866d0 100644
--- a/rkward/dataeditor/CMakeLists.txt
+++ b/rkward/dataeditor/CMakeLists.txt
@@ -13,7 +13,7 @@ SET(dataeditor_STAT_SRCS
    )
 
 ADD_LIBRARY(dataeditor STATIC ${dataeditor_STAT_SRCS})
-TARGET_LINK_LIBRARIES(dataeditor Qt5::Widgets KF5::KDELibs4Support)
+TARGET_LINK_LIBRARIES(dataeditor Qt5::Widgets KF5::WidgetsAddons KF5::Parts)
 
 ########### install files ###############