diff options
Diffstat (limited to 'rbutil')
-rw-r--r-- | rbutil/rbutilqt/base/system.cpp | 12 | ||||
-rw-r--r-- | rbutil/rbutilqt/base/system.h | 4 | ||||
-rw-r--r-- | rbutil/rbutilqt/base/utils.cpp | 6 | ||||
-rw-r--r-- | rbutil/rbutilqt/base/utils.h | 4 |
4 files changed, 15 insertions, 11 deletions
diff --git a/rbutil/rbutilqt/base/system.cpp b/rbutil/rbutilqt/base/system.cpp index 80e787515c..2bc0764b8b 100644 --- a/rbutil/rbutilqt/base/system.cpp +++ b/rbutil/rbutilqt/base/system.cpp | |||
@@ -116,16 +116,16 @@ QString System::userPermissionsString(void) | |||
116 | int perm = userPermissions(); | 116 | int perm = userPermissions(); |
117 | switch(perm) { | 117 | switch(perm) { |
118 | case GUEST: | 118 | case GUEST: |
119 | result = QObject::tr("Guest"); | 119 | result = tr("Guest"); |
120 | break; | 120 | break; |
121 | case ADMIN: | 121 | case ADMIN: |
122 | result = QObject::tr("Admin"); | 122 | result = tr("Admin"); |
123 | break; | 123 | break; |
124 | case USER: | 124 | case USER: |
125 | result = QObject::tr("User"); | 125 | result = tr("User"); |
126 | break; | 126 | break; |
127 | default: | 127 | default: |
128 | result = QObject::tr("Error"); | 128 | result = tr("Error"); |
129 | break; | 129 | break; |
130 | } | 130 | } |
131 | return result; | 131 | return result; |
@@ -254,7 +254,7 @@ QMap<uint32_t, QString> System::listUsbDevices(void) | |||
254 | libusb_close(dh); | 254 | libusb_close(dh); |
255 | } | 255 | } |
256 | if(name.isEmpty()) | 256 | if(name.isEmpty()) |
257 | name = QObject::tr("(no description available)"); | 257 | name = tr("(no description available)"); |
258 | if(id) { | 258 | if(id) { |
259 | usbids.insert(id, name); | 259 | usbids.insert(id, name); |
260 | qDebug("[System] USB: 0x%08x, %s", id, name.toLocal8Bit().data()); | 260 | qDebug("[System] USB: 0x%08x, %s", id, name.toLocal8Bit().data()); |
@@ -299,7 +299,7 @@ QMap<uint32_t, QString> System::listUsbDevices(void) | |||
299 | } | 299 | } |
300 | } | 300 | } |
301 | usb_close(dev); | 301 | usb_close(dev); |
302 | if(name.isEmpty()) name = QObject::tr("(no description available)"); | 302 | if(name.isEmpty()) name = tr("(no description available)"); |
303 | 303 | ||
304 | if(id) { | 304 | if(id) { |
305 | usbids.insert(id, name); | 305 | usbids.insert(id, name); |
diff --git a/rbutil/rbutilqt/base/system.h b/rbutil/rbutilqt/base/system.h index 25c404e37c..cd9fa82a19 100644 --- a/rbutil/rbutilqt/base/system.h +++ b/rbutil/rbutilqt/base/system.h | |||
@@ -23,12 +23,14 @@ | |||
23 | #ifndef SYSTEM_H | 23 | #ifndef SYSTEM_H |
24 | #define SYSTEM_H | 24 | #define SYSTEM_H |
25 | 25 | ||
26 | #include <QtCore/QObject> | ||
27 | |||
26 | #include <inttypes.h> | 28 | #include <inttypes.h> |
27 | 29 | ||
28 | #include <QString> | 30 | #include <QString> |
29 | #include <QUrl> | 31 | #include <QUrl> |
30 | 32 | ||
31 | class System | 33 | class System : public QObject |
32 | { | 34 | { |
33 | public: | 35 | public: |
34 | System() {} | 36 | System() {} |
diff --git a/rbutil/rbutilqt/base/utils.cpp b/rbutil/rbutilqt/base/utils.cpp index ce8cb1c5a9..f9efd955f0 100644 --- a/rbutil/rbutilqt/base/utils.cpp +++ b/rbutil/rbutilqt/base/utils.cpp | |||
@@ -180,7 +180,7 @@ QString Utils::checkEnvironment(bool permission) | |||
180 | #if defined(Q_OS_WIN32) | 180 | #if defined(Q_OS_WIN32) |
181 | if(System::userPermissions() != System::ADMIN) | 181 | if(System::userPermissions() != System::ADMIN) |
182 | { | 182 | { |
183 | text += QObject::tr("<li>Permissions insufficient for bootloader " | 183 | text += tr("<li>Permissions insufficient for bootloader " |
184 | "installation.\nAdministrator priviledges are necessary.</li>"); | 184 | "installation.\nAdministrator priviledges are necessary.</li>"); |
185 | } | 185 | } |
186 | #endif | 186 | #endif |
@@ -192,14 +192,14 @@ QString Utils::checkEnvironment(bool permission) | |||
192 | if(!installed.isEmpty() && installed != | 192 | if(!installed.isEmpty() && installed != |
193 | SystemInfo::value(SystemInfo::CurConfigureModel).toString()) | 193 | SystemInfo::value(SystemInfo::CurConfigureModel).toString()) |
194 | { | 194 | { |
195 | text += QObject::tr("<li>Target mismatch detected.\n" | 195 | text += tr("<li>Target mismatch detected.\n" |
196 | "Installed target: %1, selected target: %2.</li>") | 196 | "Installed target: %1, selected target: %2.</li>") |
197 | .arg(installed, SystemInfo::value(SystemInfo::CurPlatformName).toString()); | 197 | .arg(installed, SystemInfo::value(SystemInfo::CurPlatformName).toString()); |
198 | // FIXME: replace installed by human-friendly name | 198 | // FIXME: replace installed by human-friendly name |
199 | } | 199 | } |
200 | 200 | ||
201 | if(!text.isEmpty()) | 201 | if(!text.isEmpty()) |
202 | return QObject::tr("Problem detected:") + "<ul>" + text + "</ul>"; | 202 | return tr("Problem detected:") + "<ul>" + text + "</ul>"; |
203 | else | 203 | else |
204 | return text; | 204 | return text; |
205 | } | 205 | } |
diff --git a/rbutil/rbutilqt/base/utils.h b/rbutil/rbutilqt/base/utils.h index 266044d567..ae02a2ca95 100644 --- a/rbutil/rbutilqt/base/utils.h +++ b/rbutil/rbutilqt/base/utils.h | |||
@@ -23,10 +23,12 @@ | |||
23 | #ifndef UTILS_H | 23 | #ifndef UTILS_H |
24 | #define UTILS_H | 24 | #define UTILS_H |
25 | 25 | ||
26 | #include <QtCore/QObject> | ||
27 | |||
26 | #include <QString> | 28 | #include <QString> |
27 | #include <QUrl> | 29 | #include <QUrl> |
28 | 30 | ||
29 | class Utils | 31 | class Utils : public QObject |
30 | { | 32 | { |
31 | public: | 33 | public: |
32 | static bool recursiveRmdir(const QString &dirName); | 34 | static bool recursiveRmdir(const QString &dirName); |