Attachment #2285 for bug #2109

By default, Bugzilla does not search the list of RESOLVED bugs.
You can force it to do so by putting the upper-case word ALL in front of your search query, e.g.: ALL tdelibs
We recommend searching for bugs this way, as you may discover that your bug has already been resolved and fixed in a later release. View | Details | Raw Unified | Return to bug 2109
Collapse All | Expand All

Lines 85-91 OPTION( WITH_PCRE "Enable pcre regex support for kjs" ON ) Link Here

(-)a/CMakeLists.txt (-1 / +6 lines)
85	OPTION( WITH_GCC_VISIBILITY "Enable fvisibility and fvisibility-inlines-hidden" ${WITH_ALL_OPTIONS} )	85	OPTION( WITH_GCC_VISIBILITY "Enable fvisibility and fvisibility-inlines-hidden" ${WITH_ALL_OPTIONS} )
86	OPTION( WITH_INOTIFY "Enable inotify support for tdeio" ON )	86	OPTION( WITH_INOTIFY "Enable inotify support for tdeio" ON )
87	OPTION( WITH_GAMIN "Enable FAM/GAMIN support" ${WITH_ALL_OPTIONS} )	87	OPTION( WITH_GAMIN "Enable FAM/GAMIN support" ${WITH_ALL_OPTIONS} )
88	option( WITH_TDEHWLIB_DAEMONS "Enable daemons for TDE hwlib" ${WITH_ALL_OPTIONS} )	88	option( WITH_TDEHWLIB "Enable TDE hwlib globally" ON )
		89	option( WITH_TDEHWLIB_DAEMONS "Enable daemons for TDE hwlib" ${WITH_TDEHWLIB} )
89	option( WITH_HAL "Enable HAL support" OFF )	90	option( WITH_HAL "Enable HAL support" OFF )
90	option( WITH_DEVKITPOWER "Enable DeviceKit Power support" OFF )	91	option( WITH_DEVKITPOWER "Enable DeviceKit Power support" OFF )
91	option( WITH_LOGINDPOWER "Enable Logind/Systemd Power support" OFF )	92	option( WITH_LOGINDPOWER "Enable Logind/Systemd Power support" OFF )
Lines 493-498 set( LTDL_OBJDIR \".\" ) Link Here
493	set( KDELIBSUFF "${LIB_SUFFIX}" )	494	set( KDELIBSUFF "${LIB_SUFFIX}" )
494	set( kde_socklen_t socklen_t )	495	set( kde_socklen_t socklen_t )
495		496
		497	if( WITH_TDEHWLIB )
		498	set( __TDE_HAVE_TDEHWLIB 1 )
		499	endif( WITH_TDEHWLIB )
		500
496		501
497	##### check for libdl ###########################	502	##### check for libdl ###########################
498		503

Lines 12-18 Link Here

(-)a/tdecore/CMakeLists.txt (-4 / +9 lines)
12	add_subdirectory( malloc )	12	add_subdirectory( malloc )
13	add_subdirectory( network )	13	add_subdirectory( network )
14	add_subdirectory( tdeconfig_compiler )	14	add_subdirectory( tdeconfig_compiler )
15	add_subdirectory( tdehw )	15
		16	if( WITH_TDEHWLIB )
		17	add_subdirectory( tdehw )
		18	set( TDEHW_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/tdehw )
		19	set( TDEHW_LIB tdehw-static )
		20	endif( WITH_TDEHWLIB )
16		21
17	if( WITH_LIBART )	22	if( WITH_LIBART )
18	add_subdirectory( svgicons )	23	add_subdirectory( svgicons )
Lines 25-31 include_directories( Link Here
25	${CMAKE_BINARY_DIR}	30	${CMAKE_BINARY_DIR}
26	${CMAKE_CURRENT_SOURCE_DIR}	31	${CMAKE_CURRENT_SOURCE_DIR}
27	${CMAKE_CURRENT_SOURCE_DIR}/network	32	${CMAKE_CURRENT_SOURCE_DIR}/network
28	${CMAKE_CURRENT_SOURCE_DIR}/tdehw	33	${TDEHW_INCLUDE_DIR}
29	${CMAKE_SOURCE_DIR}/dcop	34	${CMAKE_SOURCE_DIR}/dcop
30	${CMAKE_SOURCE_DIR}/libltdl	35	${CMAKE_SOURCE_DIR}/libltdl
31	${CMAKE_SOURCE_DIR}/tdefx	36	${CMAKE_SOURCE_DIR}/tdefx
Lines 128-137 set( ${target}_SRCS Link Here
128	tde_add_library( ${target} SHARED AUTOMOC	133	tde_add_library( ${target} SHARED AUTOMOC
129	SOURCES ${${target}_SRCS}	134	SOURCES ${${target}_SRCS}
130	VERSION 14.0.0	135	VERSION 14.0.0
131	EMBED tdecorenetwork-static tdehw-static	136	EMBED tdecorenetwork-static ${TDEHW_LIB}
132	LINK ltdlc-static ${KDESVGICONS} DCOP-shared tdefx-shared ${ZLIB_LIBRARIES}	137	LINK ltdlc-static ${KDESVGICONS} DCOP-shared tdefx-shared ${ZLIB_LIBRARIES}
133	${LIBIDN_LIBRARIES} ${XCOMPOSITE_LIBRARIES} ICE SM ${GAMIN_LIBRARIES}	138	${LIBIDN_LIBRARIES} ${XCOMPOSITE_LIBRARIES} ICE SM ${GAMIN_LIBRARIES}
134	${LIBBFD_LIBRARIES} util	139	${LIBBFD_LIBRARIES} ${LIB_UTIL}
135	DEPENDENCIES dcopidl dcopidl2cpp	140	DEPENDENCIES dcopidl dcopidl2cpp
136	DESTINATION ${LIB_INSTALL_DIR}	141	DESTINATION ${LIB_INSTALL_DIR}
137	)	142	)

Lines 21-26 Link Here

(-)a/tdecore/kdemacros.h.cmake (+1 lines)
21	#define _KDE_MACROS_H_	21	#define _KDE_MACROS_H_
22		22
23	/* Set by configure */	23	/* Set by configure */
		24	#cmakedefine __TDE_HAVE_TDEHWLIB 1
24	#cmakedefine __KDE_HAVE_GCC_VISIBILITY 1	25	#cmakedefine __KDE_HAVE_GCC_VISIBILITY 1
25		26
26	/**	27	/**




#include "tdelocale.h"
#include "kcharsets.h"
#include "kiconloader.h"
#ifdef __TDE_HAVE_TDEHWLIB
#include "tdehardwaredevices.h"
#include "tdenetworkconnections.h"
#endif
#include "tdeaboutdata.h"
#include "kstandarddirs.h"
#include "kdebug.h"

  : _dirs (0L),
    _config (0L),
    _iconLoader (0L),
#ifdef __TDE_HAVE_TDEHWLIB
    _hardwaredevices (0L),
    _networkmanager (0L),
#endif
    _name( name ), _aboutData( new TDEAboutData( name, "", 0 ) ), m_configReadOnly(false)
{
    DEBUG_ADD

  : _dirs (0L),
    _config (0L),
    _iconLoader (0L),
#ifdef __TDE_HAVE_TDEHWLIB
    _hardwaredevices (0L),
    _networkmanager (0L),
#endif
    _name( aboutData->appName() ), _aboutData( aboutData ), m_configReadOnly(false)
{
    DEBUG_ADD

  : _dirs ( src->_dirs ),
    _config ( src->_config ),
    _iconLoader ( src->_iconLoader ),
#ifdef __TDE_HAVE_TDEHWLIB
    _hardwaredevices ( src->_hardwaredevices ),
    _networkmanager ( src->_networkmanager ),
#endif
    _name( src->_name ), _aboutData( src->_aboutData ), m_configReadOnly(false)
{
    DEBUG_ADD

    src->_dirs = 0L;
    src->_config = 0L;
    src->_iconLoader = 0L;
#ifdef __TDE_HAVE_TDEHWLIB
    src->_hardwaredevices = 0L;
    src->_networkmanager = 0L;
#endif
    src->_aboutData = 0L;
    delete src;
}

    delete _iconLoader;
    _iconLoader = 0;

#ifdef __TDE_HAVE_TDEHWLIB
    delete _hardwaredevices;
    _hardwaredevices = 0;

    delete _networkmanager;
    _networkmanager = 0;
#endif

    // delete _config; // Do not delete, stored in d->sharedConfig
    _config = 0;

    return _iconLoader;
}

#ifdef __TDE_HAVE_TDEHWLIB
TDEHardwareDevices *TDEInstance::hardwareDevices() const
{
    DEBUG_CHECK_ALIVE


    return _networkmanager;
}
#endif

void TDEInstance::newIconLoader() const
{

Lines 18-23 Link Here

(-)a/tdecore/kinstance.h (-3 / +9 lines)
18	#ifndef _KINSTANCE_H	18	#ifndef _KINSTANCE_H
19	#define _KINSTANCE_H	19	#define _KINSTANCE_H
20		20
		21	#include <tqstring.h>
		22	#include "tdelibs_export.h"
		23
21	class TDEStandardDirs;	24	class TDEStandardDirs;
22	class TDEAboutData;	25	class TDEAboutData;
23	class TDEConfig;	26	class TDEConfig;
Lines 27-37 class TQFont; Link Here
27	class TDEInstancePrivate;	30	class TDEInstancePrivate;
28	class KMimeSourceFactory;	31	class KMimeSourceFactory;
29	class TDESharedConfig;	32	class TDESharedConfig;
		33	#ifdef __TDE_HAVE_TDEHWLIB
30	class TDEHardwareDevices;	34	class TDEHardwareDevices;
31	class TDEGlobalNetworkManager;	35	class TDEGlobalNetworkManager;
32		36	#endif
33	#include <tqstring.h>
34	#include "tdelibs_export.h"
35		37
36		38
37	/**	39	/**
Lines 110-115 class TDECORE_EXPORT TDEInstance Link Here
110	*/	112	*/
111	TDEIconLoader *iconLoader() const;	113	TDEIconLoader *iconLoader() const;
112		114
		115	#ifdef __TDE_HAVE_TDEHWLIB
113	/**	116	/**
114	* Returns a TDEHardwareDevices object.	117	* Returns a TDEHardwareDevices object.
115	* @return the hardwaredevices object.	118	* @return the hardwaredevices object.
Lines 121-126 class TDECORE_EXPORT TDEInstance Link Here
121	* @return the networkmanager object.	124	* @return the networkmanager object.
122	*/	125	*/
123	TDEGlobalNetworkManager *networkManager() const;	126	TDEGlobalNetworkManager *networkManager() const;
		127	#endif
124		128
125	/**	129	/**
126	* Re-allocate the global iconloader.	130	* Re-allocate the global iconloader.
Lines 168-175 private: Link Here
168	mutable TDEConfig *_config;	172	mutable TDEConfig *_config;
169	mutable TDEIconLoader *_iconLoader;	173	mutable TDEIconLoader *_iconLoader;
170		174
		175	#ifdef __TDE_HAVE_TDEHWLIB
171	mutable TDEHardwareDevices *_hardwaredevices;	176	mutable TDEHardwareDevices *_hardwaredevices;
172	mutable TDEGlobalNetworkManager *_networkmanager;	177	mutable TDEGlobalNetworkManager *_networkmanager;
		178	#endif
173	mutable void *_placeholder;	179	mutable void *_placeholder;
174		180
175	TQCString _name;	181	TQCString _name;




#include <tdelocale.h>
#include <kcharsets.h>
#include <kiconloader.h>
#ifdef __TDE_HAVE_TDEHWLIB
#include <tdehardwaredevices.h>
#include <tdenetworkconnections.h>
#endif
#include <kstandarddirs.h>
#include <kinstance.h>
#include "kstaticdeleter.h"

    return _instance->iconLoader();
}

#ifdef __TDE_HAVE_TDEHWLIB
TDEHardwareDevices *TDEGlobal::hardwareDevices()
{
    MYASSERT(_instance);


    return _instance->networkManager();
}
#endif

TDEInstance *TDEGlobal::instance()
{

Return to bug 2109

Lines 24-31 Link Here

(-)a/tdecore/kinstance.cpp (+14 lines)
24	#include "tdelocale.h"	24	#include "tdelocale.h"
25	#include "kcharsets.h"	25	#include "kcharsets.h"
26	#include "kiconloader.h"	26	#include "kiconloader.h"
		27	#ifdef __TDE_HAVE_TDEHWLIB
27	#include "tdehardwaredevices.h"	28	#include "tdehardwaredevices.h"
28	#include "tdenetworkconnections.h"	29	#include "tdenetworkconnections.h"
		30	#endif
29	#include "tdeaboutdata.h"	31	#include "tdeaboutdata.h"
30	#include "kstandarddirs.h"	32	#include "kstandarddirs.h"
31	#include "kdebug.h"	33	#include "kdebug.h"
Lines 72-79 TDEInstance::TDEInstance( const TQCString& name) Link Here
72	: _dirs (0L),	74	: _dirs (0L),
73	_config (0L),	75	_config (0L),
74	_iconLoader (0L),	76	_iconLoader (0L),
		77	#ifdef __TDE_HAVE_TDEHWLIB
75	_hardwaredevices (0L),	78	_hardwaredevices (0L),
76	_networkmanager (0L),	79	_networkmanager (0L),
		80	#endif
77	_name( name ), _aboutData( new TDEAboutData( name, "", 0 ) ), m_configReadOnly(false)	81	_name( name ), _aboutData( new TDEAboutData( name, "", 0 ) ), m_configReadOnly(false)
78	{	82	{
79	DEBUG_ADD	83	DEBUG_ADD
Lines 92-99 TDEInstance::TDEInstance( const TDEAboutData * aboutData ) Link Here
92	: _dirs (0L),	96	: _dirs (0L),
93	_config (0L),	97	_config (0L),
94	_iconLoader (0L),	98	_iconLoader (0L),
		99	#ifdef __TDE_HAVE_TDEHWLIB
95	_hardwaredevices (0L),	100	_hardwaredevices (0L),
96	_networkmanager (0L),	101	_networkmanager (0L),
		102	#endif
97	_name( aboutData->appName() ), _aboutData( aboutData ), m_configReadOnly(false)	103	_name( aboutData->appName() ), _aboutData( aboutData ), m_configReadOnly(false)
98	{	104	{
99	DEBUG_ADD	105	DEBUG_ADD
Lines 113-120 TDEInstance::TDEInstance( TDEInstance* src ) Link Here
113	: _dirs ( src->_dirs ),	119	: _dirs ( src->_dirs ),
114	_config ( src->_config ),	120	_config ( src->_config ),
115	_iconLoader ( src->_iconLoader ),	121	_iconLoader ( src->_iconLoader ),
		122	#ifdef __TDE_HAVE_TDEHWLIB
116	_hardwaredevices ( src->_hardwaredevices ),	123	_hardwaredevices ( src->_hardwaredevices ),
117	_networkmanager ( src->_networkmanager ),	124	_networkmanager ( src->_networkmanager ),
		125	#endif
118	_name( src->_name ), _aboutData( src->_aboutData ), m_configReadOnly(false)	126	_name( src->_name ), _aboutData( src->_aboutData ), m_configReadOnly(false)
119	{	127	{
120	DEBUG_ADD	128	DEBUG_ADD
Lines 133-140 TDEInstance::TDEInstance( TDEInstance* src ) Link Here
133	src->_dirs = 0L;	141	src->_dirs = 0L;
134	src->_config = 0L;	142	src->_config = 0L;
135	src->_iconLoader = 0L;	143	src->_iconLoader = 0L;
		144	#ifdef __TDE_HAVE_TDEHWLIB
136	src->_hardwaredevices = 0L;	145	src->_hardwaredevices = 0L;
137	src->_networkmanager = 0L;	146	src->_networkmanager = 0L;
		147	#endif
138	src->_aboutData = 0L;	148	src->_aboutData = 0L;
139	delete src;	149	delete src;
140	}	150	}
Lines 153-163 TDEInstance::~TDEInstance() Link Here
153	delete _iconLoader;	163	delete _iconLoader;
154	_iconLoader = 0;	164	_iconLoader = 0;
155		165
		166	#ifdef __TDE_HAVE_TDEHWLIB
156	delete _hardwaredevices;	167	delete _hardwaredevices;
157	_hardwaredevices = 0;	168	_hardwaredevices = 0;
158		169
159	delete _networkmanager;	170	delete _networkmanager;
160	_networkmanager = 0;	171	_networkmanager = 0;
		172	#endif
161		173
162	// delete _config; // Do not delete, stored in d->sharedConfig	174	// delete _config; // Do not delete, stored in d->sharedConfig
163	_config = 0;	175	_config = 0;
Lines 270-275 TDEIconLoader *TDEInstance::iconLoader() const Link Here
270	return _iconLoader;	282	return _iconLoader;
271	}	283	}
272		284
		285	#ifdef __TDE_HAVE_TDEHWLIB
273	TDEHardwareDevices *TDEInstance::hardwareDevices() const	286	TDEHardwareDevices *TDEInstance::hardwareDevices() const
274	{	287	{
275	DEBUG_CHECK_ALIVE	288	DEBUG_CHECK_ALIVE
Lines 289-294 TDEGlobalNetworkManager *TDEInstance::networkManager() const Link Here
289		302
290	return _networkmanager;	303	return _networkmanager;
291	}	304	}
		305	#endif
292		306
293	void TDEInstance::newIconLoader() const	307	void TDEInstance::newIconLoader() const
294	{	308	{

Lines 34-41 Link Here

(-)a/tdecore/tdeglobal.cpp (+4 lines)
34	#include <tdelocale.h>	34	#include <tdelocale.h>
35	#include <kcharsets.h>	35	#include <kcharsets.h>
36	#include <kiconloader.h>	36	#include <kiconloader.h>
		37	#ifdef __TDE_HAVE_TDEHWLIB
37	#include <tdehardwaredevices.h>	38	#include <tdehardwaredevices.h>
38	#include <tdenetworkconnections.h>	39	#include <tdenetworkconnections.h>
		40	#endif
39	#include <kstandarddirs.h>	41	#include <kstandarddirs.h>
40	#include <kinstance.h>	42	#include <kinstance.h>
41	#include "kstaticdeleter.h"	43	#include "kstaticdeleter.h"
Lines 81-86 TDEIconLoader *TDEGlobal::iconLoader() Link Here
81	return _instance->iconLoader();	83	return _instance->iconLoader();
82	}	84	}
83		85
		86	#ifdef __TDE_HAVE_TDEHWLIB
84	TDEHardwareDevices *TDEGlobal::hardwareDevices()	87	TDEHardwareDevices *TDEGlobal::hardwareDevices()
85	{	88	{
86	MYASSERT(_instance);	89	MYASSERT(_instance);
Lines 94-99 TDEGlobalNetworkManager *TDEGlobal::networkManager() Link Here
94		97
95	return _instance->networkManager();	98	return _instance->networkManager();
96	}	99	}
		100	#endif
97		101
98	TDEInstance *TDEGlobal::instance()	102	TDEInstance *TDEGlobal::instance()
99	{	103	{