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/info | |
| parent | 9286b9ebcc5c6b73a1061763cf5e3d9dd8eea3c0 (diff) | |
| download | tdebase-77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8.tar.gz tdebase-77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'kcontrol/info')
| -rw-r--r-- | kcontrol/info/info.cpp | 2 | ||||
| -rw-r--r-- | kcontrol/info/memory.cpp | 2 | ||||
| -rw-r--r-- | kcontrol/info/opengl.cpp | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/kcontrol/info/info.cpp b/kcontrol/info/info.cpp index 666b914ab..2d79f4f54 100644 --- a/kcontrol/info/info.cpp +++ b/kcontrol/info/info.cpp @@ -31,7 +31,7 @@ #include <tqwhatsthis.h> #include <tqlayout.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <kiconloader.h> #include <kdialog.h> diff --git a/kcontrol/info/memory.cpp b/kcontrol/info/memory.cpp index d6cd750ec..76d68d675 100644 --- a/kcontrol/info/memory.cpp +++ b/kcontrol/info/memory.cpp @@ -29,7 +29,7 @@ #include <tqdrawutil.h> #include <tqtooltip.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kdialog.h> #include <kseparator.h> diff --git a/kcontrol/info/opengl.cpp b/kcontrol/info/opengl.cpp index 061e368e6..a38aee93b 100644 --- a/kcontrol/info/opengl.cpp +++ b/kcontrol/info/opengl.cpp @@ -29,8 +29,8 @@ #include <tqfile.h> #include <tqstring.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kdebug.h> #include <X11/Xlib.h> |