Commit 17c16d69 authored by Dirk Mueller's avatar Dirk Mueller

some more attempts at getting it in compilable state

svn path=/trunk/kdegraphics/kpdf/; revision=253125
parent c9749eea
......@@ -41,7 +41,7 @@ shellrc_DATA = kpdf_shell.rc
kde_module_LTLIBRARIES = libkpdfpart.la
# the Part's source, library search path, and link libraries
libkpdfpart_la_SOURCES = kpdf_canvas.cpp kpdf_part.cpp kpdf_pagewidget.cc QOutputDev.cpp QOutputDevPixmap.cpp part.ui
libkpdfpart_la_SOURCES = QOutputDev.cpp QOutputDevPixmap.cpp kpdf_canvas.cpp kpdf_part.cpp kpdf_pagewidget.cc part.ui
libkpdfpart_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
libkpdfpart_la_LIBADD = ../xpdf/libxpdf.la $(LIB_KPARTS) $(LIB_KFILE) $(LIB_KDEPRINT)
libkpdfpart_la_COMPILE_FIRST = ../aconf.h
......
......@@ -53,10 +53,12 @@
// Constants and macros
//------------------------------------------------------------------------
#ifndef KDE_USE_FINAL
static inline QColor q_col ( const GfxRGB &rgb )
{
return QColor ( lrint ( rgb. r * 255 ), lrint ( rgb. g * 255 ), lrint ( rgb. b * 255 ));
}
#endif
//------------------------------------------------------------------------
// Font substitutions
......@@ -70,7 +72,7 @@ struct QOutFontSubst {
QFont::StyleHint m_hint;
};
static QOutFontSubst qStdFonts [] = {
static QOutFontSubst qPixmapStdFonts [] = {
{ "Helvetica", "Helvetica", false, false, QFont::Helvetica },
{ "Helvetica-Oblique", "Helvetica", false, true, QFont::Helvetica },
{ "Helvetica-Bold", "Helvetica", true, false, QFont::Helvetica },
......@@ -96,7 +98,7 @@ QFont QOutputDevPixmap::matchFont ( GfxFont *gfxFont, fp_t m11, fp_t m12, fp_t m
// build dict for std. fonts on first invocation
if ( stdfonts. isEmpty ( )) {
for ( QOutFontSubst *ptr = qStdFonts; ptr-> m_name; ptr++ ) {
for ( QOutFontSubst *ptr = qPixmapStdFonts; ptr-> m_name; ptr++ ) {
stdfonts. insert ( QString ( ptr-> m_name ), ptr );
}
}
......
......@@ -14,7 +14,6 @@
#include <kstdaction.h>
#include <kconfig.h>
#include <kparts/genericfactory.h>
#include <kdebug.h>
#include <kurldrag.h>
#include <kinputdialog.h>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment