diff options
Diffstat (limited to 'Source/cmGlobalKdevelopGenerator.cxx')
| -rw-r--r-- | Source/cmGlobalKdevelopGenerator.cxx | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/Source/cmGlobalKdevelopGenerator.cxx b/Source/cmGlobalKdevelopGenerator.cxx index ed0e15b..df3ce10 100644 --- a/Source/cmGlobalKdevelopGenerator.cxx +++ b/Source/cmGlobalKdevelopGenerator.cxx @@ -25,7 +25,7 @@ //---------------------------------------------------------------------------- void cmGlobalKdevelopGenerator -::GetDocumentation(cmDocumentationEntry& entry, const char*) const +::GetDocumentation(cmDocumentationEntry& entry, const std::string&) const { entry.Name = this->GetName(); entry.Brief = "Generates KDevelop 3 project files."; @@ -44,7 +44,7 @@ void cmGlobalKdevelopGenerator::Generate() { // for each sub project in the project create // a kdevelop project - for (std::map<cmStdString, std::vector<cmLocalGenerator*> >::const_iterator + for (std::map<std::string, std::vector<cmLocalGenerator*> >::const_iterator it = this->GlobalGenerator->GetProjectMap().begin(); it!= this->GlobalGenerator->GetProjectMap().end(); ++it) @@ -76,7 +76,7 @@ void cmGlobalKdevelopGenerator::Generate() { if (ti->second.GetType()==cmTarget::EXECUTABLE) { - executable = ti->second.GetLocation(0); + executable = ti->second.GetLocation(""); break; } } @@ -103,7 +103,7 @@ bool cmGlobalKdevelopGenerator std::string projectDir = projectDirIn + "/"; std::string filename = outputDir+ "/" + projectname +".kdevelop.filelist"; - std::set<cmStdString> files; + std::set<std::string> files; std::string tmp; for (std::vector<cmLocalGenerator*>::const_iterator it=lgs.begin(); @@ -183,7 +183,7 @@ bool cmGlobalKdevelopGenerator (strstr(tmp.c_str(), cmake::GetCMakeFilesDirectoryPostSlash())==0)) { - files.insert(tmp.c_str()); + files.insert(tmp); } } } @@ -217,7 +217,7 @@ bool cmGlobalKdevelopGenerator } fileToOpen=""; - for (std::set<cmStdString>::const_iterator it=files.begin(); + for (std::set<std::string>::const_iterator it=files.begin(); it!=files.end(); it++) { // get the full path to the file @@ -360,7 +360,7 @@ void cmGlobalKdevelopGenerator if (strstr(line, "<general>")) { fout<< " <projectmanagement>KDevCustomProject</projectmanagement>\n"; - fout<< " <projectdirectory>" <<projectDir.c_str() + fout<< " <projectdirectory>" <<projectDir << "</projectdirectory>\n"; //this one is important fout<<" <absoluteprojectpath>true</absoluteprojectpath>\n"; //and this one @@ -368,14 +368,14 @@ void cmGlobalKdevelopGenerator // inside kdevcustomproject the <filelistdirectory> must be put if (strstr(line, "<kdevcustomproject>")) { - fout<<" <filelistdirectory>"<<outputDir.c_str() + fout<<" <filelistdirectory>"<<outputDir <<"</filelistdirectory>\n"; } // buildtool and builddir go inside <build> if (strstr(line, "<build>")) { fout<<" <buildtool>make</buildtool>\n"; - fout<<" <builddir>"<<outputDir.c_str()<<"</builddir>\n"; + fout<<" <builddir>"<<outputDir<<"</builddir>\n"; } } } @@ -417,7 +417,7 @@ void cmGlobalKdevelopGenerator " <projectmanagement>KDevCustomProject</projectmanagement>\n" " <primarylanguage>" << primaryLanguage << "</primarylanguage>\n" " <ignoreparts/>\n" - " <projectdirectory>" << projectDir.c_str() << + " <projectdirectory>" << projectDir << "</projectdirectory>\n"; //this one is important fout<<" <absoluteprojectpath>true</absoluteprojectpath>\n"; //and this one @@ -444,12 +444,12 @@ void cmGlobalKdevelopGenerator fout<<" </general>\n" " <kdevcustomproject>\n" - " <filelistdirectory>" << outputDir.c_str() << + " <filelistdirectory>" << outputDir << "</filelistdirectory>\n" " <run>\n" - " <mainprogram>" << executable.c_str() << "</mainprogram>\n" + " <mainprogram>" << executable << "</mainprogram>\n" " <directoryradio>custom</directoryradio>\n" - " <customdirectory>"<<outputDir.c_str()<<"</customdirectory>\n" + " <customdirectory>"<<outputDir<<"</customdirectory>\n" " <programargs></programargs>\n" " <terminal>false</terminal>\n" " <autocompile>true</autocompile>\n" @@ -457,7 +457,7 @@ void cmGlobalKdevelopGenerator " </run>\n" " <build>\n" " <buildtool>make</buildtool>\n"; //this one is important - fout<<" <builddir>"<<outputDir.c_str()<<"</builddir>\n"; //and this one + fout<<" <builddir>"<<outputDir<<"</builddir>\n"; //and this one fout<<" </build>\n" " <make>\n" " <abortonerror>false</abortonerror>\n" @@ -480,7 +480,7 @@ void cmGlobalKdevelopGenerator dirIt != this->Blacklist.end(); ++dirIt) { - fout<<" <path>" << dirIt->c_str() << "</path>\n"; + fout<<" <path>" << *dirIt << "</path>\n"; } fout<<" </blacklist>\n"; @@ -558,7 +558,7 @@ void cmGlobalKdevelopGenerator // command fout<<" <kdevfileview>\n" " <groups>\n" - " <group pattern=\"" << cmakeFilePattern.c_str() << + " <group pattern=\"" << cmakeFilePattern << "\" name=\"CMake\" />\n"; if (enableCxx) @@ -601,7 +601,7 @@ void cmGlobalKdevelopGenerator "<!DOCTYPE KDevPrjSession>\n" "<KDevPrjSession>\n" " <DocsAndViews NumberOfDocuments=\"1\" >\n" - " <Doc0 NumberOfViews=\"1\" URL=\"file://" << fileToOpen.c_str() << + " <Doc0 NumberOfViews=\"1\" URL=\"file://" << fileToOpen << "\" >\n" " <View0 line=\"0\" Type=\"Source\" />\n" " </Doc0>\n" |