From 0ea889939059694c588988e0b6d8fd92eb5b7539 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 14 Nov 2014 21:25:54 -0600
Subject: Fix a long-standing conflict between QtCurve's Gradient class and
 Libreoffice's Gradient class This largely resolves Bug 1489

---
 config/exportthemedialog.h | 4 ++++
 config/qtcurveconfig.h     | 4 ++++
 2 files changed, 8 insertions(+)

(limited to 'config')

diff --git a/config/exportthemedialog.h b/config/exportthemedialog.h
index 2891037..cc8d022 100644
--- a/config/exportthemedialog.h
+++ b/config/exportthemedialog.h
@@ -25,6 +25,10 @@
 #define CONFIG_DIALOG
 #include "common.h"
 
+#ifdef __cplusplus
+using namespace TDEQtCurveStyle;
+#endif
+
 class KURLRequester;
 class TQLineEdit;
 
diff --git a/config/qtcurveconfig.h b/config/qtcurveconfig.h
index 66bd61a..60cd63c 100644
--- a/config/qtcurveconfig.h
+++ b/config/qtcurveconfig.h
@@ -29,6 +29,10 @@
 #include <tqmap.h>
 #include "common.h"
 
+#ifdef __cplusplus
+using namespace TDEQtCurveStyle;
+#endif
+
 class TQPopupMenu;
 class TQListViewItem;
 class KDoubleNumInput;
-- 
cgit v1.2.3