diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-26 13:18:40 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-26 13:18:40 -0600 |
| commit | 82072ef281de2d5948a42fb69ae800d47e0800be (patch) | |
| tree | be82dd63affaf693c5e0857c997fa9589d344cc2 /kimagemapeditor | |
| parent | 93ec82602aa008218cc1ee075ff13d65b3a317ea (diff) | |
| download | tdewebdev-82072ef281de2d5948a42fb69ae800d47e0800be.tar.gz tdewebdev-82072ef281de2d5948a42fb69ae800d47e0800be.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'kimagemapeditor')
| -rw-r--r-- | kimagemapeditor/Makefile.am | 4 | ||||
| -rw-r--r-- | kimagemapeditor/kimagemapeditor.cpp | 2 | ||||
| -rw-r--r-- | kimagemapeditor/kimagemapeditor.h | 6 | ||||
| -rw-r--r-- | kimagemapeditor/kimedialogs.cpp | 4 | ||||
| -rw-r--r-- | kimagemapeditor/kimeshell.h | 2 |
5 files changed, 9 insertions, 9 deletions
diff --git a/kimagemapeditor/Makefile.am b/kimagemapeditor/Makefile.am index 3103375b..11c6e6d2 100644 --- a/kimagemapeditor/Makefile.am +++ b/kimagemapeditor/Makefile.am @@ -38,10 +38,10 @@ noinst_HEADERS = \ kimeshell.h -libkimagemapeditor_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts -lDCOP +libkimagemapeditor_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts -lDCOP libkimagemapeditor_la_LIBADD = libkimagemapeditorcommon.la $(LIB_KFILE) $(LIB_KPARTS) $(LIB_KHTML) -kimagemapeditor_LDFLAGS = $(all_libraries) $(KDE_RPATH) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts -lDCOP +kimagemapeditor_LDFLAGS = $(all_libraries) $(KDE_RPATH) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts -lDCOP kimagemapeditor_LDADD = libkimagemapeditorcommon.la $(LIB_KFILE) $(LIB_KPARTS) $(LIB_KHTML) # set the include path for X, qt and KDE diff --git a/kimagemapeditor/kimagemapeditor.cpp b/kimagemapeditor/kimagemapeditor.cpp index 3093e7a3..c4d698c5 100644 --- a/kimagemapeditor/kimagemapeditor.cpp +++ b/kimagemapeditor/kimagemapeditor.cpp @@ -77,7 +77,7 @@ #include "mapslistview.h" #include "kimecommon.h" -#include <kparts/genericfactory.h> +#include <tdeparts/genericfactory.h> #include <kinstance.h> // Factory code for KDE 3 diff --git a/kimagemapeditor/kimagemapeditor.h b/kimagemapeditor/kimagemapeditor.h index 34c7b0fc..17401b29 100644 --- a/kimagemapeditor/kimagemapeditor.h +++ b/kimagemapeditor/kimagemapeditor.h @@ -23,9 +23,9 @@ #include <tqdict.h> #include <tqimage.h> #include <kurl.h> -#include <kparts/part.h> -#include <kparts/browserextension.h> -#include <kparts/factory.h> +#include <tdeparts/part.h> +#include <tdeparts/browserextension.h> +#include <tdeparts/factory.h> #include <tdeversion.h> diff --git a/kimagemapeditor/kimedialogs.cpp b/kimagemapeditor/kimedialogs.cpp index 02464423..665984ea 100644 --- a/kimagemapeditor/kimedialogs.cpp +++ b/kimagemapeditor/kimedialogs.cpp @@ -38,8 +38,8 @@ #include <klocale.h> #include <kdebug.h> #include <kapplication.h> -#include <khtmlview.h> -#include <khtml_part.h> +#include <tdehtmlview.h> +#include <tdehtml_part.h> #include <ktempfile.h> #include <kpushbutton.h> #include <kstdguiitem.h> diff --git a/kimagemapeditor/kimeshell.h b/kimagemapeditor/kimeshell.h index 8eaf4a3c..154edb59 100644 --- a/kimagemapeditor/kimeshell.h +++ b/kimagemapeditor/kimeshell.h @@ -18,7 +18,7 @@ #ifndef KIMESHELL_H #define KIMESHELL_H -#include <kparts/dockmainwindow.h> +#include <tdeparts/dockmainwindow.h> class KImageMapEditor; |