diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:48:17 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:48:17 -0600 |
| commit | 63f984a752aa6a6a73e3af795b05a5a042833eff (patch) | |
| tree | 89b2d1529273ebe59f8c41800aa6c53ee4c29bb1 /karbon/core | |
| parent | 3b6870c6e1177574772803b5b09416903ee40fc0 (diff) | |
| download | koffice-63f984a752aa6a6a73e3af795b05a5a042833eff.tar.gz koffice-63f984a752aa6a6a73e3af795b05a5a042833eff.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'karbon/core')
| -rw-r--r-- | karbon/core/vglobal.h | 2 | ||||
| -rw-r--r-- | karbon/core/vlayer.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/karbon/core/vglobal.h b/karbon/core/vglobal.h index c20d48b0..5c0d4706 100644 --- a/karbon/core/vglobal.h +++ b/karbon/core/vglobal.h @@ -21,7 +21,7 @@ #ifndef __VGLOBAL_H__ #define __VGLOBAL_H__ -#include <kglobal.h> +#include <tdeglobal.h> // define some often used mathematical constants et al: diff --git a/karbon/core/vlayer.cc b/karbon/core/vlayer.cc index 47fe919d..55602598 100644 --- a/karbon/core/vlayer.cc +++ b/karbon/core/vlayer.cc @@ -19,7 +19,7 @@ #include <tqdom.h> -#include <klocale.h> +#include <tdelocale.h> #include <KoRect.h> #include "vcomposite.h" |