i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Roster: style fixes.

Browse Source 
* Check if == NULL or == 0 explicitily
* Use NULL instead of 0 as default value for pointers in header.
* other little stuff, new lines, comments
This commit is contained in:
John Scipione
2014-06-25 19:31:24 -04:00
parent 9760ac0d19
commit 732c579702
2 changed files with 21 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/os/app/Roster.h
+8 -8
View File
@@ -100,21 +100,21 @@ public:
// launch app // launch app
status_t Launch(const char* mimeType, status_t Launch(const char* mimeType,
BMessage* initialMessage = 0, BMessage* initialMessage = NULL,
team_id* appTeam = 0) const; team_id* appTeam = NULL) const;
status_t Launch(const char* mimeType, BList* messageList, status_t Launch(const char* mimeType, BList* messageList,
team_id* appTeam = 0) const; team_id* appTeam = NULL) const;
status_t Launch(const char* mimeType, int argc, status_t Launch(const char* mimeType, int argc,
char* *args, team_id* appTeam = 0) const; char* *args, team_id* appTeam = NULL) const;
status_t Launch(const entry_ref* ref, status_t Launch(const entry_ref* ref,
const BMessage* initialMessage = 0, const BMessage* initialMessage = NULL,
team_id* appTeam = 0) const; team_id* appTeam = NULL) const;
status_t Launch(const entry_ref* ref, status_t Launch(const entry_ref* ref,
const BList* messageList, const BList* messageList,
team_id* appTeam = 0) const; team_id* appTeam = NULL) const;
status_t Launch(const entry_ref* ref, int argc, status_t Launch(const entry_ref* ref, int argc,
const char* const* args, const char* const* args,
team_id* appTeam = 0) const; team_id* appTeam = NULL) const;
// recent documents, folders, apps // recent documents, folders, apps
void GetRecentDocuments(BMessage* refList, void GetRecentDocuments(BMessage* refList,
src/kits/app/Roster.cpp
+13 -11
View File
@@ -56,11 +56,12 @@ using namespace BPrivate;
//#define DBG(x) x //#define DBG(x) x
#define DBG(x) #define DBG(x)
#ifdef DEBUG_PRINTF #ifdef DEBUG_PRINTF
#define OUT DEBUG_PRINTF # define OUT DEBUG_PRINTF
#else #else
#define OUT printf # define OUT printf
#endif #endif
enum { enum {
NOT_IMPLEMENTED = B_ERROR, NOT_IMPLEMENTED = B_ERROR,
}; };
@@ -946,7 +947,7 @@ BRoster::Launch(const char* mimeType, BMessage* initialMessage,
return B_BAD_VALUE; return B_BAD_VALUE;
BList messageList; BList messageList;
if (initialMessage) if (initialMessage != NULL)
messageList.AddItem(initialMessage); messageList.AddItem(initialMessage);
return _LaunchApp(mimeType, NULL, &messageList, 0, NULL, appTeam); return _LaunchApp(mimeType, NULL, &messageList, 0, NULL, appTeam);
@@ -987,7 +988,7 @@ BRoster::Launch(const entry_ref* ref, const BMessage* initialMessage,
return B_BAD_VALUE; return B_BAD_VALUE;
BList messageList; BList messageList;
if (initialMessage) if (initialMessage != NULL)
messageList.AddItem(const_cast<BMessage*>(initialMessage)); messageList.AddItem(const_cast<BMessage*>(initialMessage));
return _LaunchApp(NULL, ref, &messageList, 0, NULL, appTeam); return _LaunchApp(NULL, ref, &messageList, 0, NULL, appTeam);
@@ -1977,8 +1978,8 @@ BRoster::_LaunchApp(const char* mimeType, const entry_ref* ref,
// If the target app is B_ARGV_ONLY, only if it is newly launched // If the target app is B_ARGV_ONLY, only if it is newly launched
// messages are sent to it (namely B_ARGV_RECEIVED and B_READY_TO_RUN). // messages are sent to it (namely B_ARGV_RECEIVED and B_READY_TO_RUN).
// An already running B_ARGV_ONLY app won't get any messages. // An already running B_ARGV_ONLY app won't get any messages.
bool argvOnly = (appFlags & B_ARGV_ONLY) bool argvOnly = (appFlags & B_ARGV_ONLY) != 0
|| (alreadyRunning && (otherAppFlags & B_ARGV_ONLY)); || (alreadyRunning && (otherAppFlags & B_ARGV_ONLY) != 0);
const BList* _messageList = (argvOnly ? NULL : messageList); const BList* _messageList = (argvOnly ? NULL : messageList);
// don't send ref, if it refers to the app or is included in the // don't send ref, if it refers to the app or is included in the
// argument vector // argument vector
@@ -2549,6 +2550,7 @@ BRoster::_SendToRunning(team_id team, int argc, const char* const* args,
bool alreadyRunning) const bool alreadyRunning) const
{ {
status_t error = B_OK; status_t error = B_OK;
// Construct a messenger to the app: We can't use the public constructor, // Construct a messenger to the app: We can't use the public constructor,
// since the target application may be B_ARGV_ONLY. // since the target application may be B_ARGV_ONLY.
app_info info; app_info info;
@@ -2559,16 +2561,16 @@ BRoster::_SendToRunning(team_id team, int argc, const char* const* args,
B_PREFERRED_TOKEN); B_PREFERRED_TOKEN);
// send messages from the list // send messages from the list
if (messageList) { if (messageList != NULL) {
for (int32 i = 0; for (int32 i = 0;
BMessage* message = (BMessage*)messageList->ItemAt(i); BMessage* message = (BMessage*)messageList->ItemAt(i);
i++) { i++) {
messenger.SendMessage(message); messenger.SendMessage(message);
} }
} }
// send B_ARGV_RECEIVED or B_REFS_RECEIVED or B_SILENT_RELAUNCH (if // send B_ARGV_RECEIVED or B_REFS_RECEIVED or B_SILENT_RELAUNCH
// already running) // (if already running)
if (args != NULL && argc > 1) { if (args != NULL && argc > 1) {
BMessage message(B_ARGV_RECEIVED); BMessage message(B_ARGV_RECEIVED);
message.AddInt32("argc", argc); message.AddInt32("argc", argc);