summaryrefslogtreecommitdiffstats
path: root/konq-plugins/microformat
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-26 13:15:08 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-26 13:15:08 -0600
commit39177c1528006932b00136d34cf022434df73d72 (patch)
treea0791bebede3e7eb454ac2268a14c4e8a157de6d /konq-plugins/microformat
parent2a74bca8c834c4d4f391c70de8fdfa12a7cc972c (diff)
downloadtdeaddons-39177c1528006932b00136d34cf022434df73d72.tar.gz
tdeaddons-39177c1528006932b00136d34cf022434df73d72.zip
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'konq-plugins/microformat')
-rw-r--r--konq-plugins/microformat/Makefile.am2
-rw-r--r--konq-plugins/microformat/konqmficon.cpp2
-rw-r--r--konq-plugins/microformat/konqmficon.h4
3 files changed, 4 insertions, 4 deletions
diff --git a/konq-plugins/microformat/Makefile.am b/konq-plugins/microformat/Makefile.am
index d96b5c5..6e13655 100644
--- a/konq-plugins/microformat/Makefile.am
+++ b/konq-plugins/microformat/Makefile.am
@@ -9,7 +9,7 @@ libmfkonqmficon_la_SOURCES = konqmficon.cpp pluginbase.cpp
libmfkonqmficon_la_LIBADD = -lkonq $(LIB_KHTML)
libmfkonqmficon_la_LDFLAGS = -module $(KDE_PLUGIN) -avoid-version -no-undefined $(all_libraries)
-konqmficondir = $(kde_datadir)/khtml/kpartplugins
+konqmficondir = $(kde_datadir)/tdehtml/kpartplugins
konqmficon_DATA = mf_konqmficon.desktop mf_konqmficon.rc
mficondir = $(kde_datadir)/microformat/pics
diff --git a/konq-plugins/microformat/konqmficon.cpp b/konq-plugins/microformat/konqmficon.cpp
index af2c58b..b6db90c 100644
--- a/konq-plugins/microformat/konqmficon.cpp
+++ b/konq-plugins/microformat/konqmficon.cpp
@@ -27,7 +27,7 @@
#include <kdebug.h>
#include <kgenericfactory.h>
#include <kiconloader.h>
-#include <kparts/statusbarextension.h>
+#include <tdeparts/statusbarextension.h>
#include <kstandarddirs.h>
#include <kstatusbar.h>
#include <kurllabel.h>
diff --git a/konq-plugins/microformat/konqmficon.h b/konq-plugins/microformat/konqmficon.h
index 0992fd7..6d1267c 100644
--- a/konq-plugins/microformat/konqmficon.h
+++ b/konq-plugins/microformat/konqmficon.h
@@ -24,8 +24,8 @@
#ifndef KONTQFEEDICON_H
#define KONTQFEEDICON_H
-#include <khtml_part.h>
-#include <kparts/plugin.h>
+#include <tdehtml_part.h>
+#include <tdeparts/plugin.h>
#include <kpopupmenu.h>
#include "pluginbase.h"