diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:57:54 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:57:54 -0600 |
| commit | ed99a30644c19b0a3cf0d2147243532df4daa16b (patch) | |
| tree | 7f3f2850e59824fdf100a642367a82b1e7f0204f /kate/plugins | |
| parent | e5f2d46e9caf6942f365f1b454087dda71a340f7 (diff) | |
| download | tdelibs-ed99a30644c19b0a3cf0d2147243532df4daa16b.tar.gz tdelibs-ed99a30644c19b0a3cf0d2147243532df4daa16b.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'kate/plugins')
| -rw-r--r-- | kate/plugins/autobookmarker/autobookmarker.cpp | 2 | ||||
| -rw-r--r-- | kate/plugins/insertfile/insertfileplugin.cpp | 6 | ||||
| -rw-r--r-- | kate/plugins/isearch/ISearchPlugin.cpp | 2 | ||||
| -rw-r--r-- | kate/plugins/kdatatool/kate_kdatatool.cpp | 2 | ||||
| -rw-r--r-- | kate/plugins/wordcompletion/docwordcompletion.cpp | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/kate/plugins/autobookmarker/autobookmarker.cpp b/kate/plugins/autobookmarker/autobookmarker.cpp index 495233d40..3f87f1580 100644 --- a/kate/plugins/autobookmarker/autobookmarker.cpp +++ b/kate/plugins/autobookmarker/autobookmarker.cpp @@ -34,7 +34,7 @@ #include <kgenericfactory.h> #include <kiconloader.h> #include <tdelistview.h> -#include <klocale.h> +#include <tdelocale.h> #include <kmimetype.h> #include <kmimetypechooser.h> #include <kprocess.h> diff --git a/kate/plugins/insertfile/insertfileplugin.cpp b/kate/plugins/insertfile/insertfileplugin.cpp index 567262a64..e2e3d354a 100644 --- a/kate/plugins/insertfile/insertfileplugin.cpp +++ b/kate/plugins/insertfile/insertfileplugin.cpp @@ -28,10 +28,10 @@ #include <tdeaction.h> #include <tdefiledialog.h> #include <kgenericfactory.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kpushbutton.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <kurl.h> #include <tqfile.h> diff --git a/kate/plugins/isearch/ISearchPlugin.cpp b/kate/plugins/isearch/ISearchPlugin.cpp index a36c9dc60..7cb01ccc9 100644 --- a/kate/plugins/isearch/ISearchPlugin.cpp +++ b/kate/plugins/isearch/ISearchPlugin.cpp @@ -21,7 +21,7 @@ #include <tqstyle.h> #include <tqpopupmenu.h> #include <kgenericfactory.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeaction.h> #include <kcombobox.h> #include <tdeconfig.h> diff --git a/kate/plugins/kdatatool/kate_kdatatool.cpp b/kate/plugins/kdatatool/kate_kdatatool.cpp index d3b762b8e..e14cd9249 100644 --- a/kate/plugins/kdatatool/kate_kdatatool.cpp +++ b/kate/plugins/kdatatool/kate_kdatatool.cpp @@ -29,7 +29,7 @@ #include <tdepopupmenu.h> #include <tdetexteditor/viewcursorinterface.h> #include <tdetexteditor/editinterface.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> //END includes diff --git a/kate/plugins/wordcompletion/docwordcompletion.cpp b/kate/plugins/wordcompletion/docwordcompletion.cpp index 4a3d34207..26dce06d0 100644 --- a/kate/plugins/wordcompletion/docwordcompletion.cpp +++ b/kate/plugins/wordcompletion/docwordcompletion.cpp @@ -37,7 +37,7 @@ #include <tdeconfig.h> #include <kdialog.h> #include <kgenericfactory.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeaction.h> #include <knotifyclient.h> #include <tdeparts/part.h> |