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

diff --git a/include/wx/clntdata.h b/include/wx/clntdata.h
index 33fae4c1045b668ea092b765675f92a59410c819..49c339bec0044f5380c9e0b000ecb09e429a1c61 100644 (file)
--- a/include/wx/clntdata.h
+++ b/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
 {

diff --git a/include/wx/cshelp.h b/include/wx/cshelp.h
index 7f85910dd7c1f9fcc088c5c3c9786af0b657e6b8..3f713a9a39a6a80f72a8b4d7aeba3c1716688e6d 100644 (file)
--- a/include/wx/cshelp.h
+++ b/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

diff --git a/include/wx/dynload.h b/include/wx/dynload.h
index b754dee03fed44e344196df460ee6557213710a9..540bd0374b63cba5421d3cedc86efe658007b26e 100644 (file)
--- a/include/wx/dynload.h
+++ b/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;
 
 // ---------------------------------------------------------------------------

diff --git a/include/wx/fs_zip.h b/include/wx/fs_zip.h
index ba864ce522a65c725c07f349b50eea8dd1246dbd..beccdf7a66c88403df3c71c940322dc1fad31d91 100644 (file)
--- a/include/wx/fs_zip.h
+++ b/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)
 
 
 //---------------------------------------------------------------------------

diff --git a/include/wx/gdicmn.h b/include/wx/gdicmn.h
index d38fe44b934dbe048d3d3ae411d2cf58c2448482..f4d5bc365ed00a159c7af7f88267475d55ea5e34 100644 (file)
--- a/include/wx/gdicmn.h
+++ b/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
 {

diff --git a/include/wx/hashmap.h b/include/wx/hashmap.h
index 31280b1f5b6e74598b5b39a5285033cd41e8d90c..f068d6d93b9837186b3e0853839ec87983bf8f40 100644 (file)
--- a/include/wx/hashmap.h
+++ b/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_

diff --git a/include/wx/hashset.h b/include/wx/hashset.h
index 599690d4026702c186a996e8fbec9e5075492fb1..9c96e5e9e20768d67f174912b0378ffcd2c4227e 100644 (file)
--- a/include/wx/hashset.h
+++ b/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)
 

diff --git a/include/wx/image.h b/include/wx/image.h
index e6850220093824a9c9e08ce53022d2eb77b0a95a..f65a1ff4aa47bd299193d2f047d3d96263bce4e9 100644 (file)
--- a/include/wx/image.h
+++ b/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
 {

diff --git a/include/wx/msw/treectrl.h b/include/wx/msw/treectrl.h
index 8fc4f90d278562346c7504d2012c0028928c8c74..69c8f04c7277fbec4ca0edcd7ad51af1f40fc931 100644 (file)
--- a/include/wx/msw/treectrl.h
+++ b/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

diff --git a/include/wx/paper.h b/include/wx/paper.h
index 1f26fbd102632a0bbbefc251b42e439c4c79a714..ab1150843b9344ef61dde112a8841f90c3c184fa 100644 (file)
--- a/include/wx/paper.h
+++ b/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;
 

diff --git a/include/wx/protocol/http.h b/include/wx/protocol/http.h
index f87227bc38346b4e64eaaf8475ad33e3d3a08ae8..ff4b2ecc48508db5f563a8d51192b0f080b35562 100644 (file)
--- a/include/wx/protocol/http.h
+++ b/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
 {

diff --git a/src/common/artprov.cpp b/src/common/artprov.cpp
index d7497a45ff31274818684c1bc9e0073770f1c2a2..817d5e08db84f2a8e4b5dbffdac739c530f0c143 100644 (file)
--- a/src/common/artprov.cpp
+++ b/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
 {

diff --git a/src/common/dynarray.cpp b/src/common/dynarray.cpp
index b098d4854b516b05e6bfb845c24b30021c6669db..4fc0f8ce40d65314f62adfac9c873517039ce452 100644 (file)
--- a/src/common/dynarray.cpp
+++ b/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

diff --git a/src/common/intl.cpp b/src/common/intl.cpp
index c1055e99e338885c529db28fdb6d370127b499e9..9ce6de4432bcce5df20ac11e77e8655080bfc2d1 100644 (file)
--- a/src/common/intl.cpp
+++ b/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
 {

diff --git a/src/common/strconv.cpp b/src/common/strconv.cpp
index 3508ac1c8b0fc9d95751d977a09274c2aaa0c394..0e3eb81df95a39b3984e598647a5ae68d615b557 100644 (file)
--- a/src/common/strconv.cpp
+++ b/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

diff --git a/src/common/xpmdecod.cpp b/src/common/xpmdecod.cpp
index fa4767ac83793975e419cb1a0a99620ee0b41b54..da656a3744ef4ac6e648bc42c77849a630f46a1a 100644 (file)
--- a/src/common/xpmdecod.cpp
+++ b/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)
 {

diff --git a/src/common/zipstrm.cpp b/src/common/zipstrm.cpp
index b7ab20d7b7d6af9b331d28e64025d3332f2981a4..93bbef9f88c58dbe7c1c5dd3a372714048f975d8 100644 (file)
--- a/src/common/zipstrm.cpp
+++ b/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
 {

diff --git a/src/msw/dde.cpp b/src/msw/dde.cpp
index d69720c31db060a22fdb9a0f4c606b02e04de38b..f33908fc4ecb9a41741074fc98011f7f10a393d9 100644 (file)
--- a/src/msw/dde.cpp
+++ b/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;

diff --git a/src/msw/ownerdrw.cpp b/src/msw/ownerdrw.cpp
index 5b3312796e58bcbac3c3e7f7dc65b2e046f26ce2..13926d36db306daec56d14da1f21fe950c35439d 100644 (file)
--- a/src/msw/ownerdrw.cpp
+++ b/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)

diff --git a/src/msw/timer.cpp b/src/msw/timer.cpp
index d93588c63728250d12f608a2219b2b9ee37d379e..1c94d7de498a4e566142ceade63acac788bfcc7a 100644 (file)
--- a/src/msw/timer.cpp
+++ b/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