rpms/kdebase-workspace/F-9 kdebase-workspace-4.2.0-bluetooth-revert.patch, 1.1, 1.2
Kevin Kofler
kkofler at fedoraproject.org
Thu Jan 29 20:10:24 UTC 2009
Author: kkofler
Update of /cvs/pkgs/rpms/kdebase-workspace/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31304/F-9
Modified Files:
kdebase-workspace-4.2.0-bluetooth-revert.patch
Log Message:
Also revert solid/solidshell/solid-bluetooth.*.
kdebase-workspace-4.2.0-bluetooth-revert.patch:
Index: kdebase-workspace-4.2.0-bluetooth-revert.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/F-9/kdebase-workspace-4.2.0-bluetooth-revert.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kdebase-workspace-4.2.0-bluetooth-revert.patch 29 Jan 2009 19:41:04 -0000 1.1
+++ kdebase-workspace-4.2.0-bluetooth-revert.patch 29 Jan 2009 20:10:23 -0000 1.2
@@ -3863,3 +3863,190 @@
#if 0
BluezBluetoothRemoteDevice remote("/org/bluez/hci0/00:16:BC:15:A3:FF");
+diff -ur kdebase-workspace-4.2.0/solid/solidshell/solid-bluetooth.cpp kdebase-workspace-4.2.0-bluetooth-revert/solid/solidshell/solid-bluetooth.cpp
+--- kdebase-workspace-4.2.0/solid/solidshell/solid-bluetooth.cpp 2008-12-04 09:34:48.000000000 +0100
++++ kdebase-workspace-4.2.0-bluetooth-revert/solid/solidshell/solid-bluetooth.cpp 2008-04-02 14:18:23.000000000 +0200
+@@ -70,8 +70,8 @@
+
+ QStringList list = value.toStringList();
+
+- QStringList::ConstIterator it = list.constBegin();
+- QStringList::ConstIterator end = list.constEnd();
++ QStringList::ConstIterator it = list.begin();
++ QStringList::ConstIterator end = list.end();
+
+ for (; it!=end; ++it)
+ {
+@@ -149,7 +149,7 @@
+
+ std::ostream &operator<<(std::ostream &out, const QMap<QString,QVariant> &properties)
+ {
+- foreach (const QString& key, properties.keys())
++ foreach (QString key, properties.keys())
+ {
+ out << " " << key << " = " << properties[key] << endl;
+ }
+@@ -205,17 +205,6 @@
+ cout << " solid-bluetooth defaultadapter" << endl;
+ cout << i18n(" # List bluetooth default adapter/interface\n") << endl;
+
+- cout << " solid-bluetooth createdevice (interface 'ubi') 'remote-mac'" << endl;
+- cout << i18n(" # Request to create a remote bluetooth device on the bus\n") << endl;
+-
+- cout << " solid-bluetooth removedevice (interface 'ubi') 'remote-mac'" << endl;
+- cout << i18n(" # Request to remove the remote bluetooth device from the bus\n") << endl;
+-
+- cout << " solid-bluetooth getproperties (interface 'ubi') " << endl;
+- cout << i18n(" # Request the properties from the bluetooth adapter\n") << endl;
+-
+-
+-/*
+ cout << " solid-bluetooth getremotename (interface 'ubi') 'remote-mac'" << endl;
+ cout << i18n(" # Query the name from the remote device 'remote-mac' with 'ubi'\n") << endl;
+
+@@ -242,7 +231,7 @@
+ cout << i18n(" # Create bonding (pairing) with bluetooth remote device.\n"
+ " # Remove bonding of bluetooth remote device.\n"
+ " # Check for bonding of bluetooth remote device.\n") << endl;
+-*/
++
+ return 0;
+ }
+
+@@ -263,35 +252,11 @@
+ if (command == "listadapters")
+ {
+ return shell.bluetoothListAdapters();
+- }
++ }
+ else if (command == "defaultadapter")
+ {
+ return shell.bluetoothDefaultAdapter();
+ }
+- else if (command == "createdevice")
+- {
+- checkArgumentCount(3, 3);
+- QString adapterUbi(args->arg(1));
+- QString mac(args->arg(2));
+- return shell.bluetoothCreateDevice(adapterUbi, mac);
+- }
+- else if (command == "removedevice")
+- {
+- checkArgumentCount(3, 3);
+- QString adapterUbi(args->arg(1));
+- QString remoteUbi(args->arg(2));
+- return shell.bluetoothRemoveDevice(adapterUbi, remoteUbi);
+- }
+- else if (command == "getproperties")
+- {
+- checkArgumentCount(2, 2);
+- QString ubi (args->arg(1));
+- return shell.bluetoothGetProperties(ubi);
+- }
+-
+-
+-
+-#if 0
+ else if (command == "getremotename")
+ {
+ checkArgumentCount(3, 3);
+@@ -401,7 +366,6 @@
+ }
+
+ }
+-#endif
+ else
+ {
+ cerr << i18n("Syntax Error: Unknown command '%1'" , command) << endl;
+@@ -414,7 +378,9 @@
+ {
+ Solid::Control::BluetoothManager &manager = Solid::Control::BluetoothManager::self();
+
+- foreach (Solid::Control::BluetoothInterface device, manager.bluetoothInterfaces())
++ const Solid::Control::BluetoothInterfaceList all = manager.bluetoothInterfaces();
++
++ foreach (const Solid::Control::BluetoothInterface device, all)
+ {
+ cout << "UBI = '" << device.ubi() << "'" << endl;
+ }
+@@ -430,36 +396,6 @@
+ return true;
+ }
+
+-bool SolidBluetooth::bluetoothCreateDevice(const QString &adapterUbi, const QString &/*mac*/)
+-{
+- Solid::Control::BluetoothManager &manager = Solid::Control::BluetoothManager::self();
+- Solid::Control::BluetoothInterface adapter = manager.findBluetoothInterface(adapterUbi);
+-// QString remoteDeviceUBI = adapter.createDevice(mac);
+-// cout << "Remote Device UBI: " << remoteDeviceUBI << endl;
+- return true;
+-}
+-
+-bool SolidBluetooth::bluetoothRemoveDevice(const QString &adapterUbi, const QString &/*remoteDeviceUbi*/)
+-{
+- Solid::Control::BluetoothManager &manager = Solid::Control::BluetoothManager::self();
+- Solid::Control::BluetoothInterface adapter = manager.findBluetoothInterface(adapterUbi);
+-// adapter.removeDevice(remoteDeviceUbi);
+- return true;
+-}
+-
+-bool SolidBluetooth::bluetoothGetProperties(const QString &adapterUbi)
+-{
+- Solid::Control::BluetoothManager &manager = Solid::Control::BluetoothManager::self();
+- Solid::Control::BluetoothInterface adapter = manager.findBluetoothInterface(adapterUbi);
+- QMap<QString,QVariant> props = adapter.getProperties();
+- foreach (QString valName, props.keys()) {
+- cout << valName << ": " << props[valName] << endl;
+- }
+- return true;
+-}
+-
+-
+-#if 0
+ bool SolidBluetooth::bluetoothGetRemoteName(const QString &adapterUbi, const QString &mac)
+ {
+ Solid::Control::BluetoothManager &manager = Solid::Control::BluetoothManager::self();
+@@ -749,6 +685,5 @@
+ }
+ m_loop.exit();
+ }
+-#endif
+
+ #include "solid-bluetooth.moc"
+diff -ur kdebase-workspace-4.2.0/solid/solidshell/solid-bluetooth.h kdebase-workspace-4.2.0-bluetooth-revert/solid/solidshell/solid-bluetooth.h
+--- kdebase-workspace-4.2.0/solid/solidshell/solid-bluetooth.h 2008-10-17 13:00:20.000000000 +0200
++++ kdebase-workspace-4.2.0-bluetooth-revert/solid/solidshell/solid-bluetooth.h 2008-04-02 14:18:23.000000000 +0200
+@@ -44,10 +44,6 @@
+
+ bool bluetoothListAdapters();
+ bool bluetoothDefaultAdapter();
+- bool bluetoothCreateDevice(const QString &adapterUbi, const QString &mac);
+- bool bluetoothRemoveDevice(const QString &adapterUbi, const QString &mac);
+- bool bluetoothGetProperties(const QString &adapterUbi);
+-#if 0
+ bool bluetoothGetRemoteName(const QString &adapterUbi, const QString &mac);
+ bool bluetoothAdapterAddress(const QString &ubi);
+ bool bluetoothAdapterName(const QString &ubi);
+@@ -67,7 +63,6 @@
+ bool bluetoothRemoteCreateBonding(const QString &adapterUbi, const QString &deviceUbi);
+ bool bluetoothRemoteRemoveBonding(const QString &adapterUbi, const QString &deviceUbi);
+ bool bluetoothRemoteHasBonding(const QString &adapterUbi, const QString &deviceUbi);
+-#endif
+
+ private:
+ void connectJob(KJob *job);
+@@ -76,14 +71,12 @@
+ int m_error;
+ QString m_errorString;
+ private slots:
+-#if 0
+ void slotStorageResult(Solid::ErrorType error, const QVariant &errorData);
+ void slotResult(KJob *job);
+ void slotPercent(KJob *job, unsigned long percent);
+ void slotInfoMessage(KJob *job, const QString &message);
+ void slotBluetoothDeviceFound(const QString &ubi, int deviceClass, int rssi);
+ void slotBluetoothDiscoveryCompleted();
+-#endif
+ };
+
+
More information about the fedora-extras-commits
mailing list