Rename UISignaller -> SignalManager.

5 files changed, 18 insertions, 18 deletions

diff --git a/src/wx/dolby_certificate_dialog.cc b/src/wx/dolby_certificate_dialog.cc
index 15551a424..ad43f6479 100644
--- a/src/wx/dolby_certificate_dialog.cc
+++ b/src/wx/dolby_certificate_dialog.cc
@@ -21,7 +21,7 @@
 #include <curl/curl.h>
 #include "lib/compose.hpp"
 #include "lib/internet.h"
-#include "lib/ui_signaller.h"
+#include "lib/signal_manager.h"
 #include "dolby_certificate_dialog.h"
 #include "wx_util.h"
 
@@ -80,7 +80,7 @@ DolbyCertificateDialog::setup_countries ()
 	/* See DoremiCertificateDialog for discussion about this daft delay */
 	wxMilliSleep (200);
 #endif
-	ui_signaller->when_idle (boost::bind (&DolbyCertificateDialog::finish_setup_countries, this));
+	signal_manager->when_idle (boost::bind (&DolbyCertificateDialog::finish_setup_countries, this));
 }
 
 void
@@ -103,7 +103,7 @@ DolbyCertificateDialog::country_selected ()
 #ifdef DCPOMATIC_OSX
 	wxMilliSleep (200);
 #endif	
-	ui_signaller->when_idle (boost::bind (&DolbyCertificateDialog::finish_country_selected, this));
+	signal_manager->when_idle (boost::bind (&DolbyCertificateDialog::finish_country_selected, this));
 }
 
 void
@@ -126,7 +126,7 @@ DolbyCertificateDialog::cinema_selected ()
 #ifdef DCPOMATIC_OSX
 	wxMilliSleep (200);
 #endif
-	ui_signaller->when_idle (boost::bind (&DolbyCertificateDialog::finish_cinema_selected, this));
+	signal_manager->when_idle (boost::bind (&DolbyCertificateDialog::finish_cinema_selected, this));
 }
 
 void
@@ -161,7 +161,7 @@ DolbyCertificateDialog::download ()
 	wxMilliSleep (200);
 #endif
 
-	ui_signaller->when_idle (boost::bind (&DolbyCertificateDialog::finish_download, this));
+	signal_manager->when_idle (boost::bind (&DolbyCertificateDialog::finish_download, this));
 }
 
 void
diff --git a/src/wx/doremi_certificate_dialog.cc b/src/wx/doremi_certificate_dialog.cc
index 105555da9..578a7a72d 100644
--- a/src/wx/doremi_certificate_dialog.cc
+++ b/src/wx/doremi_certificate_dialog.cc
@@ -21,7 +21,7 @@
 #include <zip.h>
 #include "lib/compose.hpp"
 #include "lib/util.h"
-#include "lib/ui_signaller.h"
+#include "lib/signal_manager.h"
 #include "lib/internet.h"
 #include "doremi_certificate_dialog.h"
 #include "wx_util.h"
@@ -59,7 +59,7 @@ DoremiCertificateDialog::download ()
 	wxMilliSleep (200);
 #endif	
 
-	ui_signaller->when_idle (boost::bind (&DoremiCertificateDialog::finish_download, this, serial));
+	signal_manager->when_idle (boost::bind (&DoremiCertificateDialog::finish_download, this, serial));
 }
 
 void
diff --git a/src/wx/wscript b/src/wx/wscript
index a05774cd2..370f59c62 100644
--- a/src/wx/wscript
+++ b/src/wx/wscript
@@ -80,7 +80,7 @@ sources = """
           update_dialog.cc
           video_panel.cc
           wx_util.cc
-          wx_ui_signaller.cc
+          wx_signal_manager.cc
           """
 
 def configure(conf):
diff --git a/src/wx/wx_ui_signaller.cc b/src/wx/wx_signal_manager.cc
index 8fc6670d6..3d8b9992a 100644
--- a/src/wx/wx_ui_signaller.cc
+++ b/src/wx/wx_signal_manager.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -18,16 +18,16 @@
 */
 
 #include <wx/wx.h>
-#include "wx_ui_signaller.h"
+#include "wx_signal_manager.h"
 
-wxUISignaller::wxUISignaller (wxEvtHandler* h)
+wxSignalManager::wxSignalManager (wxEvtHandler* h)
 	: _handler (h)
 {
 
 }
 
 void
-wxUISignaller::wake_ui ()
+wxSignalManager::wake_ui ()
 {
 	wxCommandEvent event (-1, -1);
 	_handler->AddPendingEvent (event);
diff --git a/src/wx/wx_ui_signaller.h b/src/wx/wx_signal_manager.h
index 63f2049cd..ad18e6880 100644
--- a/src/wx/wx_ui_signaller.h
+++ b/src/wx/wx_signal_manager.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -17,18 +17,18 @@
 
 */
 
-#include "lib/ui_signaller.h"
+#include "lib/signal_manager.h"
 
 class wxEvtHandler;
 
-/** @class wxUISignaller
- *  @brief UISignaller for the wxWidgets event loop
+/** @class wxSignalManager
+ *  @brief SignalManager for the wxWidgets event loop
  */
 
-class wxUISignaller : public UISignaller
+class wxSignalManager : public SignalManager
 {
 public:
-	wxUISignaller (wxEvtHandler *);
+	wxSignalManager (wxEvtHandler *);
 	void wake_ui ();
 
 private: