Ticket #9604: 0001-additional-style-update-to-patchbay.patch

src/apps/patchbay/CountEventConsumer.h

@@ -10 +10 @@
  * Copyright 1999, Be Incorporated.   All Rights Reserved.
  * This file may be used under the terms of the Be Sample Code License.
  */
- 
-#ifndef _CountEventConsumer_h
-#define _CountEventConsumer_h
+#ifndef COUNTEVENTCONSUMER_H
+#define COUNTEVENTCONSUMER_H
 
 #include <MidiConsumer.h>
 #include <SupportDefs.h>
@@ -43 +42 @@
     int32 fEventCount;
 };
 
-#endif /* _CountEventConsumer_h */
+#endif /* COUNTEVENTCONSUMER_H */

src/apps/patchbay/EndpointInfo.cpp

@@ -46 +46 @@
     fIcon(NULL)
 {
     BMidiRoster* roster = BMidiRoster::MidiRoster();
-    if (roster) {
+    if (roster != NULL) {
         BMidiEndpoint* endpoint = roster->FindEndpoint(id);
-        if (endpoint) {
+        if (endpoint != NULL) {
             printf("endpoint %ld = %p\n", id, endpoint);
             BMessage msg;
             if (endpoint->GetProperties(&msg) == B_OK) {
@@ -132 +132 @@
         return NULL;
     }
                             
-    if (msg->FindData(iconName, iconType, &data, &size) == B_OK)
-    {
-        ;
+    if (msg->FindData(iconName, iconType, &data, &size) == B_OK) {
         bitmap = new BBitmap(BRect(0, 0, bmapSize, bmapSize),
             ICON_COLOR_SPACE);
         ASSERT((bitmap->BitsLength() == size));

src/apps/patchbay/EndpointInfo.h

@@ -11 +11 @@
  * Copyright 1999, Be Incorporated.   All Rights Reserved.
  * This file may be used under the terms of the Be Sample Code License.
  */
- 
-#ifndef _EndpointInfo_h
-#define _EndpointInfo_h
+#ifndef ENDPOINTINFO_H
+#define ENDPOINTINFO_H
 
 #include <Mime.h> /* for icon_size */
 #include <GraphicsDefs.h> /* for color_space */
@@ -49 +48 @@
     BBitmap* fIcon;
 };
 
-#endif /* _EndpointInfo_h */
+#endif /* ENDPOINTINFO_H */

src/apps/patchbay/MidiEventMeter.cpp

@@ -10 +10 @@
  * Copyright 1999, Be Incorporated.   All Rights Reserved.
  * This file may be used under the terms of the Be Sample Code License.
  */
+
+#include "MidiEventMeter.h"
  
 #include <stdio.h>
 #include <MidiRoster.h>
 #include <MidiProducer.h>
 #include <MidiConsumer.h>
 #include <View.h>
+
 #include "CountEventConsumer.h"
-#include "MidiEventMeter.h"
 
 static const BRect METER_BOUNDS(0, 0, 7, 31);
 
@@ -34 +36 @@
     fMeterLevel(0)
 {
     BMidiRoster* roster = BMidiRoster::MidiRoster();
-    if (roster) {
+    if (roster != NULL) {
         BMidiProducer* producer = roster->FindProducer(producerID);
-        if (producer) {
+        if (producer != NULL) {
             BString name;
             name << producer->Name() << " Event Meter";
             fCounter = new CountEventConsumer(name.String());
@@ -49 +51 @@
 
 MidiEventMeter::~MidiEventMeter()
 {
-    if (fCounter)
+    if (fCounter != NULL)
         fCounter->Release();
 }
 
@@ -58 +60 @@
 MidiEventMeter::Pulse(BView* view)
 {
     int32 newLevel = fMeterLevel;
-    if (fCounter) {
+    if (fCounter != NULL) {
         newLevel = CalcMeterLevel(fCounter->CountEvents());
         fCounter->Reset();
     }
@@ -108 +110 @@
          B_DARKEN_1_TINT,
          B_NO_TINT};
     
-    for (int32 i = 4; i >= 0; i--)
-    {
+    for (int32 i = 4; i >= 0; i--) {
         rgb_color color;
         if (fMeterLevel > i) {
             color = tint_color(METER_GREEN, kTintArray[i]);

src/apps/patchbay/MidiEventMeter.h

@@ -11 +11 @@
  * Copyright 1999, Be Incorporated.   All Rights Reserved.
  * This file may be used under the terms of the Be Sample Code License.
  */
- 
-#ifndef _MidiEventMeter_h
-#define _MidiEventMeter_h
+#ifndef MIDIEVENTMETER_H
+#define MIDIEVENTMETER_H
 
 #include <Point.h>
 #include <Rect.h>
@@ -39 +38 @@
     int32 fMeterLevel;
 };
 
-#endif /* _MidiMeterWidget_h */
+#endif /* MIDIEVENTMETER_H */

src/apps/patchbay/PatchApp.cpp

@@ -14 +14 @@
 #include "PatchApp.h"
 
 #include <Roster.h>
+
 #include "PatchWin.h"
 
 PatchApp::PatchApp()

src/apps/patchbay/PatchApp.h

@@ -10 +10 @@
  * Copyright 1999, Be Incorporated.   All Rights Reserved.
  * This file may be used under the terms of the Be Sample Code License.
  */
- 
-#ifndef _PatchApp_h
-#define _PatchApp_h
+#ifndef PATCHAPP_H
+#define PATCHAPP_H
 
 #include <Application.h>
 
@@ -24 +23 @@
     void MessageReceived(BMessage* msg);
 };
 
-#endif /* _PatchApp_h */
+#endif /* PATCHAPP_H */

src/apps/patchbay/PatchRow.cpp

@@ -19 +19 @@
 #include <MidiConsumer.h>
 #include <MidiProducer.h>
 #include <Window.h>
+
 #include "MidiEventMeter.h"
 
 extern const float ROW_LEFT = 50.0f;
@@ -86 +87 @@
 void
 PatchRow::Pulse()
 {
-    if (fEventMeter)
+    if (fEventMeter != NULL)
         fEventMeter->Pulse(this);
 }
 
@@ -94 +95 @@
 void
 PatchRow::Draw(BRect)
 {
-    if (fEventMeter)
+    if (fEventMeter != NULL)
         fEventMeter->Draw(this);
 }
 
@@ -121 +122 @@
     int32 numChildren = CountChildren();
     for (int32 i = 0; i < numChildren; i++) {
         PatchCheckBox* box = dynamic_cast<PatchCheckBox*>(ChildAt(i));
-        if (box && box->ConsumerID() == consumerID) {
+        if (box != NULL && box->ConsumerID() == consumerID) {
             RemoveChild(box);
             delete box;
             while (i < numChildren) {
                 box = dynamic_cast<PatchCheckBox*>(ChildAt(i++));
-                if (box)
+                if (box != NULL)
                     box->MoveBy(-COLUMN_WIDTH, 0);
             }
             break;
@@ -141 +142 @@
     int32 numChildren = CountChildren();
     for (int32 i = 0; i < numChildren; i++) {
         PatchCheckBox* box = dynamic_cast<PatchCheckBox*>(ChildAt(i));
-        if (box && box->ConsumerID() == consumerID)
+        if (box != NULL && box->ConsumerID() == consumerID)
             box->SetValue(1);
     }
 }
@@ -153 +154 @@
     int32 numChildren = CountChildren();
     for (int32 i = 0; i < numChildren; i++) {
         PatchCheckBox* box = dynamic_cast<PatchCheckBox*>(ChildAt(i));
-        if (box && box->ConsumerID() == consumerID)
+        if (box != NULL && box->ConsumerID() == consumerID)
             box->SetValue(0);
     }
 }
@@ -167 +168 @@
     int32 numChildren = CountChildren();
     for (int32 i = 0; i < numChildren; i++) {
         PatchCheckBox* box = dynamic_cast<PatchCheckBox*>(ChildAt(i));
-        if (box)
+        if (box != NULL)
             box->SetTarget(this);
     }
 }
@@ -182 +183 @@
             BControl* ctrl;
             if (msg->FindPointer("source", (void**) &ctrl) == B_OK) {
                 PatchCheckBox* box = dynamic_cast<PatchCheckBox*>(ctrl);
-                if (box)
+                if (box != NULL)
                     box->DoConnect();
             }
         }
@@ -208 +209 @@
     
     BMidiProducer* producer = roster->FindProducer(fProducerID);
     BMidiConsumer* consumer = roster->FindConsumer(fConsumerID);    
-    if (producer && consumer) {
+    if (producer != NULL && consumer != NULL) {
         status_t err;
-        if (value)
+        if (value != 0)
             err = producer->Connect(consumer);
         else
             err = producer->Disconnect(consumer);
@@ -221 +222 @@
     } else
         SetValue(inverseValue);
 
-    if (producer) producer->Release();
-    if (consumer) consumer->Release();
+    if (producer != NULL)
+        producer->Release();
+    if (consumer != NULL)
+        consumer->Release();
 }

src/apps/patchbay/PatchRow.h

@@ -9 +9 @@
  * Copyright 1999, Be Incorporated.   All Rights Reserved.
  * This file may be used under the terms of the Be Sample Code License.
  */
-
-#ifndef _PatchRow_h
-#define _PatchRow_h
+#ifndef PATCHROW_H
+#define PATCHROW_H
 
 #include <View.h>
 
@@ -47 +46 @@
     MidiEventMeter* fEventMeter;
 };
 
-#endif /* _PatchRow_h */
+#endif /* PATCHROW_H */

src/apps/patchbay/PatchView.cpp

@@ -22 +22 @@
 #include <Messenger.h>
 #include <MidiRoster.h>
 #include <Window.h>
+
 #include "EndpointInfo.h"
 #include "PatchRow.h"
 #include "UnknownDeviceIcons.h"
@@ -112 +113 @@
 
     endpoint_itor itor;
     for (itor = begin; itor != end; itor++, index--)
-        if (index <= 0) break;
+        if (index <= 0)
+            break;
     
     if (itor == end)
         return false;

src/apps/patchbay/PatchView.h

@@ -12 +12 @@
  * Copyright 1999, Be Incorporated.   All Rights Reserved.
  * This file may be used under the terms of the Be Sample Code License.
  */
- 
-#ifndef _PatchView_h
-#define _PatchView_h
+#ifndef PATCHVIEW_H
+#define PATCHVIEW_H
 
 #include <Rect.h>
 #include <View.h>
 #include <list>
+
 #include "EndpointInfo.h"
 
 class PatchRow;
@@ -70 +70 @@
     BBitmap* fUnknownDeviceIcon;
 };
 
-#endif /* _PatchView_h */
+#endif /* PATCHVIEW_H */

src/apps/patchbay/PatchWin.cpp

@@ -14 +14 @@
 #include "PatchWin.h"
 
 #include <Application.h>
+
 #include "PatchView.h"
 
 

src/apps/patchbay/PatchWin.h

@@ -10 +10 @@
  * Copyright 1999, Be Incorporated.   All Rights Reserved.
  * This file may be used under the terms of the Be Sample Code License.
  */
-
-#ifndef _PatchWin_h
-#define _PatchWin_h
+#ifndef PATCHWIN_H
+#define PATCHWIN_H
 
 #include <Window.h>
 
@@ -27 +26 @@
     PatchView* fPatchView;
 };
 
-#endif /* _PatchWin_h */
+#endif /* PATCHWIN_H */