diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-26 13:18:13 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-26 13:18:13 -0600 |
| commit | 2fb700f92bb787fab0845a63a541cd5640daa449 (patch) | |
| tree | c6f769db55585dd47a9fd415a40ee8b86926f683 /parts/outputviews | |
| parent | fd1d1e1064eb09ddbbd67d3597c39856f5c0bc76 (diff) | |
| download | tdevelop-2fb700f92bb787fab0845a63a541cd5640daa449.tar.gz tdevelop-2fb700f92bb787fab0845a63a541cd5640daa449.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'parts/outputviews')
| -rw-r--r-- | parts/outputviews/appoutputviewpart.cpp | 2 | ||||
| -rw-r--r-- | parts/outputviews/makeactionfilter.cpp | 4 | ||||
| -rw-r--r-- | parts/outputviews/makeitem.cpp | 2 | ||||
| -rw-r--r-- | parts/outputviews/makewidget.cpp | 6 |
4 files changed, 7 insertions, 7 deletions
diff --git a/parts/outputviews/appoutputviewpart.cpp b/parts/outputviews/appoutputviewpart.cpp index 5bdb2cd9..5e1e92bc 100644 --- a/parts/outputviews/appoutputviewpart.cpp +++ b/parts/outputviews/appoutputviewpart.cpp @@ -17,7 +17,7 @@ #include <klocale.h> #include <kaction.h> #include <kiconloader.h> -#include <kparts/part.h> +#include <tdeparts/part.h> #include <kdevgenericfactory.h> #include <kdevplugininfo.h> #include <kapplication.h> diff --git a/parts/outputviews/makeactionfilter.cpp b/parts/outputviews/makeactionfilter.cpp index 5c8e7c6c..a1b1cb70 100644 --- a/parts/outputviews/makeactionfilter.cpp +++ b/parts/outputviews/makeactionfilter.cpp @@ -234,7 +234,7 @@ void MakeActionFilter::test() "-fno-builtin -g3 -fno-exceptions -fno-check-new -fno-common -o libkfilereplacepart.la.closure libkfilereplacepart_la_closure.lo " "-module -no-undefined -L/usr/X11R6/lib -L/usr/lib/qt3/lib -L/opt/trinity/lib -version-info 1:0:0 kfilereplacepart.lo kfilereplacedoc.lo " "kfilereplaceview.lo kaboutkfilereplace.lo kaddstringdlg.lo kconfirmdlg.lo kernel.lo kexpression.lo kfilereplacepref.lo " - "klistviewstring.lo knewprojectdlg.lo koptionsdlg.lo kresultview.lo filelib.lo knewprojectdlgs.lo -lkio -lkparts -lkhtml", + "klistviewstring.lo knewprojectdlg.lo koptionsdlg.lo kresultview.lo filelib.lo knewprojectdlgs.lo -lkio -ltdeparts -ltdehtml", "linking", "libtool", "libkfilereplacepart.la.closure") << TestItem( //libtool, linking 3 "/bin/sh ../libtool --silent --mode=link --tag=CXX g++ -Wnon-virtual-dtor -Wno-long-long -Wundef -Wall -pedantic " @@ -242,7 +242,7 @@ void MakeActionFilter::test() "-fno-builtin -g3 -fno-exceptions -fno-check-new -fno-common -o libkfilereplacepart.la -rpath /opt/trinity/lib/trinity " "-module -no-undefined -L/usr/X11R6/lib -L/usr/lib/qt3/lib -L/opt/trinity/lib -version-info 1:0:0 kfilereplacepart.lo " "kfilereplacedoc.lo kfilereplaceview.lo kaboutkfilereplace.lo kaddstringdlg.lo kconfirmdlg.lo kernel.lo kexpression.lo " - "kfilereplacepref.lo klistviewstring.lo knewprojectdlg.lo koptionsdlg.lo kresultview.lo filelib.lo knewprojectdlgs.lo -lkio -lkparts -lkhtml", + "kfilereplacepref.lo klistviewstring.lo knewprojectdlg.lo koptionsdlg.lo kresultview.lo filelib.lo knewprojectdlgs.lo -lkio -ltdeparts -ltdehtml", "linking", "libtool", "libkfilereplacepart.la") << TestItem( //automake, builddir!=srcdir, libtool=no, compiling " g++ -DHAVE_CONFIG_H -I. -I/home/andris/cvs-developement/head/quanta/quanta/project " diff --git a/parts/outputviews/makeitem.cpp b/parts/outputviews/makeitem.cpp index e6ae4609..e9d53ab1 100644 --- a/parts/outputviews/makeitem.cpp +++ b/parts/outputviews/makeitem.cpp @@ -16,7 +16,7 @@ #include <kdebug.h> #include <klocale.h> -#include "ktexteditor/cursorinterface.h" +#include "tdetexteditor/cursorinterface.h" MakeItem::MakeItem() { diff --git a/parts/outputviews/makewidget.cpp b/parts/outputviews/makewidget.cpp index ad106ef0..07204c8c 100644 --- a/parts/outputviews/makewidget.cpp +++ b/parts/outputviews/makewidget.cpp @@ -17,9 +17,9 @@ #include "processlinemaker.h" #include "makeviewpart.h" #include "makeitem.h" -#include "ktexteditor/document.h" -#include "ktexteditor/cursorinterface.h" -#include "ktexteditor/editinterface.h" +#include "tdetexteditor/document.h" +#include "tdetexteditor/cursorinterface.h" +#include "tdetexteditor/editinterface.h" #include "urlutil.h" #include <kdebug.h> |