Skip to content

Commit

Permalink
Style fixes according to Haiku coding style guidelines
Browse files Browse the repository at this point in the history
  • Loading branch information
Jake Secunda committed Jun 11, 2017
1 parent 851ce66 commit f5d34be
Show file tree
Hide file tree
Showing 27 changed files with 704 additions and 391 deletions.
122 changes: 73 additions & 49 deletions src/Hare/Hare/AppView.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,61 +1,70 @@
#include "AppView.h"

#include <string.h>
#include <be/app/Message.h>
#include <be/interface/Alert.h>
#include <be/interface/Bitmap.h>
#include <be/interface/Button.h>
#include <be/interface/Font.h>
#include <be/interface/InterfaceDefs.h>
#include <be/interface/MenuBar.h>
#include <be/interface/Rect.h>
#include <be/interface/StatusBar.h>
#include <be/interface/StringView.h>
#include <be/interface/TextControl.h>
#include <be/kernel/fs_attr.h>
#include <be/kernel/fs_info.h>
#include <be/kernel/image.h>
#include <be/kernel/OS.h>
#include <be/storage/Directory.h>
#include <be/storage/Entry.h>
#include <be/storage/File.h>
#include <be/storage/Node.h>
#include <be/storage/NodeInfo.h>
#include <be/storage/NodeMonitor.h>
#include <be/storage/Path.h>
#include <be/storage/Volume.h>
#include <be/storage/VolumeRoster.h>
#include <be/support/Beep.h>
#include <be/support/Debug.h>
#include <be/support/String.h>

#include <Alert.h>
#include <Beep.h>
#include <Bitmap.h>
#include <Button.h>
#include <Debug.h>
#include <Font.h>
#include <Directory.h>
#include <Entry.h>
#include <File.h>
#include <fs_attr.h>
#include <fs_info.h>
#include <image.h>
#include <InterfaceDefs.h>
#include <MenuBar.h>
#include <Message.h>
#include <Node.h>
#include <NodeInfo.h>
#include <NodeMonitor.h>
#include <OS.h>
#include <Path.h>
#include <Rect.h>
#include <StatusBar.h>
#include <StringView.h>
#include <TextControl.h>
#include <String.h>
#include <Volume.h>
#include <VolumeRoster.h>

#include <AEEncoder/AEEncoder.h>
#include <Santa/CLVRefListItem.h>
#include "../AudioInfo/AudioAttributes.h"
#include "../AudioInfo/GenreList.h"
#include <Santa/CLVRefListItem.h>

#include "AppDefs.h"
#include "AppView.h"
#include "AppWindow.h"
#include "CommandConstants.h"
#include "CheckMark.h"
#include "GUIStrings.h"
#include "EditorView.h"
#include "EncoderListView.h"
#include "FileNamePatternView.h"
#include "GUIStrings.h"
#include "Settings.h"
#include "StatusBarFilter.h"

AppView::AppView(BRect frame) : BView(frame, "AppView", B_FOLLOW_ALL,
B_WILL_DRAW | B_FRAME_EVENTS | B_NAVIGABLE_JUMP) {
AppView::AppView(BRect frame)
:
BView(frame, "AppView", B_FOLLOW_ALL,
B_WILL_DRAW | B_FRAME_EVENTS | B_NAVIGABLE_JUMP)
{
PRINT(("AppView::AppView(BRect)\n"));

}

AppView::~AppView() {
AppView::~AppView()
{
PRINT(("AppView::~AppView()\n"));

stop_watching(this);
}

void
AppView::InitView() {
AppView::InitView()
{
PRINT(("AppView::InitView()\n"));

SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR));
Expand Down Expand Up @@ -131,7 +140,8 @@ AppView::InitView() {
}

void
AppView::AttachedToWindow() {
AppView::AttachedToWindow()
{
PRINT(("AppView::AttachedToWindow()\n"));

BView::AttachedToWindow();
Expand All @@ -144,7 +154,8 @@ AppView::AttachedToWindow() {
}

void
AppView::MessageReceived(BMessage* message) {
AppView::MessageReceived(BMessage* message)
{
//PRINT(("AppView::MessageReceived(BMessage*)\n"));
switch (message->what) {
case VIEW_SHORTCUT: {
Expand Down Expand Up @@ -257,7 +268,8 @@ AppView::MessageReceived(BMessage* message) {
}

int32
AppView::RefsRecievedWrapper(void* args) {
AppView::RefsRecievedWrapper(void* args)
{
PRINT(("AppView::RefsReceivedWrapper(void*)\n"));

BList* params = (BList*)args;
Expand All @@ -270,7 +282,8 @@ AppView::RefsRecievedWrapper(void* args) {
}

void
AppView::RefsReceived(BMessage* message) {
AppView::RefsReceived(BMessage* message)
{
PRINT(("AppView::RefsReceived(BMessage*)\n"));

CLVRefListItem* item;
Expand Down Expand Up @@ -334,7 +347,8 @@ AppView::RefsReceived(BMessage* message) {
}

void
AppView::InitializeColumn(CLVRefListItem* item) {
AppView::InitializeColumn(CLVRefListItem* item)
{
PRINT(("AppView::InitializeColumn(CLVRefListItem*)\n"));

entry_ref* ref = item->EntryRef();
Expand Down Expand Up @@ -413,7 +427,8 @@ AppView::InitializeColumn(CLVRefListItem* item) {
}

void
AppView::SetSaveAsColumn(CLVRefListItem* item) {
AppView::SetSaveAsColumn(CLVRefListItem* item)
{
PRINT(("AppView::SetSaveAsColumn(CLVRefListItem*)\n"));

const char* artist = item->GetColumnContentText(ARTIST_COLUMN_INDEX);
Expand Down Expand Up @@ -446,7 +461,8 @@ AppView::SetSaveAsColumn(CLVRefListItem* item) {
}

void
AppView::ApplyAttributeChanges(BMessage* message) {
AppView::ApplyAttributeChanges(BMessage* message)
{
PRINT(("AppView::ApplyAttributeChanges(BMessage*)\n"));

type_code index_type;
Expand Down Expand Up @@ -504,7 +520,8 @@ AppView::ApplyAttributeChanges(BMessage* message) {
}

void
AppView::RemoveNodeFromList(node_ref* ref) {
AppView::RemoveNodeFromList(node_ref* ref)
{
CLVRefListItem* item;
node_ref* itemRef;
int32 numItems = listView->CountItems();
Expand All @@ -529,7 +546,8 @@ AppView::RemoveNodeFromList(node_ref* ref) {
}

void
AppView::RemoveDeviceItemsFromList(int32 device) {
AppView::RemoveDeviceItemsFromList(int32 device)
{
PRINT(("AppView::RemoveDeviceItemsFromList(int32)\n"));

bool deleted = false;
Expand Down Expand Up @@ -558,7 +576,8 @@ AppView::RemoveDeviceItemsFromList(int32 device) {
}

int32
AppView::RemoveItemsFromList(void* args) {
AppView::RemoveItemsFromList(void* args)
{
PRINT(("AppView::RemoveItemsFromList(void*)\n"));

AppView* view = (AppView*)args;
Expand All @@ -582,7 +601,8 @@ AppView::RemoveItemsFromList(void* args) {
}

int32
AppView::UpdateItem(BMessage* message) {
AppView::UpdateItem(BMessage* message)
{
PRINT(("AppView::UpdateItem(BMessage*)\n"));

ino_t node;
Expand Down Expand Up @@ -667,7 +687,8 @@ AppView::UpdateItem(BMessage* message) {
}

void
AppView::Encode() {
AppView::Encode()
{
PRINT(("AppView::Encode()\n"));

thread_id thread = spawn_thread(AppView::EncodeThread, "_Encoder_",
Expand All @@ -676,7 +697,8 @@ AppView::Encode() {
}

int32
AppView::EncodeThread(void* args) {
AppView::EncodeThread(void* args)
{
PRINT(("AppView::EncodeThread(void*)\n"));

settings->SetEncoding(true);
Expand Down Expand Up @@ -1032,7 +1054,8 @@ AppView::EncodeThread(void* args) {
}

void
AppView::Cancel() {
AppView::Cancel()
{
PRINT(("AppView::Cancel()\n"));

if (settings->IsEncoding()) {
Expand All @@ -1045,7 +1068,8 @@ AppView::Cancel() {
}

void
AppView::AlertUser(const char* message) {
AppView::AlertUser(const char* message)
{
PRINT(("AppView::AlertUser(const char*)\n"));
BAlert* alert = new BAlert("alert", message, OK, NULL, NULL, B_WIDTH_AS_USUAL,
B_WARNING_ALERT);
Expand Down
2 changes: 1 addition & 1 deletion src/Hare/Hare/AppView.h
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#ifndef __APP_VIEW_H__
#define __APP_VIEW_H__

#include <be/interface/View.h>
#include <View.h>

class BetterScrollView;
class BButton;
Expand Down
Loading

0 comments on commit f5d34be

Please sign in to comment.