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

Removed warnings and errors which were missed in the transition to BPortLink

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@8616 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
DarkWyrm
2004-08-21 19:48:13 +00:00
parent c7000cc7b3
commit bc7060f4fc
5 changed files with 32 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/prefs/appearance/APRView.cpp
+8 -7
View File
@@ -619,12 +619,13 @@ void APRView::LoadSettings(void)
if(port!=B_NAME_NOT_FOUND) if(port!=B_NAME_NOT_FOUND)
{ {
STRACE(("Retrieving settings from app_server\n")); STRACE(("Retrieving settings from app_server\n"));
PortLink link(port); BPortLink link(port);
PortMessage pmsg; int32 code;
link.SetOpCode(AS_GET_UI_COLORS); link.StartMessage(AS_GET_UI_COLORS);
link.FlushWithReply(&pmsg); link.Flush();
pmsg.Read<ColorSet>(currentset); link.GetNextReply(&code);
link.Read<ColorSet>(currentset);
} }
else else
{ {
@@ -689,9 +690,9 @@ void APRView::NotifyServer(void)
if(port!=B_NAME_NOT_FOUND) if(port!=B_NAME_NOT_FOUND)
{ {
STRACE(("Notifying app_server\n")); STRACE(("Notifying app_server\n"));
PortLink link(port); BPortLink link(port);
link.SetOpCode(AS_SET_UI_COLORS); link.StartMessage(AS_SET_UI_COLORS);
link.Attach<ColorSet>(*currentset); link.Attach<ColorSet>(*currentset);
link.Flush(); link.Flush();
} }
src/prefs/appearance/CurView.cpp
+5 -4
View File
@@ -399,11 +399,12 @@ void CurView::SetDefaults(void)
if(port==B_NAME_NOT_FOUND) if(port==B_NAME_NOT_FOUND)
return; return;
PortLink link(port); BPortLink link(port);
PortMessage pmsg; int32 code;
link.SetOpCode(AS_SET_SYSCURSOR_DEFAULTS); link.StartMessage(AS_SET_SYSCURSOR_DEFAULTS);
link.FlushWithReply(&pmsg); link.Flush();
link.GetNextReply(&code);
} }
src/prefs/appearance/DecView.cpp
+3 -3
View File
@@ -253,9 +253,9 @@ void DecView::NotifyServer(void)
return; return;
PortLink pl(serverport); BPortLink pl(serverport);
pl.SetOpCode(AS_SET_DECORATOR); pl.StartMessage(AS_SET_DECORATOR);
pl.Attach(item->Text(),strlen(item->Text())+1); pl.AttachString(item->Text());
pl.Flush(); pl.Flush();
} }
src/prefs/appearance/PreviewDriver.cpp
+12 -6
View File
@@ -156,7 +156,7 @@ void PreviewDriver::SetMode(const display_mode &mode)
{ {
} }
void PreviewDriver::FillSolidRect(const BRect &rect, RGBColor &color) void PreviewDriver::FillSolidRect(const BRect &rect, const RGBColor &color)
{ {
view->viewbmp->Lock(); view->viewbmp->Lock();
drawview->SetHighColor(color.GetColor32()); drawview->SetHighColor(color.GetColor32());
@@ -180,8 +180,11 @@ void PreviewDriver::FillPatternRect(const BRect &rect, const DrawData *d)
view->viewbmp->Unlock(); view->viewbmp->Unlock();
} }
void PreviewDriver::StrokeSolidLine(const BPoint &start, const BPoint &end, RGBColor &color) void PreviewDriver::StrokeSolidLine(int32 x1, int32 y1, int32 x2, int32 y2, const RGBColor &color)
{ {
BPoint start(x1,y1);
BPoint end(x2,y2);
view->viewbmp->Lock(); view->viewbmp->Lock();
drawview->SetHighColor(color.GetColor32()); drawview->SetHighColor(color.GetColor32());
drawview->StrokeLine(start,end); drawview->StrokeLine(start,end);
@@ -190,11 +193,14 @@ void PreviewDriver::StrokeSolidLine(const BPoint &start, const BPoint &end, RGBC
view->viewbmp->Unlock(); view->viewbmp->Unlock();
} }
void PreviewDriver::StrokePatternLine(const BPoint &start, const BPoint &end, const DrawData *d) void PreviewDriver::StrokePatternLine(int32 x1, int32 y1, int32 x2, int32 y2, const DrawData *d)
{ {
if(!d) if(!d)
return; return;
BPoint start(x1,y1);
BPoint end(x2,y2);
view->viewbmp->Lock(); view->viewbmp->Lock();
drawview->SetHighColor(d->highcolor.GetColor32()); drawview->SetHighColor(d->highcolor.GetColor32());
drawview->SetLowColor(d->lowcolor.GetColor32()); drawview->SetLowColor(d->lowcolor.GetColor32());
@@ -204,7 +210,7 @@ void PreviewDriver::StrokePatternLine(const BPoint &start, const BPoint &end, co
view->viewbmp->Unlock(); view->viewbmp->Unlock();
} }
void PreviewDriver::StrokeSolidRect(const BRect &rect, RGBColor &color) void PreviewDriver::StrokeSolidRect(const BRect &rect, const RGBColor &color)
{ {
view->viewbmp->Lock(); view->viewbmp->Lock();
drawview->SetHighColor(color.GetColor32()); drawview->SetHighColor(color.GetColor32());
@@ -234,12 +240,12 @@ void PreviewDriver::ReleaseBuffer(void)
{ {
view->viewbmp->Unlock(); view->viewbmp->Unlock();
} }
bool PreviewDriver::Lock(bigtime_t timeout=B_INFINITE_TIMEOUT) bool PreviewDriver::Lock(bigtime_t timeout=B_INFINITE_TIMEOUT)
{ {
return view->viewbmp->Lock(); return true;
} }
void PreviewDriver::Unlock(void) void PreviewDriver::Unlock(void)
{ {
view->viewbmp->Unlock();
} }
src/prefs/appearance/PreviewDriver.h
+4 -4
View File
@@ -79,11 +79,11 @@ public:
virtual void Unlock(void); virtual void Unlock(void);
protected: protected:
virtual void FillSolidRect(const BRect &rect, RGBColor &color); virtual void FillSolidRect(const BRect &rect, const RGBColor &color);
virtual void FillPatternRect(const BRect &rect, const DrawData *d); virtual void FillPatternRect(const BRect &rect, const DrawData *d);
virtual void StrokeSolidLine(const BPoint &start, const BPoint &end, RGBColor &color); virtual void StrokeSolidLine(int32 x1, int32 y1, int32 x2, int32 y2, const RGBColor &color);
virtual void StrokePatternLine(const BPoint &start, const BPoint &end, const DrawData *d); virtual void StrokePatternLine(int32 x1, int32 y1, int32 x2, int32 y2, const DrawData *d);
virtual void StrokeSolidRect(const BRect &rect, RGBColor &color); virtual void StrokeSolidRect(const BRect &rect, const RGBColor &color);
virtual bool AcquireBuffer(FBBitmap *bmp); virtual bool AcquireBuffer(FBBitmap *bmp);
virtual void ReleaseBuffer(void); virtual void ReleaseBuffer(void);