[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdebase/workspace
From: Alex Fiestas <alex () eyeos ! org>
Date: 2010-07-08 20:32:23
Message-ID: 20100708203223.A8477AC85D () svn ! kde ! org
[Download RAW message or body]
SVN commit 1147609 by afiestas:
Removed all bluetooth code from solid/control, if you need a bluetooth library take a \
look at http://gitorious.org/libbluedevil
M +2 -9 libs/solid/control/CMakeLists.txt
M +0 -2 libs/solid/control/backends/CMakeLists.txt
D libs/solid/control/bluetoothinputdevice.cpp
D libs/solid/control/bluetoothinputdevice.h
D libs/solid/control/bluetoothinterface.cpp
D libs/solid/control/bluetoothinterface.h
D libs/solid/control/bluetoothmanager.cpp
D libs/solid/control/bluetoothmanager.h
D libs/solid/control/bluetoothremotedevice.cpp
D libs/solid/control/bluetoothremotedevice.h
D libs/solid/control/bluetoothsecurity.cpp
D libs/solid/control/bluetoothsecurity.h
M +1 -6 libs/solid/control/ifaces/CMakeLists.txt
D libs/solid/control/ifaces/bluetoothinputdevice.cpp
D libs/solid/control/ifaces/bluetoothinputdevice.h
D libs/solid/control/ifaces/bluetoothinterface.cpp
D libs/solid/control/ifaces/bluetoothinterface.h
D libs/solid/control/ifaces/bluetoothmanager.cpp
D libs/solid/control/ifaces/bluetoothmanager.h
D libs/solid/control/ifaces/bluetoothremotedevice.cpp
D libs/solid/control/ifaces/bluetoothremotedevice.h
D libs/solid/control/ifaces/bluetoothsecurity.cpp
D libs/solid/control/ifaces/bluetoothsecurity.h
D libs/solid/control/solidbluetoothmanager.desktop
M +0 -13 libs/solid/control/tests/CMakeLists.txt
D libs/solid/control/tests/solidbluetoothtest.cpp
M +0 -7 solid/CMakeLists.txt
D solid/bluez (directory)
M +0 -4 solid/solidshell/CMakeLists.txt
D solid/solidshell/solid-bluetooth.cpp
D solid/solidshell/solid-bluetooth.h
--- trunk/KDE/kdebase/workspace/libs/solid/control/CMakeLists.txt #1147608:1147609
@@ -22,11 +22,6 @@
wirednetworkinterface.cpp
wirelessaccesspoint.cpp
wirelessnetworkinterface.cpp
- bluetoothinterface.cpp
- bluetoothmanager.cpp
- bluetoothremotedevice.cpp
- bluetoothinputdevice.cpp
- bluetoothsecurity.cpp
remotecontrolbutton.cpp
remotecontrol.cpp
remotecontrolmanager.cpp
@@ -64,12 +59,10 @@
########### install files ###############
-install( FILES solidpowermanager.desktop solidnetworkmanager.desktop \
solidbluetoothmanager.desktop solidremotecontrolmanager.desktop \
solidmodemmanager.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} ) +install( FILES \
solidpowermanager.desktop solidnetworkmanager.desktop \
solidremotecontrolmanager.desktop solidmodemmanager.desktop DESTINATION \
${SERVICETYPES_INSTALL_DIR} ) install( FILES powermanager.h networkmanager.h \
networkinterface.h remotecontrolmanager.h
remotecontrol.h remotecontrolbutton.h wirednetworkinterface.h \
wirelessnetworkinterface.h
- wirelessaccesspoint.h bluetoothmanager.h bluetoothinterface.h
- bluetoothremotedevice.h bluetoothinputdevice.h bluetoothsecurity.h
- singletondefs.h networking.h networkipv4config.h solid_control_export.h
+ wirelessaccesspoint.h singletondefs.h networking.h networkipv4config.h \
solid_control_export.h networkcdmainterface.h networkgsminterface.h \
networkserialinterface.h modemmanager.h modemmanagerinterface.h
modeminterface.h modemlocationinterface.h modemcdmainterface.h
--- trunk/KDE/kdebase/workspace/libs/solid/control/backends/CMakeLists.txt \
#1147608:1147609 @@ -1,3 +1 @@
add_subdirectory( fakenet )
-#add_subdirectory( fakebluetooth )
-
--- trunk/KDE/kdebase/workspace/libs/solid/control/ifaces/CMakeLists.txt \
#1147608:1147609 @@ -12,11 +12,6 @@
wirednetworkinterface.cpp
wirelessaccesspoint.cpp
wirelessnetworkinterface.cpp
- bluetoothremotedevice.cpp
- bluetoothinputdevice.cpp
- bluetoothinterface.cpp
- bluetoothmanager.cpp
- bluetoothsecurity.cpp
remotecontrol.cpp
remotecontrolmanager.cpp
modemmanager.cpp
@@ -50,5 +45,5 @@
########### install files ###############
-install( FILES powermanager.h networkmanager.h networkinterface.h \
networkcdmainterface.h networkgsminterface.h networkserialinterface.h \
wirednetworkinterface.h wirelessnetworkinterface.h wirelessaccesspoint.h \
bluetoothremotedevice.h bluetoothinputdevice.h bluetoothinterface.h \
bluetoothmanager.h remotecontrol.h remotecontrolmanager.h modemmanager.h \
modeminterface.h modemlocationinterface.h modemcdmainterface.h \
modemgsmcardinterface.h modemgsmcontactsinterface.h modemgsmnetworkinterface.h \
modemgsmsmsinterface.h modemgsmhsointerface.h modemgsmussdinterface.h DESTINATION \
${INCLUDE_INSTALL_DIR}/solid/control/ifaces COMPONENT Devel) +install( FILES \
powermanager.h networkmanager.h networkinterface.h networkcdmainterface.h \
networkgsminterface.h networkserialinterface.h wirednetworkinterface.h \
wirelessnetworkinterface.h wirelessaccesspoint.h remotecontrol.h \
remotecontrolmanager.h modemmanager.h modeminterface.h modemlocationinterface.h \
modemcdmainterface.h modemgsmcardinterface.h modemgsmcontactsinterface.h \
modemgsmnetworkinterface.h modemgsmsmsinterface.h modemgsmhsointerface.h \
modemgsmussdinterface.h DESTINATION ${INCLUDE_INSTALL_DIR}/solid/control/ifaces \
COMPONENT Devel)
--- trunk/KDE/kdebase/workspace/libs/solid/control/tests/CMakeLists.txt \
#1147608:1147609 @@ -14,17 +14,4 @@
#target_link_libraries(solidnettest ${KDE4_KDECORE_LIBS} ${QT_QTTEST_LIBRARY} \
solidcontrol solidcontrolifaces solid_fakenet_static)
-########### solidbluetoothtest ###############
-
-#set(solidbluetoothtest_SRCS
-# solidbluetoothtest.cpp )
-
-
-#kde4_add_unit_test(solidbluetoothtest ${solidbluetoothtest_SRCS})
-#add_definitions(-DFAKE_BLUETOOTH_XML="\\"${CMAKE_CURRENT_SOURCE_DIR}/../backends/fakebluetooth/fakebluetooth.xml\\"")
-
-#include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/../backends/fakebluetooth )
-
-#target_link_libraries(solidbluetoothtest ${KDE4_KDECORE_LIBS} ${QT_QTTEST_LIBRARY} \
solidcontrol solidcontrolifaces solid_fakebluetooth_static)
-
########### install files ###############
--- trunk/KDE/kdebase/workspace/solid/CMakeLists.txt #1147608:1147609
@@ -1,9 +1,6 @@
include(MacroEnsureVersion)
macro_optional_find_package(NetworkManager)
-macro_optional_find_package(BlueZ)
-macro_log_feature(BLUEZ_FOUND "BlueZ" "BlueZ is the Linux Bluetooth protocol stack" \
"http://www.bluez.org" FALSE "" "For Bluetooth support in KDE")
-
add_subdirectory(kcm)
add_subdirectory(solid-actions-kcm)
@@ -42,7 +39,3 @@
macro_optional_add_subdirectory(wicd)
add_subdirectory(lirc)
endif(NOT WIN32)
-
-if(BLUEZ_FOUND)
- add_subdirectory(bluez)
-endif(BLUEZ_FOUND)
--- trunk/KDE/kdebase/workspace/solid/solidshell/CMakeLists.txt #1147608:1147609
@@ -4,19 +4,15 @@
include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/../control )
set(solid-network_SRCS solid-network.cpp)
-set(solid-bluetooth_SRCS solid-bluetooth.cpp)
set(solid-powermanagement_SRCS solid-powermanagement.cpp)
kde4_add_executable(solid-network ${solid-network_SRCS})
-kde4_add_executable(solid-bluetooth ${solid-bluetooth_SRCS})
kde4_add_executable(solid-powermanagement ${solid-powermanagement_SRCS})
target_link_libraries(solid-network ${KDE4_KDECORE_LIBS} ${KDE4_SOLID_LIBS} \
solidcontrol)
-target_link_libraries(solid-bluetooth ${KDE4_KDECORE_LIBS} ${KDE4_SOLID_LIBS} \
solidcontrol) target_link_libraries(solid-powermanagement ${KDE4_KDECORE_LIBS} \
${KDE4_SOLID_LIBS} ${QT_QTGUI_LIBRARY} solidcontrol)
install(TARGETS solid-network ${INSTALL_TARGETS_DEFAULT_ARGS})
-install(TARGETS solid-bluetooth ${INSTALL_TARGETS_DEFAULT_ARGS})
install(TARGETS solid-powermanagement ${INSTALL_TARGETS_DEFAULT_ARGS})
########### install files ###############
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic