[haiku-commits] r42251 - in haiku/trunk: headers/os/storage src/kits/tracker
- From: korli@xxxxxxxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Sun, 19 Jun 2011 20:15:25 +0200 (CEST)
Author: korli
Date: 2011-06-19 20:15:25 +0200 (Sun, 19 Jun 2011)
New Revision: 42251
Changeset: https://dev.haiku-os.org/changeset/42251
Ticket: https://dev.haiku-os.org/ticket/6840
Modified:
haiku/trunk/headers/os/storage/FindDirectory.h
haiku/trunk/src/kits/tracker/FSUtils.h
Log:
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
Modified: haiku/trunk/headers/os/storage/FindDirectory.h
===================================================================
--- haiku/trunk/headers/os/storage/FindDirectory.h 2011-06-19 18:13:21 UTC
(rev 42250)
+++ haiku/trunk/headers/os/storage/FindDirectory.h 2011-06-19 18:15:25 UTC
(rev 42251)
@@ -69,11 +69,20 @@
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,
Modified: haiku/trunk/src/kits/tracker/FSUtils.h
===================================================================
--- haiku/trunk/src/kits/tracker/FSUtils.h 2011-06-19 18:13:21 UTC (rev
42250)
+++ haiku/trunk/src/kits/tracker/FSUtils.h 2011-06-19 18:15:25 UTC (rev
42251)
@@ -260,18 +260,6 @@
_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
Other related posts:
