From e490eab9a00398cedaccfc12ab4d78f9beb46656 Mon Sep 17 00:00:00 2001 From: DarkWyrm Date: Thu, 9 Jun 2005 12:04:29 +0000 Subject: [PATCH] Fixed the build -- updated the PortLink API to match Axel's changes git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@13026 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/prefs/appearance/APRView.cpp | 2 +- src/prefs/appearance/APRView.h | 1 - src/prefs/appearance/CurView.cpp | 2 +- src/prefs/appearance/CurView.h | 1 - src/prefs/appearance/Jamfile | 2 +- src/prefs/appearance/PreviewDriver.h | 4 ++-- src/prefs/appearance/SysCursorAPI.cpp | 2 +- 7 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/prefs/appearance/APRView.cpp b/src/prefs/appearance/APRView.cpp index c3de2c2b61..116703ea7e 100644 --- a/src/prefs/appearance/APRView.cpp +++ b/src/prefs/appearance/APRView.cpp @@ -632,7 +632,7 @@ void APRView::LoadSettings(void) link.StartMessage(AS_GET_UI_COLORS); link.Flush(); - link.GetNextReply(&code); + link.GetNextMessage(code); link.Read(currentset); } else diff --git a/src/prefs/appearance/APRView.h b/src/prefs/appearance/APRView.h index fe9828f3e4..d6db193799 100644 --- a/src/prefs/appearance/APRView.h +++ b/src/prefs/appearance/APRView.h @@ -40,7 +40,6 @@ #include #include #include -#include #include #include class ColorWell; diff --git a/src/prefs/appearance/CurView.cpp b/src/prefs/appearance/CurView.cpp index 1f23e38625..245d3bc998 100644 --- a/src/prefs/appearance/CurView.cpp +++ b/src/prefs/appearance/CurView.cpp @@ -400,7 +400,7 @@ void CurView::SetDefaults(void) link.StartMessage(AS_SET_SYSCURSOR_DEFAULTS); link.Flush(); - link.GetNextReply(&code); + link.GetNextMessage(code); } diff --git a/src/prefs/appearance/CurView.h b/src/prefs/appearance/CurView.h index 4881945a0e..a1ae324d72 100644 --- a/src/prefs/appearance/CurView.h +++ b/src/prefs/appearance/CurView.h @@ -39,7 +39,6 @@ #include #include #include -#include #include #include #include diff --git a/src/prefs/appearance/Jamfile b/src/prefs/appearance/Jamfile index c8427f2fd5..339bab15bf 100644 --- a/src/prefs/appearance/Jamfile +++ b/src/prefs/appearance/Jamfile @@ -16,7 +16,7 @@ Preference Appearance : ColorWell.cpp ColorWhichItem.cpp CursorWhichItem.cpp - : libbe.so libtracker.so libtranslation.so libappserver.so libopenbeos.so + : libopenbeos.so libbe.so libtranslation.so libappserver.so : Appearance.rdef ; diff --git a/src/prefs/appearance/PreviewDriver.h b/src/prefs/appearance/PreviewDriver.h index 6acb2cca13..6ada1c01e3 100644 --- a/src/prefs/appearance/PreviewDriver.h +++ b/src/prefs/appearance/PreviewDriver.h @@ -263,8 +263,8 @@ class PreviewDriver : public DisplayDriver virtual void Unlock(); // display mode access - virtual void SetMode(const display_mode &mode) {} - virtual void GetMode(display_mode *mode) {} + virtual status_t SetMode(const display_mode &mode) { return B_OK; } + virtual void GetMode(display_mode &mode) {} const display_mode* DisplayMode() { return &fDisplayMode; } diff --git a/src/prefs/appearance/SysCursorAPI.cpp b/src/prefs/appearance/SysCursorAPI.cpp index 304dae762e..a87d8c6924 100644 --- a/src/prefs/appearance/SysCursorAPI.cpp +++ b/src/prefs/appearance/SysCursorAPI.cpp @@ -42,7 +42,7 @@ cursor_which get_syscursor(void) BPortLink link(server); link.StartMessage(AS_GET_SYSCURSOR); - link.GetNextReply(&code); + link.GetNextMessage(code); if(code==SERVER_TRUE) {