diff options
| author | Thomas Arnhold <thomas@arnhold.org> | 2013-04-28 10:36:40 +0200 |
|---|---|---|
| committer | Thomas Arnhold <thomas@arnhold.org> | 2013-04-28 10:36:51 +0200 |
| commit | 2094610175140023cf8f904f8506c189e36dec06 (patch) | |
| tree | ccf64dab3545a2e1e7e55fc288e929cc88746598 /desktop/inc | |
| parent | ca97ee598a08365f7bef7e7b8172bff4433ee8b0 (diff) | |
namespacing cleanup
Change-Id: I1384bf53a29e174bb97db4c0644f9dce39c0e36d
Diffstat (limited to 'desktop/inc')
| -rw-r--r-- | desktop/inc/app.hxx | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/desktop/inc/app.hxx b/desktop/inc/app.hxx index f53f08cf3422..d94930441836 100644 --- a/desktop/inc/app.hxx +++ b/desktop/inc/app.hxx @@ -37,10 +37,6 @@ namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } } -using namespace com::sun::star::task; -using namespace com::sun::star::uno; -using namespace com::sun::star::lang; - namespace desktop { @@ -49,7 +45,7 @@ namespace desktop --------------------------------------------------------------------*/ class CommandLineArgs; class Lockfile; -class AcceptorMap : public std::map< OUString, Reference<XInitialization> > {}; +class AcceptorMap : public std::map< OUString, css::uno::Reference<css::lang::XInitialization> > {}; struct ConvertData; class Desktop : public Application { @@ -137,8 +133,8 @@ class Desktop : public Application private: void RegisterServices( - com::sun::star::uno::Reference< - com::sun::star::uno::XComponentContext > const & context); + css::uno::Reference< + css::uno::XComponentContext > const & context); void DeregisterServices(); void CreateTemporaryDirectory(); @@ -148,7 +144,7 @@ class Desktop : public Application bool InitializeConfiguration(); void FlushConfiguration(); static sal_Bool shouldLaunchQuickstart(); - sal_Bool InitializeQuickstartMode( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext ); + sal_Bool InitializeQuickstartMode( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); void HandleBootstrapPathErrors( ::utl::Bootstrap::Status, const OUString& aMsg ); void StartSetup( const OUString& aParameters ); @@ -160,7 +156,7 @@ class Desktop : public Application static void PreloadModuleData( const CommandLineArgs& ); static void PreloadConfigurationData(); - Reference<XStatusIndicator> m_rSplashScreen; + css::uno::Reference<css::task::XStatusIndicator> m_rSplashScreen; void OpenSplashScreen(); void CloseSplashScreen(); |