diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:57:18 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:57:18 -0600 |
| commit | 958d14ea303abe33fce2c259c1000f18171e4229 (patch) | |
| tree | 61bc8236ab3aa4bc27ca205740322f8df50baff1 /ksvg/plugin | |
| parent | b2de6514213d205907e8de3dd17f8eb80d868a4f (diff) | |
| download | tdegraphics-958d14ea303abe33fce2c259c1000f18171e4229.tar.gz tdegraphics-958d14ea303abe33fce2c259c1000f18171e4229.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'ksvg/plugin')
| -rw-r--r-- | ksvg/plugin/backends/libart/LibartCanvas.cpp | 2 | ||||
| -rw-r--r-- | ksvg/plugin/ksvg_factory.cpp | 4 | ||||
| -rw-r--r-- | ksvg/plugin/ksvg_plugin.cpp | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/ksvg/plugin/backends/libart/LibartCanvas.cpp b/ksvg/plugin/backends/libart/LibartCanvas.cpp index 55b371dd..03b18f06 100644 --- a/ksvg/plugin/backends/libart/LibartCanvas.cpp +++ b/ksvg/plugin/backends/libart/LibartCanvas.cpp @@ -39,7 +39,7 @@ #include "SVGMaskElementImpl.h" #include <kdebug.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kgenericfactory.h> #include "SVGPaint.h" diff --git a/ksvg/plugin/ksvg_factory.cpp b/ksvg/plugin/ksvg_factory.cpp index e981ac34..b856da64 100644 --- a/ksvg/plugin/ksvg_factory.cpp +++ b/ksvg/plugin/ksvg_factory.cpp @@ -20,8 +20,8 @@ #include <tdeaboutdata.h> #include <kinstance.h> -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include <kstandarddirs.h> #include "ksvg_plugin.h" diff --git a/ksvg/plugin/ksvg_plugin.cpp b/ksvg/plugin/ksvg_plugin.cpp index fbbb3e78..6f79a968 100644 --- a/ksvg/plugin/ksvg_plugin.cpp +++ b/ksvg/plugin/ksvg_plugin.cpp @@ -22,8 +22,8 @@ #include <kdebug.h> #include <tdeaction.h> #include <tdefiledialog.h> -#include <klocale.h> -#include <ktempfile.h> +#include <tdelocale.h> +#include <tdetempfile.h> #include <ksimpleconfig.h> #include <tdeaboutapplication.h> |