commit 4bdfb8c9d6482a56c7212034a6f73046227ed023
author robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Tue Jun 12 21:23:49 2012 +0000
committer robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Tue Jun 12 21:23:49 2012 +0000
tree 3647172cc2b13df5364997aaa609b2870709551e
parent 51c62a6cfadc302bb65bb5a98e358c93223dc73f

Compiler complaints + some minor cleanup

http://codereview.appspot.com/6295070/



git-svn-id: http://skia.googlecode.com/svn/trunk@4238 2bbb7eff-a529-9590-31e7-b0007b416f81

src/core/SkColorTable.cpp

diff --git a/src/core/SkColorTable.cpp b/src/core/SkColorTable.cpp
index 0aa1370..921d659 100644
--- a/src/core/SkColorTable.cpp
+++ b/src/core/SkColorTable.cpp
@@ -27,7 +27,7 @@
     SkDEBUGCODE(f16BitCacheLockCount = 0;)
 }
 
-SkColorTable::SkColorTable(const SkColorTable& src) : INHERITED() {
+SkColorTable::SkColorTable(const SkColorTable& src) {
     f16BitCache = NULL;
     fFlags = src.fFlags;
     int count = src.count();

src/core/SkOrderedReadBuffer.cpp

diff --git a/src/core/SkOrderedReadBuffer.cpp b/src/core/SkOrderedReadBuffer.cpp
index e3a56db..62404a1 100644
--- a/src/core/SkOrderedReadBuffer.cpp
+++ b/src/core/SkOrderedReadBuffer.cpp
@@ -10,8 +10,7 @@
 #include "SkTypeface.h"
 
 
-SkOrderedReadBuffer::SkOrderedReadBuffer(const void* data, size_t size)
-        : INHERITED() {
+SkOrderedReadBuffer::SkOrderedReadBuffer(const void* data, size_t size) {
     fReader.setMemory(data, size);
 }
 

src/core/SkOrderedWriteBuffer.cpp

diff --git a/src/core/SkOrderedWriteBuffer.cpp b/src/core/SkOrderedWriteBuffer.cpp
index 33ee98a..3fa9706 100644
--- a/src/core/SkOrderedWriteBuffer.cpp
+++ b/src/core/SkOrderedWriteBuffer.cpp
@@ -9,14 +9,14 @@
 #include "SkOrderedWriteBuffer.h"
 #include "SkTypeface.h"
 
-SkOrderedWriteBuffer::SkOrderedWriteBuffer(size_t minSize) :
-    INHERITED(),
-    fWriter(minSize) {
+SkOrderedWriteBuffer::SkOrderedWriteBuffer(size_t minSize) 
+    : fWriter(minSize) {
 }
 
-SkOrderedWriteBuffer::SkOrderedWriteBuffer(size_t minSize, void* storage, size_t storageSize) :
-    INHERITED(),
-    fWriter(minSize, storage, storageSize) {
+SkOrderedWriteBuffer::SkOrderedWriteBuffer(size_t minSize, 
+                                           void* storage, 
+                                           size_t storageSize)
+    : fWriter(minSize, storage, storageSize) {
 }
 
 void SkOrderedWriteBuffer::writeFlattenable(SkFlattenable* flattenable) {

src/utils/SkLayer.cpp

diff --git a/src/utils/SkLayer.cpp b/src/utils/SkLayer.cpp
index aaca786..a311cef 100644
--- a/src/utils/SkLayer.cpp
+++ b/src/utils/SkLayer.cpp
@@ -34,7 +34,7 @@
 #endif
 }
 
-SkLayer::SkLayer(const SkLayer& src) : INHERITED() {
+SkLayer::SkLayer(const SkLayer& src) {
     fParent = NULL;
     m_opacity = src.m_opacity;
     m_size = src.m_size;

src/views/unix/SkOSWindow_Unix.cpp

diff --git a/src/views/unix/SkOSWindow_Unix.cpp b/src/views/unix/SkOSWindow_Unix.cpp
index c8fc2c7..f2e3541 100644
--- a/src/views/unix/SkOSWindow_Unix.cpp
+++ b/src/views/unix/SkOSWindow_Unix.cpp
@@ -33,8 +33,7 @@
         |ExposureMask|PointerMotionMask|KeyPressMask|KeyReleaseMask;
 
 SkOSWindow::SkOSWindow(void* unused)
-    : INHERITED()
-    , fVi(NULL)
+    : fVi(NULL)
     , fMSAASampleCount(0) {
     fUnixWindow.fDisplay = NULL;
     fUnixWindow.fGLContext = NULL;