diff options
| author | Timothy Pearson <[email protected]> | 2013-02-15 21:48:17 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-02-15 21:48:17 -0600 |
| commit | 63f984a752aa6a6a73e3af795b05a5a042833eff (patch) | |
| tree | 89b2d1529273ebe59f8c41800aa6c53ee4c29bb1 /chalk/core/tiles | |
| parent | 3b6870c6e1177574772803b5b09416903ee40fc0 (diff) | |
| download | koffice-63f984a752aa6a6a73e3af795b05a5a042833eff.tar.gz koffice-63f984a752aa6a6a73e3af795b05a5a042833eff.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'chalk/core/tiles')
| -rw-r--r-- | chalk/core/tiles/kis_tilemanager.cc | 2 | ||||
| -rw-r--r-- | chalk/core/tiles/kis_tilemanager.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/chalk/core/tiles/kis_tilemanager.cc b/chalk/core/tiles/kis_tilemanager.cc index d8064615..aa8a207c 100644 --- a/chalk/core/tiles/kis_tilemanager.cc +++ b/chalk/core/tiles/kis_tilemanager.cc @@ -30,7 +30,7 @@ #include <tqfile.h> #include <kstaticdeleter.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <tdeconfig.h> #include "kis_tileddatamanager.h" diff --git a/chalk/core/tiles/kis_tilemanager.h b/chalk/core/tiles/kis_tilemanager.h index 5d388136..d0ae4f6b 100644 --- a/chalk/core/tiles/kis_tilemanager.h +++ b/chalk/core/tiles/kis_tilemanager.h @@ -25,7 +25,7 @@ #include <tqvaluelist.h> #include <tqmutex.h> -#include <ktempfile.h> +#include <tdetempfile.h> class KisTile; class KisTiledDataManager; |