Style cleanup, no functional changes.
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@38782 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
@@ -165,7 +165,8 @@ parse_arguments(int argc, const char* const* argv, bool noOutput,
|
||||
}
|
||||
|
||||
|
||||
// #pragma mark -
|
||||
// #pragma mark - Debugger application class
|
||||
|
||||
|
||||
class Debugger : public BApplication, private TeamDebugger::Listener {
|
||||
public:
|
||||
@@ -190,7 +191,8 @@ private:
|
||||
|
||||
TeamDebugger* _FindTeamDebugger(team_id teamID) const;
|
||||
TeamDebugger* _StartTeamDebugger(team_id teamID,
|
||||
thread_id threadID = -1, bool stopInMain = false);
|
||||
thread_id threadID = -1,
|
||||
bool stopInMain = false);
|
||||
private:
|
||||
SettingsManager fSettingsManager;
|
||||
TeamDebuggerList fTeamDebuggers;
|
||||
@@ -239,7 +241,7 @@ Debugger::MessageReceived(BMessage* message)
|
||||
if (fTeamsWindow)
|
||||
fTeamsWindow->Activate(true);
|
||||
else {
|
||||
fTeamsWindow = new TeamsWindow();
|
||||
fTeamsWindow = new(std::nothrow) TeamsWindow(&fSettingsManager);
|
||||
fTeamsWindow->Show();
|
||||
}
|
||||
break;
|
||||
@@ -399,9 +401,6 @@ Debugger::QuitRequested()
|
||||
void
|
||||
Debugger::Quit()
|
||||
{
|
||||
printf("Debugger::Quit(): fRunningTeamDebuggers = %ld, fTeamsWindow = %p\n",
|
||||
fRunningTeamDebuggers, fTeamsWindow);
|
||||
|
||||
// don't quit before all team debuggers have been quit
|
||||
if (fRunningTeamDebuggers <= 0 && fTeamsWindow == NULL)
|
||||
BApplication::Quit();
|
||||
|
||||
@@ -21,7 +21,8 @@
|
||||
|
||||
|
||||
TeamListItem::TeamListItem(team_info& info)
|
||||
: BStringItem("", false),
|
||||
:
|
||||
BStringItem("", false),
|
||||
fIcon(NULL)
|
||||
{
|
||||
_SetTo(info);
|
||||
@@ -29,7 +30,8 @@ TeamListItem::TeamListItem(team_info & info)
|
||||
|
||||
|
||||
TeamListItem::TeamListItem(team_id team)
|
||||
: BStringItem("", false),
|
||||
:
|
||||
BStringItem("", false),
|
||||
fIcon(NULL)
|
||||
{
|
||||
team_info info;
|
||||
@@ -174,7 +176,8 @@ TeamListItem::_SetTo(team_info & info)
|
||||
|
||||
|
||||
TeamsListView::TeamsListView(BRect frame, const char* name)
|
||||
: BListView(frame, name, B_SINGLE_SELECTION_LIST, B_FOLLOW_ALL),
|
||||
:
|
||||
BListView(frame, name, B_SINGLE_SELECTION_LIST, B_FOLLOW_ALL),
|
||||
fUpdateRunner(NULL)
|
||||
{
|
||||
team_info tmi;
|
||||
@@ -310,7 +313,7 @@ TeamsListView::_UpdateList()
|
||||
TeamListItem* item;
|
||||
int32 index = 0;
|
||||
|
||||
// NOTA: assuming get_next_team_info() returns team ordered by team ID...
|
||||
// NOTA: assuming get_next_team_info() returns teams ordered by team ID...
|
||||
while (get_next_team_info(&tmi_cookie, &tmi) == B_OK) {
|
||||
|
||||
item = (TeamListItem*) ItemAt(index);
|
||||
@@ -322,11 +325,11 @@ TeamsListView::_UpdateList()
|
||||
|
||||
if (!item || tmi.team != item->TeamID()) {
|
||||
// Team not found in known teams list: insert an new item
|
||||
TeamListItem * item = new TeamListItem(tmi);
|
||||
TeamListItem* newItem = new TeamListItem(tmi);
|
||||
if (!item)
|
||||
index++; // No item with team id bigger found: insert at list end
|
||||
|
||||
AddItem(item, index);
|
||||
AddItem(newItem, index);
|
||||
}
|
||||
index++; // Move list sync head.
|
||||
}
|
||||
|
||||
@@ -18,7 +18,6 @@ class TeamListItem : public BStringItem {
|
||||
public:
|
||||
TeamListItem(team_info & teamInfo);
|
||||
TeamListItem(team_id teamId);
|
||||
|
||||
virtual ~TeamListItem();
|
||||
|
||||
public:
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
* Distributed under the terms of the MIT License.
|
||||
*/
|
||||
|
||||
#include <new>
|
||||
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
@@ -16,13 +17,16 @@
|
||||
#include <Path.h>
|
||||
|
||||
#include "MessageCodes.h"
|
||||
#include "SettingsManager.h"
|
||||
#include "TeamsWindow.h"
|
||||
#include "TeamsListView.h"
|
||||
|
||||
|
||||
TeamsWindow::TeamsWindow()
|
||||
: BWindow(BRect(100, 100, 500, 250), "Teams", B_DOCUMENT_WINDOW,
|
||||
B_ASYNCHRONOUS_CONTROLS)
|
||||
TeamsWindow::TeamsWindow(SettingsManager* settingsManager)
|
||||
:
|
||||
BWindow(BRect(100, 100, 500, 250), "Teams", B_DOCUMENT_WINDOW,
|
||||
B_ASYNCHRONOUS_CONTROLS),
|
||||
fSettingsManager(settingsManager)
|
||||
{
|
||||
BMessage settings;
|
||||
_LoadSettings(settings);
|
||||
|
||||
@@ -11,11 +11,12 @@
|
||||
class BListView;
|
||||
class BFile;
|
||||
class BMessage;
|
||||
class SettingsManager;
|
||||
|
||||
|
||||
class TeamsWindow : public BWindow {
|
||||
public:
|
||||
TeamsWindow();
|
||||
TeamsWindow(SettingsManager* settingsManager);
|
||||
virtual ~TeamsWindow();
|
||||
|
||||
virtual void MessageReceived(BMessage* message);
|
||||
@@ -29,6 +30,7 @@ private:
|
||||
|
||||
private:
|
||||
BListView* fTeamsListView;
|
||||
SettingsManager* fSettingsManager;
|
||||
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user