Clean up SkTypes.h.

samplecode/SampleEmptyPath.cpp

 
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #include "SampleCode.h"
 #include "SkView.h"
 #include "SkCanvas.h"
 #include "SkPaint.h"
 #include "SkRandom.h"
+#include "SkString.h"
 
 class EmptyPathView : public SampleView {
 public:
     EmptyPathView() {}
 
 protected:
     // overrides from SkEventSink
     virtual bool onQuery(SkEvent* evt) {
         if (SampleCode::TitleQ(*evt)) {
             SampleCode::TitleR(evt, "EmptyPath");
@@ skipping 73 matching lines @@
                 this->drawEmpty(canvas, color, rect,
                                 gStyles[style].fStyle, gFills[fill].fFill);
 
                 SkPaint rectPaint;
                 rectPaint.setColor(SK_ColorBLACK);
                 rectPaint.setStyle(SkPaint::kStroke_Style);
                 rectPaint.setStrokeWidth(-1);
                 rectPaint.setAntiAlias(true);
                 canvas->drawRect(rect, rectPaint);
 
-                char label[1024];
-                sprintf(label, "%s, %s", gStyles[style].fName,
-                                         gFills[fill].fName);
+                SkString label;
+                label.appendf("%s, %s", gStyles[style].fName, gFills[fill].fName);
+
                 SkPaint labelPaint;
                 labelPaint.setColor(color);
                 labelPaint.setAntiAlias(true);
                 labelPaint.setLCDRenderText(true);
-                canvas->drawText(label, strlen(label),
+                canvas->drawText(label.c_str(), label.size(),
                                  0, rect.height() + 15 * SK_Scalar1,
                                  labelPaint);
             }
         }
         canvas->restore();
         canvas->restore();
     }
 
 private:
     typedef SampleView INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 static SkView* MyFactory() { return new EmptyPathView; }
 static SkViewRegister reg(MyFactory);