diff --git a/filters/sheets/csv/csvexport.h b/filters/sheets/csv/csvexport.h
--- a/filters/sheets/csv/csvexport.h
+++ b/filters/sheets/csv/csvexport.h
@@ -25,6 +25,10 @@
 #include <QByteArray>
 #include <KoFilter.h>
 #include <QVariantList>
+#include <QDebug>
+#include <QLoggingCategory>
+
+Q_DECLARE_LOGGING_CATEGORY(lcCsvExport)
 
 namespace Calligra
 {
diff --git a/filters/sheets/csv/csvexport.cc b/filters/sheets/csv/csvexport.cc
--- a/filters/sheets/csv/csvexport.cc
+++ b/filters/sheets/csv/csvexport.cc
@@ -24,8 +24,8 @@
 #include <QTextCodec>
 #include <QTextStream>
 #include <QByteArray>
+#include <QDebug>
 
-#include <kdebug.h>
 #include <kpluginfactory.h>
 #include <KoFilterChain.h>
 #include <KoFilterManager.h>
@@ -45,6 +45,8 @@
 
 K_PLUGIN_FACTORY_WITH_JSON(CSVExportFactory, "calligra_filter_sheets2csv.json", registerPlugin<CSVExport>();)
 
+Q_LOGGING_CATEGORY(lcCsvExport, "calligra.filter.csv.export")
+
 class Cell
 {
 public:
@@ -118,34 +120,34 @@
 // approach is because we don't want to export formulas but values !
 KoFilter::ConversionStatus CSVExport::convert(const QByteArray & from, const QByteArray & to)
 {
-    kDebug(30501) << "CSVExport::convert";
+    qDebug(lcCsvExport) << "CSVExport::convert";
     KoDocument* document = m_chain->inputDocument();
 
     if (!document)
         return KoFilter::StupidError;
 
     if (!qobject_cast<const Calligra::Sheets::Doc *>(document)) {
-        kWarning(30501) << "document isn't a Calligra::Sheets::Doc but a " << document->metaObject()->className();
+        qWarning(lcCsvExport) << "document isn't a Calligra::Sheets::Doc but a " << document->metaObject()->className();
         return KoFilter::NotImplemented;
     }
     if ((to != "text/csv" && to != "text/plain") || from != "application/vnd.oasis.opendocument.spreadsheet") {
-        kWarning(30501) << "Invalid mimetypes " << to << " " << from;
+        qWarning(lcCsvExport) << "Invalid mimetypes " << to << " " << from;
         return KoFilter::NotImplemented;
     }
 
     Doc *ksdoc = qobject_cast<Doc *>(document);
 
     if (ksdoc->mimeType() != "application/vnd.oasis.opendocument.spreadsheet") {
-        kWarning(30501) << "Invalid document mimetype " << ksdoc->mimeType();
+        qWarning(lcCsvExport) << "Invalid document mimetype " << ksdoc->mimeType();
         return KoFilter::NotImplemented;
     }
 
     CSVExportDialog *expDialog = 0;
     if (!m_chain->manager()->getBatchMode()) {
         expDialog = new CSVExportDialog(0);
 
         if (!expDialog) {
-            kError(30501) << "Dialog has not been created! Aborting!" << endl;
+            qCritical(lcCsvExport) << "Dialog has not been created! Aborting!" << endl;
             return KoFilter::StupidError;
         }
         expDialog->fillSheet(ksdoc->map());
@@ -186,7 +188,7 @@
         textQuote = '"';
 
     if (expDialog && expDialog->exportSelectionOnly()) {
-        kDebug(30501) << "Export as selection mode";
+        qDebug(lcCsvExport) << "Export as selection mode";
         View *view = ksdoc->documentPart()->views().isEmpty() ? 0 : static_cast<View*>(ksdoc->documentPart()->views().first());
 
         if (!view) { // no view if embedded document
@@ -235,7 +237,7 @@
             str += m_eol;
         }
     } else {
-        kDebug(30501) << "Export as full mode";
+        qDebug(lcCsvExport) << "Export as full mode";
         foreach(Sheet const * const sheet, ksdoc->map()->sheetList()) {
             if (expDialog && !expDialog->exportSheet(sheet->sheetName())) {
                 continue;
@@ -265,7 +267,7 @@
             if (CSVMaxRow + CSVMaxCol == 0)
                 continue;
 
-            kDebug(30501) << "Max row x column:" << CSVMaxRow << " x" << CSVMaxCol;
+            qDebug(lcCsvExport) << "Max row x column:" << CSVMaxRow << " x" << CSVMaxCol;
 
             // Print sheet separators, except for the first sheet
             if (!first || (expDialog && expDialog->printAlwaysSheetDelimiter())) {
@@ -326,7 +328,7 @@
 
     QFile out(m_chain->outputFile());
     if (!out.open(QIODevice::WriteOnly)) {
-        kError(30501) << "Unable to open output file!" << endl;
+        qCritical(lcCsvExport) << "Unable to open output file!" << endl;
         out.close();
         delete expDialog;
         return KoFilter::StupidError;
diff --git a/filters/sheets/csv/csvexportdialog.cpp b/filters/sheets/csv/csvexportdialog.cpp
--- a/filters/sheets/csv/csvexportdialog.cpp
+++ b/filters/sheets/csv/csvexportdialog.cpp
@@ -19,18 +19,19 @@
 */
 
 #include "csvexportdialog.h"
+#include "csvexport.h"
 
 #include "sheets/Map.h"
 #include "sheets/Sheet.h"
 
 #include <kcharsets.h>
 #include <kmessagebox.h>
 #include <KSharedConfig>
-#include <kdebug.h>
 
-#include <QApplication>
+#include <QGuiApplication>
 #include <QTextCodec>
 #include <QValidator>
+#include <QDebug>
 
 using namespace Calligra::Sheets;
 
@@ -42,7 +43,7 @@
 {
     setButtons(KoDialog::Ok | KoDialog::Cancel);
     setDefaultButton(KoDialog::Ok);
-    QApplication::restoreOverrideCursor();
+    QGuiApplication::restoreOverrideCursor();
 
     QStringList encodings;
     encodings << i18nc("Descriptive encoding name", "Recommended ( %1 )" , "UTF-8");
@@ -84,7 +85,7 @@
 CSVExportDialog::~CSVExportDialog()
 {
     saveSettings();
-    QApplication::setOverrideCursor(Qt::WaitCursor);
+    QGuiApplication::setOverrideCursor(Qt::WaitCursor);
     delete m_delimiterValidator;
 }
 
@@ -266,7 +267,7 @@
 QTextCodec* CSVExportDialog::getCodec(void) const
 {
     const QString strCodec(KCharsets::charsets()->encodingForName(m_dialog->comboBoxEncoding->currentText()));
-    kDebug(30502) << "Encoding:" << strCodec;
+    qDebug(lcCsvExport) << "Encoding:" << strCodec;
 
     bool ok = false;
     QTextCodec* codec = QTextCodec::codecForName(strCodec.toUtf8());
@@ -281,7 +282,7 @@
     // Still nothing?
     if (!codec || !ok) {
         // Default: UTF-8
-        kWarning(30502) << "Cannot find encoding:" << strCodec;
+        qWarning(lcCsvExport) << "Cannot find encoding:" << strCodec;
         // ### TODO: what parent to use?
         KMessageBox::error(0, i18n("Cannot find encoding: %1", strCodec));
         return 0;
diff --git a/filters/sheets/csv/csvimport.cc b/filters/sheets/csv/csvimport.cc
--- a/filters/sheets/csv/csvimport.cc
+++ b/filters/sheets/csv/csvimport.cc
@@ -24,10 +24,10 @@
 #include <QFile>
 #include <QRegExp>
 #include <QVector>
-#include <QApplication>
+#include <QGuiApplication>
+#include <QDebug>
 
 #include <kmessagebox.h>
-#include <kdebug.h>
 #include <kpluginfactory.h>
 #include <klocale.h>
 
@@ -59,6 +59,8 @@
 
 K_PLUGIN_FACTORY_WITH_JSON(CSVImportFactory, "calligra_filter_csv2sheets.json", registerPlugin<CSVFilter>();)
 
+Q_LOGGING_CATEGORY(lcCsvImport, "calligra.filter.csv.import")
+
 CSVFilter::CSVFilter(QObject* parent, const QVariantList&) :
         KoFilter(parent)
 {
@@ -73,18 +75,18 @@
         return KoFilter::StupidError;
 
     if (!qobject_cast<const Calligra::Sheets::Doc *>(document)) {
-        kWarning(30501) << "document isn't a Calligra::Sheets::Doc but a " << document->metaObject()->className();
+        qWarning(lcCsvImport) << "document isn't a Calligra::Sheets::Doc but a " << document->metaObject()->className();
         return KoFilter::NotImplemented;
     }
     if ((from != "text/csv" && from != "text/plain") || to != "application/vnd.oasis.opendocument.spreadsheet") {
-        kWarning(30501) << "Invalid mimetypes " << from << " " << to;
+        qWarning(lcCsvImport) << "Invalid mimetypes " << from << " " << to;
         return KoFilter::NotImplemented;
     }
 
     Doc *ksdoc = static_cast<Doc *>(document);   // type checked above
 
 //    if (ksdoc->mimeType() != "application/vnd.oasis.opendocument.spreadsheet") {
-//       kWarning(30501) << "Invalid document mimetype " << ksdoc->mimeType();
+//       qWarning(lcCsvImport) << "Invalid document mimetype " << ksdoc->mimeType();
 //        return KoFilter::NotImplemented;
 //    }
 
@@ -131,7 +133,7 @@
     int value = 0;
 
     emit sigProgress(value);
-    QApplication::setOverrideCursor(Qt::WaitCursor);
+    QGuiApplication::setOverrideCursor(Qt::WaitCursor);
 
     const double defaultWidth = ksdoc->map()->defaultColumnFormat()->width();
     QVector<double> widths(numCols);
@@ -199,7 +201,7 @@
     ksdoc->map()->calculationSettings()->locale()->setThousandsSeparator(documentThousandsSeparator);
 
     emit sigProgress(100);
-    QApplication::restoreOverrideCursor();
+    QGuiApplication::restoreOverrideCursor();
     delete dialog;
 
     return KoFilter::OK;