Allow session manager to be disable on creation when argc and argv are not passed to TDEApplication

This relates to Bug 760
(cherry picked from commit 7cc3a975d2)
v3.5.13-sru
Timothy Pearson 11 years ago committed by Slávek Banko
parent 83e71b4192
commit f05253b5e0

@ -679,6 +679,33 @@ KApplication::KApplication( int& argc, char** argv, const TQCString& rAppName,
d->m_KAppDCOPInterface = new KAppDCOPInterface(this); d->m_KAppDCOPInterface = new KAppDCOPInterface(this);
} }
KApplication::KApplication( bool allowStyles, bool GUIenabled, bool SMenabled ) :
// TQApplication( *KCmdLineArgs::qt_argc(), *KCmdLineArgs::qt_argv(), TRUE ), // Qt4 requires that there always be a GUI
TQApplication( *KCmdLineArgs::qt_argc(), *KCmdLineArgs::qt_argv(), GUIenabled, SMenabled ), // We need to be able to run command line apps
KInstance( KCmdLineArgs::about),
#ifdef Q_WS_X11
display(0L),
argb_visual(false),
#endif
d (new KApplicationPrivate)
{
aIconPixmap.pm.icon = 0L;
aIconPixmap.pm.miniIcon = 0L;
read_app_startup_id();
if (!GUIenabled)
allowStyles = false;
useStyles = allowStyles;
setName( instanceName() );
installSigpipeHandler();
parseCommandLine( );
init(GUIenabled);
d->m_KAppDCOPInterface = new KAppDCOPInterface(this);
}
// FIXME
// FOR BINARY COMPATIBILITY ONLY
// REMOVE WHEN PRACTICAL!
KApplication::KApplication( bool allowStyles, bool GUIenabled ) : KApplication::KApplication( bool allowStyles, bool GUIenabled ) :
// TQApplication( *KCmdLineArgs::qt_argc(), *KCmdLineArgs::qt_argv(), TRUE ), // Qt4 requires that there always be a GUI // TQApplication( *KCmdLineArgs::qt_argc(), *KCmdLineArgs::qt_argv(), TRUE ), // Qt4 requires that there always be a GUI
TQApplication( *KCmdLineArgs::qt_argc(), *KCmdLineArgs::qt_argv(), GUIenabled ), // We need to be able to run command line apps TQApplication( *KCmdLineArgs::qt_argc(), *KCmdLineArgs::qt_argv(), GUIenabled ), // We need to be able to run command line apps

@ -128,7 +128,14 @@ public:
* @param GUIenabled Set to false to disable all GUI stuff. This implies * @param GUIenabled Set to false to disable all GUI stuff. This implies
* no styles either. * no styles either.
*/ */
KApplication( bool allowStyles=true, bool GUIenabled=true, bool SMenabled=true);
#ifdef TDEAPPLICATION_BINARY_COMPAT_HACK
// FIXME
// FOR BINARY COMPATIBILITY ONLY
// REMOVE WHEN PRACTICAL!
KApplication( bool allowStyles=true, bool GUIenabled=true); KApplication( bool allowStyles=true, bool GUIenabled=true);
#endif // TDEAPPLICATION_BINARY_COMPAT_HACK
#ifdef Q_WS_X11 #ifdef Q_WS_X11
/** /**

Loading…
Cancel
Save