Syntax fixes for FeatureLib.

Sources/Plasma/FeatureLib/pfCamera/plCameraModifier.h

@@ -154,4 +154,4 @@ private:
 
 
 
-#endif plCameraModifier_inc
+#endif //plCameraModifier_inc

Sources/Plasma/FeatureLib/pfCamera/plInterestingModifier.h

@@ -76,4 +76,4 @@ public:
 
 
 
-#endif plInterestingModifier_inc
+#endif //plInterestingModifier_inc

Sources/Plasma/FeatureLib/pfCamera/plVirtualCamNeu.h

@@ -232,4 +232,4 @@ private:
 };
 
 
-#endif plVirtualCam1_inc
+#endif //plVirtualCam1_inc

Sources/Plasma/FeatureLib/pfConsole/pfDispatchLog.cpp

@@ -30,7 +30,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "pnKeyedObject/plKey.h"
 #include "hsWindows.h"
 
-bool DumpSpecificMsgInfo(plMessage* msg, std::string& info);
+static bool DumpSpecificMsgInfo(plMessage* msg, std::string& info);
 
 plDispatchLog::plDispatchLog() :
     fLog(nil),
@@ -184,7 +184,7 @@ static bool DumpSpecificMsgInfo(plMessage* msg, std::string& info)
     if (kiMsg)
     {
         const char* typeName = "(unknown)";
-        #define PrintKIType(type)   if (kiMsg->GetCommand() == pfKIMsg::##type) typeName = #type;
+        #define PrintKIType(type)   if (kiMsg->GetCommand() == pfKIMsg::type) typeName = #type;
         PrintKIType(kHACKChatMsg);              // send chat message via pfKIMsg
         PrintKIType(kEnterChatMode);                // toggle chat mode
         PrintKIType(kSetChatFadeDelay);         // set the chat delay
@@ -253,7 +253,7 @@ static bool DumpSpecificMsgInfo(plMessage* msg, std::string& info)
     plClientMsg* clientMsg = plClientMsg::ConvertNoRef(msg);
     if (clientMsg)
     {
-        #define PrintType(type) if (clientMsg->GetClientMsgFlag() == plClientMsg::##type) info = #type;
+        #define PrintType(type) if (clientMsg->GetClientMsgFlag() == plClientMsg::type) info = #type;
         PrintType(kLoadRoom);
         PrintType(kLoadRoomHold);
         PrintType(kUnloadRoom);
@@ -297,7 +297,7 @@ static bool DumpSpecificMsgInfo(plMessage* msg, std::string& info)
     if (refMsg)
     {
         const char* typeName = nil;
-        #define GetType(type)   if (refMsg->GetContext() == plRefMsg::##type) typeName = #type;
+        #define GetType(type)   if (refMsg->GetContext() == plRefMsg::type) typeName = #type;
         GetType(kOnCreate);
         GetType(kOnDestroy);
         GetType(kOnRequest);

Sources/Plasma/FeatureLib/pfLocalizationMgr/pfLocalizationDataMgr.cpp

@@ -834,7 +834,7 @@ template<class mapT>
 std::vector<std::wstring> pfLocalizationDataMgr::pf3PartMap<mapT>::getAgeList()
 {
     std::vector<std::wstring> retVal;
-    ThreePartMap::iterator curAge;
+    typename ThreePartMap::iterator curAge;
 
     for (curAge = fData.begin(); curAge != fData.end(); curAge++)
         retVal.push_back(curAge->first);
@@ -848,7 +848,7 @@ template<class mapT>
 std::vector<std::wstring> pfLocalizationDataMgr::pf3PartMap<mapT>::getSetList(const std::wstring & age)
 {
     std::vector<std::wstring> retVal;
-    std::map<std::wstring, std::map<std::wstring, mapT> >::iterator curSet;
+    typename std::map<std::wstring, std::map<std::wstring, mapT> >::iterator curSet;
 
     if (fData.find(age) == fData.end())
         return retVal; // return an empty list, the age doesn't exist
@@ -865,7 +865,7 @@ template<class mapT>
 std::vector<std::wstring> pfLocalizationDataMgr::pf3PartMap<mapT>::getNameList(const std::wstring & age, const std::wstring & set)
 {
     std::vector<std::wstring> retVal;
-    std::map<std::wstring, mapT>::iterator curName;
+    typename std::map<std::wstring, mapT>::iterator curName;
 
     if (fData.find(age) == fData.end())
         return retVal; // return an empty list, the age doesn't exist

Sources/Plasma/FeatureLib/pfPython/cyAvatar.h

@@ -484,7 +484,7 @@ public:
     //
     //  PURPOSE    : Enter the personal book mode...stay until further notice.
     //
-    static bool cyAvatar::EnterPBMode();
+    static bool EnterPBMode();
 
     /////////////////////////////////////////////////////////////////////////////
     //
@@ -494,7 +494,7 @@ public:
     //  PURPOSE    : Leave the personal book mode. Currently leaves any mode; will become
     //             : more specific in future version
     //
-    static bool cyAvatar::ExitPBMode();
+    static bool ExitPBMode();
     
     /////////////////////////////////////////////////////////////////////////////
     //

Sources/Plasma/FeatureLib/pfPython/cyMisc.h

@@ -238,10 +238,10 @@ public:
     //
     static const char* GetClientName(pyKey &avKey);
 
-    static PyObject* cyMisc::GetAvatarKeyFromClientID(int clientID); // returns pyKey
+    static PyObject* GetAvatarKeyFromClientID(int clientID); // returns pyKey
-    static int cyMisc::GetLocalClientID();
+    static int GetLocalClientID();
-    static int cyMisc::GetClientIDFromAvatarKey(pyKey& avatar);
+    static int GetClientIDFromAvatarKey(pyKey& avatar);
-    static hsBool cyMisc::ValidateKey(pyKey& key);
+    static hsBool ValidateKey(pyKey& key);
 
 
 
@@ -519,7 +519,7 @@ public:
     //
     //  PURPOSE    : knocks all the cameras off the current stack
     //
-    static void cyMisc::ClearCameraStack();
+    static void ClearCameraStack();
 
     /////////////////////////////////////////////////////////////////////////////
     //

Sources/Plasma/FeatureLib/pfPython/pyGUIControlListBox.cpp

@@ -273,14 +273,14 @@ class pfListTextInBox : public pfGUIListText
         UInt32              fMinHeight;
 
     public:
-        pfListTextInBox::pfListTextInBox( const char *text, UInt32 min_width=0, UInt32 min_height=0 ) : pfGUIListText( text )
+        pfListTextInBox( const char *text, UInt32 min_width=0, UInt32 min_height=0 ) : pfGUIListText( text )
         {
             fMinWidth = min_width;
             fMinHeight = min_height;
             fJustify = pfGUIListText::kCenter;
         }
 
-        pfListTextInBox::pfListTextInBox( const wchar_t *text, UInt32 min_width=0, UInt32 min_height=0 ) : pfGUIListText( text )
+        pfListTextInBox( const wchar_t *text, UInt32 min_width=0, UInt32 min_height=0 ) : pfGUIListText( text )
         {
             fMinWidth = min_width;
             fMinHeight = min_height;
@@ -313,7 +313,7 @@ class pfListPictureInBox : public pfGUIListPicture
         UInt32              fSrcHeight;
 
     public:
-        pfListPictureInBox::pfListPictureInBox( plKey mipKey, UInt32 x, UInt32 y, UInt32 width, UInt32 height, hsBool respectAlpha ) : pfGUIListPicture( mipKey,respectAlpha )
+        pfListPictureInBox( plKey mipKey, UInt32 x, UInt32 y, UInt32 width, UInt32 height, hsBool respectAlpha ) : pfGUIListPicture( mipKey,respectAlpha )
         {
             fSrcX = x;
             fSrcY = y;
@@ -378,7 +378,7 @@ class pfListPictureInBoxWithSwatches : public pfListPictureInBox
 
         static UInt16   fSwatchSize, fSwatchOffset;
 
-        pfListPictureInBoxWithSwatches::pfListPictureInBoxWithSwatches( plKey mipKey, UInt32 x, UInt32 y, 
+        pfListPictureInBoxWithSwatches( plKey mipKey, UInt32 x, UInt32 y, 
                                                                             UInt32 width, UInt32 height, 
                                                                             hsBool respectAlpha,
                                                                             const hsColorRGBA &primaryColor, const hsColorRGBA &secondaryColor )

Sources/Plasma/FeatureLib/pfPython/pyImage.h

@@ -98,7 +98,7 @@ protected:
 
 public:
 #ifndef BUILDING_PYPLASMA
-    pyImage::~pyImage()
+    ~pyImage()
     {
         if (fMipmap && fMipMapKey)
             fMipMapKey->UnRefObject();