revert braindamage

svn path=/trunk/kdegraphics/kpdf/; revision=177674
remotes/origin/kpdf-3.2
Chris Cheney 24 years ago
parent 4907df5c06
commit 2958797bb7
  1. 8
      kpdf/Makefile.am
  2. 2
      kpdf/kpdf_part.cpp
  3. 2
      kpdf/kpdf_part.desktop
  4. 2
      kpdf/kpdf_shell.cpp

@ -40,12 +40,12 @@ shellrc_DATA = kpdf_shell.rc
#########################################################################
# KPART SECTION
#########################################################################
kde_module_LTLIBRARIES = kparts_kpdf.la
kde_module_LTLIBRARIES = libkpdfpart.la
# the Part's source, library search path, and link libraries
kparts_kpdf_la_SOURCES = kpdf_canvas.cpp kpdf_part.cpp kpdf_pagewidget.cc
kparts_kpdf_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
kparts_kpdf_la_LIBADD = ../xpdf/libxpdf.la $(LIB_KPARTS) $(LIB_KFILE) $(LIB_KDEPRINT)
libkpdfpart_la_SOURCES = kpdf_canvas.cpp kpdf_part.cpp kpdf_pagewidget.cc
libkpdfpart_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
libkpdfpart_la_LIBADD = ../xpdf/libxpdf.la $(LIB_KPARTS) $(LIB_KFILE) $(LIB_KDEPRINT)
# this is where the desktop file will go
partdesktopdir = $(kde_servicesdir)

@ -21,7 +21,7 @@
#include "kpdf_pagewidget.h"
typedef KParts::GenericFactory<KPDF::Part> KPDFPartFactory;
K_EXPORT_COMPONENT_FACTORY(kparts_kpdf, KPDFPartFactory);
K_EXPORT_COMPONENT_FACTORY(libkpdfpart, KPDFPartFactory);
using namespace KPDF;

@ -5,5 +5,5 @@ Name[sv]=KPDF-del
MimeType=application/pdf
InitialPreference=4
ServiceTypes=KParts/ReadOnlyPart
X-KDE-Library=kparts_kpdf
X-KDE-Library=libkpdfpart
Type=Service

@ -34,7 +34,7 @@ Shell::Shell()
// this routine will find and load our Part. it finds the Part by
// name which is a bad idea usually.. but it's alright in this
// case since our Part is made for this Shell
KLibFactory *factory = KLibLoader::self()->factory("kparts_kpdf");
KLibFactory *factory = KLibLoader::self()->factory("libkpdfpart");
if (factory)
{
// now that the Part is loaded, we cast it to a Part to get

Loading…
Cancel
Save