Ticket #7052: Deskbar_ResourceSet_cpp_style_fix.diff

src/apps/deskbar/ResourceSet.cpp

@@ -26 +26 @@
 used in advertising or otherwise to promote the sale, use or other dealings in
 this Software without prior written authorization from Be Incorporated.
 
-Tracker(TM), Be(R), BeOS(R), and BeIA(TM) are trademarks or registered trademarks
-of Be Incorporated in the United States and other countries. Other brand product
-names are registered trademarks or trademarks of their respective holders.
+Tracker(TM), Be(R), BeOS(R), and BeIA(TM) are trademarks or registered
+trademarks of Be Incorporated in the United States and other countries. Other
+brand product names are registered trademarks or trademarks of their respective
+holders.
 All rights reserved.
 */
 
@@ -70 +71 @@
             :   fDeleteOK(false)
         {
         }
-        
+
         virtual ~TypeObject()
         {
             if (!fDeleteOK)
                 debugger("deleting object owned by BResourceSet");
         }
-        
+
         void Delete()
         {
             fDeleteOK = true;
         }
-        
+
     private:
         TypeObject(const TypeObject &);
         TypeObject &operator=(const TypeObject &);
         bool operator==(const TypeObject &);
         bool operator!=(const TypeObject &);
-        
+
         bool fDeleteOK;
     };
-    
+
     class BitmapTypeItem : public BBitmap, public TypeObject {
     public:
         BitmapTypeItem(BRect bounds, uint32 flags, color_space depth,
-            int32 bytesPerRow=B_ANY_BYTES_PER_ROW, screen_id screenID
+            int32 bytesPerRow = B_ANY_BYTES_PER_ROW, screen_id screenID
             = B_MAIN_SCREEN_ID)
             :   BBitmap(bounds, flags, depth, bytesPerRow, screenID)
         {
         }
-        
+
         BitmapTypeItem(const BBitmap* source, bool accepts_views = false,
             bool need_contiguous = false)
             :   BBitmap(source, accepts_views, need_contiguous)
         {
         }
-        
+
         BitmapTypeItem(BMessage* data)
             :   BBitmap(data)
         {
         }
-        
+
         virtual ~BitmapTypeItem()
         {
         }
     };
-    
+
     class StringBlockTypeItem : public TStringBlock, public TypeObject {
     public:
         StringBlockTypeItem(BDataIO* data)
             :   TStringBlock(data)
         {
         }
-        
+
         StringBlockTypeItem(const void* block, size_t size)
             :   TStringBlock(block, size)
         {
         }
-        
+
         virtual ~StringBlockTypeItem()
         {
         }
     };
-    
+
     class TypeItem {
     public:
         TypeItem(int32 id, const char* name, const void* data, size_t size)
-            : fID(id), fName(name),
-              fData(const_cast<void*>(data)), fSize(size), fObject(0),
-              fOwnData(false), fSourceIsFile(false)
+            :   fID(id), fName(name),
+                fData(const_cast<void*>(data)), fSize(size), fObject(0),
+                fOwnData(false), fSourceIsFile(false)
         {
         }
-        
+
         TypeItem(int32 id, const char* name, BFile* file)
             :   fID(id),
                 fName(name),
@@ -162 +163 @@
                 }
             }
         }
-        
+
         virtual ~TypeItem()
         {
             if (fOwnData) {
@@ -172 +173 @@
             }
             SetObject(NULL);
         }
-        
+
         int32 ID() const
-            { return fID; }
+        {
+            return fID;
+        }
 
         const char* Name() const
-            { return fName.String(); }
+        {
+            return fName.String();
+        }
 
         const void* Data() const
-            { return fData; }
+        {
+            return fData;
+        }
 
         size_t Size() const
-            { return fSize; }
-        
+        {
+            return fSize;
+        }
+
         void SetObject(TypeObject* object)
         {
             if (object == fObject)
@@ -195 +204 @@
         }
 
         TypeObject* Object() const
-            { return fObject; }
-        
+        {
+            return fObject;
+        }
+
         void SetSourceIsFile(bool state)
-            { fSourceIsFile = state; }
+        {
+            fSourceIsFile = state;
+        }
 
         bool SourceIsFile() const
-            { return fSourceIsFile; }
-        
+        {
+            return fSourceIsFile;
+        }
+
     private:
         int32 fID;
         BString fName;
@@ -212 +227 @@
         bool fOwnData;
         bool fSourceIsFile;
     };
-    
+
     static bool FreeTypeItemFunc(void* item)
     {
         delete reinterpret_cast<TypeItem*>(item);
@@ -225 +240 @@
             :   fType(type)
         {
         }
-        
+
         virtual ~TypeList()
         {
             fItems.DoForEach(FreeTypeItemFunc);
             fItems.MakeEmpty();
         }
-        
+
         type_code Type() const
-            { return fType; }
-        
+        {
+            return fType;
+        }
+
         TypeItem* FindItemByID(int32 id)
         {
             for (int32 i = 0; i < fItems.CountItems(); i++ ) {
@@ -254 +271 @@
             }
             return NULL;
         }
-        
+
         void AddItem(TypeItem* item)
         {
             fItems.AddItem(item);
         }
-        
+
     private:
         type_code fType;
         BList fItems;
     };
-
 }
 
 using namespace TResourcePrivate;
@@ -282 +298 @@
     fStrings = (char*)malloc(1024);
     size_t pos = 0;
     ssize_t amount;
-    while ((amount=data->Read(fStrings + pos, 1024)) == 1024) {
+    while ((amount = data->Read(fStrings + pos, 1024)) == 1024) {
         pos += amount;
         fStrings = (char*)realloc(fStrings, pos + 1024);
     }
     if (amount > 0)
         pos += amount;
-    
+
     fNumEntries = PreIndex(fStrings, amount);
     fIndex = (size_t*)malloc(sizeof(size_t) * fNumEntries);
     MakeIndex(fStrings, amount, fNumEntries, fIndex);
@@ -304 +320 @@
 {
     fIndex = (size_t*)const_cast<void*>(block);
     fStrings = (char*)const_cast<void*>(block);
-    
+
     // Figure out how many entries there are.
     size_t last_off = 0;
     while (fIndex[fNumEntries] > last_off && fIndex[fNumEntries] < size ) {
@@ -339 +355 @@
 TStringBlock::PreIndex(char* strings, ssize_t len)
 {
     size_t count = 0;
-    
     char* orig = strings;
     char* end = strings + len;
     bool in_cr = false;
     bool first = true;
     bool skipping = false;
+
     while (orig < end) {
         if (*orig == '\n' || *orig == '\r' || *orig == 0) {
             if (!in_cr && *orig == '\r')
@@ -371 +387 @@
                 case '\\':
                     *strings = '\\';
                     break;
-                    
+
                 case '\n':
                     *strings = '\n';
                     break;
-                    
+
                 case '\r':
                     *strings = '\r';
                     break;
-                    
+
                 case '\t':
                     *strings = '\t';
                     break;
-                    
+
                 default:
                     *strings = *orig;
                     break;
             }
-        } else 
+        } else
             *strings = *orig;
 
         orig++;
         strings++;
     }
-    
     return count;
 }
 
@@ -405 +420 @@
 {
     *resultingIndex++ = 0;
     indexLength--;
-    
+
     ssize_t pos = 0;
     while (pos < len && indexLength > 0) {
         if (strings[pos] == 0 ) {
@@ -475 +490 @@
 #if USE_RESOURCES
     if (!resources)
         return B_BAD_VALUE;
-    
+
     BAutolock lock(&fLock);
     status_t err = fResources.AddItem(resources) ? B_OK : B_ERROR;
     if (err != B_OK)
@@ -499 +514 @@
         delete path;
         return err;
     }
-    
+
     BAutolock lock(&fLock);
     err = fDirectories.AddItem(path) ? B_OK : B_ERROR;
     if (err != B_OK)
@@ -514 +529 @@
 {
     BString buf;
     status_t err = ExpandString(&buf, in);
-    
+
     if (err != B_OK) {
         if (defaultValue)
             return AddDirectory(defaultValue);
         return err;
     }
-    
+
     return AddDirectory(buf.String());
 }
 
@@ -529 +544 @@
 TResourceSet::ExpandString(BString* out, const char* in)
 {
     const char* start = in;
+
     while (*in) {
         if (*in == '$') {
             if (start < in)
-                 out->Append(start, (int32)(in - start));
-            
+                out->Append(start, (int32)(in - start));
+
             in++;
             char variableName[1024];
             size_t i = 0;
@@ -545 +561 @@
                 if (*in)
                     in++;
 
-            } else 
-                while ((isalnum(*in) || *in == '_') && i
-                    < sizeof(variableName) - 1)
+            } else {
+                while ((isalnum(*in) || *in == '_')
+                    && i < sizeof(variableName) - 1)
                     variableName[i++] = *in++;
-            
+            }
+
             start = in;
-            
             variableName[i] = '\0';
-            
+
             const char* val = getenv(variableName);
             if (!val) {
                 PRINT(("Error: env var %s not found.\n", &variableName[0]));
                 return B_NAME_NOT_FOUND;
             }
-            
+
             status_t err = ExpandString(out, val);
             if (err != B_OK)
                 return err;
-            
+
         } else if (*in == '\\') {
             if (start < in)
                 out->Append(start, (int32)(in - start));
@@ -576 +592 @@
 
     if (start < in)
         out->Append(start, (int32)(in - start));
-    
+
     return B_OK;
 }
 
@@ -585 +601 @@
 TResourceSet::FindResource(type_code type, int32 id, size_t* outSize)
 {
     TypeItem* item = FindItemID(type, id);
-    
+
     if (outSize)
         *outSize = item ? item->Size() : 0;
 
@@ -597 +613 @@
 TResourceSet::FindResource(type_code type, const char* name, size_t* outSize)
 {
     TypeItem* item = FindItemName(type, name);
-    
+
     if (outSize)
         *outSize = item ? item->Size() : 0;
 
@@ -632 +648 @@
     return ReturnStringBlockItem(FindItemName(type, name));
 }
 
-    
+
 const char*
 TResourceSet::FindString(type_code type, int32 id, uint32 index)
 {
     const TStringBlock* stringBlock = FindStringBlock(type, id);
+
     if (!stringBlock)
         return NULL;
 
@@ -648 +665 @@
 TResourceSet::FindString(type_code type, const char* name, uint32 index)
 {
     const TStringBlock* stringBlock = FindStringBlock(type, name);
+
     if (!stringBlock)
         return NULL;
 
     return stringBlock->String(index);
 }
 
-    
+
 TypeList*
 TResourceSet::FindTypeList(type_code type)
 {
     BAutolock lock(&fLock);
-    
+
     int32 count = fTypes.CountItems();
     for (int32 i = 0; i < count; i++ ) {
         TypeList* list = (TypeList*)fTypes.ItemAt(i);
         if (list && list->Type() == type)
             return list;
     }
-    
+
     return NULL;
 }
 
@@ -676 +694 @@
 {
     TypeList* list = FindTypeList(type);
     TypeItem* item = NULL;
-    
-    if (list) item = list->FindItemByID(id);
-    
+
+    if (list)
+        item = list->FindItemByID(id);
+
     if (!item)
         item = LoadResource(type, id, 0, &list);
-    
+
     return item;
 }
 
@@ -691 +710 @@
 {
     TypeList* list = FindTypeList(type);
     TypeItem* item = NULL;
-    
+
     if (list)
         item = list->FindItemByName(name);
-    
+
     if (!item)
         item = LoadResource(type, -1, name, &list);
-    
+
     return item;
 }
 
@@ -707 +726 @@
     TypeList** inOutList)
 {
     TypeItem* item = NULL;
-    
+
     if (name) {
         BEntry entry;
-        
+
         // If a named resource, first look in directories.
         fLock.Lock();
         int32 count = fDirectories.CountItems();
@@ -731 +750 @@
         }
         fLock.Unlock();
     }
-    
+
 #if USE_RESOURCES
     if (!item) {
         // Look through resource objects for data.
@@ -746 +765 @@
                     data = resource->LoadResource(type, id, &size);
                 else if (name != NULL)
                     data = resource->LoadResource(type, name, &size);
-                    
+
                 if (data && size) {
                     item = new TypeItem(id, name, data, size);
                     item->SetSourceIsFile(false);
@@ -787 +806 @@
 {
     if (!from)
         return NULL;
-    
+
     TypeObject* obj = from->Object();
     BitmapTypeItem* bitmap = dynamic_cast<BitmapTypeItem*>(obj);
     if (bitmap)
@@ -803 +822 @@
     // Try to read as an archived bitmap.
     stream.Seek(0, SEEK_SET);
     BMessage archive;
-    if (archive.Unflatten(&stream) == B_OK ) {
+    if (archive.Unflatten(&stream) == B_OK) {
         bitmap = new BitmapTypeItem(&archive);
         if (bitmap && bitmap->InitCheck() != B_OK) {
-            bitmap->Delete();   // allows us to delete this bitmap...
+            bitmap->Delete();
+                // allows us to delete this bitmap...
             delete bitmap;
             bitmap = NULL;
         }
@@ -815 +835 @@
     if (bitmap) {
         BAutolock lock(&fLock);
         if (from->Object() != NULL) {
-            // Whoops!  Someone snuck in under us.
+            // Whoops! Someone snuck in under us.
             bitmap->Delete();
             delete bitmap;
             bitmap = dynamic_cast<BitmapTypeItem*>(from->Object());
-        } else 
+        } else
             from->SetObject(bitmap);
     }
 
@@ -832 +852 @@
 {
     if (!from)
         return NULL;
-    
+
     TypeObject* obj = from->Object();
     StringBlockTypeItem* stringBlock = dynamic_cast<StringBlockTypeItem*>(obj);
     if (stringBlock)
         return stringBlock;
-    
+
     // Can't change an existing object.
     if (obj)
         return NULL;
-    
+
     // Don't have a string block in the item -- we'll create one.
     if (from->SourceIsFile() ) {
         BMemoryIO stream(from->Data(), from->Size());
         stringBlock = new StringBlockTypeItem(&stream);
     } else
         stringBlock = new StringBlockTypeItem(from->Data(), from->Size());
-    
+
     if (stringBlock) {
         BAutolock lock(&fLock);
         if (from->Object() != NULL) {
-            // Whoops!  Someone snuck in under us.
+            // Whoops! Someone snuck in under us.
             delete stringBlock;
             stringBlock = dynamic_cast<StringBlockTypeItem*>(from->Object());
         } else
             from->SetObject(stringBlock);
     }
-    
+
     return stringBlock;
 }
 
@@ -867 +887 @@
 
 
 namespace TResourcePrivate {
-
     TResourceSet* gResources = NULL;
     BLocker gResourceLocker;
-    
 }
 
 
@@ -880 +898 @@
     // If already have it, return immediately.
     if (gResources)
         return gResources;
-    
+
     // Don't have 'em, lock access to make 'em.
     if (!gResourceLocker.Lock())
         return NULL;
@@ -889 +907 @@
         gResourceLocker.Unlock();
         return gResources;
     }
-    
+
     // Make 'em.
     gResources = new TResourceSet;
     gResources->AddResources(BApplication::AppResources());