summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-26 13:07:19 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-26 13:07:19 -0600
commitd31a28ff1aa6d56b5e03153649ca8981ee530710 (patch)
tree09b2b983a523e0288f88fbe1f85aa898b61c882c /src
parent3a8431fc92f4824b798e05a67bd73249b6c8d0c8 (diff)
downloadbasket-d31a28ff1aa6d56b5e03153649ca8981ee530710.tar.gz
basket-d31a28ff1aa6d56b5e03153649ca8981ee530710.zip
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.am2
-rw-r--r--src/basket_part.cpp4
-rw-r--r--src/basket_part.h4
-rw-r--r--src/basketstatusbar.cpp2
-rw-r--r--src/kiconcanvas.cpp2
-rw-r--r--src/notecontent.cpp2
-rw-r--r--src/notedrag.h2
7 files changed, 9 insertions, 9 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 3890719..25d2471 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -82,7 +82,7 @@ kde_module_LTLIBRARIES = kcm_basket.la libbasketpart.la
libbasketpart_la_SOURCES = basket_part.cpp
libbasketpart_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version -no-undefined -ltdecore -ltdeui $(LIB_QT) -lDCOP -lkjs -ltdefx -ldl -lartsc -lartskde -lartskde
-libbasketpart_la_LIBADD = libbasketcommon.la -lkparts -ltdeui $(LIB_TDECORE) $(LIB_QT) -lDCOP
+libbasketpart_la_LIBADD = libbasketcommon.la -ltdeparts -ltdeui $(LIB_TDECORE) $(LIB_QT) -lDCOP
kcm_basket_la_SOURCES = kcm_basket.cpp
kcm_basket_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined -ltdecore -ltdeui $(LIB_QT) -lDCOP -lkjs -ltdefx -ldl -lartsc -lartskde
diff --git a/src/basket_part.cpp b/src/basket_part.cpp
index 3ef759f..f467dac 100644
--- a/src/basket_part.cpp
+++ b/src/basket_part.cpp
@@ -28,8 +28,8 @@
#include <klocale.h>
#include <bnpview.h>
#include <aboutdata.h>
-#include <kparts/genericfactory.h>
-#include <kparts/statusbarextension.h>
+#include <tdeparts/genericfactory.h>
+#include <tdeparts/statusbarextension.h>
#include "basketstatusbar.h"
typedef KParts::GenericFactory< BasketPart > BasketFactory;
diff --git a/src/basket_part.h b/src/basket_part.h
index 719c604..5fc094c 100644
--- a/src/basket_part.h
+++ b/src/basket_part.h
@@ -21,8 +21,8 @@
#ifndef _BASKETPART_H_
#define _BASKETPART_H_
-#include <kparts/part.h>
-#include <kparts/factory.h>
+#include <tdeparts/part.h>
+#include <tdeparts/factory.h>
class TQWidget;
class TQPainter;
diff --git a/src/basketstatusbar.cpp b/src/basketstatusbar.cpp
index 14edc82..9554e70 100644
--- a/src/basketstatusbar.cpp
+++ b/src/basketstatusbar.cpp
@@ -18,7 +18,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
-#include <kparts/statusbarextension.h>
+#include <tdeparts/statusbarextension.h>
#include <kstatusbar.h>
#include <klocale.h>
#include <kdebug.h>
diff --git a/src/kiconcanvas.cpp b/src/kiconcanvas.cpp
index b080fe2..f008489 100644
--- a/src/kiconcanvas.cpp
+++ b/src/kiconcanvas.cpp
@@ -28,7 +28,7 @@
#include <kiconloader.h>
#include <kimagefilepreview.h>
#include <kurldrag.h>
-#include <kmultipledrag.h>
+#include <tdemultipledrag.h>
#include <tqsortedlist.h>
#include <tqimage.h>
diff --git a/src/notecontent.cpp b/src/notecontent.cpp
index 785d5b1..a078b2b 100644
--- a/src/notecontent.cpp
+++ b/src/notecontent.cpp
@@ -40,7 +40,7 @@
//#include <kstringhandler.h>
#include <kfilemetainfo.h>
#include <tqdatetime.h>
-#include <kmultipledrag.h>
+#include <tdemultipledrag.h>
#include <tqfileinfo.h>
//#include <kio/kfileitem.h>
diff --git a/src/notedrag.h b/src/notedrag.h
index 86e4947..58cc1d5 100644
--- a/src/notedrag.h
+++ b/src/notedrag.h
@@ -26,7 +26,7 @@
#include <tqdatastream.h>
#include <tqpixmap.h>
#include <tqvaluelist.h>
-#include <kmultipledrag.h>
+#include <tdemultipledrag.h>
class TQDataStream;