From 5d64373798ebdb98cf240494c9c33f47a93767d3 Mon Sep 17 00:00:00 2001 From: Christophe Dumez Date: Wed, 12 Dec 2007 21:45:44 +0000 Subject: [PATCH] should fix eol problems on windows --- src/engineSelectDlg.cpp | 3 +++ src/searchEngine.cpp | 1 + 2 files changed, 4 insertions(+) diff --git a/src/engineSelectDlg.cpp b/src/engineSelectDlg.cpp index 89fb1b7bb..48979d67a 100644 --- a/src/engineSelectDlg.cpp +++ b/src/engineSelectDlg.cpp @@ -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 plugins_list = result.split(','); return plugins_list.contains(plugin_name.toUtf8()); @@ -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) { 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; diff --git a/src/searchEngine.cpp b/src/searchEngine.cpp index 06c4d8be1..d77e86027 100644 --- a/src/searchEngine.cpp +++ b/src/searchEngine.cpp @@ -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 lines_list = output.split('\n'); QByteArray line; if(!search_result_line_truncated.isEmpty()){