summaryrefslogtreecommitdiffstats
path: root/vcl/unx
diff options
context:
space:
mode:
Diffstat (limited to 'vcl/unx')
-rw-r--r--vcl/unx/generic/dtrans/X11_selection.cxx54
-rw-r--r--vcl/unx/generic/dtrans/X11_selection.hxx14
-rw-r--r--vcl/unx/generic/dtrans/X11_service.cxx2
-rw-r--r--vcl/unx/generic/gdi/salgdi3.cxx1
-rw-r--r--vcl/unx/generic/printer/cupsmgr.cxx20
-rw-r--r--vcl/unx/generic/printer/ppdparser.cxx13
-rw-r--r--vcl/unx/generic/printer/printerinfomanager.cxx30
-rw-r--r--vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx4
8 files changed, 69 insertions, 69 deletions
diff --git a/vcl/unx/generic/dtrans/X11_selection.cxx b/vcl/unx/generic/dtrans/X11_selection.cxx
index 53c006776afa..180758c8c166 100644
--- a/vcl/unx/generic/dtrans/X11_selection.cxx
+++ b/vcl/unx/generic/dtrans/X11_selection.cxx
@@ -201,9 +201,9 @@ rtl_TextEncoding x11::getTextPlainEncoding( const OUString& rMimeType )
return aEncoding;
}
-::boost::unordered_map< OUString, SelectionManager*, OUStringHash >& SelectionManager::getInstances()
+std::unordered_map< OUString, SelectionManager*, OUStringHash >& SelectionManager::getInstances()
{
- static ::boost::unordered_map< OUString, SelectionManager*, OUStringHash > aInstances;
+ static std::unordered_map< OUString, SelectionManager*, OUStringHash > aInstances;
return aInstances;
}
@@ -465,7 +465,7 @@ SelectionManager::~SelectionManager()
{
osl::MutexGuard aGuard( *osl::Mutex::getGlobalMutex() );
- ::boost::unordered_map< OUString, SelectionManager*, OUStringHash >::iterator it;
+ std::unordered_map< OUString, SelectionManager*, OUStringHash >::iterator it;
for( it = getInstances().begin(); it != getInstances().end(); ++it )
if( it->second == this )
{
@@ -522,7 +522,7 @@ SelectionManager::~SelectionManager()
SelectionAdaptor* SelectionManager::getAdaptor( Atom selection )
{
- ::boost::unordered_map< Atom, Selection* >::iterator it =
+ std::unordered_map< Atom, Selection* >::iterator it =
m_aSelections.find( selection );
return it != m_aSelections.end() ? it->second->m_pAdaptor : NULL;
}
@@ -681,7 +681,7 @@ SelectionManager& SelectionManager::get( const OUString& rDisplayName )
aDisplayName = OStringToOUString( getenv( "DISPLAY" ), RTL_TEXTENCODING_ISO_8859_1 );
SelectionManager* pInstance = NULL;
- ::boost::unordered_map< OUString, SelectionManager*, OUStringHash >::iterator it = getInstances().find( aDisplayName );
+ std::unordered_map< OUString, SelectionManager*, OUStringHash >::iterator it = getInstances().find( aDisplayName );
if( it != getInstances().end() )
pInstance = it->second;
else pInstance = getInstances()[ aDisplayName ] = new SelectionManager();
@@ -693,7 +693,7 @@ const OUString& SelectionManager::getString( Atom aAtom )
{
osl::MutexGuard aGuard(m_aMutex);
- ::boost::unordered_map< Atom, OUString >::const_iterator it;
+ std::unordered_map< Atom, OUString >::const_iterator it;
if( ( it = m_aAtomToString.find( aAtom ) ) == m_aAtomToString.end() )
{
static OUString aEmpty;
@@ -712,7 +712,7 @@ Atom SelectionManager::getAtom( const OUString& rString )
{
osl::MutexGuard aGuard(m_aMutex);
- ::boost::unordered_map< OUString, Atom, OUStringHash >::const_iterator it;
+ std::unordered_map< OUString, Atom, OUStringHash >::const_iterator it;
if( ( it = m_aStringToAtom.find( rString ) ) == m_aStringToAtom.end() )
{
static Atom nNoDisplayAtoms = 1;
@@ -857,7 +857,7 @@ OUString SelectionManager::convertTypeFromNative( Atom nType, Atom selection, in
bool SelectionManager::getPasteData( Atom selection, Atom type, Sequence< sal_Int8 >& rData )
{
osl::ResettableMutexGuard aGuard(m_aMutex);
- ::boost::unordered_map< Atom, Selection* >::iterator it;
+ std::unordered_map< Atom, Selection* >::iterator it;
bool bSuccess = false;
#if OSL_DEBUG_LEVEL > 1
@@ -994,7 +994,7 @@ bool SelectionManager::getPasteData( Atom selection, const OUString& rType, Sequ
{
bool bSuccess = false;
- ::boost::unordered_map< Atom, Selection* >::iterator it;
+ std::unordered_map< Atom, Selection* >::iterator it;
{
osl::MutexGuard aGuard(m_aMutex);
@@ -1205,7 +1205,7 @@ bool SelectionManager::getPasteData( Atom selection, const OUString& rType, Sequ
bool SelectionManager::getPasteDataTypes( Atom selection, Sequence< DataFlavor >& rTypes )
{
- ::boost::unordered_map< Atom, Selection* >::iterator it;
+ std::unordered_map< Atom, Selection* >::iterator it;
{
osl::MutexGuard aGuard(m_aMutex);
@@ -1408,7 +1408,7 @@ bool SelectionManager::getPasteDataTypes( Atom selection, Sequence< DataFlavor >
PixmapHolder* SelectionManager::getPixmapHolder( Atom selection )
{
- boost::unordered_map< Atom, Selection* >::const_iterator it = m_aSelections.find( selection );
+ std::unordered_map< Atom, Selection* >::const_iterator it = m_aSelections.find( selection );
if( it == m_aSelections.end() )
return NULL;
if( ! it->second->m_pPixmap )
@@ -1510,10 +1510,10 @@ bool SelectionManager::sendData( SelectionAdaptor* pAdaptor,
{
#if OSL_DEBUG_LEVEL > 1
fprintf( stderr, "using INCR protocol\n" );
- boost::unordered_map< ::Window, boost::unordered_map< Atom, IncrementalTransfer > >::const_iterator win_it = m_aIncrementals.find( requestor );
+ std::unordered_map< ::Window, std::unordered_map< Atom, IncrementalTransfer > >::const_iterator win_it = m_aIncrementals.find( requestor );
if( win_it != m_aIncrementals.end() )
{
- boost::unordered_map< Atom, IncrementalTransfer >::const_iterator inc_it = win_it->second.find( property );
+ std::unordered_map< Atom, IncrementalTransfer >::const_iterator inc_it = win_it->second.find( property );
if( inc_it != win_it->second.end() )
{
const IncrementalTransfer& rInc = inc_it->second;
@@ -1781,7 +1781,7 @@ bool SelectionManager::handleReceivePropertyNotify( XPropertyEvent& rNotify )
#endif
bool bHandled = false;
- ::boost::unordered_map< Atom, Selection* >::iterator it =
+ std::unordered_map< Atom, Selection* >::iterator it =
m_aSelections.find( rNotify.atom );
if( it != m_aSelections.end() &&
rNotify.state == PropertyNewValue &&
@@ -1904,13 +1904,13 @@ bool SelectionManager::handleSendPropertyNotify( XPropertyEvent& rNotify )
// feed incrementals
if( rNotify.state == PropertyDelete )
{
- boost::unordered_map< ::Window, boost::unordered_map< Atom, IncrementalTransfer > >::iterator it;
+ std::unordered_map< ::Window, std::unordered_map< Atom, IncrementalTransfer > >::iterator it;
it = m_aIncrementals.find( rNotify.window );
if( it != m_aIncrementals.end() )
{
bHandled = true;
int nCurrentTime = time( NULL );
- boost::unordered_map< Atom, IncrementalTransfer >::iterator inc_it;
+ std::unordered_map< Atom, IncrementalTransfer >::iterator inc_it;
// throw out aborted transfers
std::list< Atom > aTimeouts;
for( inc_it = it->second.begin(); inc_it != it->second.end(); ++inc_it )
@@ -2006,7 +2006,7 @@ bool SelectionManager::handleSelectionNotify( XSelectionEvent& rNotify )
if( rNotify.requestor != m_aWindow && rNotify.requestor != m_aCurrentDropWindow )
fprintf( stderr, "Warning: selection notify for unknown window 0x%lx\n", rNotify.requestor );
#endif
- ::boost::unordered_map< Atom, Selection* >::iterator it =
+ std::unordered_map< Atom, Selection* >::iterator it =
m_aSelections.find( rNotify.selection );
if (
(rNotify.requestor == m_aWindow || rNotify.requestor == m_aCurrentDropWindow) &&
@@ -2087,7 +2087,7 @@ bool SelectionManager::handleDropEvent( XClientMessageEvent& rMessage )
bool bHandled = false;
- ::boost::unordered_map< ::Window, DropTargetEntry >::iterator it =
+ std::unordered_map< ::Window, DropTargetEntry >::iterator it =
m_aDropTargets.find( aTarget );
#if OSL_DEBUG_LEVEL > 1
@@ -2455,7 +2455,7 @@ void SelectionManager::sendDropPosition( bool bForce, Time eventTime )
if( m_bDropSent )
return;
- ::boost::unordered_map< ::Window, DropTargetEntry >::const_iterator it =
+ std::unordered_map< ::Window, DropTargetEntry >::const_iterator it =
m_aDropTargets.find( m_aDropWindow );
if( it != m_aDropTargets.end() )
{
@@ -2516,7 +2516,7 @@ bool SelectionManager::handleDragEvent( XEvent& rMessage )
bool bHandled = false;
// for shortcut
- ::boost::unordered_map< ::Window, DropTargetEntry >::const_iterator it =
+ std::unordered_map< ::Window, DropTargetEntry >::const_iterator it =
m_aDropTargets.find( m_aDropWindow );
#if OSL_DEBUG_LEVEL > 1
switch( rMessage.type )
@@ -3009,7 +3009,7 @@ void SelectionManager::updateDragWindow( int nX, int nY, ::Window aRoot )
dsde.DropAction = nNewProtocolVersion >= 0 ? m_nUserDragAction : DNDConstants::ACTION_COPY;
dsde.UserAction = nNewProtocolVersion >= 0 ? m_nUserDragAction : DNDConstants::ACTION_COPY;
- ::boost::unordered_map< ::Window, DropTargetEntry >::const_iterator it;
+ std::unordered_map< ::Window, DropTargetEntry >::const_iterator it;
if( aNewCurrentWindow != m_aDropWindow )
{
#if OSL_DEBUG_LEVEL > 1
@@ -3162,7 +3162,7 @@ void SelectionManager::startDrag(
int root_x(0), root_y(0), win_x(0), win_y(0);
unsigned int mask(0);
- ::boost::unordered_map< ::Window, DropTargetEntry >::const_iterator it;
+ std::unordered_map< ::Window, DropTargetEntry >::const_iterator it;
it = m_aDropTargets.begin();
while( it != m_aDropTargets.end() )
{
@@ -3558,7 +3558,7 @@ bool SelectionManager::handleXEvent( XEvent& rEvent )
);
#endif
SelectionAdaptor* pAdaptor = getAdaptor( rEvent.xselectionclear.selection );
- boost::unordered_map< Atom, Selection* >::iterator it( m_aSelections.find( rEvent.xselectionclear.selection ) );
+ std::unordered_map< Atom, Selection* >::iterator it( m_aSelections.find( rEvent.xselectionclear.selection ) );
if( it != m_aSelections.end() )
it->second->m_bOwner = false;
aGuard.clear();
@@ -3683,7 +3683,7 @@ void SelectionManager::run( void* pThis )
osl::ClearableMutexGuard aGuard(This->m_aMutex);
std::list< std::pair< SelectionAdaptor*, css::uno::Reference< XInterface > > > aChangeList;
- for( boost::unordered_map< Atom, Selection* >::iterator it = This->m_aSelections.begin(); it != This->m_aSelections.end(); ++it )
+ for( std::unordered_map< Atom, Selection* >::iterator it = This->m_aSelections.begin(); it != This->m_aSelections.end(); ++it )
{
if( it->first != This->m_nXdndSelection && ! it->second->m_bOwner )
{
@@ -3846,7 +3846,7 @@ void SelectionManager::deregisterHandler( Atom selection )
{
osl::MutexGuard aGuard(m_aMutex);
- ::boost::unordered_map< Atom, Selection* >::iterator it =
+ std::unordered_map< Atom, Selection* >::iterator it =
m_aSelections.find( selection );
if( it != m_aSelections.end() )
{
@@ -3873,7 +3873,7 @@ void SelectionManager::registerDropTarget( ::Window aWindow, DropTarget* pTarget
osl::MutexGuard aGuard(m_aMutex);
// sanity check
- ::boost::unordered_map< ::Window, DropTargetEntry >::const_iterator it =
+ std::unordered_map< ::Window, DropTargetEntry >::const_iterator it =
m_aDropTargets.find( aWindow );
if( it != m_aDropTargets.end() )
OSL_FAIL( "attempt to register window as drop target twice" );
@@ -3918,7 +3918,7 @@ void SelectionManager::deregisterDropTarget( ::Window aWindow )
if( aWindow == m_aDragSourceWindow && m_aDragRunning.check() )
{
// abort drag
- boost::unordered_map< ::Window, DropTargetEntry >::const_iterator it =
+ std::unordered_map< ::Window, DropTargetEntry >::const_iterator it =
m_aDropTargets.find( m_aDropWindow );
if( it != m_aDropTargets.end() )
{
diff --git a/vcl/unx/generic/dtrans/X11_selection.hxx b/vcl/unx/generic/dtrans/X11_selection.hxx
index de588345c7fe..c04ae945ed51 100644
--- a/vcl/unx/generic/dtrans/X11_selection.hxx
+++ b/vcl/unx/generic/dtrans/X11_selection.hxx
@@ -34,8 +34,8 @@
#include <osl/conditn.hxx>
-#include <boost/unordered_map.hpp>
#include <list>
+#include <unordered_map>
#include <prex.h>
#include <X11/Xlib.h>
@@ -153,7 +153,7 @@ namespace x11 {
>,
public SelectionAdaptor
{
- static ::boost::unordered_map< OUString, SelectionManager*, OUStringHash >& getInstances();
+ static std::unordered_map< OUString, SelectionManager*, OUStringHash >& getInstances();
// for INCR type selection transfer
// INCR protocol is used if the data cannot
@@ -323,7 +323,7 @@ namespace x11 {
// drag and drop
int m_nCurrentProtocolVersion;
- ::boost::unordered_map< ::Window, DropTargetEntry >
+ std::unordered_map< ::Window, DropTargetEntry >
m_aDropTargets;
// some special atoms that are needed often
@@ -353,16 +353,16 @@ namespace x11 {
Atom m_nXdndActionPrivate;
// caching for atoms
- ::boost::unordered_map< Atom, OUString >
+ std::unordered_map< Atom, OUString >
m_aAtomToString;
- ::boost::unordered_map< OUString, Atom, OUStringHash >
+ std::unordered_map< OUString, Atom, OUStringHash >
m_aStringToAtom;
// the registered selections
- ::boost::unordered_map< Atom, Selection* >
+ std::unordered_map< Atom, Selection* >
m_aSelections;
// IncrementalTransfers in progress
- boost::unordered_map< ::Window, boost::unordered_map< Atom, IncrementalTransfer > >
+ std::unordered_map< ::Window, std::unordered_map< Atom, IncrementalTransfer > >
m_aIncrementals;
// do not use X11 multithreading capabilities
diff --git a/vcl/unx/generic/dtrans/X11_service.cxx b/vcl/unx/generic/dtrans/X11_service.cxx
index 4ec02c123416..360b29d087ad 100644
--- a/vcl/unx/generic/dtrans/X11_service.cxx
+++ b/vcl/unx/generic/dtrans/X11_service.cxx
@@ -73,7 +73,7 @@ css::uno::Reference< XInterface > X11SalInstance::CreateClipboard( const Sequenc
}
Atom nSelection = rManager.getAtom(sel);
- ::boost::unordered_map< Atom, css::uno::Reference< XClipboard > >::iterator it = m_aInstances.find( nSelection );
+ std::unordered_map< Atom, css::uno::Reference< XClipboard > >::iterator it = m_aInstances.find( nSelection );
if( it != m_aInstances.end() )
return it->second;
diff --git a/vcl/unx/generic/gdi/salgdi3.cxx b/vcl/unx/generic/gdi/salgdi3.cxx
index 180992332dda..f0a69ee406e2 100644
--- a/vcl/unx/generic/gdi/salgdi3.cxx
+++ b/vcl/unx/generic/gdi/salgdi3.cxx
@@ -30,7 +30,6 @@
#include <sys/types.h>
#include <basegfx/polygon/b2dpolypolygon.hxx>
-#include <boost/unordered_set.hpp>
#include <i18nlangtag/mslangid.hxx>
#include <osl/file.hxx>
#include <osl/module.hxx>
diff --git a/vcl/unx/generic/printer/cupsmgr.cxx b/vcl/unx/generic/printer/cupsmgr.cxx
index a6ed76d29db0..52a255323c64 100644
--- a/vcl/unx/generic/printer/cupsmgr.cxx
+++ b/vcl/unx/generic/printer/cupsmgr.cxx
@@ -334,7 +334,7 @@ void CUPSManager::initialize()
// behaviour
aPrinter.m_aInfo.m_pParser = NULL;
aPrinter.m_aInfo.m_aContext.setParser( NULL );
- boost::unordered_map< OUString, PPDContext, OUStringHash >::const_iterator c_it = m_aDefaultContexts.find( aPrinterName );
+ std::unordered_map< OUString, PPDContext, OUStringHash >::const_iterator c_it = m_aDefaultContexts.find( aPrinterName );
if( c_it != m_aDefaultContexts.end() )
{
aPrinter.m_aInfo.m_pParser = c_it->second.getParser();
@@ -351,7 +351,7 @@ void CUPSManager::initialize()
// remove everything that is not a CUPS printer and not
// a special purpose printer (PDF, Fax)
std::list< OUString > aRemovePrinters;
- for( boost::unordered_map< OUString, Printer, OUStringHash >::iterator it = m_aPrinters.begin();
+ for( std::unordered_map< OUString, Printer, OUStringHash >::iterator it = m_aPrinters.begin();
it != m_aPrinters.end(); ++it )
{
if( m_aCUPSDestMap.find( it->first ) != m_aCUPSDestMap.end() )
@@ -426,7 +426,7 @@ const PPDParser* CUPSManager::createCUPSParser( const OUString& rPrinter )
{
if (m_nDests && m_pDests)
{
- boost::unordered_map< OUString, int, OUStringHash >::iterator dest_it =
+ std::unordered_map< OUString, int, OUStringHash >::iterator dest_it =
m_aCUPSDestMap.find( aPrinter );
if( dest_it != m_aCUPSDestMap.end() )
{
@@ -503,13 +503,13 @@ const PPDParser* CUPSManager::createCUPSParser( const OUString& rPrinter )
void CUPSManager::setupJobContextData( JobData& rData )
{
- boost::unordered_map< OUString, int, OUStringHash >::iterator dest_it =
+ std::unordered_map< OUString, int, OUStringHash >::iterator dest_it =
m_aCUPSDestMap.find( rData.m_aPrinterName );
if( dest_it == m_aCUPSDestMap.end() )
return PrinterInfoManager::setupJobContextData( rData );
- boost::unordered_map< OUString, Printer, OUStringHash >::iterator p_it =
+ std::unordered_map< OUString, Printer, OUStringHash >::iterator p_it =
m_aPrinters.find( rData.m_aPrinterName );
if( p_it == m_aPrinters.end() ) // huh ?
{
@@ -630,7 +630,7 @@ bool CUPSManager::endSpool( const OUString& rPrintername, const OUString& rJobTi
osl::MutexGuard aGuard( m_aCUPSMutex );
- boost::unordered_map< OUString, int, OUStringHash >::iterator dest_it =
+ std::unordered_map< OUString, int, OUStringHash >::iterator dest_it =
m_aCUPSDestMap.find( rPrintername );
if( dest_it == m_aCUPSDestMap.end() )
{
@@ -638,7 +638,7 @@ bool CUPSManager::endSpool( const OUString& rPrintername, const OUString& rJobTi
return PrinterInfoManager::endSpool( rPrintername, rJobTitle, pFile, rDocumentJobData, bBanner, rFaxNumber );
}
- boost::unordered_map< FILE*, OString, FPtrHash >::const_iterator it = m_aSpoolFiles.find( pFile );
+ std::unordered_map< FILE*, OString, FPtrHash >::const_iterator it = m_aSpoolFiles.find( pFile );
if( it != m_aSpoolFiles.end() )
{
fclose( pFile );
@@ -763,7 +763,7 @@ bool CUPSManager::removePrinter( const OUString& rName, bool bCheck )
bool CUPSManager::setDefaultPrinter( const OUString& rName )
{
bool bSuccess = false;
- boost::unordered_map< OUString, int, OUStringHash >::iterator nit =
+ std::unordered_map< OUString, int, OUStringHash >::iterator nit =
m_aCUPSDestMap.find( rName );
if( nit != m_aCUPSDestMap.end() && m_aCUPSMutex.tryToAcquire() )
{
@@ -787,10 +787,10 @@ bool CUPSManager::writePrinterConfig()
bool bDestModified = false;
rtl_TextEncoding aEncoding = osl_getThreadTextEncoding();
- for( boost::unordered_map< OUString, Printer, OUStringHash >::iterator prt =
+ for( std::unordered_map< OUString, Printer, OUStringHash >::iterator prt =
m_aPrinters.begin(); prt != m_aPrinters.end(); ++prt )
{
- boost::unordered_map< OUString, int, OUStringHash >::iterator nit =
+ std::unordered_map< OUString, int, OUStringHash >::iterator nit =
m_aCUPSDestMap.find( prt->first );
if( nit == m_aCUPSDestMap.end() )
continue;
diff --git a/vcl/unx/generic/printer/ppdparser.cxx b/vcl/unx/generic/printer/ppdparser.cxx
index 7238a44d57f9..ff4cdd685fd7 100644
--- a/vcl/unx/generic/printer/ppdparser.cxx
+++ b/vcl/unx/generic/printer/ppdparser.cxx
@@ -21,7 +21,6 @@
#include <stdio.h>
#include <boost/noncopyable.hpp>
-#include <boost/unordered_map.hpp>
#include <comphelper/string.hxx>
#include "vcl/ppdparser.hxx"
@@ -45,6 +44,8 @@
#include "com/sun/star/lang/Locale.hpp"
+#include <unordered_map>
+
namespace psp
{
class PPDTranslator
@@ -71,8 +72,8 @@ namespace psp
}
};
- typedef boost::unordered_map< com::sun::star::lang::Locale, OUString, LocaleHash, LocaleEqual > translation_map;
- typedef boost::unordered_map< OUString, translation_map, OUStringHash > key_translation_map;
+ typedef std::unordered_map< css::lang::Locale, OUString, LocaleHash, LocaleEqual > translation_map;
+ typedef std::unordered_map< OUString, translation_map, OUStringHash > key_translation_map;
key_translation_map m_aTranslations;
public:
@@ -244,7 +245,7 @@ namespace psp
{
public:
std::list< PPDParser* > aAllParsers;
- boost::unordered_map< OUString, OUString, OUStringHash >* pAllPPDFiles;
+ std::unordered_map< OUString, OUString, OUStringHash >* pAllPPDFiles;
PPDCache()
: pAllPPDFiles(NULL)
{}
@@ -448,7 +449,7 @@ void PPDParser::initPPDFiles(PPDCache &rPPDCache)
if( rPPDCache.pAllPPDFiles )
return;
- rPPDCache.pAllPPDFiles = new boost::unordered_map< OUString, OUString, OUStringHash >();
+ rPPDCache.pAllPPDFiles = new std::unordered_map< OUString, OUString, OUStringHash >();
// check installation directories
std::list< OUString > aPathList;
@@ -483,7 +484,7 @@ OUString PPDParser::getPPDFile( const OUString& rFile )
PPDDecompressStream aStream( aPPD.PathToFileName() );
if( ! aStream.IsOpen() )
{
- boost::unordered_map< OUString, OUString, OUStringHash >::const_iterator it;
+ std::unordered_map< OUString, OUString, OUStringHash >::const_iterator it;
PPDCache &rPPDCache = thePPDCache::get();
bool bRetry = true;
diff --git a/vcl/unx/generic/printer/printerinfomanager.cxx b/vcl/unx/generic/printer/printerinfomanager.cxx
index 5dd8bfe7007c..1272792c6250 100644
--- a/vcl/unx/generic/printer/printerinfomanager.cxx
+++ b/vcl/unx/generic/printer/printerinfomanager.cxx
@@ -47,7 +47,7 @@
// the group of the global defaults
#define GLOBAL_DEFAULTS_GROUP "__Global_Printer_Defaults__"
-#include <boost/unordered_set.hpp>
+#include <unordered_set>
using namespace psp;
using namespace osl;
@@ -463,7 +463,7 @@ void PrinterInfoManager::initialize()
FileBase::getFileURLFromSystemPath( aFile.PathToFileName(), aPrinter.m_aFile );
aPrinter.m_bModified = false;
aPrinter.m_aGroup = aConfig.GetGroupName( nGroup );
- boost::unordered_map< OUString, Printer, OUStringHash >::const_iterator find_it =
+ std::unordered_map< OUString, Printer, OUStringHash >::const_iterator find_it =
m_aPrinters.find( aPrinterName );
if( find_it != m_aPrinters.end() )
{
@@ -537,7 +537,7 @@ void PrinterInfoManager::initialize()
void PrinterInfoManager::listPrinters( ::std::list< OUString >& rList ) const
{
- ::boost::unordered_map< OUString, Printer, OUStringHash >::const_iterator it;
+ std::unordered_map< OUString, Printer, OUStringHash >::const_iterator it;
rList.clear();
for( it = m_aPrinters.begin(); it != m_aPrinters.end(); ++it )
rList.push_back( it->first );
@@ -546,7 +546,7 @@ void PrinterInfoManager::listPrinters( ::std::list< OUString >& rList ) const
const PrinterInfo& PrinterInfoManager::getPrinterInfo( const OUString& rPrinter ) const
{
static PrinterInfo aEmptyInfo;
- ::boost::unordered_map< OUString, Printer, OUStringHash >::const_iterator it = m_aPrinters.find( rPrinter );
+ std::unordered_map< OUString, Printer, OUStringHash >::const_iterator it = m_aPrinters.find( rPrinter );
DBG_ASSERT( it != m_aPrinters.end(), "Do not ask for info about nonexistent printers" );
@@ -555,7 +555,7 @@ const PrinterInfo& PrinterInfoManager::getPrinterInfo( const OUString& rPrinter
void PrinterInfoManager::changePrinterInfo( const OUString& rPrinter, const PrinterInfo& rNewInfo )
{
- ::boost::unordered_map< OUString, Printer, OUStringHash >::iterator it = m_aPrinters.find( rPrinter );
+ std::unordered_map< OUString, Printer, OUStringHash >::iterator it = m_aPrinters.find( rPrinter );
DBG_ASSERT( it != m_aPrinters.end(), "Do not change nonexistant printers" );
@@ -582,9 +582,9 @@ static bool checkWriteability( const OUString& rUniPath )
bool PrinterInfoManager::writePrinterConfig()
{
// find at least one writeable config
- ::boost::unordered_map< OUString, Config*, OUStringHash > files;
- ::boost::unordered_map< OUString, int, OUStringHash > rofiles;
- ::boost::unordered_map< OUString, Config*, OUStringHash >::iterator file_it;
+ std::unordered_map< OUString, Config*, OUStringHash > files;
+ std::unordered_map< OUString, int, OUStringHash > rofiles;
+ std::unordered_map< OUString, Config*, OUStringHash >::iterator file_it;
for( ::std::list< WatchFile >::const_iterator wit = m_aWatchFiles.begin(); wit != m_aWatchFiles.end(); ++wit )
{
@@ -601,7 +601,7 @@ bool PrinterInfoManager::writePrinterConfig()
Config* pGlobal = files.begin()->second;
pGlobal->SetGroup( GLOBAL_DEFAULTS_GROUP );
- ::boost::unordered_map< OUString, Printer, OUStringHash >::iterator it;
+ std::unordered_map< OUString, Printer, OUStringHash >::iterator it;
for( it = m_aPrinters.begin(); it != m_aPrinters.end(); ++it )
{
if( ! it->second.m_bModified )
@@ -772,7 +772,7 @@ bool PrinterInfoManager::removePrinter( const OUString& rPrinterName, bool bChec
{
bool bSuccess = true;
- ::boost::unordered_map< OUString, Printer, OUStringHash >::iterator it = m_aPrinters.find( rPrinterName );
+ std::unordered_map< OUString, Printer, OUStringHash >::iterator it = m_aPrinters.find( rPrinterName );
if( it != m_aPrinters.end() )
{
if( !it->second.m_aFile.isEmpty() )
@@ -823,7 +823,7 @@ bool PrinterInfoManager::setDefaultPrinter( const OUString& rPrinterName )
{
bool bSuccess = false;
- ::boost::unordered_map< OUString, Printer, OUStringHash >::iterator it = m_aPrinters.find( rPrinterName );
+ std::unordered_map< OUString, Printer, OUStringHash >::iterator it = m_aPrinters.find( rPrinterName );
if( it != m_aPrinters.end() )
{
bSuccess = true;
@@ -901,7 +901,7 @@ bool PrinterInfoManager::endSpool( const OUString& /*rPrintername*/, const OUStr
void PrinterInfoManager::setupJobContextData( JobData& rData )
{
- boost::unordered_map< OUString, Printer, OUStringHash >::iterator it =
+ std::unordered_map< OUString, Printer, OUStringHash >::iterator it =
m_aPrinters.find( rData.m_aPrinterName );
if( it != m_aPrinters.end() )
{
@@ -1013,8 +1013,8 @@ static void lpgetSysQueueTokenHandler(
const SystemCommandParameters* )
{
rtl_TextEncoding aEncoding = osl_getThreadTextEncoding();
- boost::unordered_set< OUString, OUStringHash > aUniqueSet;
- boost::unordered_set< OUString, OUStringHash > aOnlySet;
+ std::unordered_set< OUString, OUStringHash > aUniqueSet;
+ std::unordered_set< OUString, OUStringHash > aOnlySet;
aUniqueSet.insert( OUString( "_all" ) );
aUniqueSet.insert( OUString( "_default" ) );
@@ -1110,7 +1110,7 @@ static void standardSysQueueTokenHandler(
const SystemCommandParameters* i_pParms)
{
rtl_TextEncoding aEncoding = osl_getThreadTextEncoding();
- boost::unordered_set< OUString, OUStringHash > aUniqueSet;
+ std::unordered_set< OUString, OUStringHash > aUniqueSet;
OString aForeToken( i_pParms->pForeToken );
OString aAftToken( i_pParms->pAftToken );
/* Normal Unix print queue discovery, also used for Darwin 5 LPR printing
diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
index d0f2bf2ac512..0e142aaa7267 100644
--- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
@@ -34,7 +34,7 @@
#include <cmath>
#include <vector>
#include <algorithm>
-#include <boost/unordered_map.hpp>
+#include <unordered_map>
#include "vcl/vclenum.hxx"
#include <vcl/settings.hxx>
@@ -175,7 +175,7 @@ struct NWFWidgetData
// Keep a hash table of Widgets->default flags so that we can
// easily and quickly reset each to a default state before using
// them
-static boost::unordered_map<long, guint> gWidgetDefaultFlags;
+static std::unordered_map<long, guint> gWidgetDefaultFlags;
class WidgetDataVector
{
private:
generated by cgit (git 2.34.1) at 2024-07-11 23:20:46 +0000