From bfb8680ff152ba63a058f8f7e7f26d3abb288ba7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20Sundstr=C3=B6m?= Date: Mon, 21 Mar 2011 12:26:05 +0000 Subject: [PATCH] Cleanup. Thanks korli! git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@41068 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- .../datatranslations/DataTranslations.cpp | 7 ++++--- .../datatranslations/DataTranslations.h | 6 ++---- .../datatranslations/DataTranslationsWindow.cpp | 6 +++--- src/preferences/datatranslations/IconView.cpp | 4 ++++ .../datatranslations/TranslatorListView.cpp | 17 +++++++++-------- 5 files changed, 22 insertions(+), 18 deletions(-) diff --git a/src/preferences/datatranslations/DataTranslations.cpp b/src/preferences/datatranslations/DataTranslations.cpp index d011c221ec..cba80e6b7a 100644 --- a/src/preferences/datatranslations/DataTranslations.cpp +++ b/src/preferences/datatranslations/DataTranslations.cpp @@ -14,12 +14,12 @@ #include #include -#include #include +#include #include #include -#include #include +#include #include "DataTranslationsWindow.h" @@ -32,7 +32,8 @@ const char* kApplicationSignature = "application/x-vnd.Haiku-DataTranslations"; DataTranslationsApplication::DataTranslationsApplication() - : BApplication(kApplicationSignature) + : + BApplication(kApplicationSignature) { new DataTranslationsWindow(); } diff --git a/src/preferences/datatranslations/DataTranslations.h b/src/preferences/datatranslations/DataTranslations.h index 6a6f998c20..bd577fda64 100644 --- a/src/preferences/datatranslations/DataTranslations.h +++ b/src/preferences/datatranslations/DataTranslations.h @@ -12,10 +12,8 @@ #include - - -class BDirectory; -class BEntry; +#include +#include class DataTranslationsApplication : public BApplication { diff --git a/src/preferences/datatranslations/DataTranslationsWindow.cpp b/src/preferences/datatranslations/DataTranslationsWindow.cpp index c02c89ef54..d9d60e58d5 100644 --- a/src/preferences/datatranslations/DataTranslationsWindow.cpp +++ b/src/preferences/datatranslations/DataTranslationsWindow.cpp @@ -14,15 +14,15 @@ #include -#include -#include #include -#include +#include +#include #include #include #include #include #include +#include #include #include #include diff --git a/src/preferences/datatranslations/IconView.cpp b/src/preferences/datatranslations/IconView.cpp index ea4381c1eb..d9b0319100 100644 --- a/src/preferences/datatranslations/IconView.cpp +++ b/src/preferences/datatranslations/IconView.cpp @@ -22,12 +22,14 @@ IconView::IconView(const BRect& frame, const char* name, uint32 resize, SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR)); } + IconView::~IconView() { delete fIconBitmap; fIconBitmap = NULL; } + bool IconView::SetIcon(const BPath& path) { @@ -45,6 +47,7 @@ IconView::SetIcon(const BPath& path) return true; } + bool IconView::DrawIcon(bool draw) { @@ -56,6 +59,7 @@ IconView::DrawIcon(bool draw) return prev; } + void IconView::Draw(BRect area) { diff --git a/src/preferences/datatranslations/TranslatorListView.cpp b/src/preferences/datatranslations/TranslatorListView.cpp index 7e4da4d674..d7cf40a9c6 100644 --- a/src/preferences/datatranslations/TranslatorListView.cpp +++ b/src/preferences/datatranslations/TranslatorListView.cpp @@ -11,10 +11,10 @@ #include "TranslatorListView.h" -#include - #include +#include + static int compare_items(const void* a, const void* b) @@ -45,7 +45,7 @@ TranslatorItem::~TranslatorItem() // #pragma mark - -TranslatorListView::TranslatorListView(const char *name, list_view_type type) +TranslatorListView::TranslatorListView(const char* name, list_view_type type) : BListView(name, B_SINGLE_SELECTION_LIST) { @@ -65,7 +65,7 @@ TranslatorListView::TranslatorAt(int32 index) const void -TranslatorListView::MessageReceived(BMessage *message) +TranslatorListView::MessageReceived(BMessage* message) { uint32 type; int32 count; @@ -90,15 +90,16 @@ TranslatorListView::MessageReceived(BMessage *message) void -TranslatorListView::MouseMoved(BPoint point, uint32 transit, const BMessage *dragMessage) +TranslatorListView::MouseMoved(BPoint point, uint32 transit, + const BMessage* dragMessage) { if (dragMessage != NULL && transit == B_ENTERED_VIEW) { // Draw a red box around the inside of the view // to tell the user that this view accepts drops - SetHighColor(220,0,0); - SetPenSize(4); + SetHighColor(220, 0, 0); + SetPenSize(4); StrokeRect(Bounds()); - SetHighColor(0,0,0); + SetHighColor(0, 0, 0); } else if (dragMessage != NULL && transit == B_EXITED_VIEW) Invalidate(); }