summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--freetype/freetypefactoryimpl.cpp2
-rw-r--r--freetype/freetypefactoryimpl.h1
2 files changed, 1 insertions, 2 deletions
diff --git a/freetype/freetypefactoryimpl.cpp b/freetype/freetypefactoryimpl.cpp
index 24fb13a..e779c7b 100644
--- a/freetype/freetypefactoryimpl.cpp
+++ b/freetype/freetypefactoryimpl.cpp
@@ -1,57 +1,57 @@
1/********************************************************************** 1/**********************************************************************
2** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. 2** Copyright (C) 2000-2002 Trolltech AS. All rights reserved.
3** 3**
4** This file is part of the 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)
26{ 26{
27} 27}
28 28
29FreeTypeFactoryImpl::~FreeTypeFactoryImpl() 29FreeTypeFactoryImpl::~FreeTypeFactoryImpl()
30{ 30{
31 delete factory; 31 delete factory;
32} 32}
33 33
34QFontFactory *FreeTypeFactoryImpl::fontFactory() 34QFontFactory *FreeTypeFactoryImpl::fontFactory()
35{ 35{
36 if ( !factory ) 36 if ( !factory )
37 factory = new QFontFactoryFT(); 37 factory = new QFontFactoryFT();
38 return factory; 38 return factory;
39} 39}
40 40
41QRESULT FreeTypeFactoryImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface ) 41QRESULT FreeTypeFactoryImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface )
42{ 42{
43 *iface = 0; 43 *iface = 0;
44 if ( uuid == IID_QUnknown ) 44 if ( uuid == IID_QUnknown )
45 *iface = this; 45 *iface = this;
46 else if ( uuid == IID_FontFactory ) 46 else if ( uuid == IID_FontFactory )
47 *iface = this; 47 *iface = this;
48 48
49 if ( *iface ) 49 if ( *iface )
50 (*iface)->addRef(); 50 (*iface)->addRef();
51 return (*iface) ? QS_OK : QS_FALSE; 51 return (*iface) ? QS_OK : QS_FALSE;
52} 52}
53 53
54Q_EXPORT_INTERFACE() 54Q_EXPORT_INTERFACE()
55{ 55{
56 Q_CREATE_INSTANCE( FreeTypeFactoryImpl ) 56 Q_CREATE_INSTANCE( FreeTypeFactoryImpl )
57} 57}
diff --git a/freetype/freetypefactoryimpl.h b/freetype/freetypefactoryimpl.h
index 4c0d5f5..4d64888 100644
--- a/freetype/freetypefactoryimpl.h
+++ b/freetype/freetypefactoryimpl.h
@@ -1,40 +1,39 @@
1/********************************************************************** 1/**********************************************************************
2** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. 2** Copyright (C) 2000-2002 Trolltech AS. All rights reserved.
3** 3**
4** This file is part of the 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 <qpe/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;
40}; 39};