From fdca63b66433c2f5a08a150df0dbda8c292cd394 Mon Sep 17 00:00:00 2001 From: Vishesh Handa Date: Tue, 6 May 2014 17:09:32 +0200 Subject: [PATCH] Calculate Runner: Port Qalculate backend away from KDELibs4Support --- runners/calculator/CMakeLists.txt | 4 +--- runners/calculator/qalculate_engine.cpp | 10 ++++------ 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/runners/calculator/CMakeLists.txt b/runners/calculator/CMakeLists.txt index 0d9c605f4..31f6fd43f 100644 --- a/runners/calculator/CMakeLists.txt +++ b/runners/calculator/CMakeLists.txt @@ -27,17 +27,15 @@ if ( QALCULATE_FOUND ) target_link_libraries(krunner_calculatorrunner ${QALCULATE_LIBRARIES} ${CLN_LIBRARIES} - KF5::Plasma + KF5::KIOCore KF5::Runner KF5::I18n - KF5::KDELibs4Support Qt5::Script Qt5::Network ) else () add_library(krunner_calculatorrunner MODULE ${krunner_calculatorrunner_SRCS}) target_link_libraries(krunner_calculatorrunner - KF5::Plasma KF5::Runner KF5::I18n Qt5::Script diff --git a/runners/calculator/qalculate_engine.cpp b/runners/calculator/qalculate_engine.cpp index 0759ff232..522b064d0 100644 --- a/runners/calculator/qalculate_engine.cpp +++ b/runners/calculator/qalculate_engine.cpp @@ -29,13 +29,11 @@ #include #include #include +#include -#include +#include #include -#include -#include #include -#include QAtomicInt QalculateEngine::s_counter; @@ -64,8 +62,8 @@ QalculateEngine::~QalculateEngine() void QalculateEngine::updateExchangeRates() { - KUrl source = KUrl("http://www.ecb.int/stats/eurofxref/eurofxref-daily.xml"); - KUrl dest = KUrl(CALCULATOR->getExchangeRatesFileName().c_str()); + QUrl source = QUrl("http://www.ecb.int/stats/eurofxref/eurofxref-daily.xml"); + QUrl dest = QUrl::fromLocalFile(QFile::decodeName(CALCULATOR->getExchangeRatesFileName().c_str())); KIO::Job* getJob = KIO::file_copy(source, dest, -1, KIO::Overwrite | KIO::HideProgressInfo); connect( getJob, SIGNAL(result(KJob*)), this, SLOT(updateResult(KJob*)) );