summaryrefslogtreecommitdiffstats
path: root/kdvi
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-26 13:17:19 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-26 13:17:19 -0600
commit00b4f54142276b0e2272ca56e48558551ab7b2b0 (patch)
tree1d1054b59fc2e76d0c2bae00126bdf65d9318865 /kdvi
parentc7549e238d15850306158ae153fc99126c84ab9d (diff)
downloadtdegraphics-00b4f54142276b0e2272ca56e48558551ab7b2b0.tar.gz
tdegraphics-00b4f54142276b0e2272ca56e48558551ab7b2b0.zip
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'kdvi')
-rw-r--r--kdvi/CMakeLists.txt4
-rw-r--r--kdvi/Makefile.am8
-rw-r--r--kdvi/kdvi_multipage.cpp4
-rw-r--r--kdvi/kdvi_multipage.h2
-rw-r--r--kdvi/main.cpp4
5 files changed, 11 insertions, 11 deletions
diff --git a/kdvi/CMakeLists.txt b/kdvi/CMakeLists.txt
index e726b97f..9c1ef8da 100644
--- a/kdvi/CMakeLists.txt
+++ b/kdvi/CMakeLists.txt
@@ -75,7 +75,7 @@ tde_add_kpart( kdvipart AUTOMOC
TeXFont_PFB.cpp TeXFont_TFM.cpp TeXFontDefinition.cpp
dviWidget.cpp dvisourcesplitter.cpp prefs.kcfgc
LINK
- kmultipage-shared tdeprint-shared kparts-shared ${FREETYPE_LIBRARIES}
+ tdemultipage-shared tdeprint-shared tdeparts-shared ${FREETYPE_LIBRARIES}
DESTINATION ${PLUGIN_INSTALL_DIR}
)
@@ -84,7 +84,7 @@ tde_add_kpart( kdvipart AUTOMOC
tde_add_executable( kdvi AUTOMOC
SOURCES main.cpp
- LINK kviewshell-static kparts-shared
+ LINK kviewshell-static tdeparts-shared
DESTINATION ${BIN_INSTALL_DIR}
)
diff --git a/kdvi/Makefile.am b/kdvi/Makefile.am
index 98f5e94f..ee2c8bc2 100644
--- a/kdvi/Makefile.am
+++ b/kdvi/Makefile.am
@@ -30,8 +30,8 @@ kdvipart_la_SOURCES = renderedDviPagePixmap.cpp dviPageCache.cpp \
kde_kcfg_DATA = kdvi.kcfg
kdvipart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
-kdvipart_la_LIBADD = $(LIBFREETYPE_LIBS) -lkparts \
- $(top_builddir)/kviewshell/libkmultipage.la
+kdvipart_la_LIBADD = $(LIBFREETYPE_LIBS) -ltdeparts \
+ $(top_builddir)/kviewshell/libtdemultipage.la
# Which sources should be compiled for squeeze.
squeeze_SOURCES = squeeze.c
@@ -39,8 +39,8 @@ squeeze_SOURCES = squeeze.c
KDE_OPTIONS = nofinal
kdvi_SOURCES = main.cpp
-kdvi_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
-kdvi_LDADD = ../kviewshell/libifaces.la ../kviewshell/libkviewshell.la -lkparts
+kdvi_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+kdvi_LDADD = ../kviewshell/libifaces.la ../kviewshell/libkviewshell.la -ltdeparts
## this option you can leave out. Just, if you use "make dist", you need it
noinst_HEADERS = dvi.h dviRenderer.h xdvi.h
diff --git a/kdvi/kdvi_multipage.cpp b/kdvi/kdvi_multipage.cpp
index ca370a83..53a5d6df 100644
--- a/kdvi/kdvi_multipage.cpp
+++ b/kdvi/kdvi_multipage.cpp
@@ -15,8 +15,8 @@
#include <ktip.h>
#include <tqtimer.h>
-#include <kparts/part.h>
-#include <kparts/genericfactory.h>
+#include <tdeparts/part.h>
+#include <tdeparts/genericfactory.h>
#include "kdvi_multipage.h"
#include "documentWidget.h"
diff --git a/kdvi/kdvi_multipage.h b/kdvi/kdvi_multipage.h
index dba4b3d2..812d56ce 100644
--- a/kdvi/kdvi_multipage.h
+++ b/kdvi/kdvi_multipage.h
@@ -2,7 +2,7 @@
#ifndef KDVIMULTIPAGE_H
#define KDVIMULTIPAGE_H
-#include "kmultipage.h"
+#include "tdemultipage.h"
#include "dviRenderer.h"
#include <tqstringlist.h>
diff --git a/kdvi/main.cpp b/kdvi/main.cpp
index 6b85af9d..51dc9306 100644
--- a/kdvi/main.cpp
+++ b/kdvi/main.cpp
@@ -105,7 +105,7 @@ int main(int argc, char** argv)
TQDataStream arg(data, IO_WriteOnly);
bool result;
arg << qualPath.stripWhiteSpace();
- if (!app.dcopClient()->call( *it, "kmultipage", "is_file_loaded(TQString)", data, replyType, replyData))
+ if (!app.dcopClient()->call( *it, "tdemultipage", "is_file_loaded(TQString)", data, replyType, replyData))
kdError(4300) << "There was an error using DCOP." << endl;
else
{
@@ -115,7 +115,7 @@ int main(int argc, char** argv)
reply >> result;
if (result == true)
{
- if (app.dcopClient()->send( *it, "kmultipage", "jumpToReference(TQString)", url.ref()) == true)
+ if (app.dcopClient()->send( *it, "tdemultipage", "jumpToReference(TQString)", url.ref()) == true)
{
app.dcopClient()->detach();
return 0;