diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2014-11-14 21:25:54 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2014-11-14 21:25:54 -0600 |
| commit | 0ea889939059694c588988e0b6d8fd92eb5b7539 (patch) | |
| tree | 69b7087db9897dab31fdc14cd6f98c030cd01b0c /config | |
| parent | b91b9e500bd265bc06564ff6935966b75cba82ff (diff) | |
| download | tde-style-qtcurve-0ea889939059694c588988e0b6d8fd92eb5b7539.tar.gz tde-style-qtcurve-0ea889939059694c588988e0b6d8fd92eb5b7539.zip | |
Fix a long-standing conflict between QtCurve's Gradient class and Libreoffice's Gradient class
This largely resolves Bug 1489
Diffstat (limited to 'config')
| -rw-r--r-- | config/exportthemedialog.h | 4 | ||||
| -rw-r--r-- | config/qtcurveconfig.h | 4 |
2 files changed, 8 insertions, 0 deletions
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; |