diff options
| author | Timothy Pearson <[email protected]> | 2013-02-15 21:51:08 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-02-15 21:51:08 -0600 |
| commit | b0699f7c1623811cff1fe3794521546d30e84ee1 (patch) | |
| tree | 9d95a691cc5086f0d348984b1fc86d433cdfad53 /src/common/global | |
| parent | f037da190037979080d407f3c6f0a88026b6bb91 (diff) | |
| download | piklab-b0699f7c1623811cff1fe3794521546d30e84ee1.tar.gz piklab-b0699f7c1623811cff1fe3794521546d30e84ee1.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'src/common/global')
| -rw-r--r-- | src/common/global/global.h | 6 | ||||
| -rw-r--r-- | src/common/global/xml_data_file.cpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/common/global/global.h b/src/common/global/global.h index 8dee015..10dfb0c 100644 --- a/src/common/global/global.h +++ b/src/common/global/global.h @@ -25,16 +25,16 @@ #if defined(NO_KDE) # include "tqt_config.h" # include "common/nokde/nokde_kurl.h" -# include "common/nokde/nokde_klocale.h" +# include "common/nokde/nokde_tdelocale.h" # include "common/nokde/nokde_tdeaboutdata.h" # include "common/nokde/nokde_tdecmdlineargs.h" #else # include "config.h" # include <tdeapplication.h> -# include <klocale.h> +# include <tdelocale.h> # include <tdeaboutdata.h> # include <tdecmdlineargs.h> -# include <ktempfile.h> +# include <tdetempfile.h> # include <tdeconfigbackend.h> #endif diff --git a/src/common/global/xml_data_file.cpp b/src/common/global/xml_data_file.cpp index bae7f17..5fa4bff 100644 --- a/src/common/global/xml_data_file.cpp +++ b/src/common/global/xml_data_file.cpp @@ -11,7 +11,7 @@ #include <tqfile.h> #include <tqstringlist.h> #include <ksimpleconfig.h> -#include <klocale.h> +#include <tdelocale.h> #include "common/global/pfile.h" XmlDataFile::XmlDataFile(const PURL::Url &url, const TQString &name) |