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 /parts/diff | |
| parent | ef5399ae5a952065c7a0679d4a875d154c972945 (diff) | |
| download | tdevelop-bd3c603465110b74a0ddcee72e6f020a78d44e59.tar.gz tdevelop-bd3c603465110b74a0ddcee72e6f020a78d44e59.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'parts/diff')
| -rw-r--r-- | parts/diff/diffdlg.cpp | 2 | ||||
| -rw-r--r-- | parts/diff/diffpart.cpp | 4 | ||||
| -rw-r--r-- | parts/diff/diffwidget.cpp | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/parts/diff/diffdlg.cpp b/parts/diff/diffdlg.cpp index 1974f39e..3fd4b666 100644 --- a/parts/diff/diffdlg.cpp +++ b/parts/diff/diffdlg.cpp @@ -11,7 +11,7 @@ #include <tqlayout.h> -#include <klocale.h> +#include <tdelocale.h> #include "diffdlg.h" #include "diffwidget.h" diff --git a/parts/diff/diffpart.cpp b/parts/diff/diffpart.cpp index 3861f202..70e676c8 100644 --- a/parts/diff/diffpart.cpp +++ b/parts/diff/diffpart.cpp @@ -15,7 +15,7 @@ #include <tqwhatsthis.h> #include <tqpopupmenu.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdevgenericfactory.h> #include <tdeaction.h> #include <tdefiledialog.h> @@ -24,7 +24,7 @@ #include <tdeio/job.h> #include <tdeparts/part.h> #include <tdetexteditor/editinterface.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kdebug.h> #include <kiconloader.h> diff --git a/parts/diff/diffwidget.cpp b/parts/diff/diffwidget.cpp index a7ab3077..b766b064 100644 --- a/parts/diff/diffwidget.cpp +++ b/parts/diff/diffwidget.cpp @@ -17,13 +17,13 @@ #include <tdeconfig.h> #include <tdeapplication.h> -#include <klocale.h> +#include <tdelocale.h> #include <kservice.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <tdepopupmenu.h> #include <kiconloader.h> #include <tdefiledialog.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdeparts/componentfactory.h> #include <tdeparts/part.h> |