From c4956ecd02d5e37cc4262cb9a33370414f32a010 Mon Sep 17 00:00:00 2001 From: Ray Vine Date: Tue, 22 May 2018 01:06:43 +0200 Subject: [PATCH] Fix FTBFS with clang This resolves bug 2897 Signed-off-by: Ray Vine --- filters/kword/mswrite/mswriteimport.h | 4 +++- kexi/migration/keximigratetest.cpp | 2 +- kspread/plugins/scripting/Makefile.am | 2 ++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/filters/kword/mswrite/mswriteimport.h b/filters/kword/mswrite/mswriteimport.h index 2282f823a..63f2c7e02 100644 --- a/filters/kword/mswrite/mswriteimport.h +++ b/filters/kword/mswrite/mswriteimport.h @@ -23,7 +23,9 @@ #include class WRIDevice; -class MSWrite::InternalParser; +namespace MSWrite { + class InternalParser; +} class KWordGenerator; class MSWriteImport : public KoFilter diff --git a/kexi/migration/keximigratetest.cpp b/kexi/migration/keximigratetest.cpp index a1b03c687..7d192b4cd 100644 --- a/kexi/migration/keximigratetest.cpp +++ b/kexi/migration/keximigratetest.cpp @@ -38,7 +38,7 @@ using namespace KexiMigration; int main(int argc, char *argv[]) { - TDEApplication app(argc, argv, "Kexi Migrate Test"); + TDEApplication app(argc, argv, TQCString("Kexi Migrate Test")); ImportWizard* iw = new ImportWizard(); iw->setGeometry(300,300,300,250); diff --git a/kspread/plugins/scripting/Makefile.am b/kspread/plugins/scripting/Makefile.am index b5a2aeab7..25e2bb913 100644 --- a/kspread/plugins/scripting/Makefile.am +++ b/kspread/plugins/scripting/Makefile.am @@ -21,3 +21,5 @@ kde_services_DATA = kspreadscripting.desktop kspreadrcdir = $(kde_datadir)/kspread/kpartplugins kspreadrc_DATA = scripting.rc + +KDE_CXXFLAGS = $(USE_EXCEPTIONS)