summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRay Vine <ray-v@inbox.lv>2018-05-22 01:06:43 +0200
committerSlávek Banko <slavek.banko@axis.cz>2018-05-22 01:06:43 +0200
commitc4956ecd02d5e37cc4262cb9a33370414f32a010 (patch)
treee8b6357e98f11f9670700f6558387ff67763b407
parente136c6bbf65989ccd8adcd6426d6a48a1e63b9fa (diff)
downloadkoffice-c4956ecd02d5e37cc4262cb9a33370414f32a010.tar.gz
koffice-c4956ecd02d5e37cc4262cb9a33370414f32a010.zip
Fix FTBFS with clang
This resolves bug 2897 Signed-off-by: Ray Vine <ray-v@inbox.lv>
-rw-r--r--filters/kword/mswrite/mswriteimport.h4
-rw-r--r--kexi/migration/keximigratetest.cpp2
-rw-r--r--kspread/plugins/scripting/Makefile.am2
3 files changed, 6 insertions, 2 deletions
diff --git a/filters/kword/mswrite/mswriteimport.h b/filters/kword/mswrite/mswriteimport.h
index 2282f823..63f2c7e0 100644
--- a/filters/kword/mswrite/mswriteimport.h
+++ b/filters/kword/mswrite/mswriteimport.h
@@ -23,7 +23,9 @@
#include <KoFilter.h>
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 a1b03c68..7d192b4c 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 b5a2aeab..25e2bb91 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)