Commit 158992fc authored by Pino Toscano's avatar Pino Toscano
Browse files

usb: drop support for local usb.ids

Our usb.ids is utterly outdated, and using it is simply a bad idea.
Since we have been supporting a system usb.ids for quite a while, then
drop the support for a local version of usb.ids.
parent 4e2f56fa
...@@ -24,12 +24,6 @@ USBDB::USBDB() { ...@@ -24,12 +24,6 @@ USBDB::USBDB() {
if (!QFile::exists(db)) { if (!QFile::exists(db)) {
db = QStringLiteral("/usr/share/misc/usb.ids"); /* on Gentoo */ db = QStringLiteral("/usr/share/misc/usb.ids"); /* on Gentoo */
} }
if (!QFile::exists(db)) {
//cannot use locate(AppDataLocation) as the app is kinfocenter
db = QStandardPaths::locate(QStandardPaths::GenericDataLocation, QStringLiteral("kcmusb"), QStandardPaths::LocateDirectory);
if (!db.isEmpty())
db+=QLatin1String("/usb.ids");
}
if (db.isEmpty()) if (db.isEmpty())
return; return;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment