Attachment #2161 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




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

    return _instance->iconLoader();
}

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


    return _instance->networkManager();
}
#endif

TDEInstance *TDEGlobal::instance()
{

Return to bug 2109

Lines 34-41 Link Here

(-)tdecore/tdeglobal.cpp.orig (+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 WITH_TDEHWHLIB
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 Link Here
81	return _instance->iconLoader();	83	return _instance->iconLoader();
82	}	84	}
83		85
		86	#ifdef WITH_TDEHWLIB
84	TDEHardwareDevices *TDEGlobal::hardwareDevices()	87	TDEHardwareDevices *TDEGlobal::hardwareDevices()
85	{	88	{
86	MYASSERT(_instance);	89	MYASSERT(_instance);
Lines 94-99 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	{