summaryrefslogtreecommitdiff
path: root/rbutil/rbutilqt/sysinfo.cpp
diff options
context:
space:
mode:
authorDominik Wenger <domonoky@googlemail.com>2008-06-27 21:53:22 +0000
committerDominik Wenger <domonoky@googlemail.com>2008-06-27 21:53:22 +0000
commit7fb11a82a1f899655e7d5a4a6ff5c39d9dc27b8f (patch)
tree88e64d6ce08ba120e6d879c23d93a26ec497f52f /rbutil/rbutilqt/sysinfo.cpp
parent3867cf9181b105900a965fa12568c21469fec135 (diff)
rbutil: move some detecting code, to make detecing things nicer
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17813 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'rbutil/rbutilqt/sysinfo.cpp')
-rw-r--r--rbutil/rbutilqt/sysinfo.cpp11
1 files changed, 5 insertions, 6 deletions
diff --git a/rbutil/rbutilqt/sysinfo.cpp b/rbutil/rbutilqt/sysinfo.cpp
index 413494c679..4cd2666e8b 100644
--- a/rbutil/rbutilqt/sysinfo.cpp
+++ b/rbutil/rbutilqt/sysinfo.cpp
@@ -20,7 +20,7 @@
#include <QtGui>
#include "sysinfo.h"
#include "ui_sysinfofrm.h"
-#include "utils.h"
+#include "detect.h"
Sysinfo::Sysinfo(QWidget *parent) : QDialog(parent)
@@ -33,17 +33,16 @@ Sysinfo::Sysinfo(QWidget *parent) : QDialog(parent)
connect(ui.buttonRefresh, SIGNAL(clicked()), this, SLOT(updateSysinfo()));
}
-
void Sysinfo::updateSysinfo(void)
{
QString info;
- info += tr("<b>OS</b><br/>") + getOsVersionString() + "<hr/>";
- info += tr("<b>Username:</b><br/>%1<hr/>").arg(getUserName());
+ info += tr("<b>OS</b><br/>") + Detect::osVersionString() + "<hr/>";
+ info += tr("<b>Username:</b><br/>%1<hr/>").arg(Detect::userName());
#if defined(Q_OS_WIN32)
- info += tr("<b>Permissions:</b><br/>%1<hr/>").arg(getUserPermissionsString());
+ info += tr("<b>Permissions:</b><br/>%1<hr/>").arg(Detect::userPermissionsString());
#endif
info += tr("<b>Attached USB devices:</b><br/>");
- QList<uint32_t> usbids = listUsbIds();
+ QList<uint32_t> usbids = Detect::listUsbIds();
for(int i = 0; i < usbids.size(); i++)
info += tr("VID: %1 PID: %2<br/>")
.arg((usbids.at(i)&0xffff0000)>>16, 4, 16, QChar('0'))