diff options
| author | Ben Boeckel <ben.boeckel@kitware.com> | 2014-02-25 01:24:01 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-03-08 18:05:39 (GMT) |
| commit | 94fc63e2d5402bc4fa570a92e1f5fe6aba088392 (patch) | |
| tree | 1d031c69fe143462a9dc581c8ace15862c89e7ee /Source/QtDialog/QCMake.cxx | |
| parent | 85fc9f26a703f28b356c93d405446c39bba43846 (diff) | |
| download | CMake-94fc63e2d5402bc4fa570a92e1f5fe6aba088392.zip CMake-94fc63e2d5402bc4fa570a92e1f5fe6aba088392.tar.gz CMake-94fc63e2d5402bc4fa570a92e1f5fe6aba088392.tar.bz2 | |
stringapi: Use strings for cache iterator values
Diffstat (limited to 'Source/QtDialog/QCMake.cxx')
| -rw-r--r-- | Source/QtDialog/QCMake.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Source/QtDialog/QCMake.cxx b/Source/QtDialog/QCMake.cxx index 0fe5f8c..12da320 100644 --- a/Source/QtDialog/QCMake.cxx +++ b/Source/QtDialog/QCMake.cxx @@ -111,7 +111,7 @@ void QCMake::setBinaryDirectory(const QString& _dir) cmCacheManager::CacheIterator itm = cachem->NewIterator(); if ( itm.Find("CMAKE_HOME_DIRECTORY")) { - setSourceDirectory(QString::fromLocal8Bit(itm.GetValue())); + setSourceDirectory(QString::fromLocal8Bit(itm.GetValue().c_str())); } if ( itm.Find("CMAKE_GENERATOR")) { @@ -201,11 +201,11 @@ void QCMake::setProperties(const QCMakePropertyList& newProps) } QCMakeProperty prop; - prop.Key = QString::fromLocal8Bit(i.GetName()); + prop.Key = QString::fromLocal8Bit(i.GetName().c_str()); int idx = props.indexOf(prop); if(idx == -1) { - toremove.append(QString::fromLocal8Bit(i.GetName())); + toremove.append(QString::fromLocal8Bit(i.GetName().c_str())); } else { @@ -286,15 +286,15 @@ QCMakePropertyList QCMake::properties() const } QCMakeProperty prop; - prop.Key = QString::fromLocal8Bit(i.GetName()); + prop.Key = QString::fromLocal8Bit(i.GetName().c_str()); prop.Help = QString::fromLocal8Bit(i.GetProperty("HELPSTRING")); - prop.Value = QString::fromLocal8Bit(i.GetValue()); + prop.Value = QString::fromLocal8Bit(i.GetValue().c_str()); prop.Advanced = i.GetPropertyAsBool("ADVANCED"); if(i.GetType() == cmCacheManager::BOOL) { prop.Type = QCMakeProperty::BOOL; - prop.Value = cmSystemTools::IsOn(i.GetValue()); + prop.Value = cmSystemTools::IsOn(i.GetValue().c_str()); } else if(i.GetType() == cmCacheManager::PATH) { |