[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdebase/workspace
From:       Dario Freddi <drf () kde ! org>
Date:       2010-11-28 17:09:36
Message-ID: 20101128170936.EBC8EAC8AC () svn ! kde ! org
[Download RAW message or body]

SVN commit 1201785 by dafre:

Remove Solid::Control::PowerManager from the tree, including the powermanager shell

 M  +2 -13     libs/solid/control/CMakeLists.txt  
 M  +1 -2      libs/solid/control/ifaces/CMakeLists.txt  
 D             libs/solid/control/ifaces/powermanager.cpp  
 D             libs/solid/control/ifaces/powermanager.h  
 D             libs/solid/control/powermanager.cpp  
 D             libs/solid/control/powermanager.h  
 D             libs/solid/control/powermanager_p.h  
 D             libs/solid/control/powermanager_randr.cpp  
 M  +0 -4      solid/CMakeLists.txt  
 D             solid/hal/CMakeLists.txt  
 D             solid/hal/halpower.cpp  
 D             solid/hal/halpower.h  
 D             solid/hal/halsuspendjob.cpp  
 D             solid/hal/halsuspendjob.h  
 D             solid/hal/module_power.cpp  
 D             solid/hal/solid_hal_power.desktop   [TRAILING SPACE]
 M  +0 -4      solid/solidshell/CMakeLists.txt  
 D             solid/solidshell/solid-powermanagement.cpp  
 D             solid/solidshell/solid-powermanagement.h  


--- trunk/KDE/kdebase/workspace/libs/solid/control/CMakeLists.txt #1201784:1201785
@@ -11,7 +11,6 @@
 set(solidcontrol_LIB_SRCS
    frontendobject.cpp
    managerbase.cpp
-   powermanager.cpp
    networking.cpp
    networkmanager.cpp
    networkinterface.cpp
@@ -38,11 +37,6 @@
    modemgsmussdinterface.cpp
 )
 
-# FIXME: this should be XRANDR_FOUND instead
-if(NOT WIN32)
-set(solidcontrol_LIB_SRCS ${solidcontrol_LIB_SRCS} powermanager_randr.cpp)
-endif(NOT WIN32)
-
 qt4_add_dbus_interface(solidcontrol_LIB_SRCS org.kde.Solid.Networking.xml \
org_kde_solid_networking)  
 kde4_add_library(solidcontrol SHARED ${solidcontrol_LIB_SRCS})
@@ -52,15 +46,10 @@
 set_target_properties(solidcontrol PROPERTIES VERSION ${GENERIC_LIB_VERSION} \
SOVERSION ${GENERIC_LIB_SOVERSION} )  install(TARGETS solidcontrol EXPORT \
kdeworkspaceLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS} )  
-pkg_check_modules (XRANDR_1_2   xrandr>=1.2)
-macro_bool_to_01(XRANDR_1_2_FOUND HAS_RANDR_1_2)
-
-configure_file(config-randr.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-randr.h )
-
 ########### install files ###############
 
-install( FILES solidpowermanager.desktop solidnetworkmanager.desktop \
solidremotecontrolmanager.desktop solidmodemmanager.desktop DESTINATION \
                ${SERVICETYPES_INSTALL_DIR}  )
-install( FILES powermanager.h networkmanager.h networkinterface.h \
remotecontrolmanager.h  +install( FILES solidnetworkmanager.desktop \
solidremotecontrolmanager.desktop solidmodemmanager.desktop DESTINATION \
${SERVICETYPES_INSTALL_DIR}  ) +install( FILES networkmanager.h networkinterface.h \
                remotecontrolmanager.h
     remotecontrol.h remotecontrolbutton.h wirednetworkinterface.h \
                wirelessnetworkinterface.h
     wirelessaccesspoint.h singletondefs.h networking.h networkipv4config.h \
solid_control_export.h   networkcdmainterface.h networkgsminterface.h \
                networkserialinterface.h
--- trunk/KDE/kdebase/workspace/libs/solid/control/ifaces/CMakeLists.txt \
#1201784:1201785 @@ -3,7 +3,6 @@
 ########### next target ###############
 
 set(solidcontrolifaces_LIB_SRCS 
-   powermanager.cpp
    networkinterface.cpp
    networkcdmainterface.cpp
    networkgsminterface.cpp
@@ -45,5 +44,5 @@
 
 ########### install files ###############
 
-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) +install( FILES \
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/solid/CMakeLists.txt #1201784:1201785
@@ -4,10 +4,6 @@
 add_subdirectory(kcm)
 add_subdirectory(solid-actions-kcm)
 
-IF("${CMAKE_SYSTEM}" MATCHES "Linux" OR "${CMAKE_SYSTEM}" MATCHES "FreeBSD")
-  add_subdirectory(hal)
-ENDIF("${CMAKE_SYSTEM}" MATCHES "Linux" OR "${CMAKE_SYSTEM}" MATCHES "FreeBSD")
-
 IF("${CMAKE_SYSTEM}" MATCHES "Linux")
   add_subdirectory(solidshell)
 ENDIF("${CMAKE_SYSTEM}" MATCHES "Linux")
--- trunk/KDE/kdebase/workspace/solid/solidshell/CMakeLists.txt #1201784:1201785
@@ -4,16 +4,12 @@
 include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/../control )
 
 set(solid-network_SRCS solid-network.cpp)
-set(solid-powermanagement_SRCS solid-powermanagement.cpp)
 
 kde4_add_executable(solid-network ${solid-network_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-powermanagement ${KDE4_KDECORE_LIBS} ${KDE4_SOLID_LIBS} \
${QT_QTGUI_LIBRARY} solidcontrol)  
 install(TARGETS solid-network ${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]