Include wx/hashmap.h according to precompiled headers of wx/wx.h (with other minor cleaning).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39802 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

include/wx/hashmap.h

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        hashmap.h
+// Name:        wx/hashmap.h
 // Purpose:     wxHashMap class
 // Author:      Mattia Barbon
 // Modified by:
@@ -708,4 +708,3 @@ WX_DECLARE_HASH_MAP_WITH_DECL( long, long, wxIntegerHash, wxIntegerEqual,
 
 
 #endif // _WX_HASHMAP_H_
-

include/wx/wx.h

@@ -18,6 +18,7 @@
 #include "wx/list.h"
 #include "wx/hash.h"
 #include "wx/string.h"
+#include "wx/hashmap.h"
 #include "wx/arrstr.h"
 #include "wx/intl.h"
 #include "wx/log.h"

src/common/artprov.cpp

@@ -23,10 +23,10 @@
 #ifndef WX_PRECOMP
     #include "wx/list.h"
     #include "wx/log.h"
+    #include "wx/hashmap.h"
 #endif
 
 #include "wx/artprov.h"
-#include "wx/hashmap.h"
 #include "wx/module.h"
 
 #if wxUSE_IMAGE

src/common/hashmap.cpp

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        hashmap.cpp
+// Name:        src/common/hashmap.cpp
 // Purpose:     wxHashMap implementation
 // Author:      Mattia Barbon
 // Modified by:

src/common/intl.cpp

@@ -46,6 +46,7 @@
     #include "wx/log.h"
     #include "wx/utils.h"
     #include "wx/app.h"
+    #include "wx/hashmap.h"
 #endif // WX_PRECOMP
 
 #ifndef __WXWINCE__
@@ -71,7 +72,6 @@
 #include "wx/module.h"
 #include "wx/fontmap.h"
 #include "wx/encconv.h"
-#include "wx/hashmap.h"
 #include "wx/ptr_scpd.h"
 #include "wx/apptrait.h"
 #include "wx/stdpaths.h"
@@ -1939,9 +1939,9 @@ void wxLocale::AddCatalogLookupPathPrefix(const wxString& prefix)
     // check for this
 
     // do we have just the language (or sublang too)?
-    bool justLang = langFull.Len() == LEN_LANG;
+    bool justLang = langFull.length() == LEN_LANG;
     if ( justLang ||
-         (langFull.Len() == LEN_FULL && langFull[LEN_LANG] == wxT('_')) )
+         (langFull.length() == LEN_FULL && langFull[LEN_LANG] == wxT('_')) )
     {
         // 0. Make sure the lang is according to latest ISO 639
         //    (this is necessary because glibc uses iw and in instead

src/common/strconv.cpp

@@ -19,6 +19,7 @@
     #include "wx/intl.h"
     #include "wx/log.h"
     #include "wx/utils.h"
+    #include "wx/hashmap.h"
 #endif
 
 #include "wx/strconv.h"
@@ -3073,7 +3074,6 @@ void wxCSConv::SetName(const wxChar *charset)
 }
 
 #if wxUSE_FONTMAP
-#include "wx/hashmap.h"
 
 WX_DECLARE_HASH_MAP( wxFontEncoding, wxString, wxIntegerHash, wxIntegerEqual,
                      wxEncodingNameCache );

src/common/xpmdecod.cpp

@@ -103,13 +103,13 @@ license is as follows:
     #include "wx/intl.h"
     #include "wx/log.h"
     #include "wx/utils.h"
+    #include "wx/hashmap.h"
     #if wxUSE_STREAMS
         #include "wx/stream.h"
     #endif
 #endif
 
 #include "wx/image.h"
-#include "wx/hashmap.h"
 #include <string.h>
 
 #include <ctype.h>

src/mgl/cursor.cpp

@@ -20,10 +20,10 @@
     #include "wx/intl.h"
     #include "wx/log.h"
     #include "wx/utils.h"
+    #include "wx/hashmap.h"
 #endif
 
 #include "wx/module.h"
-#include "wx/hashmap.h"
 
 #include "wx/mgl/private.h"
 

src/motif/timer.cpp

@@ -16,9 +16,8 @@
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"
-#endif
-
     #include "wx/hashmap.h"
+#endif
 
 #ifdef __VMS__
 #pragma message disable nosimpint

src/msw/dde.cpp

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        msw/dde.cpp
+// Name:        src/msw/dde.cpp
 // Purpose:     DDE classes
 // Author:      Julian Smart
 // Modified by:
@@ -29,12 +29,12 @@
 #ifndef WX_PRECOMP
     #include "wx/utils.h"
     #include "wx/app.h"
+    #include "wx/hashmap.h"
 #endif
 
 #include "wx/module.h"
 #include "wx/dde.h"
 #include "wx/intl.h"
-#include "wx/hashmap.h"
 
 #include "wx/msw/private.h"
 
@@ -300,7 +300,7 @@ bool wxDDEServer::Create(const wxString& server)
 
 wxDDEServer::~wxDDEServer()
 {
-    if ( !m_serviceName.IsEmpty() )
+    if ( !m_serviceName.empty() )
     {
         HSZ hsz = DDEAtomFromString(m_serviceName);
 

src/msw/timer.cpp

@@ -27,9 +27,8 @@
     #include "wx/app.h"
     #include "wx/intl.h"
     #include "wx/log.h"
-#endif
-
     #include "wx/hashmap.h"
+#endif
 
 #include "wx/msw/private.h"
 

src/msw/volume.cpp

@@ -30,10 +30,10 @@
         #include "wx/icon.h"
     #endif
     #include "wx/intl.h"
+    #include "wx/hashmap.h"
 #endif // WX_PRECOMP
 
 #include "wx/dir.h"
-#include "wx/hashmap.h"
 #include "wx/dynlib.h"
 #include "wx/arrimpl.cpp"
 
@@ -262,7 +262,7 @@ static void BuildListFromNN(wxArrayString& list, NETRESOURCE* pResSrc,
                 {
                     wxString filename(pRes->lpRemoteName);
 
-                    if (filename.Len())
+                    if (!filename.empty())
                     {
                         if (filename.Last() != '\\')
                             filename.Append('\\');

src/palmos/timer.cpp

@@ -27,9 +27,8 @@
     #include "wx/app.h"
     #include "wx/intl.h"
     #include "wx/log.h"
-#endif
-
     #include "wx/hashmap.h"
+#endif
 
 #include "wx/palmos/private.h"
 

src/palmos/volume.cpp

@@ -33,9 +33,8 @@
     #endif
     #include "wx/intl.h"
     #include "wx/arrstr.h"
-#endif // WX_PRECOMP
-
     #include "wx/hashmap.h"
+#endif // WX_PRECOMP
 
 #include <VFSMgr.h>
 #include <PalmTypesCompatibility.h>