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/arts | |
| parent | 9286b9ebcc5c6b73a1061763cf5e3d9dd8eea3c0 (diff) | |
| download | tdebase-77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8.tar.gz tdebase-77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'kcontrol/arts')
| -rw-r--r-- | kcontrol/arts/arts.cpp | 2 | ||||
| -rw-r--r-- | kcontrol/arts/krichtextlabel.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/kcontrol/arts/arts.cpp b/kcontrol/arts/arts.cpp index 1332f60c0..d2428783b 100644 --- a/kcontrol/arts/arts.cpp +++ b/kcontrol/arts/arts.cpp @@ -42,7 +42,7 @@ #include <kdebug.h> #include <kdialog.h> #include <klineedit.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kprocess.h> #include <krichtextlabel.h> #include <ksimpleconfig.h> diff --git a/kcontrol/arts/krichtextlabel.cpp b/kcontrol/arts/krichtextlabel.cpp index 6543b3690..c2fb6e916 100644 --- a/kcontrol/arts/krichtextlabel.cpp +++ b/kcontrol/arts/krichtextlabel.cpp @@ -22,7 +22,7 @@ #include <tqstylesheet.h> #include <tqsimplerichtext.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> static TQString qrichtextify( const TQString& text ) { |