--- a/graphicsdeviceinterface/gdi/tgdi/TTYPES.H	Thu Sep 02 21:50:40 2010 +0300
+++ b/graphicsdeviceinterface/gdi/tgdi/TTYPES.H	Fri Sep 17 08:36:49 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 1998-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 1998-2010 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -103,56 +103,6 @@
 	CTestPalette* iPalette2;
 	CTTypes* iTest;
 	};
-
-class TTestFontAccess
-	{
-public:
-	CFont* iFont;
-	TInt iAccessCount;
-	};
-
-class CTestTypefaceStore : public CTypefaceStore
-	{
-public:
-	CTestTypefaceStore(CTTypes* aTest);
-	void ConstructTestL();
-	TInt Count();
-	TInt AccessCount(TInt aIndex);
-	void AddFont(CFont*);
-	void OpenFont(CFont*);
-	// CTypefaceStore implementation
-	TInt GetNearestFontInTwips(CFont*&, const TFontSpec&) { return KErrNone; }
-	TInt GetNearestFontToDesignHeightInTwips(CFont*&, const TFontSpec&) { return KErrNone; }
-	TInt GetNearestFontToMaxHeightInTwips(CFont*&, const TFontSpec&, TInt) { return KErrNone; }
-	virtual TInt NumTypefaces() const {return(0);}
-	virtual void TypefaceSupport(TTypefaceSupport&,TInt) const {}
-	virtual TInt FontHeightInTwips(TInt,TInt) const {return(0);}
-	virtual TBool IsSameFont(CFont* aFirstFont,CFont* aSecondFont) {return(aFirstFont==aSecondFont);}
-private:
-	CTTypes* iTest;	
-	};
-
-class TestTFStore
-	{
-public:
-	TestTFStore(CTTypes* aTest);
-	void Test();
-private:
-	CTestTypefaceStore iTTFStore;
-	CTTypes* iTest;
-	};
-
-class TestFontCache
-	{
-public:
-	TestFontCache(CTTypes* aTest);
-	void Test();
-	void TestL();
-public:
-	CFontCache* iCache;
-	CTTypes* iTest;
-	};
-
 class TestLine
 	{
 public:
@@ -170,33 +120,6 @@
 	TPoint iFinish;
 	CTTypes* iTest;
 	};
-
-class TestTypeface
-	{
-public:
-	TestTypeface(const TBuf<KMaxTypefaceNameLength>& aName,TUint32 aFlags, CTTypes* aTest);
-	void Test();
-	void TestStream();
-private:
-    TBuf<KMaxTypefaceNameLength> iName;
-	TUint32 iFlags;
-	CTTypes* iTest;
-	};
-
-class TestMargins
-	{
-public:
-	TestMargins(TInt aLeft,TInt aRight,TInt aTop,TInt aBottom, CTTypes* aTest);
-	void Test();
-	void TestStream();
-private:
-	TInt iLeft;
-	TInt iRight;
-	TInt iTop;
-	TInt iBottom;
-	CTTypes* iTest;
-	};
-
 class TestPageSpec
 	{
 public:
@@ -208,56 +131,6 @@
 	TPageSpec::TPageOrientation iOrientation;
 	CTTypes* iTest;
 	};
-
-class TestFontEffect
-	{
-public:
-	TestFontEffect(CTTypes* aTest) : 
-		iTest(aTest)
-		{
-		
-		}
-	void Test();
-	CTTypes* iTest;
-	};
-
-class TestTFontStyle
-	{
-public:
-	TestTFontStyle(CTTypes* aTest) : 
-		iTest(aTest)
-		{
-		
-		}
-	void Test();
-private:
-	void Test(TFontStyle& aFontStyle);
-	void TestStream(const TFontStyle& aFontStyle);
-	void TestStyle(TFontStyle& aFontStyle);
-	TBool TestPosture(TFontStyle& aFontStyle);
-	TBool TestStrokeWeight(TFontStyle& aFontStyle);
-	TBool TestPrintPosition(TFontStyle& aFontStyle);
-	TBool VerifyStyle(const TFontStyle& aFontStyle, TFontPosture aFontPosture, TFontStrokeWeight aFontStrokeWeight, TFontPrintPosition aFontPrintPosition);
-	void TestBitmapType(TFontStyle& aFontStyle);
-	void TestFontEffect(TFontStyle& aFontStyle);
-	void VerifyFontEffect(TFontStyle& aFontStyle);
-protected:
-	CTTypes* iTest;
-	};
-
-class TestFontSpec
-	{
-public:
-	TestFontSpec(const TTypeface& aTypeface,TInt aHeight,TFontStyle aStyle, CTTypes* aTest);
-	void Test();
-	void TestStream();
-private:
-	TTypeface iTypeface;
-	TInt iHeight;
-	TFontStyle iStyle;
-	CTTypes* iTest;
-	};
-
 class TestRgb
 	{
 public: