From 781a715529c3dde0d9a29e441d517dce5791123d Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Thu, 27 Mar 2008 02:51:58 +0000 Subject: [PATCH] Move RegistrarThread[Manager].cpp to the registrar. There was no point in those living in libbe. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@24603 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/kits/app/Jamfile | 2 -- src/servers/registrar/Jamfile | 2 ++ src/servers/registrar/MIMEManager.h | 2 +- src/servers/registrar/mime/MimeUpdateThread.h | 3 ++- src/{kits/app => servers/registrar/mime}/RegistrarThread.cpp | 0 .../app => src/servers/registrar/mime}/RegistrarThread.h | 0 .../app => servers/registrar/mime}/RegistrarThreadManager.cpp | 4 +++- .../servers/registrar/mime}/RegistrarThreadManager.h | 0 8 files changed, 8 insertions(+), 5 deletions(-) rename src/{kits/app => servers/registrar/mime}/RegistrarThread.cpp (100%) rename {headers/private/app => src/servers/registrar/mime}/RegistrarThread.h (100%) rename src/{kits/app => servers/registrar/mime}/RegistrarThreadManager.cpp (99%) rename {headers/private/app => src/servers/registrar/mime}/RegistrarThreadManager.h (100%) diff --git a/src/kits/app/Jamfile b/src/kits/app/Jamfile index 27860a977c..7aef610ef1 100644 --- a/src/kits/app/Jamfile +++ b/src/kits/app/Jamfile @@ -49,8 +49,6 @@ MergeObject app_kit.o : PropertyInfo.cpp PortLink.cpp RegistrarDefs.cpp - RegistrarThread.cpp - RegistrarThreadManager.cpp Roster.cpp RosterPrivate.cpp Server.cpp diff --git a/src/servers/registrar/Jamfile b/src/servers/registrar/Jamfile index 6531173243..a686fccda6 100644 --- a/src/servers/registrar/Jamfile +++ b/src/servers/registrar/Jamfile @@ -44,6 +44,8 @@ Server registrar MimeSnifferAddon.cpp MimeSnifferAddonManager.cpp MimeUpdateThread.cpp + RegistrarThread.cpp + RegistrarThreadManager.cpp SnifferRules.cpp Supertype.cpp SupportingApps.cpp diff --git a/src/servers/registrar/MIMEManager.h b/src/servers/registrar/MIMEManager.h index 7eda3ab9b7..05317b75ca 100644 --- a/src/servers/registrar/MIMEManager.h +++ b/src/servers/registrar/MIMEManager.h @@ -4,9 +4,9 @@ #define MIME_MANAGER_H #include -#include #include "Database.h" +#include "RegistrarThreadManager.h" class MIMEManager : public BLooper { public: diff --git a/src/servers/registrar/mime/MimeUpdateThread.h b/src/servers/registrar/mime/MimeUpdateThread.h index 924d2b9e0a..adca70a977 100644 --- a/src/servers/registrar/mime/MimeUpdateThread.h +++ b/src/servers/registrar/mime/MimeUpdateThread.h @@ -11,12 +11,13 @@ #define _MIME_UPDATE_THREAD_H #include -#include #include #include #include +#include "RegistrarThread.h" + struct entry_ref; class BMessage; diff --git a/src/kits/app/RegistrarThread.cpp b/src/servers/registrar/mime/RegistrarThread.cpp similarity index 100% rename from src/kits/app/RegistrarThread.cpp rename to src/servers/registrar/mime/RegistrarThread.cpp diff --git a/headers/private/app/RegistrarThread.h b/src/servers/registrar/mime/RegistrarThread.h similarity index 100% rename from headers/private/app/RegistrarThread.h rename to src/servers/registrar/mime/RegistrarThread.h diff --git a/src/kits/app/RegistrarThreadManager.cpp b/src/servers/registrar/mime/RegistrarThreadManager.cpp similarity index 99% rename from src/kits/app/RegistrarThreadManager.cpp rename to src/servers/registrar/mime/RegistrarThreadManager.cpp index 8d2772c570..187aaac0f5 100644 --- a/src/kits/app/RegistrarThreadManager.cpp +++ b/src/servers/registrar/mime/RegistrarThreadManager.cpp @@ -10,10 +10,12 @@ #include "RegistrarThreadManager.h" #include -#include #include +#include "RegistrarThread.h" + + //#define DBG(x) x #define DBG(x) #define OUT printf diff --git a/headers/private/app/RegistrarThreadManager.h b/src/servers/registrar/mime/RegistrarThreadManager.h similarity index 100% rename from headers/private/app/RegistrarThreadManager.h rename to src/servers/registrar/mime/RegistrarThreadManager.h