diff options
| author | Timothy Pearson <[email protected]> | 2013-01-26 13:18:40 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-26 13:18:40 -0600 |
| commit | 82072ef281de2d5948a42fb69ae800d47e0800be (patch) | |
| tree | be82dd63affaf693c5e0857c997fa9589d344cc2 /kfilereplace | |
| 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 'kfilereplace')
| -rw-r--r-- | kfilereplace/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | kfilereplace/Makefile.am | 4 | ||||
| -rw-r--r-- | kfilereplace/kfilereplace.h | 2 | ||||
| -rw-r--r-- | kfilereplace/kfilereplacepart.cpp | 2 | ||||
| -rw-r--r-- | kfilereplace/kfilereplacepart.h | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/kfilereplace/CMakeLists.txt b/kfilereplace/CMakeLists.txt index 0748dec8..2ca35794 100644 --- a/kfilereplace/CMakeLists.txt +++ b/kfilereplace/CMakeLists.txt @@ -41,7 +41,7 @@ tde_add_kpart( libkfilereplacepart AUTOMOC kfilereplaceviewwdg.ui kaddstringdlg.cpp kaddstringdlgs.ui knewprojectdlg.cpp knewprojectdlgs.ui koptionsdlg.cpp koptionsdlgs.ui kfilereplacelib.cpp report.cpp - LINK kio-shared kparts-shared + LINK kio-shared tdeparts-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) @@ -51,6 +51,6 @@ tde_add_kpart( libkfilereplacepart AUTOMOC tde_add_executable( kfilereplace AUTOMOC SOURCES kfilereplace.cpp main.cpp - LINK kio-shared kparts-shared + LINK kio-shared tdeparts-shared DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/kfilereplace/Makefile.am b/kfilereplace/Makefile.am index d758e866..4e0d8ed1 100644 --- a/kfilereplace/Makefile.am +++ b/kfilereplace/Makefile.am @@ -21,7 +21,7 @@ libkfilereplacepart_la_SOURCES = kfilereplacepart.cpp kfilereplaceview.cpp \ knewprojectdlgs.ui koptionsdlg.cpp koptionsdlgs.ui kfilereplacelib.cpp report.cpp \ commandengine.cpp configurationclasses.cpp -libkfilereplacepart_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts -lDCOP +libkfilereplacepart_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts -lDCOP libkfilereplacepart_la_LIBADD = $(LIB_KFILE) $(LIB_KPARTS) $(LIB_KHTML) messages: rc.cpp @@ -38,6 +38,6 @@ partrc_DATA = kfilereplacepartui.rc shellrcdir = $(kde_datadir)/kfilereplace shellrc_DATA = kfilereplaceui.rc bin_PROGRAMS = kfilereplace -kfilereplace_LDFLAGS = $(KDE_RPATH) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts -lDCOP +kfilereplace_LDFLAGS = $(KDE_RPATH) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts -lDCOP kfilereplace_LDADD = $(LIB_KPARTS) kfilereplace_SOURCES = kfilereplace.cpp main.cpp diff --git a/kfilereplace/kfilereplace.h b/kfilereplace/kfilereplace.h index 2ba946a1..5623d3bf 100644 --- a/kfilereplace/kfilereplace.h +++ b/kfilereplace/kfilereplace.h @@ -16,7 +16,7 @@ #ifndef KFILEREPLACE_H #define KFILEREPLACE_H -#include <kparts/mainwindow.h> +#include <tdeparts/mainwindow.h> /** Shell application for the KFileReplace part. diff --git a/kfilereplace/kfilereplacepart.cpp b/kfilereplace/kfilereplacepart.cpp index 49730efa..ed01399a 100644 --- a/kfilereplace/kfilereplacepart.cpp +++ b/kfilereplace/kfilereplacepart.cpp @@ -32,7 +32,7 @@ #include <kio/netaccess.h> #include <klocale.h> #include <kmessagebox.h> -#include <kparts/genericfactory.h> +#include <tdeparts/genericfactory.h> #include <kstandarddirs.h> #include <kiconloader.h> #include <kglobal.h> diff --git a/kfilereplace/kfilereplacepart.h b/kfilereplace/kfilereplacepart.h index 57e1706d..cc427153 100644 --- a/kfilereplace/kfilereplacepart.h +++ b/kfilereplace/kfilereplacepart.h @@ -18,7 +18,7 @@ // QT // KDE -#include <kparts/part.h> +#include <tdeparts/part.h> class KAboutApplication; class TDEAboutData; class TDEConfig; |