summaryrefslogtreecommitdiffstats
path: root/Source/QtDialog
diff options
context:
space:
mode:
authorRegina Pfeifer <regina@mailbox.org>2019-01-30 17:33:58 (GMT)
committerRegina Pfeifer <regina@mailbox.org>2019-01-30 17:33:58 (GMT)
commit1180fc87803b39cc03e503e4d08fa7d68656da8a (patch)
tree217027628d5cfa0e8f7ecf213486a0038d87f983 /Source/QtDialog
parent748d024551d8f447046363ad617fc72bdd977fd2 (diff)
downloadCMake-1180fc87803b39cc03e503e4d08fa7d68656da8a.zip
CMake-1180fc87803b39cc03e503e4d08fa7d68656da8a.tar.gz
CMake-1180fc87803b39cc03e503e4d08fa7d68656da8a.tar.bz2
OutputCallback: Accept std::string argument
Diffstat (limited to 'Source/QtDialog')
-rw-r--r--Source/QtDialog/QCMake.cxx12
-rw-r--r--Source/QtDialog/QCMake.h4
2 files changed, 8 insertions, 8 deletions
diff --git a/Source/QtDialog/QCMake.cxx b/Source/QtDialog/QCMake.cxx
index 065d610..a073c30 100644
--- a/Source/QtDialog/QCMake.cxx
+++ b/Source/QtDialog/QCMake.cxx
@@ -29,9 +29,9 @@ QCMake::QCMake(QObject* p)
this->messageCallback(msg, title);
});
cmSystemTools::SetStdoutCallback(
- [this](const char* msg, size_t len) { this->stdoutCallback(msg, len); });
+ [this](std::string const& msg) { this->stdoutCallback(msg); });
cmSystemTools::SetStderrCallback(
- [this](const char* msg, size_t len) { this->stderrCallback(msg, len); });
+ [this](std::string const& msg) { this->stderrCallback(msg); });
this->CMakeInstance = new cmake(cmake::RoleProject, cmState::Project);
this->CMakeInstance->SetCMakeEditCommand(
@@ -365,15 +365,15 @@ void QCMake::messageCallback(const char* msg, const char* /*title*/)
QCoreApplication::processEvents();
}
-void QCMake::stdoutCallback(const char* msg, size_t len)
+void QCMake::stdoutCallback(std::string const& msg)
{
- emit this->outputMessage(QString::fromLocal8Bit(msg, int(len)));
+ emit this->outputMessage(QString::fromStdString(msg));
QCoreApplication::processEvents();
}
-void QCMake::stderrCallback(const char* msg, size_t len)
+void QCMake::stderrCallback(std::string const& msg)
{
- emit this->outputMessage(QString::fromLocal8Bit(msg, int(len)));
+ emit this->outputMessage(QString::fromStdString(msg));
QCoreApplication::processEvents();
}
diff --git a/Source/QtDialog/QCMake.h b/Source/QtDialog/QCMake.h
index 4f22505..ef4d2a1 100644
--- a/Source/QtDialog/QCMake.h
+++ b/Source/QtDialog/QCMake.h
@@ -170,8 +170,8 @@ protected:
bool interruptCallback();
void progressCallback(const char* msg, float percent);
void messageCallback(const char* msg, const char* title);
- void stdoutCallback(const char* msg, size_t len);
- void stderrCallback(const char* msg, size_t len);
+ void stdoutCallback(std::string const& msg);
+ void stderrCallback(std::string const& msg);
bool WarnUninitializedMode;
bool WarnUnusedMode;