From 1546cbf149d9308ffd2d0d2aa817fbe245de2c61 Mon Sep 17 00:00:00 2001
From: Ingo Weinhold <ingo_weinhold@gmx.de>
Date: Mon, 26 Feb 2007 16:00:45 +0000
Subject: [PATCH] Moved FileSystem class into the new Dispatcher subnamespace,
 so we can drop the "User" part of the way more often used UserFileSystem and
 the other classes that had it accordingly for consistency.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@20237 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 .../server/{FileSystem.cpp => DispatcherFileSystem.cpp}       | 3 ++-
 .../server/{FileSystem.h => DispatcherFileSystem.h}           | 4 +++-
 .../file_systems/userlandfs/server/UserlandFSDispatcher.cpp   | 2 +-
 .../file_systems/userlandfs/server/UserlandFSDispatcher.h     | 3 +++
 4 files changed, 9 insertions(+), 3 deletions(-)
 rename src/add-ons/kernel/file_systems/userlandfs/server/{FileSystem.cpp => DispatcherFileSystem.cpp} (98%)
 rename src/add-ons/kernel/file_systems/userlandfs/server/{FileSystem.h => DispatcherFileSystem.h} (90%)

diff --git a/src/add-ons/kernel/file_systems/userlandfs/server/FileSystem.cpp b/src/add-ons/kernel/file_systems/userlandfs/server/DispatcherFileSystem.cpp
similarity index 98%
rename from src/add-ons/kernel/file_systems/userlandfs/server/FileSystem.cpp
rename to src/add-ons/kernel/file_systems/userlandfs/server/DispatcherFileSystem.cpp
index cf41884637..1d9fc7c3a3 100644
--- a/src/add-ons/kernel/file_systems/userlandfs/server/FileSystem.cpp
+++ b/src/add-ons/kernel/file_systems/userlandfs/server/DispatcherFileSystem.cpp
@@ -1,5 +1,7 @@
 // FileSystem.cpp
 
+#include "DispatcherFileSystem.h"
+
 #include <Application.h>
 #include <Autolock.h>
 #include <Entry.h>
@@ -9,7 +11,6 @@
 
 #include "Debug.h"
 #include "DispatcherDefs.h"
-#include "FileSystem.h"
 #include "ServerDefs.h"
 
 // constructor
diff --git a/src/add-ons/kernel/file_systems/userlandfs/server/FileSystem.h b/src/add-ons/kernel/file_systems/userlandfs/server/DispatcherFileSystem.h
similarity index 90%
rename from src/add-ons/kernel/file_systems/userlandfs/server/FileSystem.h
rename to src/add-ons/kernel/file_systems/userlandfs/server/DispatcherFileSystem.h
index 47e62edb30..356462db31 100644
--- a/src/add-ons/kernel/file_systems/userlandfs/server/FileSystem.h
+++ b/src/add-ons/kernel/file_systems/userlandfs/server/DispatcherFileSystem.h
@@ -11,6 +11,7 @@
 #include "String.h"
 
 namespace UserlandFS {
+namespace Dispatcher {
 
 class FileSystem : public LazyInitializable, public Referencable {
 public:
@@ -39,8 +40,9 @@ private:
 	mutable	BLocker				fTeamLock;
 };
 
+}	// namespace Dispatcher
 }	// namespace UserlandFS
 
-using UserlandFS::FileSystem;
+using UserlandFS::Dispatcher::FileSystem;
 
 #endif	// USERLAND_FS_FILE_SYSTEM_H
diff --git a/src/add-ons/kernel/file_systems/userlandfs/server/UserlandFSDispatcher.cpp b/src/add-ons/kernel/file_systems/userlandfs/server/UserlandFSDispatcher.cpp
index 3fdfe6a6db..81584ecb29 100644
--- a/src/add-ons/kernel/file_systems/userlandfs/server/UserlandFSDispatcher.cpp
+++ b/src/add-ons/kernel/file_systems/userlandfs/server/UserlandFSDispatcher.cpp
@@ -13,7 +13,7 @@
 #include "Compatibility.h"
 #include "Debug.h"
 #include "DispatcherDefs.h"
-#include "FileSystem.h"
+#include "DispatcherFileSystem.h"
 #include "FSInfo.h"
 #include "RequestAllocator.h"
 #include "RequestPort.h"
diff --git a/src/add-ons/kernel/file_systems/userlandfs/server/UserlandFSDispatcher.h b/src/add-ons/kernel/file_systems/userlandfs/server/UserlandFSDispatcher.h
index 97059864f9..ebcaba04f9 100644
--- a/src/add-ons/kernel/file_systems/userlandfs/server/UserlandFSDispatcher.h
+++ b/src/add-ons/kernel/file_systems/userlandfs/server/UserlandFSDispatcher.h
@@ -21,7 +21,10 @@ using UserlandFSUtil::String;
 
 namespace UserlandFS {
 
+namespace Dispatcher {
 class FileSystem;
+}
+using Dispatcher::FileSystem;
 
 class UserlandFSDispatcher : public BApplication {
 public: