On newer gcc/libstdc/glibc systems virtual base objects are not actually allocated,
causing a crash when assigning to data members of the virtual base object.


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1240474 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
v3.5.13-sru
tpearson 13 years ago
parent 20957d880f
commit 02ee984b9d

@ -8,11 +8,13 @@
#include <dcopobject.h> #include <dcopobject.h>
#include <tqcolor.h> #include <tqcolor.h>
class KBackgroundIface : virtual public DCOPObject class KBackgroundIface : public DCOPObject
{ {
K_DCOP K_DCOP
public: public:
KBackgroundIface() : DCOPObject("KBackgroundIface") {}
k_dcop: k_dcop:
/** Reread the configuration */ /** Reread the configuration */
virtual void configure() = 0; virtual void configure() = 0;

@ -60,7 +60,7 @@ extern KDesktopApp *myApp;
/**** KBackgroundManager ****/ /**** KBackgroundManager ****/
KBackgroundManager::KBackgroundManager(TQWidget *desktop, KWinModule* kwinModule) KBackgroundManager::KBackgroundManager(TQWidget *desktop, KWinModule* kwinModule)
: DCOPObject("KBackgroundIface") : KBackgroundIface()
{ {
if( !properties_inited ) if( !properties_inited )
{ {

@ -55,7 +55,7 @@ struct KBackgroundCacheEntry
class KBackgroundManager class KBackgroundManager
: public TQObject, : public TQObject,
virtual public KBackgroundIface public KBackgroundIface
{ {
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT

@ -69,7 +69,7 @@ KRootWm * KRootWm::s_rootWm = 0;
extern TQCString kdesktop_name, kicker_name, kwin_name; extern TQCString kdesktop_name, kicker_name, kwin_name;
KRootWm::KRootWm(KDesktop* _desktop) : TQObject(_desktop) KRootWm::KRootWm(KDesktop* _desktop) : TQObject(_desktop), startup(FALSE)
{ {
s_rootWm = this; s_rootWm = this;
m_actionCollection = new KActionCollection(_desktop, this, "KRootWm::m_actionCollection"); m_actionCollection = new KActionCollection(_desktop, this, "KRootWm::m_actionCollection");

Loading…
Cancel
Save