diff options
| author | Brad King <brad.king@kitware.com> | 2014-10-21 19:08:01 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-10-21 19:08:01 (GMT) |
| commit | ae5686f8d0e4f153991d5a7c0cf7406fa7d3468c (patch) | |
| tree | 7e4833de51d717fbd989acfe7c1ea1a1594f94d6 /Source/cmGlobalKdevelopGenerator.cxx | |
| parent | 4f9fcd356b07143a570b39cb5be72d4e3a4e83dc (diff) | |
| parent | cc1139cc304b6bd4c8403d437cf08f73e06e243a (diff) | |
| download | CMake-ae5686f8d0e4f153991d5a7c0cf7406fa7d3468c.zip CMake-ae5686f8d0e4f153991d5a7c0cf7406fa7d3468c.tar.gz CMake-ae5686f8d0e4f153991d5a7c0cf7406fa7d3468c.tar.bz2 | |
Merge topic 'remove-redundant-c_str'
cc1139cc strings: Remove redundant calls to std::string::c_str()
Diffstat (limited to 'Source/cmGlobalKdevelopGenerator.cxx')
| -rw-r--r-- | Source/cmGlobalKdevelopGenerator.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/cmGlobalKdevelopGenerator.cxx b/Source/cmGlobalKdevelopGenerator.cxx index 89d25c4..ee0c583 100644 --- a/Source/cmGlobalKdevelopGenerator.cxx +++ b/Source/cmGlobalKdevelopGenerator.cxx @@ -222,7 +222,7 @@ bool cmGlobalKdevelopGenerator it!=files.end(); it++) { // get the full path to the file - tmp=cmSystemTools::CollapseFullPath(it->c_str(), projectDir.c_str()); + tmp=cmSystemTools::CollapseFullPath(*it, projectDir.c_str()); // just select the first source file if (fileToOpen.empty()) { @@ -274,7 +274,7 @@ void cmGlobalKdevelopGenerator // kdevelop blacklist so they are not monitored for added or removed files // since this is handled by adding files to the cmake files cmsys::Directory d; - if (d.Load(projectDir.c_str())) + if (d.Load(projectDir)) { size_t numf = d.GetNumberOfFiles(); for (unsigned int i = 0; i < numf; i++) @@ -285,7 +285,7 @@ void cmGlobalKdevelopGenerator std::string tmp = projectDir; tmp += "/"; tmp += nextFile; - if (cmSystemTools::FileIsDirectory(tmp.c_str())) + if (cmSystemTools::FileIsDirectory(tmp)) { tmp += "/CMakeCache.txt"; if ((nextFile == "CMakeFiles") |