From 65ace75aa9350a48214d5f33f5bea4e16106a398 Mon Sep 17 00:00:00 2001 From: Michael Hansen Date: Sat, 9 Apr 2011 18:31:52 -0700 Subject: [PATCH] Fix some more include paths --- .../Plasma20/Sources/Plasma/Apps/plClient/plClient.cpp | 2 +- .../Plasma/NucleusLib/pnNetCommon/plGenericVar.h | 2 +- .../Sources/Plasma/NucleusLib/pnNetCommon/plNetApp.cpp | 2 +- .../Sources/Plasma/NucleusLib/pnNetCommon/plNetApp.h | 6 +++--- .../Sources/Plasma/NucleusLib/pnNetCommon/plNetGroup.h | 2 +- .../Plasma/NucleusLib/pnNetCommon/plNetResManager.cpp | 10 +++++----- .../Plasma/NucleusLib/pnNetCommon/plNetSharedState.cpp | 2 +- .../Plasma/NucleusLib/pnNetCommon/plSynchedObject.cpp | 8 ++++---- .../Plasma/NucleusLib/pnNetCommon/plSynchedObject.h | 4 ++-- .../Plasma/NucleusLib/pnNetCommon/plSynchedValue.cpp | 8 ++++---- .../Plasma/NucleusLib/pnNetCommon/pnNetCommon.cpp | 2 +- 11 files changed, 24 insertions(+), 24 deletions(-) diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/Apps/plClient/plClient.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/Apps/plClient/plClient.cpp index 61800c72..2e86938a 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/Apps/plClient/plClient.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/Apps/plClient/plClient.cpp @@ -960,7 +960,7 @@ void plClient::SetHoldLoadRequests(bool hold) ILoadNextRoom(); } -#include "../plResMgr/plPageInfo.h" +#include "plResMgr/plPageInfo.h" void plClient::IQueueRoomLoad(const std::vector& locs, bool hold) { diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnNetCommon/plGenericVar.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnNetCommon/plGenericVar.h index 16a2ba18..8f3700e1 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnNetCommon/plGenericVar.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnNetCommon/plGenericVar.h @@ -29,7 +29,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsTypes.h" #include "hsUtils.h" #include "hsStlUtils.h" -#include "../pnFactory/plCreatable.h" +#include "pnFactory/plCreatable.h" class hsStream; diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnNetCommon/plNetApp.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnNetCommon/plNetApp.cpp index 3cc26b10..aea88ef2 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnNetCommon/plNetApp.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnNetCommon/plNetApp.cpp @@ -25,7 +25,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "plNetApp.h" #include "hsStlUtils.h" -#include "../pnMessage/plMessage.h" +#include "pnMessage/plMessage.h" plNetApp* plNetApp::fInstance = nil; plNetObjectDebuggerBase* plNetObjectDebuggerBase::fInstance=nil; diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnNetCommon/plNetApp.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnNetCommon/plNetApp.h index 34b5b648..bb2f28f2 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnNetCommon/plNetApp.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnNetCommon/plNetApp.h @@ -31,11 +31,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsBitVector.h" #include "plNetGroup.h" -#include "../pnKeyedObject/hsKeyedObject.h" -#include "../pnKeyedObject/plUoid.h" +#include "pnKeyedObject/hsKeyedObject.h" +#include "pnKeyedObject/plUoid.h" -#include "../../PubUtilLib/plStatusLog/plLoggable.h" +#include "plStatusLog/plLoggable.h" #include diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnNetCommon/plNetGroup.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnNetCommon/plNetGroup.h index bfd69e53..e289be2d 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnNetCommon/plNetGroup.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnNetCommon/plNetGroup.h @@ -26,7 +26,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #ifndef plNetGroup_h #define plNetGroup_h -#include "../pnKeyedObject/plUoid.h" +#include "pnKeyedObject/plUoid.h" #include "hsStream.h" #include "hsStlUtils.h" diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnNetCommon/plNetResManager.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnNetCommon/plNetResManager.cpp index 994ed3a5..accc930a 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnNetCommon/plNetResManager.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnNetCommon/plNetResManager.cpp @@ -45,11 +45,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com ////////////////////////////////////////////////////////////////////////////// #include "plNetResManager.h" -#include "../pnKeyedObject/plKeyImp.h" -#include "../pnKeyedObject/plUoid.h" -#include "../pnKeyedObject/hsKeyedObject.h" -#include "../pnFactory/plCreatable.h" -#include "../pnNetCommon/plNetApp.h" +#include "pnKeyedObject/plKeyImp.h" +#include "pnKeyedObject/plUoid.h" +#include "pnKeyedObject/hsKeyedObject.h" +#include "pnFactory/plCreatable.h" +#include "pnNetCommon/plNetApp.h" #include "hsStream.h" plNetResManager::plNetResManager() diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnNetCommon/plNetSharedState.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnNetCommon/plNetSharedState.cpp index d7c330d5..6f3f93ee 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnNetCommon/plNetSharedState.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnNetCommon/plNetSharedState.cpp @@ -26,7 +26,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "hsStream.h" #include "plNetSharedState.h" #include "plGenericVar.h" -#include "../pnMessage/plMessage.h" +#include "pnMessage/plMessage.h" plNetSharedState::plNetSharedState(char* name) : fServerMayDelete(false) { diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnNetCommon/plSynchedObject.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnNetCommon/plSynchedObject.cpp index 0671bada..35ebd084 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnNetCommon/plSynchedObject.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnNetCommon/plSynchedObject.cpp @@ -28,10 +28,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plNetApp.h" #include "plNetGroup.h" #include "hsResMgr.h" -#include "../pnSceneObject/plSceneObject.h" -#include "../pnKeyedObject/plKey.h" -#include "../pnMessage/plSDLModifierMsg.h" -#include "../pnMessage/plSetNetGroupIDMsg.h" +#include "pnSceneObject/plSceneObject.h" +#include "pnKeyedObject/plKey.h" +#include "pnMessage/plSDLModifierMsg.h" +#include "pnMessage/plSetNetGroupIDMsg.h" #include diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnNetCommon/plSynchedObject.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnNetCommon/plSynchedObject.h index 87561d1d..1f0c3748 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnNetCommon/plSynchedObject.h +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnNetCommon/plSynchedObject.h @@ -27,8 +27,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #define PLSYNCHOBJ_inc #include "hsTypes.h" -#include "../pnKeyedObject/hsKeyedObject.h" -#include "../pnKeyedObject/plKey.h" +#include "pnKeyedObject/hsKeyedObject.h" +#include "pnKeyedObject/plKey.h" #include "hsStlUtils.h" #include "plNetGroup.h" diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnNetCommon/plSynchedValue.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnNetCommon/plSynchedValue.cpp index 06781a45..a6b4a67a 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnNetCommon/plSynchedValue.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnNetCommon/plSynchedValue.cpp @@ -26,12 +26,12 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "plSynchedValue.h" #ifdef USE_SYNCHED_VALUES -#include "../pnKeyedObject/plKey.h" +#include "pnKeyedObject/plKey.h" #include "hsBitVector.h" -#include "../pnSceneObject/plSceneObject.h" +#include "pnSceneObject/plSceneObject.h" #include "hsResMgr.h" -#include "../pnKeyedObject/plUoid.h" -#include "../pnSceneObject/plCoordinateInterface.h" +#include "pnKeyedObject/plUoid.h" +#include "pnSceneObject/plCoordinateInterface.h" #define ISaveOrLoadSimpleType() \ { \ diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnNetCommon/pnNetCommon.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnNetCommon/pnNetCommon.cpp index 4958c273..56e05db1 100644 --- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnNetCommon/pnNetCommon.cpp +++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/NucleusLib/pnNetCommon/pnNetCommon.cpp @@ -24,7 +24,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com *==LICENSE==*/ #include "pnNetCommon.h" -#include "../pnAddrInfo/pnAddrInfo.h" +#include "pnAddrInfo/pnAddrInfo.h" #ifdef HS_BUILD_FOR_WIN32 # include "hsWindows.h" #elif HS_BUILD_FOR_UNIX