From 9c34bd7051ee78430250a5fea4dde1a1c5381b92 Mon Sep 17 00:00:00 2001 From: Christophe Devriese Date: Thu, 15 Jan 2004 05:42:12 +0000 Subject: [PATCH] Licence updates svn path=/trunk/kdegraphics/kpdf/; revision=279822 --- kpdf/QOutputDev.cpp | 36 ++++++++++++++++++++++++------------ kpdf/QOutputDev.h | 26 ++++++++++++++++++-------- kpdf/kpdf_shell.cpp | 23 ++++++++++++++++++----- kpdf/kpdf_shell.h | 18 ++++++++++++++++++ 4 files changed, 78 insertions(+), 25 deletions(-) diff --git a/kpdf/QOutputDev.cpp b/kpdf/QOutputDev.cpp index 6eea5bdaf..b226b6b31 100644 --- a/kpdf/QOutputDev.cpp +++ b/kpdf/QOutputDev.cpp @@ -1,11 +1,22 @@ -///======================================================================== -// -// QOutputDev.cc -// -// Copyright 1996 Derek B. Noonburg -// CopyRight 2002 Robert Griebl -// -//======================================================================== +/* This file is part of the KDE libraries + Copyright (C) 2001, 2003 Christophe Devriese + Copyright 1996 Derek B. Noonburg + CopyRight 2002 Robert Griebl + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License version 2 as published by the Free Software Foundation. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to + the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. +*/ #ifdef __GNUC__ #pragma implementation @@ -146,10 +157,10 @@ QFont QOutputDev::matchFont ( GfxFont *gfxFont, fp_t m11, fp_t m12, fp_t m21, fp else sty = QFont::Helvetica; - f. setStyleHint ( sty, (QFont::StyleStrategy) ( QFont::PreferOutline | QFont::PreferQuality )); - f. setBold ( gfxFont-> isBold ( ) > 0 ); - f. setItalic ( gfxFont-> isItalic ( ) > 0 ); - f. setFixedPitch ( gfxFont-> isFixedWidth ( ) > 0 ); + f.setStyleHint ( sty, (QFont::StyleStrategy) ( QFont::PreferOutline | QFont::PreferQuality )); + f.setBold ( gfxFont-> isBold ( ) > 0 ); + f.setItalic ( gfxFont-> isItalic ( ) > 0 ); + f.setFixedPitch ( gfxFont-> isFixedWidth ( ) > 0 ); // common specifiers in font names if ( fname. contains ( "Oblique" ) || fname. contains ( "Italic" )) @@ -615,6 +626,7 @@ void QOutputDev::drawChar ( GfxState *state, fp_t x, fp_t y, { fp_t x1, y1, dx1, dy1; + if ( uLen > 0 ) m_text-> addChar ( state, x, y, dx, dy, code, u, uLen ); diff --git a/kpdf/QOutputDev.h b/kpdf/QOutputDev.h index c0e99441d..e071993cc 100644 --- a/kpdf/QOutputDev.h +++ b/kpdf/QOutputDev.h @@ -1,11 +1,21 @@ - -//======================================================================== -// -// XOutputDev.h -// -// Copyright 1996 Derek B. Noonburg -// -//======================================================================== +/* This file is part of the KDE libraries + Copyright (C) 2001, 2003 Christophe Devriese + Copyright 1996 Derek B. Noonburg + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License version 2 as published by the Free Software Foundation. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to + the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. +*/ #ifndef QOUTPUTDEV_H #define QOUTPUTDEV_H diff --git a/kpdf/kpdf_shell.cpp b/kpdf/kpdf_shell.cpp index cb8c535df..e67061015 100644 --- a/kpdf/kpdf_shell.cpp +++ b/kpdf/kpdf_shell.cpp @@ -1,8 +1,21 @@ -/* - * kpdf_shell.cpp - * - * Copyright (C) 2001 - */ +/* This file is part of the KDE libraries + Copyright (C) 2001, 2003 Christophe Devriese + Copyright (C) 2001 + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License version 2 as published by the Free Software Foundation. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to + the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. +*/ #include "kpdf_shell.h" #include "kpdf_shell.moc" #include "kpdf_part.h" diff --git a/kpdf/kpdf_shell.h b/kpdf/kpdf_shell.h index 8124bdd1f..5b35fb5ed 100644 --- a/kpdf/kpdf_shell.h +++ b/kpdf/kpdf_shell.h @@ -1,3 +1,21 @@ +/* This file is part of the KDE libraries + Copyright (C) 2001, 2003 Christophe Devriese + Copyright (C) 2001 + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License version 2 as published by the Free Software Foundation. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to + the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. +*/ #ifndef _KPDF_SHELL_H_ #define _KPDF_SHELL_H_