|
|
|
@ -185,7 +185,7 @@ extern int getfd(const char *fnam);
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
#include "kappdcopiface.h"
|
|
|
|
|
#include "tdeappdcopinterface.h"
|
|
|
|
|
|
|
|
|
|
// exported for tdm kfrontend
|
|
|
|
|
TDE_EXPORT bool kde_have_kipc = true; // magic hook to disable kipc in tdm
|
|
|
|
@ -326,7 +326,7 @@ public:
|
|
|
|
|
overrideStyle( TQString::null ),
|
|
|
|
|
startup_id( "0" ),
|
|
|
|
|
app_started_timer( NULL ),
|
|
|
|
|
m_KAppDCOPInterface( 0L ),
|
|
|
|
|
m_TDEAppDCOPInterface( 0L ),
|
|
|
|
|
session_save( false )
|
|
|
|
|
#ifdef TQ_WS_X11
|
|
|
|
|
,oldXErrorHandler( NULL )
|
|
|
|
@ -360,7 +360,7 @@ public:
|
|
|
|
|
TQString geometry_arg;
|
|
|
|
|
TQCString startup_id;
|
|
|
|
|
TQTimer* app_started_timer;
|
|
|
|
|
KAppDCOPInterface *m_KAppDCOPInterface;
|
|
|
|
|
TDEAppDCOPInterface *m_TDEAppDCOPInterface;
|
|
|
|
|
bool session_save;
|
|
|
|
|
#ifdef TQ_WS_X11
|
|
|
|
|
int (*oldXErrorHandler)(Display*,XErrorEvent*);
|
|
|
|
@ -720,7 +720,7 @@ TDEApplication::TDEApplication( int& argc, char** argv, const TQCString& rAppNam
|
|
|
|
|
TDECmdLineArgs::initIgnore(argc, argv, rAppName.data());
|
|
|
|
|
parseCommandLine( );
|
|
|
|
|
init(GUIenabled);
|
|
|
|
|
d->m_KAppDCOPInterface = new KAppDCOPInterface(this);
|
|
|
|
|
d->m_TDEAppDCOPInterface = new TDEAppDCOPInterface(this);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// FIXME
|
|
|
|
@ -748,7 +748,7 @@ TDEApplication::TDEApplication( int& argc, char** argv, const TQCString& rAppNam
|
|
|
|
|
TDECmdLineArgs::initIgnore(argc, argv, rAppName.data());
|
|
|
|
|
parseCommandLine( );
|
|
|
|
|
init(GUIenabled);
|
|
|
|
|
d->m_KAppDCOPInterface = new KAppDCOPInterface(this);
|
|
|
|
|
d->m_TDEAppDCOPInterface = new TDEAppDCOPInterface(this);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
TDEApplication::TDEApplication( bool allowStyles, bool GUIenabled, bool SMenabled ) :
|
|
|
|
@ -771,7 +771,7 @@ TDEApplication::TDEApplication( bool allowStyles, bool GUIenabled, bool SMenable
|
|
|
|
|
installSigpipeHandler();
|
|
|
|
|
parseCommandLine( );
|
|
|
|
|
init(GUIenabled);
|
|
|
|
|
d->m_KAppDCOPInterface = new KAppDCOPInterface(this);
|
|
|
|
|
d->m_TDEAppDCOPInterface = new TDEAppDCOPInterface(this);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// FIXME
|
|
|
|
@ -797,7 +797,7 @@ TDEApplication::TDEApplication( bool allowStyles, bool GUIenabled ) :
|
|
|
|
|
installSigpipeHandler();
|
|
|
|
|
parseCommandLine( );
|
|
|
|
|
init(GUIenabled);
|
|
|
|
|
d->m_KAppDCOPInterface = new KAppDCOPInterface(this);
|
|
|
|
|
d->m_TDEAppDCOPInterface = new TDEAppDCOPInterface(this);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#ifdef TQ_WS_X11
|
|
|
|
@ -814,7 +814,7 @@ TDEApplication::TDEApplication( Display *dpy, bool allowStyles ) :
|
|
|
|
|
installSigpipeHandler();
|
|
|
|
|
parseCommandLine( );
|
|
|
|
|
init( true );
|
|
|
|
|
d->m_KAppDCOPInterface = new KAppDCOPInterface(this);
|
|
|
|
|
d->m_TDEAppDCOPInterface = new TDEAppDCOPInterface(this);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
TDEApplication::TDEApplication( Display *dpy, bool disable_argb, TQt::HANDLE visual, TQt::HANDLE colormap, bool allowStyles ) :
|
|
|
|
@ -831,7 +831,7 @@ TDEApplication::TDEApplication( Display *dpy, bool disable_argb, TQt::HANDLE vis
|
|
|
|
|
installSigpipeHandler();
|
|
|
|
|
parseCommandLine( );
|
|
|
|
|
init( true );
|
|
|
|
|
d->m_KAppDCOPInterface = new KAppDCOPInterface(this);
|
|
|
|
|
d->m_TDEAppDCOPInterface = new TDEAppDCOPInterface(this);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
TDEApplication::TDEApplication( Display *dpy, TQt::HANDLE visual, TQt::HANDLE colormap,
|
|
|
|
@ -850,7 +850,7 @@ TDEApplication::TDEApplication( Display *dpy, TQt::HANDLE visual, TQt::HANDLE co
|
|
|
|
|
installSigpipeHandler();
|
|
|
|
|
parseCommandLine( );
|
|
|
|
|
init( true );
|
|
|
|
|
d->m_KAppDCOPInterface = new KAppDCOPInterface(this);
|
|
|
|
|
d->m_TDEAppDCOPInterface = new TDEAppDCOPInterface(this);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
TDEApplication::TDEApplication( Display *dpy, TQt::HANDLE visual, TQt::HANDLE colormap,
|
|
|
|
@ -869,7 +869,7 @@ TDEApplication::TDEApplication( Display *dpy, TQt::HANDLE visual, TQt::HANDLE co
|
|
|
|
|
installSigpipeHandler();
|
|
|
|
|
parseCommandLine( );
|
|
|
|
|
init( true );
|
|
|
|
|
d->m_KAppDCOPInterface = new KAppDCOPInterface(this);
|
|
|
|
|
d->m_TDEAppDCOPInterface = new TDEAppDCOPInterface(this);
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
@ -894,7 +894,7 @@ TDEApplication::TDEApplication( bool allowStyles, bool GUIenabled, TDEInstance*
|
|
|
|
|
installSigpipeHandler();
|
|
|
|
|
parseCommandLine( );
|
|
|
|
|
init(GUIenabled);
|
|
|
|
|
d->m_KAppDCOPInterface = new KAppDCOPInterface(this);
|
|
|
|
|
d->m_TDEAppDCOPInterface = new TDEAppDCOPInterface(this);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#ifdef TQ_WS_X11
|
|
|
|
@ -919,7 +919,7 @@ TDEApplication::TDEApplication(Display *display, int& argc, char** argv, const T
|
|
|
|
|
TDECmdLineArgs::initIgnore(argc, argv, rAppName.data());
|
|
|
|
|
parseCommandLine( );
|
|
|
|
|
init(GUIenabled);
|
|
|
|
|
d->m_KAppDCOPInterface = new KAppDCOPInterface(this);
|
|
|
|
|
d->m_TDEAppDCOPInterface = new TDEAppDCOPInterface(this);
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
@ -1858,7 +1858,7 @@ TDEApplication::~TDEApplication()
|
|
|
|
|
aIconPixmap.pm.miniIcon = 0L;
|
|
|
|
|
delete aIconPixmap.pm.icon;
|
|
|
|
|
aIconPixmap.pm.icon = 0L;
|
|
|
|
|
delete d->m_KAppDCOPInterface;
|
|
|
|
|
delete d->m_TDEAppDCOPInterface;
|
|
|
|
|
|
|
|
|
|
// First call the static deleters and then call KLibLoader::cleanup()
|
|
|
|
|
// The static deleters may delete libraries for which they need KLibLoader.
|
|
|
|
|