diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2012-08-07 15:35:20 +0200 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2012-08-08 10:04:17 +0200 |
| commit | 510576b6d8ba1cbd0bac6584f5ce56c93abc36ae (patch) | |
| tree | 6dfa575a7eebe39892a47079c2a25a39bb6bc6ad /desktop | |
| parent | b870f1420ea926f231502272eec08c45e9da4cc5 (diff) | |
tubes: finish efforts to make TeleManager static
Change-Id: I1d25a6074c3465a6e8c1df3127093d30d913b65d
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/inc/app.hxx | 7 | ||||
| -rw-r--r-- | desktop/source/app/app.cxx | 8 |
2 files changed, 2 insertions, 13 deletions
diff --git a/desktop/inc/app.hxx b/desktop/inc/app.hxx index c31b953170ba..06dc4c76d027 100644 --- a/desktop/inc/app.hxx +++ b/desktop/inc/app.hxx @@ -42,10 +42,6 @@ #include <com/sun/star/uno/Reference.h> #include <osl/mutex.hxx> -#ifdef ENABLE_TELEPATHY -class TeleManager; -#endif - using namespace com::sun::star::task; using namespace com::sun::star::uno; using namespace com::sun::star::lang; @@ -209,9 +205,6 @@ class Desktop : public Application sal_uInt16 m_nAppEvents; BootstrapError m_aBootstrapError; BootstrapStatus m_aBootstrapStatus; -#ifdef ENABLE_TELEPATHY - TeleManager* m_pTeleManager; -#endif std::auto_ptr< Lockfile > m_pLockfile; Timer m_firstRunTimer; diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index 4e76579c3cd4..84a7516878c7 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -618,9 +618,6 @@ throw() Desktop::Desktop() : m_bServicesRegistered( false ) , m_aBootstrapError( BE_OK ) -#ifdef ENABLE_TELEPATHY -, m_pTeleManager( NULL ) -#endif { RTL_LOGFILE_TRACE( "desktop (cd100003) ::Desktop::Desktop" ); } @@ -628,7 +625,7 @@ Desktop::Desktop() Desktop::~Desktop() { #ifdef ENABLE_TELEPATHY - delete m_pTeleManager; + TeleManager::finalize(); #endif } @@ -1711,9 +1708,8 @@ int Desktop::Main() SetSplashScreenProgress(60); #ifdef ENABLE_TELEPATHY - m_pTeleManager = new TeleManager(); bool bListen = rCmdLineArgs.IsInvisible(); - m_pTeleManager->init( bListen ); + TeleManager::init( bListen ); #endif if ( !pExecGlobals->bRestartRequested ) |