Move IceccMonMon::connect to MonMon

All implementations are going to need a "connect" method

1 files changed, 9 insertions, 10 deletions

diff --git a/src/icecc.cc b/src/icecc.cc
index 5e99981..7982f7c 100644
--- a/src/icecc.cc
+++ b/src/icecc.cc
@@ -10,18 +10,19 @@
 #include "fake_monitor.hh"
 #include "icecc.hh"
 #include "monitor.hh"
+#include "monmon.hh"
 #include "pango.hh"
 
 namespace {
 
-class IceccMonMonImpl : public IceccMonMon, virtual Monitor::Observer {
+class IceccMonMon : public MonMon, virtual Monitor::Observer {
 public:
-  IceccMonMonImpl(std::shared_ptr<PollLooper> const& looper, unsigned columns)
-    : IceccMonMon(looper), connected_(false), max_jobs_(0), jobs_(0),
-      requests_(0), force_columns_(columns) {
+  IceccMonMon(std::shared_ptr<PollLooper> const& looper, unsigned columns)
+    : MonMon(looper), connected_(false), max_jobs_(0), jobs_(0), requests_(0),
+      force_columns_(columns) {
   }
 
-  void connect(Args const* args) override {
+  bool connect(Args const* args) override {
     std::unique_ptr<Monitor> monitor;
 #if FAKE_MONITOR
     monitor = FakeMonitor::create(looper_);
@@ -32,6 +33,7 @@ public:
     monitor_->add_observer(this);
     monitor_->connect(args->arg("network", ""),
                       args->arg("scheduler", ""));
+    return true;
   }
 
 protected:
@@ -348,10 +350,7 @@ private:
 
 }  // namespace
 
-IceccMonMon::IceccMonMon(std::shared_ptr<PollLooper> const& looper)
-  : MonMon(looper) {}
-
-std::unique_ptr<IceccMonMon> create_icecc_monmon(
+std::unique_ptr<MonMon> create_icecc_monmon(
     std::shared_ptr<PollLooper> const& looper, unsigned columns) {
-  return std::make_unique<IceccMonMonImpl>(looper, columns);
+  return std::make_unique<IceccMonMon>(looper, columns);
 }