[cmake-commits] king committed cmCallVisualStudioMacro.cxx 1.1 1.2
cmGlobalGenerator.cxx 1.212 1.213
cmGlobalVisualStudio8Generator.cxx 1.28 1.29
cmGlobalVisualStudio9Generator.cxx 1.3 1.4
cmGlobalVisualStudioGenerator.cxx 1.7 1.8
cmake-commits at cmake.org
cmake-commits at cmake.org
Tue Nov 20 11:10:13 EST 2007
Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv22318/Source
Modified Files:
cmCallVisualStudioMacro.cxx cmGlobalGenerator.cxx
cmGlobalVisualStudio8Generator.cxx
cmGlobalVisualStudio9Generator.cxx
cmGlobalVisualStudioGenerator.cxx
Log Message:
STYLE: Fixed line-too-long. COMP: Fixed warnings about lossy conversions.
Index: cmGlobalGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalGenerator.cxx,v
retrieving revision 1.212
retrieving revision 1.213
diff -u -d -r1.212 -r1.213
--- cmGlobalGenerator.cxx 16 Nov 2007 12:01:58 -0000 1.212
+++ cmGlobalGenerator.cxx 20 Nov 2007 16:10:11 -0000 1.213
@@ -1795,7 +1795,9 @@
this->FilesReplacedDuringGenerate.push_back(filename);
}
-void cmGlobalGenerator::GetFilesReplacedDuringGenerate(std::vector<std::string>& filenames)
+void
+cmGlobalGenerator
+::GetFilesReplacedDuringGenerate(std::vector<std::string>& filenames)
{
filenames.clear();
std::copy(
Index: cmGlobalVisualStudio9Generator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalVisualStudio9Generator.cxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- cmGlobalVisualStudio9Generator.cxx 16 Nov 2007 12:01:58 -0000 1.3
+++ cmGlobalVisualStudio9Generator.cxx 20 Nov 2007 16:10:11 -0000 1.4
@@ -69,7 +69,8 @@
// base begins with the VisualStudioProjectsLocation reg value...
if (cmSystemTools::ReadRegistryValue(
- "HKEY_CURRENT_USER\\Software\\Microsoft\\VisualStudio\\9.0;VisualStudioProjectsLocation",
+ "HKEY_CURRENT_USER\\Software\\Microsoft\\VisualStudio\\9.0;"
+ "VisualStudioProjectsLocation",
base))
{
cmSystemTools::ConvertToUnixSlashes(base);
Index: cmCallVisualStudioMacro.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmCallVisualStudioMacro.cxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- cmCallVisualStudioMacro.cxx 16 Nov 2007 12:01:58 -0000 1.1
+++ cmCallVisualStudioMacro.cxx 20 Nov 2007 16:10:11 -0000 1.2
@@ -347,7 +347,8 @@
//std::cout << "Found Visual Studio instance." << std::endl;
//std::cout << " ROT entry name: " << it->first << std::endl;
- //std::cout << " ROT entry object: " << (IUnknown*) it->second << std::endl;
+ //std::cout << " ROT entry object: "
+ // << (IUnknown*) it->second << std::endl;
//std::cout << " slnFile: " << slnFile << std::endl;
//std::cout << " slnName: " << slnName << std::endl;
}
@@ -381,7 +382,7 @@
if(SUCCEEDED(hr))
{
- count = instances.size();
+ count = static_cast<int>(instances.size());
}
// Force release all COM pointers before CoUninitialize:
@@ -389,6 +390,8 @@
CoUninitialize();
}
+#else
+ (void)slnFile;
#endif
return count;
@@ -449,6 +452,9 @@
CoUninitialize();
}
#else
+ (void)slnFile;
+ (void)macro;
+ (void)args;
cmSystemTools::Error("cmCallVisualStudioMacro::CallMacro is not "
"supported on this platform");
#endif
Index: cmGlobalVisualStudioGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalVisualStudioGenerator.cxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- cmGlobalVisualStudioGenerator.cxx 19 Nov 2007 18:44:51 -0000 1.7
+++ cmGlobalVisualStudioGenerator.cxx 20 Nov 2007 16:10:11 -0000 1.8
@@ -380,9 +380,11 @@
LONG result = ERROR_SUCCESS;
DWORD index = 0;
- keyname = "Software\\Microsoft\\VisualStudio\\8.0\\vsmacros\\OtherProjects7";
+ keyname =
+ "Software\\Microsoft\\VisualStudio\\8.0\\vsmacros\\OtherProjects7";
hkey = NULL;
- result = RegOpenKeyEx(HKEY_CURRENT_USER, keyname.c_str(), 0, KEY_READ, &hkey);
+ result = RegOpenKeyEx(HKEY_CURRENT_USER, keyname.c_str(),
+ 0, KEY_READ, &hkey);
if (ERROR_SUCCESS == result)
{
// Iterate the subkeys and look for the values of interest in each subkey:
@@ -394,7 +396,8 @@
lastWriteTime.dwHighDateTime = 0;
lastWriteTime.dwLowDateTime = 0;
- while (ERROR_SUCCESS == RegEnumKeyEx(hkey, index, subkeyname, &cch_subkeyname,
+ while (ERROR_SUCCESS == RegEnumKeyEx(hkey, index, subkeyname,
+ &cch_subkeyname,
0, keyclass, &cch_keyclass, &lastWriteTime))
{
// Open the subkey and query the values of interest:
@@ -405,15 +408,18 @@
DWORD valueType = REG_SZ;
CHAR data1[256];
DWORD cch_data1 = sizeof(data1)/sizeof(data1[0]);
- RegQueryValueEx(hsubkey, "Path", 0, &valueType, (LPBYTE) &data1[0], &cch_data1);
+ RegQueryValueEx(hsubkey, "Path", 0, &valueType,
+ (LPBYTE) &data1[0], &cch_data1);
DWORD data2 = 0;
DWORD cch_data2 = sizeof(data2);
- RegQueryValueEx(hsubkey, "Security", 0, &valueType, (LPBYTE) &data2, &cch_data2);
+ RegQueryValueEx(hsubkey, "Security", 0, &valueType,
+ (LPBYTE) &data2, &cch_data2);
DWORD data3 = 0;
DWORD cch_data3 = sizeof(data3);
- RegQueryValueEx(hsubkey, "StorageFormat", 0, &valueType, (LPBYTE) &data3, &cch_data3);
+ RegQueryValueEx(hsubkey, "StorageFormat", 0, &valueType,
+ (LPBYTE) &data3, &cch_data3);
s2 = cmSystemTools::LowerCase(data1);
cmSystemTools::ConvertToUnixSlashes(s2);
@@ -478,23 +484,28 @@
nextAvailableSubKeyName = ossNext.str();
- keyname = "Software\\Microsoft\\VisualStudio\\8.0\\vsmacros\\RecordingProject7";
+ keyname =
+ "Software\\Microsoft\\VisualStudio\\8.0\\vsmacros\\RecordingProject7";
hkey = NULL;
- result = RegOpenKeyEx(HKEY_CURRENT_USER, keyname.c_str(), 0, KEY_READ, &hkey);
+ result = RegOpenKeyEx(HKEY_CURRENT_USER, keyname.c_str(),
+ 0, KEY_READ, &hkey);
if (ERROR_SUCCESS == result)
{
DWORD valueType = REG_SZ;
CHAR data1[256];
DWORD cch_data1 = sizeof(data1)/sizeof(data1[0]);
- RegQueryValueEx(hkey, "Path", 0, &valueType, (LPBYTE) &data1[0], &cch_data1);
+ RegQueryValueEx(hkey, "Path", 0, &valueType,
+ (LPBYTE) &data1[0], &cch_data1);
DWORD data2 = 0;
DWORD cch_data2 = sizeof(data2);
- RegQueryValueEx(hkey, "Security", 0, &valueType, (LPBYTE) &data2, &cch_data2);
+ RegQueryValueEx(hkey, "Security", 0, &valueType,
+ (LPBYTE) &data2, &cch_data2);
DWORD data3 = 0;
DWORD cch_data3 = sizeof(data3);
- RegQueryValueEx(hkey, "StorageFormat", 0, &valueType, (LPBYTE) &data3, &cch_data3);
+ RegQueryValueEx(hkey, "StorageFormat", 0, &valueType,
+ (LPBYTE) &data3, &cch_data3);
s2 = cmSystemTools::LowerCase(data1);
cmSystemTools::ConvertToUnixSlashes(s2);
@@ -525,7 +536,8 @@
const std::string& nextAvailableSubKeyName,
const std::string& macrosFile)
{
- std::string keyname = "Software\\Microsoft\\VisualStudio\\8.0\\vsmacros\\OtherProjects7";
+ std::string keyname =
+ "Software\\Microsoft\\VisualStudio\\8.0\\vsmacros\\OtherProjects7";
HKEY hkey = NULL;
LONG result = RegOpenKeyEx(HKEY_CURRENT_USER, keyname.c_str(), 0,
KEY_READ|KEY_WRITE, &hkey);
@@ -543,7 +555,7 @@
cmSystemTools::ReplaceString(s, "/", "\\");
result = RegSetValueEx(hsubkey, "Path", 0, REG_SZ, (LPBYTE) s.c_str(),
- strlen(s.c_str()) + 1);
+ static_cast<DWORD>(strlen(s.c_str()) + 1));
if (ERROR_SUCCESS != result)
{
std::cout << "error result 1: " << result << std::endl;
@@ -553,7 +565,8 @@
// Security value is always "1" for sample macros files (seems to be "2"
// if you put the file somewhere outside the standard VSMacros folder)
dw = 1;
- result = RegSetValueEx(hsubkey, "Security", 0, REG_DWORD, (LPBYTE) &dw, sizeof(DWORD));
+ result = RegSetValueEx(hsubkey, "Security",
+ 0, REG_DWORD, (LPBYTE) &dw, sizeof(DWORD));
if (ERROR_SUCCESS != result)
{
std::cout << "error result 2: " << result << std::endl;
@@ -562,7 +575,8 @@
// StorageFormat value is always "0" for sample macros files
dw = 0;
- result = RegSetValueEx(hsubkey, "StorageFormat", 0, REG_DWORD, (LPBYTE) &dw, sizeof(DWORD));
+ result = RegSetValueEx(hsubkey, "StorageFormat",
+ 0, REG_DWORD, (LPBYTE) &dw, sizeof(DWORD));
if (ERROR_SUCCESS != result)
{
std::cout << "error result 3: " << result << std::endl;
@@ -573,7 +587,8 @@
}
else
{
- std::cout << "error creating subkey: " << nextAvailableSubKeyName << std::endl;
+ std::cout << "error creating subkey: "
+ << nextAvailableSubKeyName << std::endl;
std::cout << std::endl;
}
RegCloseKey(hkey);
Index: cmGlobalVisualStudio8Generator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalVisualStudio8Generator.cxx,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- cmGlobalVisualStudio8Generator.cxx 19 Nov 2007 18:44:51 -0000 1.28
+++ cmGlobalVisualStudio8Generator.cxx 20 Nov 2007 16:10:11 -0000 1.29
@@ -79,7 +79,8 @@
// base begins with the VisualStudioProjectsLocation reg value...
if (cmSystemTools::ReadRegistryValue(
- "HKEY_CURRENT_USER\\Software\\Microsoft\\VisualStudio\\8.0;VisualStudioProjectsLocation",
+ "HKEY_CURRENT_USER\\Software\\Microsoft\\VisualStudio\\8.0;"
+ "VisualStudioProjectsLocation",
base))
{
cmSystemTools::ConvertToUnixSlashes(base);
More information about the Cmake-commits
mailing list