From ac171d8311bee41ed329515006c62bb4d57c696f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Wed, 1 Oct 2008 03:52:08 +0000 Subject: [PATCH] More guidelinization... git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@27809 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- 3rdparty/mmu_man/themes/ThemeAddonItem.cpp | 31 ++- 3rdparty/mmu_man/themes/ThemeAddonItem.h | 4 +- 3rdparty/mmu_man/themes/ThemeImporter.cpp | 37 +++- 3rdparty/mmu_man/themes/ThemeManager.cpp | 221 +++++++++++++++------ 3rdparty/mmu_man/themes/ThemesAddon.cpp | 90 ++++++--- 5 files changed, 286 insertions(+), 97 deletions(-) diff --git a/3rdparty/mmu_man/themes/ThemeAddonItem.cpp b/3rdparty/mmu_man/themes/ThemeAddonItem.cpp index 4f59dde4d7..f6627e6ead 100644 --- a/3rdparty/mmu_man/themes/ThemeAddonItem.cpp +++ b/3rdparty/mmu_man/themes/ThemeAddonItem.cpp @@ -25,6 +25,7 @@ //#define HAVE_PREF_BTN + ThemeAddonItem::ThemeAddonItem(BRect bounds, ThemeInterfaceView *iview, int32 id) : ViewItem(bounds, "addonitem", B_FOLLOW_NONE, B_WILL_DRAW) { @@ -71,6 +72,7 @@ ThemeAddonItem::ThemeAddonItem(BRect bounds, ThemeInterfaceView *iview, int32 id SetFont(&fnt); } + ThemeAddonItem::~ThemeAddonItem() { delete fApplyBox; @@ -80,12 +82,16 @@ ThemeAddonItem::~ThemeAddonItem() #endif } -void ThemeAddonItem::DrawItem(BView *ownerview, BRect frame, bool complete) + +void +ThemeAddonItem::DrawItem(BView *ownerview, BRect frame, bool complete) { ViewItem::DrawItem(ownerview, frame, complete); } -void ThemeAddonItem::AttachedToWindow() + +void +ThemeAddonItem::AttachedToWindow() { AddChild(fApplyBox); fApplyBox->SetTarget(fIView); @@ -98,7 +104,9 @@ void ThemeAddonItem::AttachedToWindow() RelayoutButtons(); } -void ThemeAddonItem::MessageReceived(BMessage *message) + +void +ThemeAddonItem::MessageReceived(BMessage *message) { switch (message->what) { case B_LANGUAGE_CHANGED: @@ -107,12 +115,16 @@ void ThemeAddonItem::MessageReceived(BMessage *message) BView::MessageReceived(message); } -void ThemeAddonItem::Draw(BRect) + +void +ThemeAddonItem::Draw(BRect) { DrawString(fAddonName.String(), BPoint(10, 15/*Bounds().Height()/2*/)); } -void ThemeAddonItem::RelocalizeStrings() + +void +ThemeAddonItem::RelocalizeStrings() { fApplyBox->SetLabel(_T("Apply")); fSaveBox->SetLabel(_T("Save")); @@ -129,7 +141,9 @@ void ThemeAddonItem::RelocalizeStrings() RelayoutButtons(); } -void ThemeAddonItem::RelayoutButtons() + +void +ThemeAddonItem::RelayoutButtons() { fApplyBox->ResizeToPreferred(); fSaveBox->MoveTo(fApplyBox->Frame().right+CTRL_SPACING, fApplyBox->Frame().top); @@ -140,7 +154,10 @@ void ThemeAddonItem::RelayoutButtons() #endif } -int32 ThemeAddonItem::AddonId() + +int32 +ThemeAddonItem::AddonId() { return fId; } + diff --git a/3rdparty/mmu_man/themes/ThemeAddonItem.h b/3rdparty/mmu_man/themes/ThemeAddonItem.h index a0f5f4585c..e66cfd93dd 100644 --- a/3rdparty/mmu_man/themes/ThemeAddonItem.h +++ b/3rdparty/mmu_man/themes/ThemeAddonItem.h @@ -10,7 +10,7 @@ class BButton; class ThemeAddonItem : public ViewItem { - public: +public: ThemeAddonItem(BRect bounds, ThemeInterfaceView *iview, int32 id); ~ThemeAddonItem(); void DrawItem(BView *ownerview, BRect frame, bool complete = false); @@ -22,7 +22,7 @@ class ThemeAddonItem : public ViewItem void RelayoutButtons(); int32 AddonId(); - private: +private: int32 fId; ThemeInterfaceView *fIView; BString fAddonName; diff --git a/3rdparty/mmu_man/themes/ThemeImporter.cpp b/3rdparty/mmu_man/themes/ThemeImporter.cpp index fa9414a955..1c36c7129b 100644 --- a/3rdparty/mmu_man/themes/ThemeImporter.cpp +++ b/3rdparty/mmu_man/themes/ThemeImporter.cpp @@ -30,23 +30,30 @@ ThemeImporter::ThemeImporter(const char *name) fSettings.MakeEmpty(); } + ThemeImporter::~ThemeImporter() { FENTRY; } -const char *ThemeImporter::Name() + +const char * +ThemeImporter::Name() { return fName.String(); } -const char *ThemeImporter::Description() + +const char * +ThemeImporter::Description() { FENTRY; return "No description yet."; } -status_t ThemeImporter::LoadSettings(BMessage &settings) + +status_t +ThemeImporter::LoadSettings(BMessage &settings) { FENTRY; uint32 flags; @@ -56,7 +63,9 @@ status_t ThemeImporter::LoadSettings(BMessage &settings) return B_OK; } -status_t ThemeImporter::SaveSettings(BMessage &settings) + +status_t +ThemeImporter::SaveSettings(BMessage &settings) { FENTRY; status_t err; @@ -65,29 +74,39 @@ status_t ThemeImporter::SaveSettings(BMessage &settings) return err; } -void ThemeImporter::SetFlags(uint32 flags) + +void +ThemeImporter::SetFlags(uint32 flags) { fFlags = flags; } -uint32 ThemeImporter::Flags() + +uint32 +ThemeImporter::Flags() { return fFlags; } -status_t ThemeImporter::FetchThemes() + +status_t +ThemeImporter::FetchThemes() { FENTRY; return B_OK; } -status_t ThemeImporter::ImportNextTheme(BMessage **theme) + +status_t +ThemeImporter::ImportNextTheme(BMessage **theme) { FENTRY; return ENOENT; } -status_t ThemeImporter::EndImports() + +status_t +ThemeImporter::EndImports() { FENTRY; return B_OK; diff --git a/3rdparty/mmu_man/themes/ThemeManager.cpp b/3rdparty/mmu_man/themes/ThemeManager.cpp index db08d1915e..8cfd07a581 100644 --- a/3rdparty/mmu_man/themes/ThemeManager.cpp +++ b/3rdparty/mmu_man/themes/ThemeManager.cpp @@ -43,6 +43,7 @@ extern status_t MakeScreenshot(BBitmap **here); #define FENTRY #endif + ThemeManager::ThemeManager() : fAddonCount(0) { @@ -78,6 +79,7 @@ ThemeManager::ThemeManager() */ } + ThemeManager::~ThemeManager() { FENTRY; @@ -88,7 +90,9 @@ ThemeManager::~ThemeManager() UnloadAddons(); } -status_t ThemeManager::LoadAddons() + +status_t +ThemeManager::LoadAddons() { FENTRY; ThemesAddon *ta; @@ -216,7 +220,9 @@ status_t ThemeManager::LoadAddons() return B_OK; } -status_t ThemeManager::UnloadAddons() + +status_t +ThemeManager::UnloadAddons() { FENTRY; int32 i; @@ -235,7 +241,9 @@ status_t ThemeManager::UnloadAddons() return B_OK; } -int32 ThemeManager::FindAddon(const char *name) + +int32 +ThemeManager::FindAddon(const char *name) { FENTRY; int32 i; @@ -250,13 +258,17 @@ int32 ThemeManager::FindAddon(const char *name) return -1; } -int32 ThemeManager::CountAddons() + +int32 +ThemeManager::CountAddons() { FENTRY; return fAddonCount; } -ThemesAddon *ThemeManager::AddonAt(int32 addon) + +ThemesAddon * +ThemeManager::AddonAt(int32 addon) { FENTRY; if (addon < 0) @@ -264,7 +276,9 @@ ThemesAddon *ThemeManager::AddonAt(int32 addon) return (ThemesAddon *)fAddonList.ItemAt(addon); } -const char *ThemeManager::AddonName(int32 addon) + +const char * +ThemeManager::AddonName(int32 addon) { FENTRY; if (addon < 0) @@ -272,7 +286,9 @@ const char *ThemeManager::AddonName(int32 addon) return ((ThemesAddon *)fAddonList.ItemAt(addon))->Name(); } -const char *ThemeManager::AddonDescription(int32 addon) + +const char * +ThemeManager::AddonDescription(int32 addon) { FENTRY; if (addon < 0) @@ -280,9 +296,12 @@ const char *ThemeManager::AddonDescription(int32 addon) return ((ThemesAddon *)fAddonList.ItemAt(addon))->Description(); } + const char *AddonName(int32 addon); -BView *ThemeManager::OptionsView(int32 addon) + +BView * +ThemeManager::OptionsView(int32 addon) { FENTRY; ThemesAddon *ta; @@ -292,7 +311,9 @@ BView *ThemeManager::OptionsView(int32 addon) return NULL; } -status_t ThemeManager::RunPreferencesPanel(int32 addon) + +status_t +ThemeManager::RunPreferencesPanel(int32 addon) { FENTRY; ThemesAddon *ta; @@ -302,7 +323,9 @@ status_t ThemeManager::RunPreferencesPanel(int32 addon) return B_OK; } -status_t ThemeManager::LoadSettings() + +status_t +ThemeManager::LoadSettings() { FENTRY; BMessage addonSettings; @@ -341,7 +364,9 @@ status_t ThemeManager::LoadSettings() return B_OK; } -status_t ThemeManager::SaveSettings() + +status_t +ThemeManager::SaveSettings() { FENTRY; BMessage addonSettings; @@ -375,7 +400,9 @@ status_t ThemeManager::SaveSettings() return B_OK; } -void ThemeManager::SetAddonFlags(int32 addon, uint32 flags) + +void +ThemeManager::SetAddonFlags(int32 addon, uint32 flags) { FENTRY; ThemesAddon *ta; @@ -384,7 +411,9 @@ void ThemeManager::SetAddonFlags(int32 addon, uint32 flags) ta->SetAddonFlags(flags); } -uint32 ThemeManager::AddonFlags(int32 addon) + +uint32 +ThemeManager::AddonFlags(int32 addon) { FENTRY; ThemesAddon *ta; @@ -394,7 +423,9 @@ uint32 ThemeManager::AddonFlags(int32 addon) return 0L; } -status_t ThemeManager::AddNames(BMessage &names) + +status_t +ThemeManager::AddNames(BMessage &names) { FENTRY; int32 i; @@ -411,14 +442,18 @@ status_t ThemeManager::AddNames(BMessage &names) return gerr; } -status_t ThemeManager::GetNames(BMessage &names) + +status_t +ThemeManager::GetNames(BMessage &names) { FENTRY; names = fNames; return B_OK; } -status_t ThemeManager::LoadThemes() + +status_t +ThemeManager::LoadThemes() { FENTRY; int dirwhich; @@ -461,7 +496,9 @@ status_t ThemeManager::LoadThemes() return B_OK; } -status_t ThemeManager::AddTheme(BMessage *theme) + +status_t +ThemeManager::AddTheme(BMessage *theme) { FENTRY; BString name; @@ -477,7 +514,9 @@ status_t ThemeManager::AddTheme(BMessage *theme) return B_OK; } -status_t ThemeManager::UnloadThemes() + +status_t +ThemeManager::UnloadThemes() { FENTRY; int32 i; @@ -491,14 +530,18 @@ status_t ThemeManager::UnloadThemes() return B_OK; } -int32 ThemeManager::CountThemes() + +int32 +ThemeManager::CountThemes() { FENTRY; return fThemeList.CountItems(); } -BMessage *ThemeManager::ThemeAt(int32 id, bool allowbackup) + +BMessage * +ThemeManager::ThemeAt(int32 id, bool allowbackup) { FENTRY; BMessage *theme; @@ -512,7 +555,9 @@ BMessage *ThemeManager::ThemeAt(int32 id, bool allowbackup) return theme; } -status_t ThemeManager::SetThemeAt(int32 id, BMessage ©from) + +status_t +ThemeManager::SetThemeAt(int32 id, BMessage ©from) { FENTRY; BMessage *theme; @@ -537,7 +582,9 @@ status_t ThemeManager::SetThemeAt(int32 id, BMessage ©from) return B_OK; } -int32 ThemeManager::FindTheme(const char *name) + +int32 +ThemeManager::FindTheme(const char *name) { FENTRY; int32 i; @@ -556,7 +603,9 @@ int32 ThemeManager::FindTheme(const char *name) return -1L; } -status_t ThemeManager::CurrentTheme(BMessage ©to) + +status_t +ThemeManager::CurrentTheme(BMessage ©to) { FENTRY; @@ -578,8 +627,8 @@ status_t ThemeManager::CurrentTheme(BMessage ©to) } - -status_t ThemeManager::ApplyTheme(int32 id, uint32 flags) +status_t +ThemeManager::ApplyTheme(int32 id, uint32 flags) { FENTRY; int32 i; @@ -605,7 +654,9 @@ status_t ThemeManager::ApplyTheme(int32 id, uint32 flags) return gerr; } -int32 ThemeManager::MakeTheme(uint32 flags) + +int32 +ThemeManager::MakeTheme(uint32 flags) { FENTRY; int32 i, id; @@ -632,7 +683,9 @@ int32 ThemeManager::MakeTheme(uint32 flags) return id; } -status_t ThemeManager::UpdateTheme(int32 id, uint32 flags) + +status_t +ThemeManager::UpdateTheme(int32 id, uint32 flags) { FENTRY; int32 i; @@ -668,7 +721,9 @@ status_t ThemeManager::UpdateTheme(int32 id, uint32 flags) return B_OK;//gerr; } -status_t ThemeManager::DeleteTheme(int32 id) + +status_t +ThemeManager::DeleteTheme(int32 id) { status_t err; BMessage *theme; @@ -715,7 +770,9 @@ status_t ThemeManager::DeleteTheme(int32 id) return B_OK; } -int32 ThemeManager::SelectedTheme() + +int32 +ThemeManager::SelectedTheme() { BMessage *theme; theme = ThemeAt(fSelectedTheme); @@ -725,7 +782,9 @@ int32 ThemeManager::SelectedTheme() return fSelectedTheme; } -status_t ThemeManager::ApplyDefaultTheme(uint32 flags) + +status_t +ThemeManager::ApplyDefaultTheme(uint32 flags) { FENTRY; int32 i; @@ -748,7 +807,8 @@ status_t ThemeManager::ApplyDefaultTheme(uint32 flags) } -status_t ThemeManager::BackupCurrent() +status_t +ThemeManager::BackupCurrent() { FENTRY; int32 i; @@ -768,7 +828,9 @@ status_t ThemeManager::BackupCurrent() return gerr; } -status_t ThemeManager::RestoreCurrent() + +status_t +ThemeManager::RestoreCurrent() { FENTRY; int32 i; @@ -790,13 +852,17 @@ status_t ThemeManager::RestoreCurrent() return gerr; } -bool ThemeManager::CanRevert() + +bool +ThemeManager::CanRevert() { FENTRY; return !fBackupTheme.IsEmpty(); } -status_t ThemeManager::CompareToCurrent(BMessage &theme) + +status_t +ThemeManager::CompareToCurrent(BMessage &theme) { FENTRY; int32 i; @@ -817,7 +883,8 @@ status_t ThemeManager::CompareToCurrent(BMessage &theme) } -status_t ThemeManager::InstallFiles(BMessage &theme, BDirectory &folder) +status_t +ThemeManager::InstallFiles(BMessage &theme, BDirectory &folder) { FENTRY; int32 i; @@ -836,7 +903,9 @@ status_t ThemeManager::InstallFiles(BMessage &theme, BDirectory &folder) return gerr; } -status_t ThemeManager::BackupFiles(BMessage &theme, BDirectory &folder) + +status_t +ThemeManager::BackupFiles(BMessage &theme, BDirectory &folder) { FENTRY; int32 i; @@ -855,7 +924,9 @@ status_t ThemeManager::BackupFiles(BMessage &theme, BDirectory &folder) return gerr; } -status_t ThemeManager::SaveTheme(int32 id, bool excl) + +status_t +ThemeManager::SaveTheme(int32 id, bool excl) { FENTRY; status_t err; @@ -910,7 +981,9 @@ status_t ThemeManager::SaveTheme(int32 id, bool excl) return B_OK; } -status_t ThemeManager::PackageTheme(BMessage &theme) + +status_t +ThemeManager::PackageTheme(BMessage &theme) { PRINT(("UNIMPLEMENTED %s()\n", __FUNCTION__)); @@ -918,7 +991,9 @@ status_t ThemeManager::PackageTheme(BMessage &theme) return B_OK; } -status_t ThemeManager::LoadTheme(const char *path, BMessage **to) + +status_t +ThemeManager::LoadTheme(const char *path, BMessage **to) { status_t err; BDirectory dir; @@ -959,13 +1034,17 @@ status_t ThemeManager::LoadTheme(const char *path, BMessage **to) return err; } -int32 ThemeManager::CountThemeImporters() + +int32 +ThemeManager::CountThemeImporters() { FENTRY; return fThemeImporters.CountItems(); } -const char * ThemeManager::ThemeImporterAt(int32 index) + +const char * +ThemeManager::ThemeImporterAt(int32 index) { FENTRY; ThemeImporter *importer; @@ -975,7 +1054,9 @@ const char * ThemeManager::ThemeImporterAt(int32 index) return importer->Name(); } -status_t ThemeManager::ImportThemesFor(int32 index, const char *path) + +status_t +ThemeManager::ImportThemesFor(int32 index, const char *path) { FENTRY; status_t err; @@ -1002,7 +1083,9 @@ status_t ThemeManager::ImportThemesFor(int32 index, const char *path) return B_OK; } -bool ThemeManager::ThemeHasInfoFor(int32 id, BString &module) + +bool +ThemeManager::ThemeHasInfoFor(int32 id, BString &module) { FENTRY; status_t err; @@ -1026,7 +1109,9 @@ bool ThemeManager::ThemeHasInfoFor(int32 id, BString &module) return false; } -status_t ThemeManager::ThemeName(int32 id, BString ©to) + +status_t +ThemeManager::ThemeName(int32 id, BString ©to) { FENTRY; status_t err; @@ -1050,7 +1135,9 @@ status_t ThemeManager::ThemeName(int32 id, BString ©to) return B_OK; } -status_t ThemeManager::ThemeLocation(int32 id, BString ©to) + +status_t +ThemeManager::ThemeLocation(int32 id, BString ©to) { FENTRY; status_t err; @@ -1070,7 +1157,9 @@ status_t ThemeManager::ThemeLocation(int32 id, BString ©to) return B_OK; } -bool ThemeManager::ThemeIsReadOnly(int32 id) + +bool +ThemeManager::ThemeIsReadOnly(int32 id) { FENTRY; status_t err; @@ -1095,7 +1184,9 @@ bool ThemeManager::ThemeIsReadOnly(int32 id) return false; } -status_t ThemeManager::ThemeDescription(int32 id, BString ©to) + +status_t +ThemeManager::ThemeDescription(int32 id, BString ©to) { FENTRY; status_t err; @@ -1119,7 +1210,9 @@ status_t ThemeManager::ThemeDescription(int32 id, BString ©to) return B_OK; } -status_t ThemeManager::ThemeKeywords(int32 id, BString ©to) + +status_t +ThemeManager::ThemeKeywords(int32 id, BString ©to) { FENTRY; status_t err; @@ -1143,7 +1236,9 @@ status_t ThemeManager::ThemeKeywords(int32 id, BString ©to) return B_OK; } -status_t ThemeManager::ThemeScreenShot(int32 id, BBitmap **copyto) + +status_t +ThemeManager::ThemeScreenShot(int32 id, BBitmap **copyto) { FENTRY; status_t err; @@ -1184,7 +1279,9 @@ status_t ThemeManager::ThemeScreenShot(int32 id, BBitmap **copyto) return B_OK; } -status_t ThemeManager::SetThemeHasInfoFor(int32 id, BString module) + +status_t +ThemeManager::SetThemeHasInfoFor(int32 id, BString module) { FENTRY; status_t err; @@ -1209,7 +1306,9 @@ status_t ThemeManager::SetThemeHasInfoFor(int32 id, BString module) return err; } -status_t ThemeManager::SetThemeName(int32 id, BString name) + +status_t +ThemeManager::SetThemeName(int32 id, BString name) { FENTRY; status_t err; @@ -1236,7 +1335,9 @@ status_t ThemeManager::SetThemeName(int32 id, BString name) return err; } -status_t ThemeManager::SetThemeDescription(int32 id, BString description) + +status_t +ThemeManager::SetThemeDescription(int32 id, BString description) { FENTRY; status_t err; @@ -1263,7 +1364,9 @@ status_t ThemeManager::SetThemeDescription(int32 id, BString description) return err; } -status_t ThemeManager::SetThemeKeywords(int32 id, BString keywords) + +status_t +ThemeManager::SetThemeKeywords(int32 id, BString keywords) { FENTRY; status_t err; @@ -1290,7 +1393,9 @@ status_t ThemeManager::SetThemeKeywords(int32 id, BString keywords) return err; } -status_t ThemeManager::SetThemeScreenShot(int32 id, BBitmap *bitmap) + +status_t +ThemeManager::SetThemeScreenShot(int32 id, BBitmap *bitmap) { FENTRY; status_t err; @@ -1347,7 +1452,9 @@ status_t ThemeManager::SetThemeScreenShot(int32 id, BBitmap *bitmap) return err; } -status_t ThemeManager::MakeThemeScreenShot(int32 id) + +status_t +ThemeManager::MakeThemeScreenShot(int32 id) { FENTRY; status_t err; @@ -1369,7 +1476,9 @@ status_t ThemeManager::MakeThemeScreenShot(int32 id) return err; } -void ThemeManager::NormalizeThemeFolderName(BString &name) + +void +ThemeManager::NormalizeThemeFolderName(BString &name) { FENTRY; name.RemoveSet("\"\\'/&:*~#|`^"); diff --git a/3rdparty/mmu_man/themes/ThemesAddon.cpp b/3rdparty/mmu_man/themes/ThemesAddon.cpp index 9042e36fa0..7d1985d7e6 100644 --- a/3rdparty/mmu_man/themes/ThemesAddon.cpp +++ b/3rdparty/mmu_man/themes/ThemesAddon.cpp @@ -25,8 +25,11 @@ extern bool CompareMessages(BMessage &a, BMessage &b); +// #pragma mark - + + ThemesAddon::ThemesAddon(const char *name, const char *message_name) - :fImageId(-1), + : fImageId(-1), fName(NULL), fMsgName(NULL), fFlags(0L) @@ -38,6 +41,7 @@ ThemesAddon::ThemesAddon(const char *name, const char *message_name) fSettings.MakeEmpty(); } + ThemesAddon::~ThemesAddon() { FENTRY; @@ -45,30 +49,40 @@ ThemesAddon::~ThemesAddon() free(fName); } -const char *ThemesAddon::Name() + +const char * +ThemesAddon::Name() { return (const char *)fName; } -const char *ThemesAddon::Description() + +const char * +ThemesAddon::Description() { FENTRY; return "No description yet."; } + -BView *ThemesAddon::OptionsView() +BView * +ThemesAddon::OptionsView() { FENTRY; return NULL; } -status_t ThemesAddon::RunPreferencesPanel() + +status_t +ThemesAddon::RunPreferencesPanel() { FENTRY; return B_OK; } -status_t ThemesAddon::LoadSettings(BMessage &settings) + +status_t +ThemesAddon::LoadSettings(BMessage &settings) { FENTRY; uint32 flags; @@ -78,7 +92,9 @@ status_t ThemesAddon::LoadSettings(BMessage &settings) return B_OK; } -status_t ThemesAddon::SaveSettings(BMessage &settings) + +status_t +ThemesAddon::SaveSettings(BMessage &settings) { FENTRY; status_t err; @@ -87,17 +103,23 @@ status_t ThemesAddon::SaveSettings(BMessage &settings) return err; } -void ThemesAddon::SetAddonFlags(uint32 flags) + +void +ThemesAddon::SetAddonFlags(uint32 flags) { fFlags = flags; } -uint32 ThemesAddon::AddonFlags() + +uint32 +ThemesAddon::AddonFlags() { return fFlags; } -status_t ThemesAddon::AddNames(BMessage &names) + +status_t +ThemesAddon::AddNames(BMessage &names) { FENTRY; BString str; @@ -109,7 +131,8 @@ status_t ThemesAddon::AddNames(BMessage &names) } -status_t ThemesAddon::MyMessage(BMessage &theme, BMessage &mine) +status_t +ThemesAddon::MyMessage(BMessage &theme, BMessage &mine) { FENTRY; BMessage msg; @@ -126,7 +149,9 @@ error: return err; } -status_t ThemesAddon::SetMyMessage(BMessage &theme, BMessage &mine) + +status_t +ThemesAddon::SetMyMessage(BMessage &theme, BMessage &mine) { FENTRY; status_t err; @@ -141,26 +166,34 @@ status_t ThemesAddon::SetMyMessage(BMessage &theme, BMessage &mine) return err; } -const char *ThemesAddon::MessageName() + +const char * +ThemesAddon::MessageName() { return (const char *)fMsgName; } -status_t ThemesAddon::ApplyTheme(BMessage &theme, uint32 flags) + +status_t +ThemesAddon::ApplyTheme(BMessage &theme, uint32 flags) { FENTRY; (void)theme; (void) flags; return B_OK; } -status_t ThemesAddon::MakeTheme(BMessage &theme, uint32 flags) + +status_t +ThemesAddon::MakeTheme(BMessage &theme, uint32 flags) { FENTRY; (void)theme; (void) flags; return B_OK; } -status_t ThemesAddon::ApplyDefaultTheme(uint32 flags) + +status_t +ThemesAddon::ApplyDefaultTheme(uint32 flags) { FENTRY; (void) flags; @@ -168,23 +201,28 @@ status_t ThemesAddon::ApplyDefaultTheme(uint32 flags) } -status_t ThemesAddon::BackupCurrent(BMessage &theme) +status_t +ThemesAddon::BackupCurrent(BMessage &theme) { FENTRY; return MakeTheme(theme); } -status_t ThemesAddon::RestoreCurrent(BMessage &theme) + +status_t +ThemesAddon::RestoreCurrent(BMessage &theme) { FENTRY; return ApplyTheme(theme); } + /* by default, try to find the addon's specific message * and compare them. Some addons don't add any message, * they'll have to do comparison by hand. */ -status_t ThemesAddon::CompareToCurrent(BMessage &theme) +status_t +ThemesAddon::CompareToCurrent(BMessage &theme) { FENTRY; BMessage current, a, b; @@ -207,14 +245,16 @@ status_t ThemesAddon::CompareToCurrent(BMessage &theme) } -status_t ThemesAddon::InstallFiles(BMessage &theme, BDirectory &folder) +status_t +ThemesAddon::InstallFiles(BMessage &theme, BDirectory &folder) { FENTRY; (void)theme; (void)folder; return B_OK; } -status_t ThemesAddon::BackupFiles(BMessage &theme, BDirectory &folder) +status_t +ThemesAddon::BackupFiles(BMessage &theme, BDirectory &folder) { FENTRY; (void)theme; (void)folder; @@ -224,12 +264,16 @@ status_t ThemesAddon::BackupFiles(BMessage &theme, BDirectory &folder) /* private */ -void ThemesAddon::SetImageId(image_id id) + +void +ThemesAddon::SetImageId(image_id id) { fImageId = id; } -image_id ThemesAddon::ImageId() + +image_id +ThemesAddon::ImageId() { return fImageId; }