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 /tdescreensaver | |
| parent | 9286b9ebcc5c6b73a1061763cf5e3d9dd8eea3c0 (diff) | |
| download | tdebase-77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8.tar.gz tdebase-77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'tdescreensaver')
| -rw-r--r-- | tdescreensaver/blankscrn.cpp | 4 | ||||
| -rw-r--r-- | tdescreensaver/random.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/tdescreensaver/blankscrn.cpp b/tdescreensaver/blankscrn.cpp index fd6860f58..fce4491e7 100644 --- a/tdescreensaver/blankscrn.cpp +++ b/tdescreensaver/blankscrn.cpp @@ -11,12 +11,12 @@ #include <tqlabel.h> #include <tqlayout.h> #include <tdeapplication.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeconfig.h> #include <kcolordialog.h> #include <kbuttonbox.h> #include <kcolorbutton.h> -#include <kglobal.h> +#include <tdeglobal.h> #include "blankscrn.h" #include "blankscrn.moc" diff --git a/tdescreensaver/random.cpp b/tdescreensaver/random.cpp index a624cff0e..ae2bce601 100644 --- a/tdescreensaver/random.cpp +++ b/tdescreensaver/random.cpp @@ -23,8 +23,8 @@ #include <tdeapplication.h> #include <kstandarddirs.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <kdesktopfile.h> #include <krandomsequence.h> #include <kdebug.h> |