From 2fb700f92bb787fab0845a63a541cd5640daa449 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sat, 26 Jan 2013 13:18:13 -0600 Subject: Rename a number of libraries and executables to avoid conflicts with KDE4 --- buildtools/ada/adaproject_widget.cpp | 2 +- buildtools/autotools/autoprojectpart.cpp | 2 +- buildtools/autotools/kfilednddetailview.cpp | 2 +- buildtools/autotools/kfiledndiconview.cpp | 2 +- buildtools/autotools/misc.cpp | 2 +- buildtools/custommakefiles/customprojectpart.cpp | 2 +- buildtools/lib/base/Makefile.am | 2 +- buildtools/lib/parsers/autotools/Makefile.am | 2 +- buildtools/lib/parsers/qmake/Makefile.am | 2 +- buildtools/lib/widgets/Makefile.am | 4 ++-- buildtools/pascal/pascalproject_widget.cpp | 2 +- buildtools/qmake/trollprojectpart.cpp | 2 +- buildtools/qmake/trollprojectwidget.cpp | 2 +- 13 files changed, 14 insertions(+), 14 deletions(-) (limited to 'buildtools') diff --git a/buildtools/ada/adaproject_widget.cpp b/buildtools/ada/adaproject_widget.cpp index 2e5d818a..f5016e8c 100644 --- a/buildtools/ada/adaproject_widget.cpp +++ b/buildtools/ada/adaproject_widget.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include #include diff --git a/buildtools/autotools/autoprojectpart.cpp b/buildtools/autotools/autoprojectpart.cpp index 0375c6f2..0e665eb7 100644 --- a/buildtools/autotools/autoprojectpart.cpp +++ b/buildtools/autotools/autoprojectpart.cpp @@ -40,7 +40,7 @@ #include #include #include -#include +#include #include #include diff --git a/buildtools/autotools/kfilednddetailview.cpp b/buildtools/autotools/kfilednddetailview.cpp index 915891dc..405ff249 100644 --- a/buildtools/autotools/kfilednddetailview.cpp +++ b/buildtools/autotools/kfilednddetailview.cpp @@ -160,7 +160,7 @@ void KFileDnDDetailView::startDrag(){ } TQPixmap pixmap; if( urls.count() > 1 ){ - pixmap = DesktopIcon( "kmultiple", 16 ); + pixmap = DesktopIcon( "tdemultiple", 16 ); } if( pixmap.isNull() ) pixmap = currentFileItem()->pixmap( 16 ); diff --git a/buildtools/autotools/kfiledndiconview.cpp b/buildtools/autotools/kfiledndiconview.cpp index c68a1f58..e7b727e5 100644 --- a/buildtools/autotools/kfiledndiconview.cpp +++ b/buildtools/autotools/kfiledndiconview.cpp @@ -149,7 +149,7 @@ TQDragObject* KFileDnDIconView::dragObject() { } TQPixmap pixmap; if( urls.count() > 1 ) - pixmap = DesktopIcon( "kmultiple", iconSize() ); + pixmap = DesktopIcon( "tdemultiple", iconSize() ); if( pixmap.isNull() ) pixmap = currentFileItem()->pixmap( iconSize() ); TQPoint hotspot; diff --git a/buildtools/autotools/misc.cpp b/buildtools/autotools/misc.cpp index 9f6e1cb5..71d6cf09 100644 --- a/buildtools/autotools/misc.cpp +++ b/buildtools/autotools/misc.cpp @@ -16,7 +16,7 @@ #include #include -#include +#include #include #include "misc.h" diff --git a/buildtools/custommakefiles/customprojectpart.cpp b/buildtools/custommakefiles/customprojectpart.cpp index e7883961..b39dc00f 100644 --- a/buildtools/custommakefiles/customprojectpart.cpp +++ b/buildtools/custommakefiles/customprojectpart.cpp @@ -36,7 +36,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/buildtools/lib/base/Makefile.am b/buildtools/lib/base/Makefile.am index be6b9576..dbb9850b 100644 --- a/buildtools/lib/base/Makefile.am +++ b/buildtools/lib/base/Makefile.am @@ -9,7 +9,7 @@ libkdevbuildbase_la_SOURCES = kdevbuildtool.cpp tdevelopbuildtoolsincludedir = $(includedir)/tdevelop/buildtools/base tdevelopbuildtoolsinclude_HEADERS = kdevbuildtool.h -DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui khtml kmdi kio kjs kparts kutils kdevutil kdevinterfaces kdevextensions +DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi kio kjs tdeparts tdeutils kdevutil kdevinterfaces kdevextensions DOXYGEN_PROJECTNAME = KDevelop Buildtool Base Library DOXYGEN_DOCDIRPREFIX = kdevbt include ../../../Doxyfile.am diff --git a/buildtools/lib/parsers/autotools/Makefile.am b/buildtools/lib/parsers/autotools/Makefile.am index 929f089a..fc8cdc9a 100644 --- a/buildtools/lib/parsers/autotools/Makefile.am +++ b/buildtools/lib/parsers/autotools/Makefile.am @@ -18,7 +18,7 @@ parser: EXTRA_DIST = autotools.yy autotools.ll -DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui khtml kmdi kio kjs kparts kutils +DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi kio kjs tdeparts tdeutils DOXYGEN_PROJECTNAME = KDevelop AutoTools Parser DOXYGEN_DOCDIRPREFIX = kdevparser include ../../../../Doxyfile.am diff --git a/buildtools/lib/parsers/qmake/Makefile.am b/buildtools/lib/parsers/qmake/Makefile.am index 8dde1ed2..5f7ec787 100644 --- a/buildtools/lib/parsers/qmake/Makefile.am +++ b/buildtools/lib/parsers/qmake/Makefile.am @@ -23,7 +23,7 @@ parser: EXTRA_DIST = qmake.yy qmake.ll -DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui khtml kmdi kio kjs kparts kutils +DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi kio kjs tdeparts tdeutils DOXYGEN_PROJECTNAME = KDevelop QMake parser DOXYGEN_DOCDIRPREFIX = kdevparser include ../../../../Doxyfile.am diff --git a/buildtools/lib/widgets/Makefile.am b/buildtools/lib/widgets/Makefile.am index d640a831..5528ab85 100644 --- a/buildtools/lib/widgets/Makefile.am +++ b/buildtools/lib/widgets/Makefile.am @@ -8,7 +8,7 @@ INCLUDES = -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/util \ lib_LTLIBRARIES = libkdevbuildtoolswidgets.la libkdevbuildtoolswidgets_la_LDFLAGS = $(all_libraries) libkdevbuildtoolswidgets_la_LIBADD = $(top_builddir)/lib/interfaces/libkdevinterfaces.la \ - $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KIO) -lktexteditor + $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KIO) -ltdetexteditor libkdevbuildtoolswidgets_la_SOURCES = addenvvardlg.cpp addfilesdialog.cpp \ environmentdisplaydialog.cpp environmentdisplaydialogbase.ui environmentvariableswidget.cpp \ environmentvariableswidgetbase.ui envvartools.cpp makeoptionswidget.cpp makeoptionswidgetbase.ui \ @@ -23,7 +23,7 @@ tdevelopbuildtoolsinclude_HEADERS = addenvvardlg.h addfilesdialog.h \ makeoptionswidgetbase.h removesubprojectdialog.h removesubprojectdlgbase.h runoptionswidget.h \ runoptionswidgetbase.h subclassesdlg.h subclassesdlgbase.h -DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui khtml kmdi kio kjs kparts kutils kdevutil kdevinterfaces kdevutil +DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi kio kjs tdeparts tdeutils kdevutil kdevinterfaces kdevutil DOXYGEN_PROJECTNAME = KDevelop Buildtool Widgets Library DOXYGEN_DOCDIRPREFIX = kdevbt include ../../../Doxyfile.am diff --git a/buildtools/pascal/pascalproject_widget.cpp b/buildtools/pascal/pascalproject_widget.cpp index 9e0c533c..a8671023 100644 --- a/buildtools/pascal/pascalproject_widget.cpp +++ b/buildtools/pascal/pascalproject_widget.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include #include diff --git a/buildtools/qmake/trollprojectpart.cpp b/buildtools/qmake/trollprojectpart.cpp index 7086ae1e..58c4ba22 100644 --- a/buildtools/qmake/trollprojectpart.cpp +++ b/buildtools/qmake/trollprojectpart.cpp @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/buildtools/qmake/trollprojectwidget.cpp b/buildtools/qmake/trollprojectwidget.cpp index 86a485f6..5b1f528b 100644 --- a/buildtools/qmake/trollprojectwidget.cpp +++ b/buildtools/qmake/trollprojectwidget.cpp @@ -49,7 +49,7 @@ #include #include #include -#include +#include #include #include #include -- cgit v1.2.1