Change the name of SkFlags to SkCommandLineFlags.

tools/flags/SkCommandLineFlags.cpp

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
-#include "SkFlags.h"
+#include "SkCommandLineFlags.h"
 
 static bool string_is_in(const char* target, const char* set[], size_t len) {
     for (size_t i = 0; i < len; i++) {
         if (0 == strcmp(target, set[i])) {
             return true;
         }
     }
     return false;
 }
 
@@ skipping 53 matching lines @@
             }
         }
         return fName.equals(string) || fShortName.equals(string);
     } else {
         // Has no dash
         return false;
     }
     return false;
 }
 
-SkFlagInfo* SkFlags::gHead;
-SkString SkFlags::gUsage;
+SkFlagInfo* SkCommandLineFlags::gHead;
+SkString SkCommandLineFlags::gUsage;
 
-void SkFlags::SetUsage(const char* usage) {
+void SkCommandLineFlags::SetUsage(const char* usage) {
     gUsage.set(usage);
 }
 
 // Maximum line length for the help message.
 #define LINE_LENGTH 80
 
 static void print_help_for_flag(const SkFlagInfo* flag) {
     SkDebugf("\t--%s", flag->name().c_str());
     const SkString& shortName = flag->shortName();
     if (shortName.size() > 0) {
@@ skipping 36 matching lines @@
         } else {
             // the line break is within the limit. Break there.
             lineBreak++;
             SkDebugf("\t\t%.*s", lineBreak, currLine);
             currLine += lineBreak;
         }
     }
     SkDebugf("\n");
 }
 
-void SkFlags::ParseCommandLine(int argc, char** argv) {
+void SkCommandLineFlags::Parse(int argc, char** argv) {
     // Only allow calling this function once.
     static bool gOnce;
     if (gOnce) {
-        SkDebugf("ParseCommandLine should only be called once at the beginning"
+        SkDebugf("Parse should only be called once at the beginning"
                  " of main!\n");
         SkASSERT(false);
         return;
     }
     gOnce = true;
 
     bool helpPrinted = false;
     // Loop over argv, starting with 1, since the first is just the name of the program.
     for (int i = 1; i < argc; i++) {
         if (0 == strcmp("-h", argv[i]) || 0 == strcmp("--h", argv[i])
                 || 0 == strcmp("-help", argv[i]) || 0 == strcmp("--help", argv[i])) {
             // Print help message.
             SkTDArray<const char*> helpFlags;
             for (int j = i + 1; j < argc; j++) {
                 if (SkStrStartsWith(argv[j], '-')) {
                     break;
                 }
                 helpFlags.append(1, &argv[j]);
             }
             if (0 == helpFlags.count()) {
                 // Only print general help message if help for specific flags is not requested.
                 SkDebugf("%s\n%s\n", argv[0], gUsage.c_str());
             }
             SkDebugf("Flags:\n");
-            SkFlagInfo* flag = SkFlags::gHead;
+            SkFlagInfo* flag = SkCommandLineFlags::gHead;
             while (flag != NULL) {
                 // If no flags followed --help, print them all
                 bool printFlag = 0 == helpFlags.count();
                 if (!printFlag) {
                     for (int k = 0; k < helpFlags.count(); k++) {
                         if (flag->name().equals(helpFlags[k]) ||
                             flag->shortName().equals(helpFlags[k])) {
                             printFlag = true;
                             helpFlags.remove(k);
                             break;
@@ skipping 66 matching lines @@
     gHead = NULL;
     while (flag != NULL) {
         SkFlagInfo* next = flag->next();
         SkDELETE(flag);
         flag = next;
     }
     if (helpPrinted) {
         exit(0);
     }
 }