From 289adc045d3aa7860aae3b1959d28a4d4c440ae2 Mon Sep 17 00:00:00 2001
From: Ingo Weinhold <ingo_weinhold@gmx.de>
Date: Tue, 18 Jan 2005 01:11:39 +0000
Subject: [PATCH] Changed due to moving RegistrarDefs.h stuff into the BPrivate
 namespace and replacing kRosterPortName.

git-svn-id: file:///srv/svn/repos/haiku/trunk/current@10813 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 src/kits/app/Application.cpp            | 2 +-
 src/kits/app/Clipboard.cpp              | 2 ++
 src/kits/app/MessageRunner.cpp          | 2 ++
 src/kits/app/RegistrarThreadManager.cpp | 2 ++
 src/kits/app/Roster.cpp                 | 3 ++-
 src/kits/storage/Mime.cpp               | 2 ++
 src/kits/storage/MimeType.cpp           | 2 ++
 7 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/kits/app/Application.cpp b/src/kits/app/Application.cpp
index bd7832e0e7..f5d36655d1 100644
--- a/src/kits/app/Application.cpp
+++ b/src/kits/app/Application.cpp
@@ -1317,7 +1317,7 @@ const char*
 looper_name_for(const char *signature)
 {
 	if (signature && !strcasecmp(signature, kRegistrarSignature))
-		return kRosterPortName;
+		return BPrivate::get_roster_port_name();
 	return "AppLooperPort";
 }
 
diff --git a/src/kits/app/Clipboard.cpp b/src/kits/app/Clipboard.cpp
index cbd3ba4bc4..d9e29d6a17 100644
--- a/src/kits/app/Clipboard.cpp
+++ b/src/kits/app/Clipboard.cpp
@@ -41,6 +41,8 @@
 // Globals ---------------------------------------------------------------------
 BClipboard *be_clipboard = NULL;
 
+using namespace BPrivate;
+
 
 BClipboard::BClipboard(const char *name, bool transient)
 {
diff --git a/src/kits/app/MessageRunner.cpp b/src/kits/app/MessageRunner.cpp
index bebe6b361d..2b5b48361f 100644
--- a/src/kits/app/MessageRunner.cpp
+++ b/src/kits/app/MessageRunner.cpp
@@ -31,6 +31,8 @@
 #include <Roster.h>
 #include <RosterPrivate.h>
 
+using namespace BPrivate;
+
 // constructor
 /*!	\brief Creates and initializes a new BMessageRunner.
 
diff --git a/src/kits/app/RegistrarThreadManager.cpp b/src/kits/app/RegistrarThreadManager.cpp
index 66720568de..6b88d8a963 100644
--- a/src/kits/app/RegistrarThreadManager.cpp
+++ b/src/kits/app/RegistrarThreadManager.cpp
@@ -18,6 +18,8 @@
 #define DBG(x)
 #define OUT printf
 
+using namespace BPrivate;
+
 /*!
 	\class RegistrarThreadManager
 	\brief RegistrarThreadManager is the master of all threads spawned by the registrar
diff --git a/src/kits/app/Roster.cpp b/src/kits/app/Roster.cpp
index e4f26fcfca..c4d1878cb9 100644
--- a/src/kits/app/Roster.cpp
+++ b/src/kits/app/Roster.cpp
@@ -53,6 +53,7 @@
 #include <Volume.h>
 
 using namespace std;
+using namespace BPrivate;
 
 // debugging
 //#define DBG(x) x
@@ -2180,7 +2181,7 @@ BRoster::InitMessengers()
 {
 DBG(OUT("BRoster::InitMessengers()\n"));
 	// find the registrar port
-	port_id rosterPort = find_port(kRosterPortName);
+	port_id rosterPort = find_port(BPrivate::get_roster_port_name());
 	port_info info;
 	if (rosterPort >= 0 && get_port_info(rosterPort, &info) == B_OK) {
 DBG(OUT("  found roster port\n"));
diff --git a/src/kits/storage/Mime.cpp b/src/kits/storage/Mime.cpp
index f4c80ab7b4..b3d2bc6f8f 100644
--- a/src/kits/storage/Mime.cpp
+++ b/src/kits/storage/Mime.cpp
@@ -23,6 +23,8 @@
 #include <unistd.h>
 #include <sys/ioctl.h>
 
+using namespace BPrivate;
+
 enum {
 	NOT_IMPLEMENTED	= B_ERROR,
 };
diff --git a/src/kits/storage/MimeType.cpp b/src/kits/storage/MimeType.cpp
index 204b044f8b..d4cb6fe721 100644
--- a/src/kits/storage/MimeType.cpp
+++ b/src/kits/storage/MimeType.cpp
@@ -20,6 +20,8 @@
 #include <RegistrarDefs.h>
 #include <RosterPrivate.h>	// For SendTo()
 
+using namespace BPrivate;
+
 // Private helper functions
 bool isValidMimeChar(const char ch);
 status_t toLower(const char *str, char *result);