summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Cord-Landwehr <cordlandwehr@kde.org>2015-09-27 15:39:31 (GMT)
committerAndreas Cord-Landwehr <cordlandwehr@kde.org>2015-09-27 15:39:31 (GMT)
commit6adad7e25ecd84111dd859923725718629820651 (patch)
tree5a7bd06198f0710675c26837f93a79669c404f57
parent6b9cf7154f5c41a23c96051a5e83e63ac0c33078 (diff)
Cleanup definitions.
- remove empty variables - ensure that no silent QString to QUrl cast happens
-rw-r--r--CMakeLists.txt7
-rw-r--r--src/CMakeLists.txt2
-rw-r--r--src/kalzium.cpp2
3 files changed, 7 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2451028..47cc860 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -35,8 +35,11 @@ else(WIN32)
# set (KDE4_ICON_DIR ${CMAKE_INSTALL_PREFIX}/share/icons)
endif(WIN32)
-add_definitions (${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
-add_definitions(-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS)
+add_definitions(
+ -DQT_NO_URL_CAST_FROM_STRING
+ -DQT_USE_FAST_CONCATENATION
+ -DQT_USE_FAST_OPERATOR_PLUS
+)
#include_directories (${QDBUS_INCLUDE_DIRS} ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES} libscience)
if(MSVC)
# for correctly linking openbabel:
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index add43ec..8e47132 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -51,7 +51,7 @@ set(kalziumtools_SRCS
calculator/titrationCalculator.cpp
# calculator/massCalculator.cpp
)
-qt5_wrap_ui(kalziumtools_SRCS
+ki18n_wrap_ui(kalziumtools_SRCS
calculator/calculator.ui
calculator/nuclearCalculator.ui
calculator/gasCalculator.ui
diff --git a/src/kalzium.cpp b/src/kalzium.cpp
index fec6aa7..6df0d68 100644
--- a/src/kalzium.cpp
+++ b/src/kalzium.cpp
@@ -325,7 +325,7 @@ void Kalzium::setupSidebars()
void Kalzium::slotExportTable()
{
- QString fileName = KFileDialog::getSaveFileName(QString(), i18n("*.png *.xpm *.jpg *.svg"), //
+ QString fileName = KFileDialog::getSaveFileName(QUrl(), i18n("*.png *.xpm *.jpg *.svg"), //
this,
i18n("Save Kalzium's Table In"));