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/outputviews | |
parent | ef5399ae5a952065c7a0679d4a875d154c972945 (diff) | |
download | tdevelop-bd3c603465110b74a0ddcee72e6f020a78d44e59.tar.gz tdevelop-bd3c603465110b74a0ddcee72e6f020a78d44e59.zip |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'parts/outputviews')
-rw-r--r-- | parts/outputviews/appoutputviewpart.cpp | 2 | ||||
-rw-r--r-- | parts/outputviews/appoutputwidget.cpp | 2 | ||||
-rw-r--r-- | parts/outputviews/makeactionfilter.cpp | 2 | ||||
-rw-r--r-- | parts/outputviews/makeitem.cpp | 2 | ||||
-rw-r--r-- | parts/outputviews/makeviewpart.cpp | 2 | ||||
-rw-r--r-- | parts/outputviews/makewidget.cpp | 4 |
6 files changed, 7 insertions, 7 deletions
diff --git a/parts/outputviews/appoutputviewpart.cpp b/parts/outputviews/appoutputviewpart.cpp index cabc11f4..9de22794 100644 --- a/parts/outputviews/appoutputviewpart.cpp +++ b/parts/outputviews/appoutputviewpart.cpp @@ -14,7 +14,7 @@ #include <tqwhatsthis.h> #include <tqdir.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeaction.h> #include <kiconloader.h> #include <tdeparts/part.h> diff --git a/parts/outputviews/appoutputwidget.cpp b/parts/outputviews/appoutputwidget.cpp index b2dba9d6..ab51c6a8 100644 --- a/parts/outputviews/appoutputwidget.cpp +++ b/parts/outputviews/appoutputwidget.cpp @@ -22,7 +22,7 @@ #include <tqtextstream.h> #include <tqclipboard.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <kstatusbar.h> #include <tdeapplication.h> diff --git a/parts/outputviews/makeactionfilter.cpp b/parts/outputviews/makeactionfilter.cpp index cfc42904..51eeb8ee 100644 --- a/parts/outputviews/makeactionfilter.cpp +++ b/parts/outputviews/makeactionfilter.cpp @@ -16,7 +16,7 @@ #include "makeactionfilter.moc" #include "makeitem.h" -#include <klocale.h> +#include <tdelocale.h> //#define DEBUG diff --git a/parts/outputviews/makeitem.cpp b/parts/outputviews/makeitem.cpp index e9d53ab1..b6d618c6 100644 --- a/parts/outputviews/makeitem.cpp +++ b/parts/outputviews/makeitem.cpp @@ -14,7 +14,7 @@ #include <tqstylesheet.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include "tdetexteditor/cursorinterface.h" diff --git a/parts/outputviews/makeviewpart.cpp b/parts/outputviews/makeviewpart.cpp index 8937fa5d..c1df6522 100644 --- a/parts/outputviews/makeviewpart.cpp +++ b/parts/outputviews/makeviewpart.cpp @@ -14,7 +14,7 @@ #include <tqwhatsthis.h> #include <tqdir.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeaction.h> #include <kiconloader.h> #include <kdevgenericfactory.h> diff --git a/parts/outputviews/makewidget.cpp b/parts/outputviews/makewidget.cpp index 4b247eed..543f97e1 100644 --- a/parts/outputviews/makewidget.cpp +++ b/parts/outputviews/makewidget.cpp @@ -23,10 +23,10 @@ #include "urlutil.h" #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <knotifyclient.h> #include <kprocess.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kstandarddirs.h> #include <kinstance.h> #include <kstatusbar.h> |