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 /twin/popupinfo.cpp | |
| parent | 9286b9ebcc5c6b73a1061763cf5e3d9dd8eea3c0 (diff) | |
| download | tdebase-77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8.tar.gz tdebase-77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'twin/popupinfo.cpp')
| -rw-r--r-- | twin/popupinfo.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/twin/popupinfo.cpp b/twin/popupinfo.cpp index 3f5aa4d90..638bd9354 100644 --- a/twin/popupinfo.cpp +++ b/twin/popupinfo.cpp @@ -18,15 +18,15 @@ License. See the file "COPYING" for the exact licensing terms. #include <tqlabel.h> #include <tqdrawutil.h> #include <tqstyle.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <fixx11h.h> #include <tdeconfig.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqapplication.h> #include <tqdesktopwidget.h> #include <kstringhandler.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> // specify externals before namespace |