summaryrefslogtreecommitdiff
path: root/vcl/inc
diff options
context:
space:
mode:
Diffstat (limited to 'vcl/inc')
-rw-r--r--vcl/inc/PhysicalFontCollection.hxx2
-rw-r--r--vcl/inc/implimagetree.hxx6
-rw-r--r--vcl/inc/jobset.h4
-rw-r--r--vcl/inc/opengl/program.hxx2
-rw-r--r--vcl/inc/print.h2
-rw-r--r--vcl/inc/printerinfomanager.hxx2
-rw-r--r--vcl/inc/unx/cpdmgr.hxx4
-rw-r--r--vcl/inc/unx/cupsmgr.hxx4
-rw-r--r--vcl/inc/unx/fontmanager.hxx6
9 files changed, 16 insertions, 16 deletions
diff --git a/vcl/inc/PhysicalFontCollection.hxx b/vcl/inc/PhysicalFontCollection.hxx
index 0ff6868b9853..41382cd0116e 100644
--- a/vcl/inc/PhysicalFontCollection.hxx
+++ b/vcl/inc/PhysicalFontCollection.hxx
@@ -70,7 +70,7 @@ private:
mutable bool mbMatchData; // true if matching attributes are initialized
bool mbMapNames; // true if MapNames are available
- typedef std::unordered_map<OUString, PhysicalFontFamily*,OUStringHash> PhysicalFontFamilies;
+ typedef std::unordered_map<OUString, PhysicalFontFamily*> PhysicalFontFamilies;
PhysicalFontFamilies maPhysicalFontFamilies;
ImplPreMatchFontSubstitution* mpPreMatchHook; // device specific prematch substitution
diff --git a/vcl/inc/implimagetree.hxx b/vcl/inc/implimagetree.hxx
index b37c0419a52f..9118664775e8 100644
--- a/vcl/inc/implimagetree.hxx
+++ b/vcl/inc/implimagetree.hxx
@@ -83,8 +83,8 @@ private:
ImplImageTree(const ImplImageTree&) = delete;
ImplImageTree& operator=(const ImplImageTree&) = delete;
- typedef std::unordered_map<OUString, std::pair<bool, BitmapEx>, OUStringHash> IconCache;
- typedef std::unordered_map<OUString, OUString, OUStringHash> IconLinkHash;
+ typedef std::unordered_map<OUString, std::pair<bool, BitmapEx>> IconCache;
+ typedef std::unordered_map<OUString, OUString> IconLinkHash;
struct IconSet
{
@@ -102,7 +102,7 @@ private:
};
/// Map between the theme name(s) and the content.
- typedef std::unordered_map<OUString, IconSet, OUStringHash> StyleIconSet;
+ typedef std::unordered_map<OUString, IconSet> StyleIconSet;
/// Remember all the (used) icon styles and individual icons in them.
StyleIconSet maIconSets;
diff --git a/vcl/inc/jobset.h b/vcl/inc/jobset.h
index db833018f905..35a706536b45 100644
--- a/vcl/inc/jobset.h
+++ b/vcl/inc/jobset.h
@@ -44,7 +44,7 @@ private:
sal_uInt32 mnDriverDataLen; //< length of system specific data
sal_uInt8* mpDriverData; //< system specific data (will be streamed a byte block)
bool mbPapersizeFromSetup;
- std::unordered_map< OUString, OUString, OUStringHash > maValueMap;
+ std::unordered_map< OUString, OUString > maValueMap;
public:
ImplJobSetup();
@@ -89,7 +89,7 @@ public:
bool GetPapersizeFromSetup() const { return mbPapersizeFromSetup; }
void SetPapersizeFromSetup(bool bPapersizeFromSetup);
- const std::unordered_map< OUString, OUString, OUStringHash >& GetValueMap() const
+ const std::unordered_map< OUString, OUString >& GetValueMap() const
{ return maValueMap; }
void SetValueMap(const OUString& rKey, const OUString& rValue);
};
diff --git a/vcl/inc/opengl/program.hxx b/vcl/inc/opengl/program.hxx
index fabd07ae1a1e..9d6340cebf11 100644
--- a/vcl/inc/opengl/program.hxx
+++ b/vcl/inc/opengl/program.hxx
@@ -43,7 +43,7 @@ class VCL_PLUGIN_PUBLIC OpenGLProgram
{
private:
GLuint mnId;
- std::unordered_map< OString, GLuint, OStringHash >
+ std::unordered_map< OString, GLuint >
maUniformLocations;
sal_uInt32 mnEnabledAttribs;
GLuint mnPositionAttrib;
diff --git a/vcl/inc/print.h b/vcl/inc/print.h
index e53d03318083..3ea53ec2bdd9 100644
--- a/vcl/inc/print.h
+++ b/vcl/inc/print.h
@@ -42,7 +42,7 @@ struct ImplPrnQueueData
class VCL_PLUGIN_PUBLIC ImplPrnQueueList
{
public:
- std::unordered_map< OUString, sal_Int32, OUStringHash > m_aNameToIndex;
+ std::unordered_map< OUString, sal_Int32 > m_aNameToIndex;
std::vector< ImplPrnQueueData > m_aQueueInfos;
std::vector< OUString > m_aPrinterList;
diff --git a/vcl/inc/printerinfomanager.hxx b/vcl/inc/printerinfomanager.hxx
index 315d7253ae8b..871565842db9 100644
--- a/vcl/inc/printerinfomanager.hxx
+++ b/vcl/inc/printerinfomanager.hxx
@@ -101,7 +101,7 @@ protected:
PrinterInfo m_aInfo;
};
- std::unordered_map< OUString, Printer, OUStringHash > m_aPrinters;
+ std::unordered_map< OUString, Printer > m_aPrinters;
PrinterInfo m_aGlobalDefaults;
std::vector< WatchFile > m_aWatchFiles;
OUString m_aDefaultPrinter;
diff --git a/vcl/inc/unx/cpdmgr.hxx b/vcl/inc/unx/cpdmgr.hxx
index dea353384f1b..6174449a38b5 100644
--- a/vcl/inc/unx/cpdmgr.hxx
+++ b/vcl/inc/unx/cpdmgr.hxx
@@ -71,8 +71,8 @@ class CPDManager : public PrinterInfoManager
std::vector<std::pair<std::string, gchar*>> m_tBackends;
std::unordered_map< std::string, GDBusProxy * > m_pBackends;
std::unordered_map< FILE*, OString, FPtrHash > m_aSpoolFiles;
- std::unordered_map< OUString, CPDPrinter *, OUStringHash > m_aCPDDestMap;
- std::unordered_map< OUString, PPDContext, OUStringHash > m_aDefaultContexts;
+ std::unordered_map< OUString, CPDPrinter * > m_aCPDDestMap;
+ std::unordered_map< OUString, PPDContext > m_aDefaultContexts;
#endif
CPDManager();
// Function called when CPDManager is destroyed
diff --git a/vcl/inc/unx/cupsmgr.hxx b/vcl/inc/unx/cupsmgr.hxx
index f0dd91171ae2..f32b84256044 100644
--- a/vcl/inc/unx/cupsmgr.hxx
+++ b/vcl/inc/unx/cupsmgr.hxx
@@ -42,9 +42,9 @@ class CUPSManager : public PrinterInfoManager
int m_nDests;
void* m_pDests;
bool m_bNewDests;
- std::unordered_map< OUString, int, OUStringHash > m_aCUPSDestMap;
+ std::unordered_map< OUString, int > m_aCUPSDestMap;
- std::unordered_map< OUString, PPDContext, OUStringHash > m_aDefaultContexts;
+ std::unordered_map< OUString, PPDContext > m_aDefaultContexts;
OString m_aUser;
/** this is a security risk, but the CUPS API demands
diff --git a/vcl/inc/unx/fontmanager.hxx b/vcl/inc/unx/fontmanager.hxx
index 43170bb7108d..1597dca79ed0 100644
--- a/vcl/inc/unx/fontmanager.hxx
+++ b/vcl/inc/unx/fontmanager.hxx
@@ -138,10 +138,10 @@ class VCL_PLUGIN_PUBLIC PrintFontManager
fontID m_nNextFontID;
std::unordered_map< fontID, PrintFont* > m_aFonts;
// for speeding up findFontFileID
- std::unordered_map< OString, std::set< fontID >, OStringHash >
+ std::unordered_map< OString, std::set< fontID > >
m_aFontFileToFontID;
- std::unordered_map< OString, int, OStringHash >
+ std::unordered_map< OString, int >
m_aDirToAtom;
std::unordered_map< int, OString > m_aAtomToDir;
int m_nNextDirAtom;
@@ -178,7 +178,7 @@ class VCL_PLUGIN_PUBLIC PrintFontManager
called from <code>initialize()</code>
*/
static void initFontconfig();
- void countFontconfigFonts( std::unordered_map<OString, int, OStringHash>& o_rVisitedPaths );
+ void countFontconfigFonts( std::unordered_map<OString, int>& o_rVisitedPaths );
/* deinitialize fontconfig
*/
static void deinitFontconfig();
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-17 21:15:46 +0000