summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--freetype/.cvsignore5
-rw-r--r--freetype/fontfactoryttf_qws.cpp4
-rw-r--r--freetype/fontfactoryttf_qws.h4
-rw-r--r--freetype/freetype.pro25
-rw-r--r--freetype/freetypefactoryimpl.cpp4
-rw-r--r--freetype/freetypefactoryimpl.h6
-rw-r--r--freetype/opie-freetype.control8
-rw-r--r--freetype/qfontdata_p.h6
8 files changed, 29 insertions, 33 deletions
diff --git a/freetype/.cvsignore b/freetype/.cvsignore
new file mode 100644
index 0000000..fccc477
--- a/dev/null
+++ b/freetype/.cvsignore
@@ -0,0 +1,5 @@
1moc_*
2*.moc
3Makefile*
4qimpenprefbase.h
5qimpenprefbase.cpp
diff --git a/freetype/fontfactoryttf_qws.cpp b/freetype/fontfactoryttf_qws.cpp
index 66fd96a..5aa53fb 100644
--- a/freetype/fontfactoryttf_qws.cpp
+++ b/freetype/fontfactoryttf_qws.cpp
@@ -1,28 +1,28 @@
1/********************************************************************** 1/**********************************************************************
2** Copyright (C) 2000 Trolltech AS. All rights reserved. 2** Copyright (C) 2000-2002 Trolltech AS. All rights reserved.
3** 3**
4** This file is part of Qtopia Environment. 4** This file is part of the Qtopia Environment.
5** 5**
6** This file may be distributed and/or modified under the terms of the 6** This file may be distributed and/or modified under the terms of the
7** GNU General Public License version 2 as published by the Free Software 7** GNU General Public License version 2 as published by the Free Software
8** Foundation and appearing in the file LICENSE.GPL included in the 8** Foundation and appearing in the file LICENSE.GPL included in the
9** packaging of this file. 9** packaging of this file.
10** 10**
11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE 11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. 12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
13** 13**
14** See http://www.trolltech.com/gpl/ for GPL licensing information. 14** See http://www.trolltech.com/gpl/ for GPL licensing information.
15** 15**
16** Contact info@trolltech.com if any conditions of this licensing are 16** Contact info@trolltech.com if any conditions of this licensing are
17** not clear to you. 17** not clear to you.
18** 18**
19**********************************************************************/ 19**********************************************************************/
20 20
21 21
22#include "fontfactoryttf_qws.h" 22#include "fontfactoryttf_qws.h"
23 23
24#ifdef QT_NO_FREETYPE 24#ifdef QT_NO_FREETYPE
25 25
26#include "qfontdata_p.h" 26#include "qfontdata_p.h"
27#include <string.h> 27#include <string.h>
28#include <stdio.h> 28#include <stdio.h>
diff --git a/freetype/fontfactoryttf_qws.h b/freetype/fontfactoryttf_qws.h
index 82b7e49..4ba8ce5 100644
--- a/freetype/fontfactoryttf_qws.h
+++ b/freetype/fontfactoryttf_qws.h
@@ -1,28 +1,28 @@
1/********************************************************************** 1/**********************************************************************
2** Copyright (C) 2000 Trolltech AS. All rights reserved. 2** Copyright (C) 2000-2002 Trolltech AS. All rights reserved.
3** 3**
4** This file is part of Qtopia Environment. 4** This file is part of the Qtopia Environment.
5** 5**
6** This file may be distributed and/or modified under the terms of the 6** This file may be distributed and/or modified under the terms of the
7** GNU General Public License version 2 as published by the Free Software 7** GNU General Public License version 2 as published by the Free Software
8** Foundation and appearing in the file LICENSE.GPL included in the 8** Foundation and appearing in the file LICENSE.GPL included in the
9** packaging of this file. 9** packaging of this file.
10** 10**
11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE 11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. 12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
13** 13**
14** See http://www.trolltech.com/gpl/ for GPL licensing information. 14** See http://www.trolltech.com/gpl/ for GPL licensing information.
15** 15**
16** Contact info@trolltech.com if any conditions of this licensing are 16** Contact info@trolltech.com if any conditions of this licensing are
17** not clear to you. 17** not clear to you.
18** 18**
19**********************************************************************/ 19**********************************************************************/
20 20
21 21
22#ifndef FONTFACTORY_FT_H 22#ifndef FONTFACTORY_FT_H
23#define FONTFACTORY_FT_H 23#define FONTFACTORY_FT_H
24 24
25#include <qfontmanager_qws.h> 25#include <qfontmanager_qws.h>
26#if QT_VERSION >= 300 26#if QT_VERSION >= 300
27# include <private/qfontdata_p.h> 27# include <private/qfontdata_p.h>
28#else 28#else
diff --git a/freetype/freetype.pro b/freetype/freetype.pro
index 1196db9..5800b48 100644
--- a/freetype/freetype.pro
+++ b/freetype/freetype.pro
@@ -1,28 +1,11 @@
1 TEMPLATE= lib 1 TEMPLATE= lib
2 CONFIG += qt warn_on release 2 CONFIG += qt warn_on release
3 HEADERS =fontfactoryttf_qws.h freetypefactoryimpl.h 3 HEADERS = fontfactoryttf_qws.h freetypefactoryimpl.h
4 SOURCES =fontfactoryttf_qws.cpp freetypefactoryimpl.cpp 4 SOURCES = fontfactoryttf_qws.cpp freetypefactoryimpl.cpp
5 qt2:HEADERS+= qfontdata_p.h 5 qt2:HEADERS+= qfontdata_p.h
6 TARGET = freetypefactory 6 TARGET = freetypefactory
7 DESTDIR = ../plugins/fontfactories 7 DESTDIR = $(OPIEDIR)/plugins/fontfactories
8INCLUDEPATH += $(OPIEDIR)/include 8 INCLUDEPATH+= $(OPIEDIR)/include
9DEPENDPATH += $(OPIEDIR)/include 9DEPENDPATH += $(OPIEDIR)/include
10#INCLUDEPATH += $(OPIEDIR)/include
11 #DEPENDPATH+= /usr/local/include/freetype2
12LIBS += -lqpe -lfreetype 10LIBS += -lqpe -lfreetype
13 VERSION = 1.0.0 11 VERSION = 1.0.0
14
15TRANSLATIONS = ../i18n/de/libfreetypefactory.ts \
16 ../i18n/en/libfreetypefactory.ts \
17 ../i18n/es/libfreetypefactory.ts \
18 ../i18n/fr/libfreetypefactory.ts \
19 ../i18n/hu/libfreetypefactory.ts \
20 ../i18n/ja/libfreetypefactory.ts \
21 ../i18n/ko/libfreetypefactory.ts \
22 ../i18n/no/libfreetypefactory.ts \
23 ../i18n/pl/libfreetypefactory.ts \
24 ../i18n/pt/libfreetypefactory.ts \
25 ../i18n/pt_BR/libfreetypefactory.ts \
26 ../i18n/sl/libfreetypefactory.ts \
27 ../i18n/zh_CN/libfreetypefactory.ts \
28 ../i18n/zh_TW/libfreetypefactory.ts
diff --git a/freetype/freetypefactoryimpl.cpp b/freetype/freetypefactoryimpl.cpp
index 8c1afab..71460b2 100644
--- a/freetype/freetypefactoryimpl.cpp
+++ b/freetype/freetypefactoryimpl.cpp
@@ -1,28 +1,28 @@
1/********************************************************************** 1/**********************************************************************
2** Copyright (C) 2000 Trolltech AS. All rights reserved. 2** Copyright (C) 2000-2002 Trolltech AS. All rights reserved.
3** 3**
4** This file is part of Qtopia Environment. 4** This file is part of the Qtopia Environment.
5** 5**
6** This file may be distributed and/or modified under the terms of the 6** This file may be distributed and/or modified under the terms of the
7** GNU General Public License version 2 as published by the Free Software 7** GNU General Public License version 2 as published by the Free Software
8** Foundation and appearing in the file LICENSE.GPL included in the 8** Foundation and appearing in the file LICENSE.GPL included in the
9** packaging of this file. 9** packaging of this file.
10** 10**
11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE 11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. 12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
13** 13**
14** See http://www.trolltech.com/gpl/ for GPL licensing information. 14** See http://www.trolltech.com/gpl/ for GPL licensing information.
15** 15**
16** Contact info@trolltech.com if any conditions of this licensing are 16** Contact info@trolltech.com if any conditions of this licensing are
17** not clear to you. 17** not clear to you.
18** 18**
19**********************************************************************/ 19**********************************************************************/
20#include "fontfactoryttf_qws.h" 20#include "fontfactoryttf_qws.h"
21#include "freetypefactoryimpl.h" 21#include "freetypefactoryimpl.h"
22 22
23 23
24FreeTypeFactoryImpl::FreeTypeFactoryImpl() 24FreeTypeFactoryImpl::FreeTypeFactoryImpl()
25 : factory(0), ref(0) 25 : factory(0), ref(0)
26{ 26{
27} 27}
28 28
diff --git a/freetype/freetypefactoryimpl.h b/freetype/freetypefactoryimpl.h
index d7c376e..4c0d5f5 100644
--- a/freetype/freetypefactoryimpl.h
+++ b/freetype/freetypefactoryimpl.h
@@ -1,40 +1,40 @@
1/********************************************************************** 1/**********************************************************************
2** Copyright (C) 2000 Trolltech AS. All rights reserved. 2** Copyright (C) 2000-2002 Trolltech AS. All rights reserved.
3** 3**
4** This file is part of Qtopia Environment. 4** This file is part of the Qtopia Environment.
5** 5**
6** This file may be distributed and/or modified under the terms of the 6** This file may be distributed and/or modified under the terms of the
7** GNU General Public License version 2 as published by the Free Software 7** GNU General Public License version 2 as published by the Free Software
8** Foundation and appearing in the file LICENSE.GPL included in the 8** Foundation and appearing in the file LICENSE.GPL included in the
9** packaging of this file. 9** packaging of this file.
10** 10**
11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE 11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. 12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
13** 13**
14** See http://www.trolltech.com/gpl/ for GPL licensing information. 14** See http://www.trolltech.com/gpl/ for GPL licensing information.
15** 15**
16** Contact info@trolltech.com if any conditions of this licensing are 16** Contact info@trolltech.com if any conditions of this licensing are
17** not clear to you. 17** not clear to you.
18** 18**
19**********************************************************************/ 19**********************************************************************/
20 20
21 21
22#include <fontfactoryinterface.h> 22#include <qpe/fontfactoryinterface.h>
23 23
24class QFontFactoryFT; 24class QFontFactoryFT;
25 25
26class FreeTypeFactoryImpl : public FontFactoryInterface 26class FreeTypeFactoryImpl : public FontFactoryInterface
27{ 27{
28public: 28public:
29 FreeTypeFactoryImpl(); 29 FreeTypeFactoryImpl();
30 virtual ~FreeTypeFactoryImpl(); 30 virtual ~FreeTypeFactoryImpl();
31 31
32 QRESULT queryInterface( const QUuid&, QUnknownInterface** ); 32 QRESULT queryInterface( const QUuid&, QUnknownInterface** );
33 Q_REFCOUNT 33 Q_REFCOUNT
34 34
35 virtual QFontFactory *fontFactory(); 35 virtual QFontFactory *fontFactory();
36 36
37private: 37private:
38 QFontFactoryFT *factory; 38 QFontFactoryFT *factory;
39 ulong ref; 39 ulong ref;
40}; 40};
diff --git a/freetype/opie-freetype.control b/freetype/opie-freetype.control
new file mode 100644
index 0000000..f1ce408
--- a/dev/null
+++ b/freetype/opie-freetype.control
@@ -0,0 +1,8 @@
1Files: plugins/fontfactories/libfreetypefactory*
2Priority: optional
3Section: opie/plugins
4Maintainer: Opie <opie@llornkcor.com>
5Architecture: arm
6Version: $QPE_VERSION-$SUB_VERSION
7Depends: opie-base ($QPE_VERSION)
8Description: Freetype fontfactory plugin
diff --git a/freetype/qfontdata_p.h b/freetype/qfontdata_p.h
index fc22c72..9da1d06 100644
--- a/freetype/qfontdata_p.h
+++ b/freetype/qfontdata_p.h
@@ -1,60 +1,60 @@
1/********************************************************************** 1/**********************************************************************
2** Copyright (C) 2000 Trolltech AS. All rights reserved. 2** Copyright (C) 2000-2002 Trolltech AS. All rights reserved.
3** 3**
4** This file is part of Qtopia Environment. 4** This file is part of the Qtopia Environment.
5** 5**
6** This file may be distributed and/or modified under the terms of the 6** This file may be distributed and/or modified under the terms of the
7** GNU General Public License version 2 as published by the Free Software 7** GNU General Public License version 2 as published by the Free Software
8** Foundation and appearing in the file LICENSE.GPL included in the 8** Foundation and appearing in the file LICENSE.GPL included in the
9** packaging of this file. 9** packaging of this file.
10** 10**
11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE 11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. 12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
13** 13**
14** See http://www.trolltech.com/gpl/ for GPL licensing information. 14** See http://www.trolltech.com/gpl/ for GPL licensing information.
15** 15**
16** Contact info@trolltech.com if any conditions of this licensing are 16** Contact info@trolltech.com if any conditions of this licensing are
17** not clear to you. 17** not clear to you.
18** 18**
19**********************************************************************/ 19**********************************************************************/
20 20
21 21
22#ifndef QFONTDATA_P_H 22#ifndef QFONTDATA_P_H
23#define QFONTDATA_P_H 23#define QFONTDATA_P_H
24 24
25 25
26// 26//
27// W A R N I N G 27// W A R N I N G
28// ------------- 28// -------------
29// 29//
30// This file is not part of the Qt API. It exists for the convenience 30// This file is not part of the Qt API. It exists for the convenience
31// of qmenudata.cpp, qmenubar.cpp, qmenubar.cpp, qpopupmenu.cpp, 31// of qmenudata.cpp, qmenubar.cpp, qmenubar.cpp, qpopupmenu.cpp,
32// qmotifstyle.cpp and qwindowssstyle.cpp. This header file may change 32// qmotifstyle.cpp and qwindowssstyle.cpp. This header file may change
33// from version to version without notice, or even be removed. 33// from version to version without notice, or even be removed.
34// 34//
35// We mean it. 35// We mean it.
36// 36// oh, we're really scared.
37// 37//
38 38
39#ifndef QT_H 39#ifndef QT_H
40#endif // QT_H 40#endif // QT_H
41 41
42 struct QFontDef { // font definition 42 struct QFontDef { // font definition
43 QStringfamily; 43 QStringfamily;
44 QStringaddStyle; 44 QStringaddStyle;
45 int pointSize; 45 int pointSize;
46 uint styleHint: 8; 46 uint styleHint: 8;
47 uint styleStrategy: 8; 47 uint styleStrategy: 8;
48 uint charSet : 8; 48 uint charSet : 8;
49 uint weight : 8; 49 uint weight : 8;
50 uint italic : 1; 50 uint italic : 1;
51 uint underline: 1; 51 uint underline: 1;
52 uint strikeOut: 1; 52 uint strikeOut: 1;
53 uint fixedPitch: 1; 53 uint fixedPitch: 1;
54 uint hintSetByUser: 1; 54 uint hintSetByUser: 1;
55 uint rawMode : 1; 55 uint rawMode : 1;
56 uint dirty : 1; 56 uint dirty : 1;
57 shortlbearing; 57 shortlbearing;
58 shortrbearing; 58 shortrbearing;
59}; 59};
60 60