[haiku-commits] r33880 - haiku/trunk/src/servers/app
- From: axeld@xxxxxxxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Wed, 4 Nov 2009 16:17:05 +0100 (CET)
Author: axeld
Date: 2009-11-04 16:17:05 +0100 (Wed, 04 Nov 2009)
New Revision: 33880
Changeset: http://dev.haiku-os.org/changeset/33880/haiku
Modified:
haiku/trunk/src/servers/app/FontCacheEntry.cpp
haiku/trunk/src/servers/app/FontCacheEntry.h
haiku/trunk/src/servers/app/ServerBitmap.h
haiku/trunk/src/servers/app/ServerPicture.h
Log:
* Use BReferenceable instead of Referenceable. Didn't notice there was a
BReferenceable in the first place, thanks Ingo!
Modified: haiku/trunk/src/servers/app/FontCacheEntry.cpp
===================================================================
--- haiku/trunk/src/servers/app/FontCacheEntry.cpp 2009-11-04 15:08:53 UTC
(rev 33879)
+++ haiku/trunk/src/servers/app/FontCacheEntry.cpp 2009-11-04 15:17:05 UTC
(rev 33880)
@@ -1,5 +1,5 @@
/*
- * Copyright 2007, Haiku. All rights reserved.
+ * Copyright 2007-2009, Haiku. All rights reserved.
* Distributed under the terms of the MIT License.
*
* Authors:
@@ -30,20 +30,18 @@
#include <new>
-#include <agg_array.h>
+#include <Autolock.h>
+#include <agg_array.h>
+#include <utf8_functions.h>
#include <util/OpenHashTable.h>
-#include <Autolock.h>
-
-#include "utf8_functions.h"
-
#include "GlobalSubpixelSettings.h"
-BLocker
-FontCacheEntry::sUsageUpdateLock("FontCacheEntry usage lock");
+BLocker FontCacheEntry::sUsageUpdateLock("FontCacheEntry usage lock");
+
class FontCacheEntry::GlyphCachePool {
public:
GlyphCachePool()
@@ -131,7 +129,6 @@
FontCacheEntry::FontCacheEntry()
:
MultiLocker("FontCacheEntry lock"),
- Referenceable(),
fGlyphCache(new(std::nothrow) GlyphCachePool()),
fEngine(),
fLastUsedTime(LONGLONG_MIN),
Modified: haiku/trunk/src/servers/app/FontCacheEntry.h
===================================================================
--- haiku/trunk/src/servers/app/FontCacheEntry.h 2009-11-04 15:08:53 UTC
(rev 33879)
+++ haiku/trunk/src/servers/app/FontCacheEntry.h 2009-11-04 15:17:05 UTC
(rev 33880)
@@ -1,5 +1,5 @@
/*
- * Copyright 2007, Haiku. All rights reserved.
+ * Copyright 2007-2009, Haiku. All rights reserved.
* Distributed under the terms of the MIT License.
*
* Authors:
@@ -77,7 +77,7 @@
class FontCache;
-class FontCacheEntry : public MultiLocker, public Referenceable {
+class FontCacheEntry : public MultiLocker, public BReferenceable {
public:
typedef FontEngine::PathAdapter
GlyphPathAdapter;
typedef FontEngine::Gray8Adapter
GlyphGray8Adapter;
Modified: haiku/trunk/src/servers/app/ServerBitmap.h
===================================================================
--- haiku/trunk/src/servers/app/ServerBitmap.h 2009-11-04 15:08:53 UTC (rev
33879)
+++ haiku/trunk/src/servers/app/ServerBitmap.h 2009-11-04 15:17:05 UTC (rev
33880)
@@ -31,7 +31,7 @@
managed by the BitmapManager class. It is also the base class for
all cursors. Every BBitmap has a shadow ServerBitmap object.
*/
-class ServerBitmap : public Referenceable {
+class ServerBitmap : public BReferenceable {
public:
inline bool IsValid() const
{ return
fBuffer != NULL; }
Modified: haiku/trunk/src/servers/app/ServerPicture.h
===================================================================
--- haiku/trunk/src/servers/app/ServerPicture.h 2009-11-04 15:08:53 UTC (rev
33879)
+++ haiku/trunk/src/servers/app/ServerPicture.h 2009-11-04 15:17:05 UTC (rev
33880)
@@ -28,7 +28,7 @@
class BList;
-class ServerPicture : public Referenceable, public PictureDataWriter {
+class ServerPicture : public BReferenceable, public PictureDataWriter {
public:
ServerPicture();
ServerPicture(const ServerPicture& other);
Other related posts:
- » [haiku-commits] r33880 - haiku/trunk/src/servers/app - axeld
