From 1d13cc310ec466cd798cd51b77a6177ce328e51c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Tue, 23 May 2006 20:15:17 +0000 Subject: [PATCH] It does now compile - turns out the utterly broken MemorySpyWindow.cpp is not needed at all (and so I removed it). git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@17569 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/apps/processcontroller/Jamfile | 5 +- .../processcontroller/MemorySpyWindow.cpp | 67 ------------------- src/apps/processcontroller/MemorySpyWindow.h | 42 ------------ src/apps/processcontroller/PCView.cpp | 26 +++---- 4 files changed, 14 insertions(+), 126 deletions(-) delete mode 100644 src/apps/processcontroller/MemorySpyWindow.cpp delete mode 100644 src/apps/processcontroller/MemorySpyWindow.h diff --git a/src/apps/processcontroller/Jamfile b/src/apps/processcontroller/Jamfile index 97ce5d09a5..9eb10b6dca 100644 --- a/src/apps/processcontroller/Jamfile +++ b/src/apps/processcontroller/Jamfile @@ -2,8 +2,6 @@ SubDir HAIKU_TOP src apps processcontroller ; SetSubDirSupportedPlatformsBeOSCompatible ; -#UsePrivateHeaders shared ; - Application ProcessController : AboutPC.cpp AutoIcon.cpp @@ -11,7 +9,6 @@ Application ProcessController : KernelMemoryBarMenuItem.cpp MemoryBarMenu.cpp MemoryBarMenuItem.cpp - MemorySpyWindow.cpp NoiseBarMenuItem.cpp PCUtils.cpp PCView.cpp @@ -29,6 +26,6 @@ Application ProcessController : ThreadBarMenuItem.cpp URLView.cpp WindowsTools.cpp - : be #tracker translation + : be : #ProcessController.rdef ; diff --git a/src/apps/processcontroller/MemorySpyWindow.cpp b/src/apps/processcontroller/MemorySpyWindow.cpp deleted file mode 100644 index 6958bcd0fa..0000000000 --- a/src/apps/processcontroller/MemorySpyWindow.cpp +++ /dev/null @@ -1,67 +0,0 @@ -/* - - MemorySpyWindow.cpp - - ProcessController © 2000, Georges-Edouard Berenger, All Rights Reserved. - Copyright (C) 2004 beunited.org - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -*/ - -#include "MemorySpyWindow.h" - -const char* kPositionPrefName = "MemorySpyWindowPosition"; - -MemorySpyWindow::MemorySpyWindow (team_id team) - : BWindow (BRect (100, 100, 200, 150)), B_EMPTY_STRING, B_FLOATING_WINDOW_LOOK, - B_NORMAL_WINDOW_FEEL, B_NOT_RESIZABLE | B_NOT_ZOOMABLE) -{ - team_info tinfo; - get - get_team_name_and_icon (); - be_roster->GetRunningAppInfo(tminfo->team, &info) - GebsPreferences tPreferences (kPreferencesFileName); - gPreferences.LoadWindowPosition (this, kPositionPrefName); - SetPulseRate(150000); - - MMView *mmView; - BView *view; - - // set up a rectangle and instantiate a new view - // view rect should be same size as window rect but with left top at (0, 0) - frame.OffsetTo(B_ORIGIN); - view = new BView(frame, "Main", B_FOLLOW_ALL, B_WILL_DRAW); - AddChild(view); - view->SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR)); - - // View About - view->AddChild(new TriggerAboutView(frame.LeftBottom())); - - frame.InsetBy(10, 10); - mmView = new MMView(frame); - - // add view to window - view->AddChild(mmView); - Show(); -} - -bool MemorySpyWindow::QuitRequested() -{ - GebsPreferences tPreferences (kPreferencesFileName); - tPreferences.SaveWindowPosition (this, kPositionPrefName); - be_app->PostMessage (B_QUIT_REQUESTED); - return true; -} diff --git a/src/apps/processcontroller/MemorySpyWindow.h b/src/apps/processcontroller/MemorySpyWindow.h deleted file mode 100644 index 7fbac9d062..0000000000 --- a/src/apps/processcontroller/MemorySpyWindow.h +++ /dev/null @@ -1,42 +0,0 @@ -/* - - MemorySpyWindow.h - - ProcessController - © 2000, Georges-Edouard Berenger, All Rights Reserved. - Copyright (C) 2004 beunited.org - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -*/ - -#ifndef _MEMORY_SPY_WINDOW_H_ -#define _MEMORY_SPY_WINDOW_H_ - -#include - -class MemorySpyWindow : public BWindow { - -public: - MemorySpyWindow (team_id team); - bool QuitRequested (); - -private: - system_info fSysInfos; - app_info fTeamInfo; - BBitmap* fBitmap; -}; - -#endif // _MEMORY_SPY_WINDOW_H_ diff --git a/src/apps/processcontroller/PCView.cpp b/src/apps/processcontroller/PCView.cpp index eba0419a14..9e5f4b3020 100644 --- a/src/apps/processcontroller/PCView.cpp +++ b/src/apps/processcontroller/PCView.cpp @@ -1,9 +1,7 @@ /* - PCView.cpp - - ProcessController - © 2000, Georges-Edouard Berenger, All Rights Reserved. + + ProcessController © 2000, Georges-Edouard Berenger, All Rights Reserved. Copyright (C) 2004 beunited.org This library is free software; you can redistribute it and/or @@ -19,7 +17,6 @@ You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ #include "PCView.h" @@ -29,18 +26,21 @@ #include "Preferences.h" #include "PCUtils.h" #include "Colors.h" -#include + #include -#include -#include -#include -#include -#include #include +#include +#include +#include +#include #include #include -#include -#include +#include +#include + +#include +#include +#include const char* kDeskbarItemName = "ProcessController"; const char* kClassName = "ProcessController";