Katana_mirror/kde-workspace
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kde-workspace.git synced 2025-02-23 18:32:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

solid-hardware: drop support for generic interfaces/non-portable info

Browse source 
currently used only by the fake solid backend for the tests and I have no
plans to keep it for other purpose

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2023-06-16 00:17:02 +03:00
parent 3950bafa65
commit f430a47304
2 changed files with 6 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
solid-hardware/solid-hardware.cpp
View file

@ -33,7 +33,6 @@
#include <klocale.h>
#include <solid/device.h>
#include <solid/genericinterface.h>
#include <solid/storageaccess.h>
#include <solid/opticaldrive.h>
#include <solid/devicenotifier.h>
@ -209,11 +208,8 @@ int main(int argc, char **argv)
std::cout << std::endl << i18n("Syntax:") << std::endl << std::endl;
std::cout << " solid-hardware list [details|nonportableinfo]" << std::endl;
std::cout << " solid-hardware list [details]" << std::endl;
std::cout << i18n(" # List the hardware available in the system.\n"
" # - If the 'nonportableinfo' option is specified, the device\n"
" # properties are listed (be careful, in this case property names\n"
" # are backend dependent),\n"
" # - If the 'details' option is specified, the device interfaces\n"
" # and the corresponding properties are listed in a platform\n"
" # neutral fashion,\n"
@ -223,9 +219,8 @@ int main(int argc, char **argv)
std::cout << i18n(" # Display all the interfaces and properties of the device\n"
" # corresponding to 'udi' in a platform neutral fashion.\n") << std::endl;
std::cout << " solid-hardware nonportableinfo 'udi'" << std::endl;
std::cout << i18n(" # Display all the properties of the device corresponding to 'udi'\n"
" # (be careful, in this case property names are backend dependent).\n") << std::endl;
std::cout << " solid-hardware 'udi'" << std::endl;
std::cout << i18n(" # Display all the properties of the device corresponding to 'udi'.\n") << std::endl;
std::cout << " solid-hardware query 'predicate' ['parentUdi']" << std::endl;
std::cout << i18n(" # List the UDI of devices corresponding to 'predicate'.\n"
@ -266,7 +261,7 @@ bool SolidHardware::doIt()
{
checkArgumentCount(1, 2);
QByteArray extra(args->count()==2 ? args->arg(1).toLocal8Bit() : "");
return shell.hwList(extra=="details", extra=="nonportableinfo");
return shell.hwList(extra=="details");
}
else if (command == "details")
{
@ -274,12 +269,6 @@ bool SolidHardware::doIt()
QString udi(args->arg(1));
return shell.hwCapabilities(udi);
}
else if (command == "nonportableinfo")
{
checkArgumentCount(2, 2);
QString udi(args->arg(1));
return shell.hwProperties(udi);
}
else if (command == "query")
{
checkArgumentCount(2, 3);
@ -324,7 +313,7 @@ bool SolidHardware::doIt()
return false;
}
bool SolidHardware::hwList(bool interfaces, bool system)
bool SolidHardware::hwList(bool interfaces)
{
const QList<Solid::Device> all = Solid::Device::allDevices();
@ -336,11 +325,6 @@ bool SolidHardware::hwList(bool interfaces, bool system)
{
std::cout << device << std::endl;
}
else if (system && device.is<Solid::GenericInterface>())
{
QMap<QString,QVariant> properties = device.as<Solid::GenericInterface>()->allProperties();
std::cout << properties << std::endl;
}
}
return true;
@ -356,19 +340,6 @@ bool SolidHardware::hwCapabilities(const QString &udi)
return true;
}
bool SolidHardware::hwProperties(const QString &udi)
{
const Solid::Device device(udi);
std::cout << "udi = '" << device.udi() << "'" << std::endl;
if (device.is<Solid::GenericInterface>()) {
QMap<QString,QVariant> properties = device.as<Solid::GenericInterface>()->allProperties();
std::cout << properties << std::endl;
}
return true;
}
bool SolidHardware::hwQuery(const QString &parentUdi, const QString &query)
{
const QList<Solid::Device> devices

3
solid-hardware/solid-hardware.h
View file

@ -42,9 +42,8 @@ public:
static bool doIt();
bool hwList(bool interfaces, bool system);
bool hwList(bool interfaces);
bool hwCapabilities(const QString &udi);
bool hwProperties(const QString &udi);
bool hwQuery(const QString &parentUdi, const QString &query);
bool listen();