Commit 6adad7e2 authored by Andreas Cord-Landwehr's avatar Andreas Cord-Landwehr
Browse files

Cleanup definitions.

- remove empty variables
- ensure that no silent QString to QUrl cast happens
parent 6b9cf715
......@@ -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:
......
......@@ -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
......
......@@ -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"));
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment