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/autotools/autoprojectpart.cpp | 2 +- buildtools/autotools/kfilednddetailview.cpp | 2 +- buildtools/autotools/kfiledndiconview.cpp | 2 +- buildtools/autotools/misc.cpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'buildtools/autotools') 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" -- cgit v1.2.3