Browse Source

should fix eol problems on windows

adaptive-webui-19844
Christophe Dumez 17 years ago
parent
commit
5d64373798
  1. 3
      src/engineSelectDlg.cpp
  2. 1
      src/searchEngine.cpp

3
src/engineSelectDlg.cpp

@ -256,6 +256,7 @@ bool engineSelectDlg::checkInstalled(QString plugin_name) const { @@ -256,6 +256,7 @@ bool engineSelectDlg::checkInstalled(QString plugin_name) const {
nova.waitForStarted();
nova.waitForFinished();
QByteArray result = nova.readAll();
result = result.replace("\n\r", "");
result = result.replace("\n", "");
QList<QByteArray> plugins_list = result.split(',');
return plugins_list.contains(plugin_name.toUtf8());
@ -287,6 +288,7 @@ void engineSelectDlg::loadSupportedSearchEngines(bool first) { @@ -287,6 +288,7 @@ void engineSelectDlg::loadSupportedSearchEngines(bool first) {
nova.waitForStarted();
nova.waitForFinished();
QByteArray result = nova.readAll();
result = result.replace("\n\r", "");
result = result.replace("\n", "");
qDebug("read: %s", result.data());
QByteArray e;
@ -303,6 +305,7 @@ void engineSelectDlg::loadSupportedSearchEngines(bool first) { @@ -303,6 +305,7 @@ void engineSelectDlg::loadSupportedSearchEngines(bool first) {
nova.waitForStarted();
nova.waitForFinished();
result = nova.readAll();
result = result.replace("\n\r", "");
result = result.replace("\n", "");
qDebug("read: %s", result.data());
unsigned int i = 0;

1
src/searchEngine.cpp

@ -318,6 +318,7 @@ void SearchEngine::downloadSelectedItem(const QModelIndex& index){ @@ -318,6 +318,7 @@ void SearchEngine::downloadSelectedItem(const QModelIndex& index){
// line to search results calling appendSearchResult().
void SearchEngine::readSearchOutput(){
QByteArray output = searchProcess->readAllStandardOutput();
output.replace("\r", "");
QList<QByteArray> lines_list = output.split('\n');
QByteArray line;
if(!search_result_line_truncated.isEmpty()){

Loading…
Cancel
Save