Applied patch [ 1399013 ] More removals of extraneous semicolons

Wlodek Szafran


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

include/wx/clntdata.h

@@ -21,12 +21,12 @@ WX_DECLARE_STRING_HASH_MAP_WITH_DECL(
     wxShadowObjectMethod,
     wxShadowObjectMethods,
     class WXDLLIMPEXP_BASE
-);
+)
 WX_DECLARE_STRING_HASH_MAP_WITH_DECL(
     void *,
     wxShadowObjectFields,
     class WXDLLIMPEXP_BASE
-);
+)
 
 class WXDLLIMPEXP_BASE wxShadowObject
 {

include/wx/cshelp.h

@@ -138,7 +138,7 @@ private:
 };
 
 WX_DECLARE_EXPORTED_HASH_MAP( wxUIntPtr, wxString, wxIntegerHash,
-                              wxIntegerEqual, wxSimpleHelpProviderHashMap );
+                              wxIntegerEqual, wxSimpleHelpProviderHashMap )
 
 // wxSimpleHelpProvider is an implementation of wxHelpProvider which supports
 // only plain text help strings and shows the string associated with the

include/wx/dynload.h

@@ -29,7 +29,7 @@ class WXDLLIMPEXP_BASE wxPluginLibrary;
 
 
 WX_DECLARE_STRING_HASH_MAP_WITH_DECL(wxPluginLibrary *, wxDLManifest,
-                                     class WXDLLIMPEXP_BASE);
+                                     class WXDLLIMPEXP_BASE)
 typedef wxDLManifest wxDLImports;
 
 // ---------------------------------------------------------------------------

include/wx/fs_zip.h

@@ -18,7 +18,7 @@
 #include "wx/hashmap.h"
 
 
-WX_DECLARE_STRING_HASH_MAP(int, wxZipFilenameHashMap);
+WX_DECLARE_STRING_HASH_MAP(int, wxZipFilenameHashMap)
 
 
 //---------------------------------------------------------------------------

include/wx/gdicmn.h

@@ -474,7 +474,7 @@ public:
                              wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
 };
 
-WX_DECLARE_STRING_HASH_MAP( wxColour *, wxStringToColourHashMap );
+WX_DECLARE_STRING_HASH_MAP( wxColour *, wxStringToColourHashMap )
 
 class WXDLLEXPORT wxColourDatabase
 {

include/wx/hashmap.h

@@ -640,7 +640,7 @@ public: \
     /* count() == 0 | 1 */ \
     size_type count( const const_key_type& key ) \
         { return GetNode( key ) ? 1 : 0; } \
-}
+};
 
 #endif // !wxUSE_STL || !defined(HAVE_STL_HASH_MAP)
 
@@ -699,7 +699,7 @@ public: \
 // Declarations of common hashmap classes
 
 WX_DECLARE_HASH_MAP_WITH_DECL( long, long, wxIntegerHash, wxIntegerEqual,
-                               wxLongToLongHashMap, class WXDLLIMPEXP_BASE );
+                               wxLongToLongHashMap, class WXDLLIMPEXP_BASE )
 
 
 #endif // _WX_HASHMAP_H_

include/wx/hashset.h

@@ -83,7 +83,7 @@ public:                                                                      \
     /* count() == 0 | 1 */                                                   \
     size_type count( const const_key_type& key )                             \
         { return GetNode( key ) ? 1 : 0; }                                   \
-}
+};
 
 #endif // !wxUSE_STL || !defined(HAVE_STL_HASH_MAP)
 

include/wx/image.h

@@ -118,7 +118,7 @@ public:
 
 WX_DECLARE_EXPORTED_HASH_MAP(unsigned long, wxImageHistogramEntry,
                              wxIntegerHash, wxIntegerEqual,
-                             wxImageHistogramBase);
+                             wxImageHistogramBase)
 
 class WXDLLEXPORT wxImageHistogram : public wxImageHistogramBase
 {

include/wx/msw/treectrl.h

@@ -43,7 +43,7 @@ struct WXDLLEXPORT wxTreeViewItem;
 #define wxTREE_INSERT_LAST  0xFFFF0002
 
 // hash storing attributes for our items
-WX_DECLARE_EXPORTED_VOIDPTR_HASH_MAP(wxTreeItemAttr *, wxMapTreeAttr);
+WX_DECLARE_EXPORTED_VOIDPTR_HASH_MAP(wxTreeItemAttr *, wxMapTreeAttr)
 
 // ----------------------------------------------------------------------------
 // wxTreeCtrl

include/wx/paper.h

@@ -66,7 +66,7 @@ private:
     DECLARE_DYNAMIC_CLASS(wxPrintPaperType)
 };
 
-WX_DECLARE_STRING_HASH_MAP(wxPrintPaperType*, wxStringToPrintPaperTypeHashMap);
+WX_DECLARE_STRING_HASH_MAP(wxPrintPaperType*, wxStringToPrintPaperTypeHashMap)
 
 class WXDLLEXPORT wxPrintPaperTypeList;
 

include/wx/protocol/http.h

@@ -19,7 +19,7 @@
 #include "wx/protocol/protocol.h"
 
 WX_DECLARE_STRING_HASH_MAP_WITH_DECL( wxString, wxStringToStringHashMap,
-                                      class WXDLLIMPEXP_NET );
+                                      class WXDLLIMPEXP_NET )
 
 class WXDLLIMPEXP_NET wxHTTP : public wxProtocol
 {

src/common/artprov.cpp

@@ -44,7 +44,7 @@ WX_DEFINE_LIST(wxArtProvidersList)
 // Cache class - stores already requested bitmaps
 // ----------------------------------------------------------------------------
 
-WX_DECLARE_EXPORTED_STRING_HASH_MAP(wxBitmap, wxArtProviderBitmapsHash);
+WX_DECLARE_EXPORTED_STRING_HASH_MAP(wxBitmap, wxArtProviderBitmapsHash)
 
 class WXDLLEXPORT wxArtProviderCache
 {

src/common/dynarray.cpp

@@ -434,7 +434,7 @@ _WX_DEFINE_BASEARRAY(double,       wxBaseArrayDouble)
 #include <functional>
 #include "wx/afterstd.h"
 
-_WX_DEFINE_BASEARRAY(wxString, wxBaseArrayStringBase);
+_WX_DEFINE_BASEARRAY(wxString, wxBaseArrayStringBase)
 
 // some compilers (Sun CC being the only known example) distinguish between
 // extern "C" functions and the functions with C++ linkage and ptr_fun and

src/common/intl.cpp

@@ -870,7 +870,7 @@ wxPluralFormsCalculator* wxPluralFormsCalculator::make(const char* s)
 // This is a "low-level" class and is used only by wxMsgCatalog
 // ----------------------------------------------------------------------------
 
-WX_DECLARE_EXPORTED_STRING_HASH_MAP(wxString, wxMessagesHash);
+WX_DECLARE_EXPORTED_STRING_HASH_MAP(wxString, wxMessagesHash)
 
 class wxMsgCatalogFile
 {

src/common/strconv.cpp

@@ -2525,7 +2525,7 @@ void wxCSConv::SetName(const wxChar *charset)
 #include "wx/hashmap.h"
 
 WX_DECLARE_HASH_MAP( wxFontEncoding, wxString, wxIntegerHash, wxIntegerEqual,
-                     wxEncodingNameCache );
+                     wxEncodingNameCache )
 
 static wxEncodingNameCache gs_nameCache;
 #endif

src/common/xpmdecod.cpp

@@ -653,7 +653,7 @@ struct wxXPMColourMapData
 {
     unsigned char R,G,B;
 };
-WX_DECLARE_STRING_HASH_MAP(wxXPMColourMapData, wxXPMColourMap);
+WX_DECLARE_STRING_HASH_MAP(wxXPMColourMapData, wxXPMColourMap)
 
 wxImage wxXPMDecoder::ReadData(const char **xpm_data)
 {

src/common/zipstrm.cpp

@@ -604,7 +604,7 @@ static void Unique(wxZipMemory*& zm, size_t size)
 // Collection of weak references to entries
 
 WX_DECLARE_HASH_MAP(long, wxZipEntry*, wxIntegerHash,
-                    wxIntegerEqual, wx__OffsetZipEntryMap);
+                    wxIntegerEqual, wx__OffsetZipEntryMap)
 
 class wxZipWeakLinks
 {

src/msw/dde.cpp

@@ -96,7 +96,7 @@ static void DDELogError(const wxString& s, UINT error = DMLERR_NO_ERROR);
 // global variables
 // ----------------------------------------------------------------------------
 
-WX_DECLARE_STRING_HASH_MAP( HSZ, wxAtomMap );
+WX_DECLARE_STRING_HASH_MAP( HSZ, wxAtomMap )
 
 static DWORD DDEIdInst = 0L;
 static wxDDEConnection *DDECurrentlyConnecting = NULL;

src/msw/ownerdrw.cpp

@@ -109,7 +109,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxMSWSystemMenuFontModule, wxModule)
 #endif
 
 #include "wx/hashset.h"
-WX_DECLARE_HASH_SET(wxOwnerDrawn*, wxPointerHash, wxPointerEqual, OwnerDrawnSet);
+WX_DECLARE_HASH_SET(wxOwnerDrawn*, wxPointerHash, wxPointerEqual, OwnerDrawnSet)
 
 #ifdef POP_WARNINGS
     #pragma warning(pop)

src/msw/timer.cpp

@@ -40,7 +40,7 @@
 // define a hash containing all the timers: it is indexed by timer id and
 // contains the corresponding timer
 WX_DECLARE_HASH_MAP(unsigned long, wxTimer *, wxIntegerHash, wxIntegerEqual,
-                    wxTimerMap);
+                    wxTimerMap)
 
 // instead of using a global here, wrap it in a static function as otherwise it
 // could have been used before being initialized if a timer object were created