diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-08-06 09:35:49 -0500 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-08-06 09:35:49 -0500 |
| commit | 6f4fd5e5632b2288a483430c625081a51342fdab (patch) | |
| tree | b4ec677f360df504eb4196a5000771d21653a10c /tdecore/tdeapplication.cpp | |
| parent | 5ee8849b092e8f3ecabf08fa959006a7e99e58b7 (diff) | |
| download | tdelibs-6f4fd5e5632b2288a483430c625081a51342fdab.tar.gz tdelibs-6f4fd5e5632b2288a483430c625081a51342fdab.zip | |
Allow TDEApplication objects to be constructed without a session manager
This relates to Bug 760
Diffstat (limited to 'tdecore/tdeapplication.cpp')
| -rw-r--r-- | tdecore/tdeapplication.cpp | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/tdecore/tdeapplication.cpp b/tdecore/tdeapplication.cpp index 58b010e4e..857c157e8 100644 --- a/tdecore/tdeapplication.cpp +++ b/tdecore/tdeapplication.cpp @@ -35,7 +35,14 @@ #undef QT_NO_TRANSLATION #undef TQT_NO_TRANSLATION #include <tqtranslator.h> + +// FIXME +// FOR BINARY COMPATIBILITY ONLY +// REMOVE WHEN PRACTICAL! +#define TDEAPPLICATION_BINARY_COMPAT_HACK 1 #include "tdeapplication.h" +#undef TDEAPPLICATION_BINARY_COMPAT_HACK + #define QT_NO_TRANSLATION #define TQT_NO_TRANSLATION #include <tqdir.h> @@ -622,6 +629,34 @@ static SmcConn tmpSmcConnection = 0; static TQTime* smModificationTime = 0; TDEApplication::TDEApplication( int& argc, char** argv, const TQCString& rAppName, + bool allowStyles, bool GUIenabled, bool SMenabled ) : + TQApplication( argc, argv, GUIenabled, SMenabled ), TDEInstance(rAppName), +#ifdef Q_WS_X11 + display(0L), + argb_visual(false), +#endif + d (new TDEApplicationPrivate()) +{ + aIconPixmap.pm.icon = 0L; + aIconPixmap.pm.miniIcon = 0L; + read_app_startup_id(); + if (!GUIenabled) + allowStyles = false; + useStyles = allowStyles; + Q_ASSERT (!rAppName.isEmpty()); + setName(rAppName); + + installSigpipeHandler(); + TDECmdLineArgs::initIgnore(argc, argv, rAppName.data()); + parseCommandLine( ); + init(GUIenabled); + d->m_KAppDCOPInterface = new KAppDCOPInterface(this); +} + +// FIXME +// FOR BINARY COMPATIBILITY ONLY +// REMOVE WHEN PRACTICAL! +TDEApplication::TDEApplication( int& argc, char** argv, const TQCString& rAppName, bool allowStyles, bool GUIenabled ) : TQApplication( argc, argv, GUIenabled ), TDEInstance(rAppName), #ifdef Q_WS_X11 |