diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:45:31 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:45:31 -0600 |
| commit | 39de4d2189f86e632184f4390fef1d8b6dd88027 (patch) | |
| tree | 23abf05dc5cde86eb7547ff20c99e09226a58cae /kbfxlib | |
| parent | 607de125e34173ea3f6bca9dd60b4c9640a738ed (diff) | |
| download | kbfx-39de4d2189f86e632184f4390fef1d8b6dd88027.tar.gz kbfx-39de4d2189f86e632184f4390fef1d8b6dd88027.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'kbfxlib')
| -rw-r--r-- | kbfxlib/common/kbfxconfig.h | 4 | ||||
| -rw-r--r-- | kbfxlib/common/kbfxfontchooser.h | 2 | ||||
| -rw-r--r-- | kbfxlib/common/kbfxkiodownload.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/kbfxlib/common/kbfxconfig.h b/kbfxlib/common/kbfxconfig.h index 3214b1e..dd60620 100644 --- a/kbfxlib/common/kbfxconfig.h +++ b/kbfxlib/common/kbfxconfig.h @@ -35,9 +35,9 @@ #include <tdeconfig.h> #include <tdeconfigskeleton.h> #include <kdebug.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstandarddirs.h> #include <kuser.h> diff --git a/kbfxlib/common/kbfxfontchooser.h b/kbfxlib/common/kbfxfontchooser.h index 9ad1e80..790d801 100644 --- a/kbfxlib/common/kbfxfontchooser.h +++ b/kbfxlib/common/kbfxfontchooser.h @@ -22,7 +22,7 @@ #include <kdialog.h> #include <tdefontdialog.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <tqwidget.h> #include <tqlabel.h> diff --git a/kbfxlib/common/kbfxkiodownload.h b/kbfxlib/common/kbfxkiodownload.h index 3e9df44..2878678 100644 --- a/kbfxlib/common/kbfxkiodownload.h +++ b/kbfxlib/common/kbfxkiodownload.h @@ -23,7 +23,7 @@ #define KBFX_KIO_DOWNLOAD_H #include <tdeio/job.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <kdebug.h> /** |