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

Removed BRoster::Launch() const args kludges.

Browse Source 
* They are no longer needed, as Launch() no longer takes a
  const-less char array.
This commit is contained in:
Axel Dörfler
2015-01-28 17:06:32 +01:00
parent be883bad52
commit 03b57bdc55
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/processcontroller/ProcessController.cpp
+7 -6
View File
@@ -1,7 +1,7 @@
/* /*
ProcessController © 2000, Georges-Edouard Berenger, All Rights Reserved. ProcessController © 2000, Georges-Edouard Berenger, All Rights Reserved.
Copyright (C) 2004 beunited.org Copyright (C) 2004 beunited.org
Copyright (c) 2006-2013, Haiku, Inc. All rights reserved. Copyright (c) 2006-2015, Haiku, Inc. All rights reserved.
This library is free software; you can redistribute it and/or This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public modify it under the terms of the GNU Lesser General Public
@@ -244,13 +244,14 @@ ProcessController::Init()
void void
ProcessController::_HandleDebugRequest(team_id team, thread_id thread) ProcessController::_HandleDebugRequest(team_id team, thread_id thread)
{ {
char *argv[2];
char paramString[16]; char paramString[16];
char idString[16]; char idString[16];
strlcpy(paramString, thread > 0 ? "--thread" : "--team", sizeof(paramString)); strlcpy(paramString, thread > 0 ? "--thread" : "--team",
snprintf(idString, sizeof(idString), "%" B_PRId32, thread > 0 ? thread : team); sizeof(paramString));
argv[0] = paramString; snprintf(idString, sizeof(idString), "%" B_PRId32,
argv[1] = idString; thread > 0 ? thread : team);
const char* argv[] = {paramString, idString, NULL};
status_t error = be_roster->Launch(kDebuggerSignature, 2, argv); status_t error = be_roster->Launch(kDebuggerSignature, 2, argv);
if (error != B_OK) { if (error != B_OK) {
// TODO: notify user // TODO: notify user
src/apps/webpositive/BrowserWindow.cpp
+3 -3
View File
@@ -5,7 +5,7 @@
* Copyright (C) 2010 Stephan Aßmus <[email protected]> * Copyright (C) 2010 Stephan Aßmus <[email protected]>
* Copyright (C) 2010 Michael Lotz <[email protected]> * Copyright (C) 2010 Michael Lotz <[email protected]>
* Copyright (C) 2010 Rene Gollent <[email protected]> * Copyright (C) 2010 Rene Gollent <[email protected]>
* Copyright 2013-2014 Haiku, Inc. All rights reserved. * Copyright 2013-2015 Haiku, Inc. All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions * modification, are permitted provided that the following conditions
@@ -420,7 +420,7 @@ BrowserWindow::BrowserWindow(BRect frame, SettingsMessage* appSettings,
menu->AddItem(new BMenuItem(B_TRANSLATE("Settings"), menu->AddItem(new BMenuItem(B_TRANSLATE("Settings"),
new BMessage(SHOW_SETTINGS_WINDOW))); new BMessage(SHOW_SETTINGS_WINDOW)));
menu->AddItem(new BMenuItem(B_TRANSLATE("Script console"), menu->AddItem(new BMenuItem(B_TRANSLATE("Script console"),
new BMessage(SHOW_CONSOLE_WINDOW))); new BMessage(SHOW_CONSOLE_WINDOW)));
BMenuItem* aboutItem = new BMenuItem(B_TRANSLATE("About"), BMenuItem* aboutItem = new BMenuItem(B_TRANSLATE("About"),
new BMessage(B_ABOUT_REQUESTED)); new BMessage(B_ABOUT_REQUESTED));
menu->AddItem(aboutItem); menu->AddItem(aboutItem);
@@ -2502,7 +2502,7 @@ BrowserWindow::_SmartURLHandler(const BString& url)
temp = "application/x-vnd.Be.URL."; temp = "application/x-vnd.Be.URL.";
temp += proto; temp += proto;
char* argv[1] = { (char*)url.String() }; const char* argv[1] = { url.String(), NULL };
if (be_roster->Launch(temp.String(), 1, argv) == B_OK) if (be_roster->Launch(temp.String(), 1, argv) == B_OK)
return; return;