diff options
| author | Timothy Pearson <[email protected]> | 2013-01-26 13:17:19 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-26 13:17:19 -0600 |
| commit | 00b4f54142276b0e2272ca56e48558551ab7b2b0 (patch) | |
| tree | 1d1054b59fc2e76d0c2bae00126bdf65d9318865 /kpdf/shell | |
| parent | c7549e238d15850306158ae153fc99126c84ab9d (diff) | |
| download | tdegraphics-00b4f54142276b0e2272ca56e48558551ab7b2b0.tar.gz tdegraphics-00b4f54142276b0e2272ca56e48558551ab7b2b0.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'kpdf/shell')
| -rw-r--r-- | kpdf/shell/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | kpdf/shell/Makefile.am | 2 | ||||
| -rw-r--r-- | kpdf/shell/shell.cpp | 2 | ||||
| -rw-r--r-- | kpdf/shell/shell.h | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/kpdf/shell/CMakeLists.txt b/kpdf/shell/CMakeLists.txt index 59f84caa..74553840 100644 --- a/kpdf/shell/CMakeLists.txt +++ b/kpdf/shell/CMakeLists.txt @@ -31,6 +31,6 @@ install( FILES shell.rc DESTINATION ${DATA_INSTALL_DIR}/kpdf ) tde_add_executable( kpdf AUTOMOC SOURCES main.cpp shell.cpp - LINK kparts-shared + LINK tdeparts-shared DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/kpdf/shell/Makefile.am b/kpdf/shell/Makefile.am index ed901f6e..8ee058b4 100644 --- a/kpdf/shell/Makefile.am +++ b/kpdf/shell/Makefile.am @@ -5,7 +5,7 @@ METASOURCES = AUTO bin_PROGRAMS = kpdf kpdf_SOURCES = main.cpp shell.cpp -kpdf_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kpdf_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor kpdf_LDADD = $(LIB_KPARTS) EXTRA_DIST = kpdf.desktop diff --git a/kpdf/shell/shell.cpp b/kpdf/shell/shell.cpp index ed0fc8fc..5491321e 100644 --- a/kpdf/shell/shell.cpp +++ b/kpdf/shell/shell.cpp @@ -31,7 +31,7 @@ #include <kdebug.h> #include <klocale.h> #include <kmenubar.h> -#include <kparts/componentfactory.h> +#include <tdeparts/componentfactory.h> #include <kio/netaccess.h> #include <kmainwindowiface.h> diff --git a/kpdf/shell/shell.h b/kpdf/shell/shell.h index b6bbf499..6fc2a21e 100644 --- a/kpdf/shell/shell.h +++ b/kpdf/shell/shell.h @@ -20,7 +20,7 @@ #include <config.h> #endif -#include <kparts/mainwindow.h> +#include <tdeparts/mainwindow.h> namespace KPDF { |