Menu
▾
▴
[Freeorion-programmers] SF.net SVN: freeorion:[2692] trunk/FreeOrion
|
From: <tz...@us...> - 2008-12-07 07:24:45
|
Revision: 2692
http://freeorion.svn.sourceforge.net/freeorion/revision/?rev=2692&view=rev
Author: tzlaine
Date: 2008-12-07 07:24:41 +0000 (Sun, 07 Dec 2008)
Log Message:
-----------
Small changes to bring code into agreement with recent GG changes.
Modified Paths:
--------------
trunk/FreeOrion/UI/CUIControls.cpp
trunk/FreeOrion/UI/DesignWnd.cpp
trunk/FreeOrion/UI/InfoPanels.cpp
trunk/FreeOrion/UI/InfoPanels.h
trunk/FreeOrion/UI/IntroScreen.cpp
trunk/FreeOrion/UI/MapWnd.cpp
trunk/FreeOrion/UI/MultiplayerLobbyWnd.cpp
trunk/FreeOrion/UI/MultiplayerLobbyWnd.h
trunk/FreeOrion/UI/ServerConnectWnd.cpp
trunk/FreeOrion/UI/ServerConnectWnd.h
trunk/FreeOrion/client/human/HumanClientApp.cpp
Modified: trunk/FreeOrion/UI/CUIControls.cpp
===================================================================
--- trunk/FreeOrion/UI/CUIControls.cpp 2008-12-03 03:50:16 UTC (rev 2691)
+++ trunk/FreeOrion/UI/CUIControls.cpp 2008-12-07 07:24:41 UTC (rev 2692)
@@ -913,15 +913,15 @@
int tab_width = GetOrientation() == GG::VERTICAL ? Value(Tab()->Height()) : Value(Tab()->Width());
GG::Pt ul, lr;
if (GetOrientation() == GG::VERTICAL) {
- ul.x = ((LR.x + UL.x) - LineWidth()) / 2;
- lr.x = ul.x + LineWidth();
+ ul.x = ((LR.x + UL.x) - static_cast<int>(LineWidth())) / 2;
+ lr.x = ul.x + static_cast<int>(LineWidth());
ul.y = UL.y + tab_width / 2;
lr.y = LR.y - tab_width / 2;
} else {
ul.x = UL.x + tab_width / 2;
lr.x = LR.x - tab_width / 2;
- ul.y = ((LR.y + UL.y) - LineWidth()) / 2;
- lr.y = ul.y + LineWidth();
+ ul.y = ((LR.y + UL.y) - static_cast<int>(LineWidth())) / 2;
+ lr.y = ul.y + static_cast<int>(LineWidth());
}
GG::FlatRectangle(ul, lr, GG::CLR_ZERO, border_color_to_use, 1);
Tab()->OffsetMove(UpperLeft());
Modified: trunk/FreeOrion/UI/DesignWnd.cpp
===================================================================
--- trunk/FreeOrion/UI/DesignWnd.cpp 2008-12-03 03:50:16 UTC (rev 2691)
+++ trunk/FreeOrion/UI/DesignWnd.cpp 2008-12-07 07:24:41 UTC (rev 2692)
@@ -1119,7 +1119,7 @@
HullBrowsedSignal; //!< a hull was browsed (clicked once)
private:
void DoLayout();
- void WndSelected(int index);
+ void WndSelected(std::size_t index);
int m_empire_id;
@@ -1267,7 +1267,7 @@
m_tabs->SizeMove(GG::Pt(left, top), ClientSize() - GG::Pt(LEFT_PAD, TOP_PAD));
}
-void DesignWnd::BaseSelector::WndSelected(int index) {
+void DesignWnd::BaseSelector::WndSelected(std::size_t index) {
Reset();
}
Modified: trunk/FreeOrion/UI/InfoPanels.cpp
===================================================================
--- trunk/FreeOrion/UI/InfoPanels.cpp 2008-12-03 03:50:16 UTC (rev 2691)
+++ trunk/FreeOrion/UI/InfoPanels.cpp 2008-12-07 07:24:41 UTC (rev 2692)
@@ -38,9 +38,9 @@
initialized(false)
{}
- virtual bool WndHasBrowseInfo(const Wnd* wnd, int mode) const {
+ virtual bool WndHasBrowseInfo(const Wnd* wnd, std::size_t mode) const {
const std::vector<Wnd::BrowseInfoMode>& browse_modes = wnd->BrowseModes();
- assert(0 <= mode && mode <= static_cast<int>(browse_modes.size()));
+ assert(mode <= browse_modes.size());
return true;
}
@@ -95,7 +95,7 @@
initialized = true;
}
- virtual void UpdateImpl(int mode, const Wnd* target) {
+ virtual void UpdateImpl(std::size_t mode, const Wnd* target) {
if (!initialized)
Initialize();
}
@@ -535,14 +535,13 @@
m_pop_stat->SetValue(pop->ProjectedMeterPoints(METER_POPULATION));
m_health_stat->SetValue(pop->ProjectedMeterPoints(METER_HEALTH));
-
// tooltips
if (meter_map) {
- boost::shared_ptr<GG::BrowseInfoWnd> browse_wnd = boost::shared_ptr<GG::BrowseInfoWnd>(new MeterBrowseWnd(METER_POPULATION, obj, *meter_map));
+ boost::shared_ptr<GG::BrowseInfoWnd> browse_wnd(new MeterBrowseWnd(METER_POPULATION, obj, *meter_map));
m_pop_stat->SetBrowseInfoWnd(browse_wnd);
m_multi_icon_value_indicator->SetToolTip(METER_POPULATION, browse_wnd);
- browse_wnd = boost::shared_ptr<GG::BrowseInfoWnd>(new MeterBrowseWnd(METER_HEALTH, obj, *meter_map));
+ browse_wnd.reset(new MeterBrowseWnd(METER_HEALTH, obj, *meter_map));
m_health_stat->SetBrowseInfoWnd(browse_wnd);
m_multi_icon_value_indicator->SetToolTip(METER_HEALTH, browse_wnd);
}
@@ -2212,9 +2211,9 @@
Resize(GG::Pt(TEXT_WIDTH + ICON_WIDTH, std::max(m_icon->Height(), ROW_HEIGHT + m_main_text->Height())));
}
-bool IconTextBrowseWnd::WndHasBrowseInfo(const Wnd* wnd, int mode) const {
+bool IconTextBrowseWnd::WndHasBrowseInfo(const Wnd* wnd, std::size_t mode) const {
const std::vector<Wnd::BrowseInfoMode>& browse_modes = wnd->BrowseModes();
- assert(0 <= mode && mode <= static_cast<int>(browse_modes.size()));
+ assert(mode <= browse_modes.size());
return true;
}
Modified: trunk/FreeOrion/UI/InfoPanels.h
===================================================================
--- trunk/FreeOrion/UI/InfoPanels.h 2008-12-03 03:50:16 UTC (rev 2691)
+++ trunk/FreeOrion/UI/InfoPanels.h 2008-12-07 07:24:41 UTC (rev 2692)
@@ -369,7 +369,7 @@
public:
IconTextBrowseWnd(const boost::shared_ptr<GG::Texture> texture, const std::string& title_text,
const std::string& main_text);
- virtual bool WndHasBrowseInfo(const Wnd* wnd, int mode) const;
+ virtual bool WndHasBrowseInfo(const Wnd* wnd, std::size_t mode) const;
virtual void Render();
private:
Modified: trunk/FreeOrion/UI/IntroScreen.cpp
===================================================================
--- trunk/FreeOrion/UI/IntroScreen.cpp 2008-12-03 03:50:16 UTC (rev 2691)
+++ trunk/FreeOrion/UI/IntroScreen.cpp 2008-12-07 07:24:41 UTC (rev 2692)
@@ -76,7 +76,7 @@
GG::Y offset(m_co);
- offset -= (GG::GUI::GetGUI()->Ticks() - m_start_time)/40;
+ offset -= static_cast<int>((GG::GUI::GetGUI()->Ticks() - m_start_time)/40);
int transparency = 255;
Modified: trunk/FreeOrion/UI/MapWnd.cpp
===================================================================
--- trunk/FreeOrion/UI/MapWnd.cpp 2008-12-03 03:50:16 UTC (rev 2691)
+++ trunk/FreeOrion/UI/MapWnd.cpp 2008-12-07 07:24:41 UTC (rev 2692)
@@ -487,7 +487,7 @@
RenderStarfields();
- int interval = GetOptionsDB().Get<int>("UI.chat-hide-interval");
+ unsigned int interval = GetOptionsDB().Get<int>("UI.chat-hide-interval");
if (!m_chat_edit->Visible() && g_chat_display_show_time && interval &&
(interval < (GG::GUI::GetGUI()->Ticks() - g_chat_display_show_time) / 1000)) {
m_chat_display->Hide();
Modified: trunk/FreeOrion/UI/MultiplayerLobbyWnd.cpp
===================================================================
--- trunk/FreeOrion/UI/MultiplayerLobbyWnd.cpp 2008-12-03 03:50:16 UTC (rev 2691)
+++ trunk/FreeOrion/UI/MultiplayerLobbyWnd.cpp 2008-12-07 07:24:41 UTC (rev 2692)
@@ -234,7 +234,7 @@
m_saved_games_list->Disable();
if (!m_host) {
- for (int i = 0; i < m_new_load_game_buttons->NumButtons(); ++i) {
+ for (std::size_t i = 0; i < m_new_load_game_buttons->NumButtons(); ++i) {
m_new_load_game_buttons->DisableButton(i);
}
m_galaxy_setup_panel->Disable();
@@ -322,15 +322,15 @@
m_start_game_bn->Disable(!CanStart());
}
-void MultiplayerLobbyWnd::NewLoadClicked(int idx)
+void MultiplayerLobbyWnd::NewLoadClicked(std::size_t idx)
{
switch (idx) {
- case 0:
+ case std::size_t(0):
m_lobby_data.m_new_game = true;
m_galaxy_setup_panel->Disable(false);
m_saved_games_list->Disable();
break;
- case 1:
+ case std::size_t(1):
m_lobby_data.m_new_game = false;
m_galaxy_setup_panel->Disable();
m_saved_games_list->Disable(false);
Modified: trunk/FreeOrion/UI/MultiplayerLobbyWnd.h
===================================================================
--- trunk/FreeOrion/UI/MultiplayerLobbyWnd.h 2008-12-03 03:50:16 UTC (rev 2691)
+++ trunk/FreeOrion/UI/MultiplayerLobbyWnd.h 2008-12-07 07:24:41 UTC (rev 2692)
@@ -50,7 +50,7 @@
private:
void Init();
- void NewLoadClicked(int idx);
+ void NewLoadClicked(std::size_t idx);
void GalaxySetupPanelChanged();
void SaveGameChanged(GG::DropDownList::iterator it);
void PreviewImageChanged(boost::shared_ptr<GG::Texture> new_image);
Modified: trunk/FreeOrion/UI/ServerConnectWnd.cpp
===================================================================
--- trunk/FreeOrion/UI/ServerConnectWnd.cpp 2008-12-03 03:50:16 UTC (rev 2691)
+++ trunk/FreeOrion/UI/ServerConnectWnd.cpp 2008-12-07 07:24:41 UTC (rev 2692)
@@ -145,7 +145,7 @@
PopulateServerList();
}
-void ServerConnectWnd::HostOrJoinClicked(int idx)
+void ServerConnectWnd::HostOrJoinClicked(std::size_t idx)
{
EnableDisableControls();
}
Modified: trunk/FreeOrion/UI/ServerConnectWnd.h
===================================================================
--- trunk/FreeOrion/UI/ServerConnectWnd.h 2008-12-03 03:50:16 UTC (rev 2691)
+++ trunk/FreeOrion/UI/ServerConnectWnd.h 2008-12-07 07:24:41 UTC (rev 2692)
@@ -41,7 +41,7 @@
void Init();
void PopulateServerList();
void RefreshServerList();
- void HostOrJoinClicked(int idx);
+ void HostOrJoinClicked(std::size_t idx);
void ServerSelected(const GG::ListBox::SelectionSet& selections);
void IPAddressEdited(const std::string& str);
void NameEdited(const std::string& str);
Modified: trunk/FreeOrion/client/human/HumanClientApp.cpp
===================================================================
--- trunk/FreeOrion/client/human/HumanClientApp.cpp 2008-12-03 03:50:16 UTC (rev 2691)
+++ trunk/FreeOrion/client/human/HumanClientApp.cpp 2008-12-07 07:24:41 UTC (rev 2692)
@@ -78,7 +78,7 @@
#endif //ENABLE_CRASH_BACKTRACE
namespace {
- const int SERVER_CONNECT_TIMEOUT = 30000; // in ms
+ const unsigned int SERVER_CONNECT_TIMEOUT = 30000; // in ms
// command-line options
void AddOptions(OptionsDB& db)
@@ -202,7 +202,7 @@
bool failed = false;
if (galaxy_wnd.EndedWithOk()) {
- int start_time = Ticks();
+ unsigned int start_time = Ticks();
while (!Networking().ConnectToLocalHostServer()) {
if (SERVER_CONNECT_TIMEOUT < Ticks() - start_time) {
ClientUI::MessageBox(UserString("ERR_CONNECT_TIMED_OUT"), true);
@@ -253,7 +253,7 @@
}
server_name = "localhost";
}
- int start_time = Ticks();
+ unsigned int start_time = Ticks();
while (!Networking().ConnectToServer(server_name)) {
if (SERVER_CONNECT_TIMEOUT < Ticks() - start_time) {
ClientUI::MessageBox(UserString("ERR_CONNECT_TIMED_OUT"), true);
@@ -305,8 +305,7 @@
if (!GetOptionsDB().Get<bool>("force-external-server"))
StartServer();
- int start_time = Ticks();
- const int SERVER_CONNECT_TIMEOUT = 30000; // in ms
+ unsigned int start_time = Ticks();
while (!Networking().ConnectToLocalHostServer()) {
if (SERVER_CONNECT_TIMEOUT < Ticks() - start_time) {
ClientUI::MessageBox(UserString("ERR_CONNECT_TIMED_OUT"), true);
|