From 3453ed7814cde95f666fa8120279eb23fc9966fe Mon Sep 17 00:00:00 2001 From: David Anderson Date: Thu, 7 Feb 2013 10:26:02 -0800 Subject: [PATCH] - manager: fix some compile warnings on Unix --- clientgui/BOINCBaseView.cpp | 4 ++-- clientgui/BOINCBaseView.h | 4 ++-- clientgui/ViewNotices.cpp | 8 ++++---- clientgui/ViewNotices.h | 4 ++-- clientgui/ViewProjects.cpp | 2 +- clientgui/ViewProjects.h | 2 +- clientgui/ViewResources.cpp | 4 ++-- clientgui/ViewResources.h | 4 ++-- clientgui/ViewStatistics.cpp | 4 ++-- clientgui/ViewStatistics.h | 4 ++-- clientgui/ViewTransfers.cpp | 2 +- clientgui/ViewTransfers.h | 2 +- clientgui/ViewWork.cpp | 2 +- clientgui/ViewWork.h | 2 +- 14 files changed, 24 insertions(+), 24 deletions(-) diff --git a/clientgui/BOINCBaseView.cpp b/clientgui/BOINCBaseView.cpp index fd21731a4b..cd260171fc 100644 --- a/clientgui/BOINCBaseView.cpp +++ b/clientgui/BOINCBaseView.cpp @@ -193,14 +193,14 @@ const char** CBOINCBaseView::GetViewIcon() { // The rate at which the view is refreshed. // If it has not been defined by the view 1 second is retrned. // -const int CBOINCBaseView::GetViewRefreshRate() { +int CBOINCBaseView::GetViewRefreshRate() { return 1; } // Get bit mask of current view(s). // -const int CBOINCBaseView::GetViewCurrentViewPage() { +int CBOINCBaseView::GetViewCurrentViewPage() { return 0; } diff --git a/clientgui/BOINCBaseView.h b/clientgui/BOINCBaseView.h index 034b4c5d69..bcd9ec04bc 100644 --- a/clientgui/BOINCBaseView.h +++ b/clientgui/BOINCBaseView.h @@ -120,8 +120,8 @@ public: virtual wxString& GetViewName(); virtual wxString& GetViewDisplayName(); virtual const char** GetViewIcon(); - virtual const int GetViewRefreshRate(); - virtual const int GetViewCurrentViewPage(); + virtual int GetViewRefreshRate(); + virtual int GetViewCurrentViewPage(); virtual wxString GetKeyValue1(int iRowIndex); virtual wxString GetKeyValue2(int iRowIndex); diff --git a/clientgui/ViewNotices.cpp b/clientgui/ViewNotices.cpp index d955c03b5d..6f55987808 100644 --- a/clientgui/ViewNotices.cpp +++ b/clientgui/ViewNotices.cpp @@ -127,12 +127,12 @@ const char** CViewNotices::GetViewIcon() { } -const int CViewNotices::GetViewRefreshRate() { +int CViewNotices::GetViewRefreshRate() { return 10; } -const int CViewNotices::GetViewCurrentViewPage() { - return VW_NOTIF; +int CViewNotices::GetViewCurrentViewPage() { + return VW_NOTIF; } @@ -229,4 +229,4 @@ void CViewNotices::ReloadNotices() { m_FetchingNoticesText->Show(); m_NoNoticesText->Hide(); } -} \ No newline at end of file +} diff --git a/clientgui/ViewNotices.h b/clientgui/ViewNotices.h index e8176f1ccc..f88d255890 100644 --- a/clientgui/ViewNotices.h +++ b/clientgui/ViewNotices.h @@ -42,8 +42,8 @@ public: virtual wxString& GetViewName(); virtual wxString& GetViewDisplayName(); virtual const char** GetViewIcon(); - virtual const int GetViewRefreshRate(); - virtual const int GetViewCurrentViewPage(); + virtual int GetViewRefreshRate(); + virtual int GetViewCurrentViewPage(); void ReloadNotices(); protected: diff --git a/clientgui/ViewProjects.cpp b/clientgui/ViewProjects.cpp index 251ff7d256..353ff2949a 100644 --- a/clientgui/ViewProjects.cpp +++ b/clientgui/ViewProjects.cpp @@ -256,7 +256,7 @@ const char** CViewProjects::GetViewIcon() { } -const int CViewProjects::GetViewCurrentViewPage() { +int CViewProjects::GetViewCurrentViewPage() { return VW_PROJ; } diff --git a/clientgui/ViewProjects.h b/clientgui/ViewProjects.h index 6fa7901f41..376b2bc459 100644 --- a/clientgui/ViewProjects.h +++ b/clientgui/ViewProjects.h @@ -60,7 +60,7 @@ public: virtual wxString& GetViewName(); virtual wxString& GetViewDisplayName(); virtual const char** GetViewIcon(); - virtual const int GetViewCurrentViewPage(); + virtual int GetViewCurrentViewPage(); virtual wxString GetKeyValue1(int iRowIndex); virtual int FindRowIndexByKeyValues(wxString& key1, wxString& key2); diff --git a/clientgui/ViewResources.cpp b/clientgui/ViewResources.cpp index 04ec0bef76..5d8d555575 100644 --- a/clientgui/ViewResources.cpp +++ b/clientgui/ViewResources.cpp @@ -123,12 +123,12 @@ const char** CViewResources::GetViewIcon() { } -const int CViewResources::GetViewRefreshRate() { +int CViewResources::GetViewRefreshRate() { return 10; } -const int CViewResources::GetViewCurrentViewPage() { +int CViewResources::GetViewCurrentViewPage() { return VW_DISK; } diff --git a/clientgui/ViewResources.h b/clientgui/ViewResources.h index 7def34a611..247ce1b2a2 100644 --- a/clientgui/ViewResources.h +++ b/clientgui/ViewResources.h @@ -43,8 +43,8 @@ public: virtual wxString& GetViewName(); virtual wxString& GetViewDisplayName(); virtual const char** GetViewIcon(); - virtual const int GetViewRefreshRate(); - virtual const int GetViewCurrentViewPage(); + virtual int GetViewRefreshRate(); + virtual int GetViewCurrentViewPage(); protected: diff --git a/clientgui/ViewStatistics.cpp b/clientgui/ViewStatistics.cpp index 6ab010ea5e..3a35ac6761 100644 --- a/clientgui/ViewStatistics.cpp +++ b/clientgui/ViewStatistics.cpp @@ -2075,11 +2075,11 @@ const char** CViewStatistics::GetViewIcon() { return stats_xpm; } -const int CViewStatistics::GetViewRefreshRate() { +int CViewStatistics::GetViewRefreshRate() { return 60; } -const int CViewStatistics::GetViewCurrentViewPage() { +int CViewStatistics::GetViewCurrentViewPage() { return VW_STAT; } diff --git a/clientgui/ViewStatistics.h b/clientgui/ViewStatistics.h index 0c5c108d8d..5823920928 100644 --- a/clientgui/ViewStatistics.h +++ b/clientgui/ViewStatistics.h @@ -225,8 +225,8 @@ public: virtual wxString& GetViewName(); virtual wxString& GetViewDisplayName(); virtual const char** GetViewIcon(); - virtual const int GetViewRefreshRate(); - virtual const int GetViewCurrentViewPage(); + virtual int GetViewRefreshRate(); + virtual int GetViewCurrentViewPage(); void OnStatisticsUserTotal( wxCommandEvent& event ); void OnStatisticsUserAverage( wxCommandEvent& event ); diff --git a/clientgui/ViewTransfers.cpp b/clientgui/ViewTransfers.cpp index da0bd1a28a..b3836562d2 100644 --- a/clientgui/ViewTransfers.cpp +++ b/clientgui/ViewTransfers.cpp @@ -219,7 +219,7 @@ const char** CViewTransfers::GetViewIcon() { } -const int CViewTransfers::GetViewCurrentViewPage() { +int CViewTransfers::GetViewCurrentViewPage() { return VW_XFER; } diff --git a/clientgui/ViewTransfers.h b/clientgui/ViewTransfers.h index c1177591d7..cbe9a43965 100644 --- a/clientgui/ViewTransfers.h +++ b/clientgui/ViewTransfers.h @@ -59,7 +59,7 @@ public: virtual wxString& GetViewName(); virtual wxString& GetViewDisplayName(); virtual const char** GetViewIcon(); - virtual const int GetViewCurrentViewPage(); + virtual int GetViewCurrentViewPage(); virtual wxString GetKeyValue1(int iRowIndex); virtual wxString GetKeyValue2(int iRowIndex); diff --git a/clientgui/ViewWork.cpp b/clientgui/ViewWork.cpp index 292fc26c41..e538255924 100644 --- a/clientgui/ViewWork.cpp +++ b/clientgui/ViewWork.cpp @@ -270,7 +270,7 @@ const char** CViewWork::GetViewIcon() { } -const int CViewWork::GetViewCurrentViewPage() { +int CViewWork::GetViewCurrentViewPage() { return VW_TASK; } diff --git a/clientgui/ViewWork.h b/clientgui/ViewWork.h index 5c61a5fc52..5b99cdc911 100644 --- a/clientgui/ViewWork.h +++ b/clientgui/ViewWork.h @@ -61,7 +61,7 @@ public: virtual wxString& GetViewName(); virtual wxString& GetViewDisplayName(); virtual const char** GetViewIcon(); - virtual const int GetViewCurrentViewPage(); + virtual int GetViewCurrentViewPage(); virtual wxString GetKeyValue1(int iRowIndex); virtual wxString GetKeyValue2(int iRowIndex);