From: Martin Ling <redacted>
Date: Tue, 20 Oct 2015 23:20:18 +0000 (+0100)
Subject: java: Remove overrides for overloaded methods.
X-Git-Tag: libsigrok-0.4.0~187
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=d4db558810aba7c3ee66510a036f48cecf0d9d0d;p=libsigrok.git

java: Remove overrides for overloaded methods.

These are now wrapped correctly without needing this.
---

diff --git a/bindings/java/org/sigrok/core/classes/classes.i b/bindings/java/org/sigrok/core/classes/classes.i
index 7e1919e2..ba95144b 100644
--- a/bindings/java/org/sigrok/core/classes/classes.i
+++ b/bindings/java/org/sigrok/core/classes/classes.i
@@ -193,72 +193,6 @@ MAP_COMMON(const sigrok::ConfigKey *, Glib::VariantBase, ConfigKey, Variant)
   }
 }
 
-/* Support Driver.scan() with no arguments. */
-%ignore sigrok::Driver::scan;
-
-%extend sigrok::Driver {
-  std::vector<std::shared_ptr<sigrok::HardwareDevice> > scan()
-  {
-    std::map<const sigrok::ConfigKey *, Glib::VariantBase> options;
-    return $self->scan(options);
-  }
-
-  std::vector<std::shared_ptr<sigrok::HardwareDevice> > scan(
-    std::map<const sigrok::ConfigKey *, Glib::VariantBase> options)
-  {
-    return $self->scan(options);
-  }
-}
-
-/* Support InputFormat.create_input() with or without options. */
-%ignore sigrok::InputFormat::create_input;
-
-%extend sigrok::InputFormat {
-  std::shared_ptr<sigrok::Input> create_input()
-  {
-    return $self->create_input();
-  }
-
-  std::shared_ptr<sigrok::Input> create_input(
-    std::map<std::string, Glib::VariantBase> options)
-  {
-    return $self->create_input(options);
-  }
-}
-
-/* Support OutputFormat.create_output() with or without options. */
-%ignore sigrok::OutputFormat::create_output;
-
-%extend sigrok::OutputFormat {
-  std::shared_ptr<sigrok::Output> create_output(
-    std::shared_ptr<sigrok::Device> device)
-  {
-    return $self->create_output(device);
-  }
-
-  std::shared_ptr<sigrok::Output> create_output(
-    std::shared_ptr<sigrok::Device> device,
-    std::map<std::string, Glib::VariantBase> options)
-  {
-    return $self->create_output(device, options);
-  }
-
-  std::shared_ptr<sigrok::Output> create_output(
-    std::string filename,
-    std::shared_ptr<sigrok::Device> device)
-  {
-    return $self->create_output(filename, device);
-  }
-
-  std::shared_ptr<sigrok::Output> create_output(
-    std::string filename,
-    std::shared_ptr<sigrok::Device> device,
-    std::map<std::string, Glib::VariantBase> options)
-  {
-    return $self->create_output(filename, device, options);
-  }
-}
-
 /* Pass JNIEnv parameter to C++ extension methods requiring it. */
 
 %typemap(in, numinputs=0) JNIEnv * %{