diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 22:00:22 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 22:00:22 -0600 |
| commit | bd3c603465110b74a0ddcee72e6f020a78d44e59 (patch) | |
| tree | f556266a927227ba3f30e337c4ccf06facc55ea3 /languages/python | |
| parent | ef5399ae5a952065c7a0679d4a875d154c972945 (diff) | |
| download | tdevelop-bd3c603465110b74a0ddcee72e6f020a78d44e59.tar.gz tdevelop-bd3c603465110b74a0ddcee72e6f020a78d44e59.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'languages/python')
| -rw-r--r-- | languages/python/pydoc.cpp | 4 | ||||
| -rw-r--r-- | languages/python/pythonimplementationwidget.cpp | 4 | ||||
| -rw-r--r-- | languages/python/pythonsupportpart.cpp | 2 | ||||
| -rw-r--r-- | languages/python/qtdesignerpythonintegration.cpp | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/languages/python/pydoc.cpp b/languages/python/pydoc.cpp index c021b368..bcb38b1e 100644 --- a/languages/python/pydoc.cpp +++ b/languages/python/pydoc.cpp @@ -10,8 +10,8 @@ #include <kinstance.h> #include <kprocess.h> #include <tdeversion.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> using namespace TDEIO; diff --git a/languages/python/pythonimplementationwidget.cpp b/languages/python/pythonimplementationwidget.cpp index 94835226..ad8d0157 100644 --- a/languages/python/pythonimplementationwidget.cpp +++ b/languages/python/pythonimplementationwidget.cpp @@ -26,8 +26,8 @@ #include <tqtextstream.h> #include <klineedit.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <filetemplate.h> #include <kdevlanguagesupport.h> diff --git a/languages/python/pythonsupportpart.cpp b/languages/python/pythonsupportpart.cpp index 9cb0257a..4301a3f4 100644 --- a/languages/python/pythonsupportpart.cpp +++ b/languages/python/pythonsupportpart.cpp @@ -32,7 +32,7 @@ #include <kdevgenericfactory.h> #include <kdevplugininfo.h> #include <kinputdialog.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqregexp.h> #include "qtdesignerpythonintegration.h" diff --git a/languages/python/qtdesignerpythonintegration.cpp b/languages/python/qtdesignerpythonintegration.cpp index 4d7b28a5..cb905f29 100644 --- a/languages/python/qtdesignerpythonintegration.cpp +++ b/languages/python/qtdesignerpythonintegration.cpp @@ -22,9 +22,9 @@ #include <tqpair.h> #include <tqregexp.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kurl.h> #include <tdetexteditor/editinterface.h> #include <tdetexteditor/view.h> |