--- a/fbs/fontandbitmapserver/inc/FBS.H	Tue Aug 31 16:31:06 2010 +0300
+++ b/fbs/fontandbitmapserver/inc/FBS.H	Wed Sep 01 12:39:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 1995-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 1995-2009 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"
@@ -40,15 +40,6 @@
 */
 #define SYMBIAN_FBSERV_V2
 
-/**
-Indicates version of FBS that provides the CFbsFont extension 
-interfaces RFbsGlyphDataIterator for using hardware glyphs, and
-RFbsGlyphMetricsArray.
-@publishedAll
-@prototype
-*/
-//#define SYMBIAN_FBSERV_GLYPHDATA
-
 /** 
 Character width and adjustment information. 
 @publishedAll
@@ -70,8 +61,6 @@
 class CFbsRalCache;
 class CFbsSessionHelper;
 class CFbsRasterizer;
-class TGlyphCacheMetrics;
-class TFbsOogmMessage;
 
 /** 
 A session with the font and bitmap server. 
@@ -112,9 +101,6 @@
 	HBufC8* GetDecompressionBuffer(TInt aSize);
 	HBufC8* GetExtraBuffer(TInt aSize);
     TInt ServerSessionHandle() const;
-    IMPORT_C TInt GetGlyphCacheMetrics(TGlyphCacheMetrics& aGlyphCacheMetrics);
-    IMPORT_C TInt ConveyOogmMessage( TFbsOogmMessage& aOogmMessage );
-
 public:
 	/** WARNING: For internal use ONLY.  Compatibility is not guaranteed in future releases.	 
 	Used for testing server side out of memory failures.	
@@ -143,12 +129,6 @@
 	TUint32* iSpare;
 	};
 
-/** forward declaration of some private classes. */
-class TGetFontTableParam;
-class TReleaseGlyphOutlineParam;
-class TGetGlyphOutlineParam;
-
-
 /** 
 Font managed by the font and bitmap server.
 CFbsFont objects are used for screen and off-screen bitmap fonts. They are 
@@ -163,8 +143,6 @@
 class CFbsFont: public CFont
 	{
 	friend class CFbsTypefaceStore;
-	friend class RFbsGlyphDataIterator;
-	friend class RFbsGlyphMetricsArray;
 
 private:
 	// From CFont
@@ -215,16 +193,12 @@
 	TInt DoFontGetShaping(TFontShapeFunctionParameters* aParam) const;
 	TInt DoFontDeleteShaping(TFontShapeDeleteFunctionParameters* aParam) const;
 	TInt DoTextWidthInPixels(const TDesC& aText,const TMeasureTextInput* aParam) const;
-	TInt DoGetFontTable(TGetFontTableParam * aParam) const;
-	TInt DoGetGlyphOutline(TGetGlyphOutlineParam *aParam) const;
-	TInt DoReleaseGlyphOutline(TReleaseGlyphOutlineParam *aParam) const;
-	TInt DoReleaseFontTable(TUint32 *aParam) const;
 
 protected:
 	RFbsSession* iFbs;
 	CBitmapFont* iAddressPointer;
 	TInt iHandle;
-    TInt iServerHandle;
+	TInt iServerHandle;
 	};
 
 /**
@@ -523,22 +497,4 @@
 	CDitherColor256* iDither;
 	};
 
-
-/**
- A class encapsulating the current state of the glyph cache.
-
- @publishedAll
- @released
-*/
-class TGlyphCacheMetrics
-    {
-public:
-    TInt iMaxCacheSizeInBytes;
-    TInt iMaxCacheSizeHigh;
-    TInt iMaxCacheSizeLow;
-    TInt iCacheSizeInBytes;
-    TBool iGpuCacheSizeLimitIsMax;
-    };
-
-#endif // __FBS_H__
-
+#endif