From ad1263fce3f0d6df2d0ae8a15020fbf7606c989a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= Date: Sun, 19 Jun 2011 18:15:25 +0000 Subject: [PATCH] Part of patch from #6840: * GCC 4.5 complains about switchs with cases not part of the directory_which enum * Merge FSUtils directory_which values into the enum git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@42251 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- headers/os/storage/FindDirectory.h | 9 +++++++++ src/kits/tracker/FSUtils.h | 12 ------------ 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/headers/os/storage/FindDirectory.h b/headers/os/storage/FindDirectory.h index f7814475ec..80f6328634 100644 --- a/headers/os/storage/FindDirectory.h +++ b/headers/os/storage/FindDirectory.h @@ -69,11 +69,20 @@ typedef enum { B_USER_SOUNDS_DIRECTORY, B_USER_DATA_DIRECTORY, B_USER_CACHE_DIRECTORY, + B_USER_MAIL_DIRECTORY, + B_USER_QUERIES_DIRECTORY, + B_USER_PEOPLE_DIRECTORY, + B_USER_DOWNLOADS_DIRECTORY, + B_USER_DESKBAR_APPS_DIRECTORY, + B_USER_DESKBAR_PREFERENCES_DIRECTORY, + B_USER_DESKBAR_DEVELOP_DIRECTORY, + /* Global directories. */ B_APPS_DIRECTORY = 4000, B_PREFERENCES_DIRECTORY, B_UTILITIES_DIRECTORY, + B_BOOT_DISK, /* Obsolete: Legacy BeOS definition to be phased out */ B_BEOS_DIRECTORY = 1000, diff --git a/src/kits/tracker/FSUtils.h b/src/kits/tracker/FSUtils.h index eb359028b2..ec9f43f855 100644 --- a/src/kits/tracker/FSUtils.h +++ b/src/kits/tracker/FSUtils.h @@ -260,18 +260,6 @@ _IMPEXP_TRACKER void FSOpenWithDocuments(const entry_ref *executableToLaunch, _IMPEXP_TRACKER status_t FSLaunchUsing(const entry_ref *ref, BMessage *listOfRefs); -// some extra directory_which values -// move these to FindDirectory.h -const uint32 B_USER_MAIL_DIRECTORY = 3500; -const uint32 B_USER_QUERIES_DIRECTORY = 3501; -const uint32 B_USER_PEOPLE_DIRECTORY = 3502; -const uint32 B_USER_DOWNLOADS_DIRECTORY = 3503; -const uint32 B_USER_DESKBAR_APPS_DIRECTORY = 3504; -const uint32 B_USER_DESKBAR_PREFERENCES_DIRECTORY = 3505; -const uint32 B_USER_DESKBAR_DEVELOP_DIRECTORY = 3506; -const uint32 B_BOOT_DISK = 3507; - // map /boot into the directory_which enum for convenience - class WellKnowEntryList { // matches up names, id's and node_refs of well known entries in the // system hierarchy