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 /drkonqi | |
parent | 9286b9ebcc5c6b73a1061763cf5e3d9dd8eea3c0 (diff) | |
download | tdebase-77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8.tar.gz tdebase-77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8.zip |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'drkonqi')
-rw-r--r-- | drkonqi/backtrace.cpp | 6 | ||||
-rw-r--r-- | drkonqi/debugger.cpp | 10 | ||||
-rw-r--r-- | drkonqi/drbugreport.cpp | 4 | ||||
-rw-r--r-- | drkonqi/krashconf.cpp | 6 | ||||
-rw-r--r-- | drkonqi/main.cpp | 2 | ||||
-rw-r--r-- | drkonqi/toplevel.cpp | 6 |
6 files changed, 17 insertions, 17 deletions
diff --git a/drkonqi/backtrace.cpp b/drkonqi/backtrace.cpp index b0d3cb4fe..d7a09c54e 100644 --- a/drkonqi/backtrace.cpp +++ b/drkonqi/backtrace.cpp @@ -31,9 +31,9 @@ #include <kprocess.h> #include <kdebug.h> #include <kstandarddirs.h> -#include <kmessagebox.h> -#include <klocale.h> -#include <ktempfile.h> +#include <tdemessagebox.h> +#include <tdelocale.h> +#include <tdetempfile.h> #include "krashconf.h" #include "backtrace.h" diff --git a/drkonqi/debugger.cpp b/drkonqi/debugger.cpp index 71b6f3a4a..aab0e7948 100644 --- a/drkonqi/debugger.cpp +++ b/drkonqi/debugger.cpp @@ -30,15 +30,15 @@ #include <tqlabel.h> #include <kdialog.h> -#include <klocale.h> -#include <kglobal.h> -#include <kglobalsettings.h> +#include <tdelocale.h> +#include <tdeglobal.h> +#include <tdeglobalsettings.h> #include <tdefiledialog.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kpushbutton.h> #include <kstdguiitem.h> #include <ktextbrowser.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include "backtrace.h" #include "krashconf.h" diff --git a/drkonqi/drbugreport.cpp b/drkonqi/drbugreport.cpp index 924f83e28..0d59396d6 100644 --- a/drkonqi/drbugreport.cpp +++ b/drkonqi/drbugreport.cpp @@ -28,8 +28,8 @@ #include <tqmultilineedit.h> -#include <kmessagebox.h> -#include <klocale.h> +#include <tdemessagebox.h> +#include <tdelocale.h> #include "drbugreport.moc" #include "drbugreport.h" diff --git a/drkonqi/krashconf.cpp b/drkonqi/krashconf.cpp index 6fcfbaeea..884d66bc4 100644 --- a/drkonqi/krashconf.cpp +++ b/drkonqi/krashconf.cpp @@ -26,12 +26,12 @@ *****************************************************************/ #include <tdeconfig.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <tdeaboutdata.h> #include <tdecmdlineargs.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> -#include <kstartupinfo.h> +#include <tdestartupinfo.h> #include <dcopclient.h> #include <kmacroexpander.h> diff --git a/drkonqi/main.cpp b/drkonqi/main.cpp index feb6c4ba0..ae53f43f9 100644 --- a/drkonqi/main.cpp +++ b/drkonqi/main.cpp @@ -33,7 +33,7 @@ #include <tdeapplication.h> #include <tdecmdlineargs.h> #include <tdeaboutdata.h> -#include <klocale.h> +#include <tdelocale.h> #include <dcopclient.h> #include "krashconf.h" diff --git a/drkonqi/toplevel.cpp b/drkonqi/toplevel.cpp index 95f291365..3368f6dcf 100644 --- a/drkonqi/toplevel.cpp +++ b/drkonqi/toplevel.cpp @@ -31,11 +31,11 @@ #include "netwm.h" -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include <kstandarddirs.h> #include <kbugreport.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kprocess.h> #include <tdeapplication.h> #include <dcopclient.h> |