diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-12-06 19:59:47 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-12-11 11:56:22 +0000 |
| commit | 17df947ac256397311a11894062070f8069c7e75 (patch) | |
| tree | bb84d231ae31cab2e7e4d6546c62fcd88150b4d8 /src/wx | |
| parent | d499ec381ea5fbbae954531be9d66c9cc723c230 (diff) | |
Rename Server -> EncodeServer, ServerFinder -> EncodeServerFinder, ServerDescription -> EncodeServerDescription.
Diffstat (limited to 'src/wx')
| -rw-r--r-- | src/wx/server_dialog.cc | 2 | ||||
| -rw-r--r-- | src/wx/servers_list_dialog.cc | 10 | ||||
| -rw-r--r-- | src/wx/servers_list_dialog.h | 2 |
3 files changed, 8 insertions, 6 deletions
diff --git a/src/wx/server_dialog.cc b/src/wx/server_dialog.cc index 8b32ad3b9..18ed09e9e 100644 --- a/src/wx/server_dialog.cc +++ b/src/wx/server_dialog.cc @@ -17,7 +17,7 @@ */ -#include "lib/server.h" +#include "lib/encode_server.h" #include "server_dialog.h" #include "wx_util.h" diff --git a/src/wx/servers_list_dialog.cc b/src/wx/servers_list_dialog.cc index 0c46b1ecf..a05c42d4a 100644 --- a/src/wx/servers_list_dialog.cc +++ b/src/wx/servers_list_dialog.cc @@ -19,8 +19,8 @@ #include "servers_list_dialog.h" #include "wx_util.h" -#include "lib/server_finder.h" -#include "lib/server_description.h" +#include "lib/encode_server_finder.h" +#include "lib/encode_server_description.h" #include <boost/lexical_cast.hpp> #include <boost/foreach.hpp> @@ -63,7 +63,9 @@ ServersListDialog::ServersListDialog (wxWindow* parent) s->Layout (); s->SetSizeHints (this); - _server_finder_connection = ServerFinder::instance()->ServersListChanged.connect (boost::bind (&ServersListDialog::servers_list_changed, this)); + _server_finder_connection = EncodeServerFinder::instance()->ServersListChanged.connect ( + boost::bind (&ServersListDialog::servers_list_changed, this) + ); servers_list_changed (); } @@ -73,7 +75,7 @@ ServersListDialog::servers_list_changed () _list->DeleteAllItems (); int n = 0; - BOOST_FOREACH (ServerDescription i, ServerFinder::instance()->servers ()) { + BOOST_FOREACH (EncodeServerDescription i, EncodeServerFinder::instance()->servers ()) { wxListItem list_item; list_item.SetId (n); _list->InsertItem (list_item); diff --git a/src/wx/servers_list_dialog.h b/src/wx/servers_list_dialog.h index 6adc90655..08d9c739c 100644 --- a/src/wx/servers_list_dialog.h +++ b/src/wx/servers_list_dialog.h @@ -17,7 +17,7 @@ */ -#include "lib/server.h" +#include "lib/encode_server.h" #include <wx/wx.h> #include <wx/listctrl.h> #include <boost/signals2.hpp> |