From 2e3717837ffe257f98c854ebde2c7a0ac0ff27fb Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Mon, 5 Sep 2016 10:17:51 +0200 Subject: convert PrinterInfoManager::Type to scoped enum Change-Id: I3ae15e3ef9505b9857ab1dfa0ecdbf57e3a08150 --- vcl/unx/generic/printer/cupsmgr.cxx | 4 ++-- vcl/unx/generic/printer/ppdparser.cxx | 2 +- vcl/unx/generic/printer/printerinfomanager.cxx | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'vcl') diff --git a/vcl/unx/generic/printer/cupsmgr.cxx b/vcl/unx/generic/printer/cupsmgr.cxx index cafaeedc120f..5e9f7160876a 100644 --- a/vcl/unx/generic/printer/cupsmgr.cxx +++ b/vcl/unx/generic/printer/cupsmgr.cxx @@ -150,7 +150,7 @@ static const char* setPasswordCallback( const char* pIn ) const char* pRet = nullptr; PrinterInfoManager& rMgr = PrinterInfoManager::get(); - if( rMgr.getType() == PrinterInfoManager::CUPS ) // sanity check + if( rMgr.getType() == PrinterInfoManager::Type::CUPS ) // sanity check pRet = static_cast(rMgr).authenticateUser( pIn ); return pRet; } @@ -179,7 +179,7 @@ static void run_dest_thread_stub( void* pThis ) } CUPSManager::CUPSManager() : - PrinterInfoManager( CUPS ), + PrinterInfoManager( PrinterInfoManager::Type::CUPS ), m_nDests( 0 ), m_pDests( nullptr ), m_bNewDests( false ), diff --git a/vcl/unx/generic/printer/ppdparser.cxx b/vcl/unx/generic/printer/ppdparser.cxx index d68ca2c59567..231cd9019f1a 100644 --- a/vcl/unx/generic/printer/ppdparser.cxx +++ b/vcl/unx/generic/printer/ppdparser.cxx @@ -568,7 +568,7 @@ const PPDParser* PPDParser::getParser( const OUString& rFile ) else { PrinterInfoManager& rMgr = PrinterInfoManager::get(); - if( rMgr.getType() == PrinterInfoManager::CUPS ) + if( rMgr.getType() == PrinterInfoManager::Type::CUPS ) { #ifdef ENABLE_CUPS pNewParser = const_cast(static_cast(rMgr).createCUPSParser( aFile )); diff --git a/vcl/unx/generic/printer/printerinfomanager.cxx b/vcl/unx/generic/printer/printerinfomanager.cxx index 5e08f42f4aaf..2c39a87105a2 100644 --- a/vcl/unx/generic/printer/printerinfomanager.cxx +++ b/vcl/unx/generic/printer/printerinfomanager.cxx @@ -111,7 +111,7 @@ PrinterInfoManager::PrinterInfoManager( Type eType ) : m_bUseJobPatch( true ), m_aSystemDefaultPaper( "A4" ) { - if( eType == Default ) + if( eType == Type::Default ) m_pQueueInfo = new SystemQueueInfo(); initSystemDefaultPaper(); } @@ -483,7 +483,7 @@ void PrinterInfoManager::initialize() aDefaultPrinter.clear(); m_aDefaultPrinter = aDefaultPrinter; - if( m_eType != Default ) + if( m_eType != Type::Default ) return; // add a default printer for every available print queue -- cgit