summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDominik Riebeling <Dominik.Riebeling@gmail.com>2013-11-03 11:35:41 +0100
committerDominik Riebeling <Dominik.Riebeling@gmail.com>2013-11-04 23:32:57 +0100
commitdd0d52ee0f6750233be61155160eb35e74b908f9 (patch)
tree73083ec78b3af7df8ec04c3b91bbd26d0b368ff2
parent646f74937f00e508a5b25a003333569e907013d7 (diff)
downloadrockbox-dd0d52ee0f6750233be61155160eb35e74b908f9.tar.gz
rockbox-dd0d52ee0f6750233be61155160eb35e74b908f9.zip
Handle conversion to text in Sysinfo::getInfo().
When saving the system info from the progresslogger it shouldn't have knowledge about the format of the data provided by getInfo(). Instead of relying on the output being HTML formatted make getInfo() accept a parameter that indicates if the data is to be formatted as HTML or text. Change-Id: I733fe1a148e51b70ea1361d8feccffd7cbccd3d7
-rw-r--r--rbutil/rbutilqt/progressloggergui.cpp3
-rw-r--r--rbutil/rbutilqt/sysinfo.cpp5
-rw-r--r--rbutil/rbutilqt/sysinfo.h6
3 files changed, 10 insertions, 4 deletions
diff --git a/rbutil/rbutilqt/progressloggergui.cpp b/rbutil/rbutilqt/progressloggergui.cpp
index 41df0600f0..71485b02ea 100644
--- a/rbutil/rbutilqt/progressloggergui.cpp
+++ b/rbutil/rbutilqt/progressloggergui.cpp
@@ -175,8 +175,7 @@ void ProgressLoggerGui::saveErrorLog()
"*********************************************\n";
file.write(info.toUtf8(), info.size());
- info = Sysinfo::getInfo();
- info.replace(QRegExp("(<[^>]+>)+"),"\n");
+ info = Sysinfo::getInfo(Sysinfo::InfoText);
file.write(info.toUtf8(), info.size());
// trace
diff --git a/rbutil/rbutilqt/sysinfo.cpp b/rbutil/rbutilqt/sysinfo.cpp
index 3de387721c..0bb5465240 100644
--- a/rbutil/rbutilqt/sysinfo.cpp
+++ b/rbutil/rbutilqt/sysinfo.cpp
@@ -39,7 +39,7 @@ void Sysinfo::updateSysinfo(void)
ui.textBrowser->setHtml(getInfo());
}
-QString Sysinfo::getInfo()
+QString Sysinfo::getInfo(Sysinfo::InfoType type)
{
QString info;
info += tr("<b>OS</b><br/>") + System::osVersionString() + "<hr/>";
@@ -76,6 +76,9 @@ QString Sysinfo::getInfo()
}
info += "</table>";
info += "<hr/>";
+ if(type == InfoText) {
+ info.replace(QRegExp("(<[^>]+>)+"),"\n");
+ }
return info;
}
diff --git a/rbutil/rbutilqt/sysinfo.h b/rbutil/rbutilqt/sysinfo.h
index 45928a8b43..e2b3675102 100644
--- a/rbutil/rbutilqt/sysinfo.h
+++ b/rbutil/rbutilqt/sysinfo.h
@@ -30,9 +30,13 @@ class Sysinfo : public QDialog
Q_OBJECT
public:
+ enum InfoType {
+ InfoHtml,
+ InfoText,
+ };
Sysinfo(QWidget *parent = 0);
- static QString getInfo();
+ static QString getInfo(InfoType type = InfoHtml);
private:
void changeEvent(QEvent *event);
Ui::SysinfoFrm ui;