diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:55:37 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:55:37 -0600 |
| commit | 77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8 (patch) | |
| tree | a1cce95474892add7cb970b8e9fbdb16e12bc2d7 /kcontrol/clock | |
| parent | 9286b9ebcc5c6b73a1061763cf5e3d9dd8eea3c0 (diff) | |
| download | tdebase-77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8.tar.gz tdebase-77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'kcontrol/clock')
| -rw-r--r-- | kcontrol/clock/dtime.cpp | 4 | ||||
| -rw-r--r-- | kcontrol/clock/tzone.cpp | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/kcontrol/clock/dtime.cpp b/kcontrol/clock/dtime.cpp index f46031640..d469b1ff9 100644 --- a/kcontrol/clock/dtime.cpp +++ b/kcontrol/clock/dtime.cpp @@ -33,9 +33,9 @@ #include <tqregexp.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kprocess.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kdialog.h> #include <tdeconfig.h> diff --git a/kcontrol/clock/tzone.cpp b/kcontrol/clock/tzone.cpp index 4af720b04..518c6663d 100644 --- a/kcontrol/clock/tzone.cpp +++ b/kcontrol/clock/tzone.cpp @@ -29,8 +29,8 @@ #include <tqfile.h> #include <kdebug.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kdialog.h> #include <tdeio/netaccess.h> @@ -39,7 +39,7 @@ #include "tzone.moc" #if defined(USE_SOLARIS) -#include <ktempfile.h> +#include <tdetempfile.h> #include <kstandarddirs.h> #include <sys/param.h> #include <sys/types.h> |