[commit] r1339 - trunk/Paradigms/UML/decorator

GMESRC Repository Notifications gme-commit at list.isis.vanderbilt.edu
Wed Jun 1 16:58:56 CDT 2011 

Author: ksmyth
Date: Wed Jun  1 16:58:56 2011
New Revision: 1339

Log:
UNICODE

Modified:
   trunk/Paradigms/UML/decorator/   (props changed)
   trunk/Paradigms/UML/decorator/TokenEx.cpp
   trunk/Paradigms/UML/decorator/UMLClassPart.cpp
   trunk/Paradigms/UML/decorator/UMLDecorator.sln
   trunk/Paradigms/UML/decorator/UMLDecorator.vcxproj

Modified: trunk/Paradigms/UML/decorator/TokenEx.cpp
==============================================================================
--- trunk/Paradigms/UML/decorator/TokenEx.cpp	Wed Jun  1 16:57:25 2011	(r1338)
+++ trunk/Paradigms/UML/decorator/TokenEx.cpp	Wed Jun  1 16:58:56 2011	(r1339)
@@ -122,14 +122,14 @@
 	int nSecond;
 
 	// Look for a UNC Name!
-	if (Path.Left(2) == "\\\\") {
-		int nFirst = Path.Find("\\",3);
-		nSecond = Path.Find("\\",nFirst + 1);
+	if (Path.Left(2) == _T("\\\\")) {
+		int nFirst = Path.Find(_T("\\"),3);
+		nSecond = Path.Find(_T("\\"),nFirst + 1);
 		if (nSecond == -1) {
 			Drive = Path;
-			Dir = "";
-			FName = "";
-			Ext = "";
+			Dir = _T("");
+			FName = _T("");
+			Ext = _T("");
 		}
 		else if (nSecond > nFirst)
 			Drive = Path.Left(nSecond);
@@ -141,15 +141,15 @@
 
 	if (UsingDirsOnly) {
 		Dir = Path.Right((Path.GetLength() - nSecond) - 1);
-		FName = "";
-		Ext = "";
+		FName = _T("");
+		Ext = _T("");
 	}
 	else {
 		int nDirEnd = Path.ReverseFind('\\');
 		if (nDirEnd == Path.GetLength()) {
-			Dir = "";
-			FName = "";
-			Ext = "";
+			Dir = _T("");
+			FName = _T("");
+			Ext = _T("");
 		}
 		else {
 
@@ -160,7 +160,7 @@
 				
 				if (nDirEnd > nFileEnd) {
 					FName = Path.Right(Path.GetLength() - nDirEnd);
-					Ext = "";
+					Ext = _T("");
 				}
 				else {
 					FName = Path.Mid(nDirEnd + 1, (nFileEnd - nDirEnd) - 1);
@@ -169,7 +169,7 @@
 			}
 			else {
 				FName = Path.Right((Path.GetLength() - nDirEnd) - 1);
-				Ext = "";
+				Ext = _T("");
 			}
 		}
 	}

Modified: trunk/Paradigms/UML/decorator/UMLClassPart.cpp
==============================================================================
--- trunk/Paradigms/UML/decorator/UMLClassPart.cpp	Wed Jun  1 16:57:25 2011	(r1338)
+++ trunk/Paradigms/UML/decorator/UMLClassPart.cpp	Wed Jun  1 16:58:56 2011	(r1339)
@@ -91,8 +91,7 @@
 			}
 			CComBSTR bstr;
 			COMTHROW(m_spFCO->get_Name(&bstr));
-			CString textStr;
-			CopyTo(bstr, textStr);
+			CString textStr = bstr;
 			m_LabelPart = new DecoratorSDK::ClassLabelPart(this, m_eventSink, isAbstract);
 			m_LabelPart->SetText(textStr);
 		} else {
@@ -109,8 +108,7 @@
 				bstr.Empty();
 				COMTHROW(m_spMetaFCO->get_Name(&bstr));
 			}
-			CString textStr;
-			CopyTo(bstr, textStr);
+			CString textStr = bstr;
 			m_LabelPart = new DecoratorSDK::ClassLabelPart(this, m_eventSink, false);
 			m_LabelPart->SetText(textStr);
 		}

Modified: trunk/Paradigms/UML/decorator/UMLDecorator.sln
==============================================================================
--- trunk/Paradigms/UML/decorator/UMLDecorator.sln	Wed Jun  1 16:57:25 2011	(r1338)
+++ trunk/Paradigms/UML/decorator/UMLDecorator.sln	Wed Jun  1 16:58:56 2011	(r1339)
@@ -14,10 +14,10 @@
 		{FCD04E3B-691C-461F-92F2-BE3E01F78582}.Debug|Win32.Build.0 = Debug|Win32
 		{FCD04E3B-691C-461F-92F2-BE3E01F78582}.Release|Win32.ActiveCfg = Release|Win32
 		{FCD04E3B-691C-461F-92F2-BE3E01F78582}.Release|Win32.Build.0 = Release|Win32
-		{77FEBD41-CD6C-4D55-B561-3957F7151CC2}.Debug|Win32.ActiveCfg = Debug|Win32
-		{77FEBD41-CD6C-4D55-B561-3957F7151CC2}.Debug|Win32.Build.0 = Debug|Win32
-		{77FEBD41-CD6C-4D55-B561-3957F7151CC2}.Release|Win32.ActiveCfg = Release|Win32
-		{77FEBD41-CD6C-4D55-B561-3957F7151CC2}.Release|Win32.Build.0 = Release|Win32
+		{77FEBD41-CD6C-4D55-B561-3957F7151CC2}.Debug|Win32.ActiveCfg = DebugUnicode|Win32
+		{77FEBD41-CD6C-4D55-B561-3957F7151CC2}.Debug|Win32.Build.0 = DebugUnicode|Win32
+		{77FEBD41-CD6C-4D55-B561-3957F7151CC2}.Release|Win32.ActiveCfg = ReleaseUnicode|Win32
+		{77FEBD41-CD6C-4D55-B561-3957F7151CC2}.Release|Win32.Build.0 = ReleaseUnicode|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

Modified: trunk/Paradigms/UML/decorator/UMLDecorator.vcxproj
==============================================================================
--- trunk/Paradigms/UML/decorator/UMLDecorator.vcxproj	Wed Jun  1 16:57:25 2011	(r1338)
+++ trunk/Paradigms/UML/decorator/UMLDecorator.vcxproj	Wed Jun  1 16:58:56 2011	(r1339)
@@ -20,13 +20,13 @@
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseOfMfc>Dynamic</UseOfMfc>
     <UseOfAtl>Dynamic</UseOfAtl>
-    <CharacterSet>MultiByte</CharacterSet>
+    <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseOfMfc>Dynamic</UseOfMfc>
     <UseOfAtl>Dynamic</UseOfAtl>
-    <CharacterSet>MultiByte</CharacterSet>
+    <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -91,7 +91,7 @@
       <Culture>0x0409</Culture>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>gdiplus.lib;DecoratorLib.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>gdiplus.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>.\Release/UMLDecorator.dll</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>$(GME_ROOT)\GME\Lib;$(GME_ROOT)\Lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -143,7 +143,7 @@
       <Culture>0x0409</Culture>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>gdiplus.lib;DecoratorLibD.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>gdiplus.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>.\Debug/UMLDecorator.dll</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>$(GME_ROOT)\GME\Lib;$(GME_ROOT)\Lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -244,11 +244,6 @@
   <ItemGroup>
     <ProjectReference Include="..\..\..\SDK\DecoratorLib\DecoratorLib.vcxproj">
       <Project>{77febd41-cd6c-4d55-b561-3957f7151cc2}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-      <Private>true</Private>
-      <CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
-      <LinkLibraryDependencies>false</LinkLibraryDependencies>
-      <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

More information about the gme-commit mailing list