diff options
| author | Timothy Pearson <[email protected]> | 2013-02-15 21:55:37 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-02-15 21:55:37 -0600 |
| commit | 77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8 (patch) | |
| tree | a1cce95474892add7cb970b8e9fbdb16e12bc2d7 /kcontrol/konsole | |
| parent | 9286b9ebcc5c6b73a1061763cf5e3d9dd8eea3c0 (diff) | |
| download | tdebase-77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8.tar.gz tdebase-77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'kcontrol/konsole')
| -rw-r--r-- | kcontrol/konsole/kcmkonsole.cpp | 2 | ||||
| -rw-r--r-- | kcontrol/konsole/schemaeditor.cpp | 4 | ||||
| -rw-r--r-- | kcontrol/konsole/sessioneditor.cpp | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/kcontrol/konsole/kcmkonsole.cpp b/kcontrol/konsole/kcmkonsole.cpp index 97eeb6d42..cdda274ba 100644 --- a/kcontrol/konsole/kcmkonsole.cpp +++ b/kcontrol/konsole/kcmkonsole.cpp @@ -27,7 +27,7 @@ #include <kdebug.h> #include <tdefontdialog.h> #include <kgenericfactory.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include "schemaeditor.h" #include "sessioneditor.h" diff --git a/kcontrol/konsole/schemaeditor.cpp b/kcontrol/konsole/schemaeditor.cpp index 0594e7d9d..66b07e59f 100644 --- a/kcontrol/konsole/schemaeditor.cpp +++ b/kcontrol/konsole/schemaeditor.cpp @@ -34,11 +34,11 @@ //#include <errno.h> #include <tqslider.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdefiledialog.h> #include <kinputdialog.h> #include <tqtoolbutton.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <ksharedpixmap.h> #include <kimageeffect.h> #include <tqimage.h> diff --git a/kcontrol/konsole/sessioneditor.cpp b/kcontrol/konsole/sessioneditor.cpp index d0f4f822a..86c9dd825 100644 --- a/kcontrol/konsole/sessioneditor.cpp +++ b/kcontrol/konsole/sessioneditor.cpp @@ -23,11 +23,11 @@ #include <kdebug.h> #include <kstandarddirs.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdefiledialog.h> #include <kinputdialog.h> #include <kicondialog.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kurlrequester.h> #include <klineedit.h> #include <kiconloader.h> |