diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 23:22:57 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 23:22:57 -0600 |
| commit | 5be945600e2d7776e74663f56c2a25a8f57d7891 (patch) | |
| tree | 9be5ab8203c0769df4dc0f314c45e52fa5ecfd8c /parts/outputviews | |
| parent | e36b30d13d1f89100fae656adfde2b52234d12b6 (diff) | |
| download | tdevelop-5be945600e2d7776e74663f56c2a25a8f57d7891.tar.gz tdevelop-5be945600e2d7776e74663f56c2a25a8f57d7891.zip | |
Rename many classes and 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 | 4 | ||||
| -rw-r--r-- | parts/outputviews/makeviewpart.cpp | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/parts/outputviews/appoutputviewpart.cpp b/parts/outputviews/appoutputviewpart.cpp index 5e1e92bc..d8fa152a 100644 --- a/parts/outputviews/appoutputviewpart.cpp +++ b/parts/outputviews/appoutputviewpart.cpp @@ -15,7 +15,7 @@ #include <tqdir.h> #include <kdebug.h> #include <klocale.h> -#include <kaction.h> +#include <tdeaction.h> #include <kiconloader.h> #include <tdeparts/part.h> #include <kdevgenericfactory.h> diff --git a/parts/outputviews/appoutputwidget.cpp b/parts/outputviews/appoutputwidget.cpp index d6aa0856..b38586a7 100644 --- a/parts/outputviews/appoutputwidget.cpp +++ b/parts/outputviews/appoutputwidget.cpp @@ -27,7 +27,7 @@ #include <kstatusbar.h> #include <kapplication.h> #include <tdeconfig.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <klineedit.h> #include <tdefiledialog.h> diff --git a/parts/outputviews/makeactionfilter.cpp b/parts/outputviews/makeactionfilter.cpp index e7285c82..cfc42904 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 libtdefilereplacepart.la.closure libtdefilereplacepart_la_closure.lo " "-module -no-undefined -L/usr/X11R6/lib -L/usr/lib/qt3/lib -L/opt/trinity/lib -version-info 1:0:0 tdefilereplacepart.lo tdefilereplacedoc.lo " "tdefilereplaceview.lo kabouttdefilereplace.lo kaddstringdlg.lo tdeconfirmdlg.lo kernel.lo kexpression.lo tdefilereplacepref.lo " - "klistviewstring.lo knewprojectdlg.lo koptionsdlg.lo kresultview.lo filelib.lo knewprojectdlgs.lo -ltdeio -ltdeparts -ltdehtml", + "tdelistviewstring.lo knewprojectdlg.lo koptionsdlg.lo kresultview.lo filelib.lo knewprojectdlgs.lo -ltdeio -ltdeparts -ltdehtml", "linking", "libtool", "libtdefilereplacepart.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 libtdefilereplacepart.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 tdefilereplacepart.lo " "tdefilereplacedoc.lo tdefilereplaceview.lo kabouttdefilereplace.lo kaddstringdlg.lo tdeconfirmdlg.lo kernel.lo kexpression.lo " - "tdefilereplacepref.lo klistviewstring.lo knewprojectdlg.lo koptionsdlg.lo kresultview.lo filelib.lo knewprojectdlgs.lo -ltdeio -ltdeparts -ltdehtml", + "tdefilereplacepref.lo tdelistviewstring.lo knewprojectdlg.lo koptionsdlg.lo kresultview.lo filelib.lo knewprojectdlgs.lo -ltdeio -ltdeparts -ltdehtml", "linking", "libtool", "libtdefilereplacepart.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/makeviewpart.cpp b/parts/outputviews/makeviewpart.cpp index cc8d356c..8937fa5d 100644 --- a/parts/outputviews/makeviewpart.cpp +++ b/parts/outputviews/makeviewpart.cpp @@ -15,7 +15,7 @@ #include <tqdir.h> #include <kdebug.h> #include <klocale.h> -#include <kaction.h> +#include <tdeaction.h> #include <kiconloader.h> #include <kdevgenericfactory.h> #include <kdevplugininfo.h> |