git rid of thaose dangerous by name implicits

meetuparchive · Apr 3, 2010 · c1cd8c5 · c1cd8c5
1 parent 974e59e
commit c1cd8c5
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 13 deletions.
diff --git a/src/main/scala/Main.scala b/src/main/scala/Main.scala
@@ -27,8 +27,8 @@ class Main extends ScalaActivity {
       new AlertDialog.Builder(Main.this)
         .setTitle("Connection Error")
         .setMessage("Snapup requires a network connection to retrieve your Meetups.")
-        .setPositiveButton("Exit", exit)
-        .setOnCancelListener(exit)
+        .setPositiveButton("Exit", () => exit)
+        .setOnCancelListener(() => exit)
         .show()
     }
   }

diff --git a/src/main/scala/Members.scala b/src/main/scala/Members.scala
@@ -52,7 +52,7 @@ class Members extends ListActivity with ScalaActivity {
     text_!(R.id.group_name).setText(group_name)
     text_!(R.id.event_time).setText(extras("event_time"))
     val snap_photo = findViewById(R.id.snap_photo).asInstanceOf[Button];
-    snap_photo.setOnClickListener {
+    snap_photo.setOnClickListener { () =>
       startActivityForResult(new Intent(MediaStore.ACTION_IMAGE_CAPTURE).putExtra(MediaStore.EXTRA_OUTPUT, Uri.fromFile(image_f)), 0)
     }
     RsvpCache(prefs)(event_id) { rsvps =>
@@ -132,11 +132,11 @@ class Members extends ListActivity with ScalaActivity {
     val dialog = new AlertDialog.Builder(this)
       .setTitle(event_name)
       .setMessage("Photo Caption: (optional)")
-      .setPositiveButton("Post", block(input.getText.toString))
-      .setNegativeButton("Cancel", clean_image())
-      .setOnCancelListener(clean_image())
+      .setPositiveButton("Post", () => block(input.getText.toString))
+      .setNegativeButton("Cancel", () => clean_image())
+      .setOnCancelListener(() => clean_image())
       .create()
-    dialog.setOnDismissListener(input.setVisibility(View.GONE))
+    dialog.setOnDismissListener(() => input.setVisibility(View.GONE))
     dialog.setView(input, 15, 15, 15, 15)
     dialog.show()
   }
@@ -148,8 +148,8 @@ class Members extends ListActivity with ScalaActivity {
       .setPositiveButton("Retry", new DialogInterface.OnClickListener {
         def onClick(dialog: DialogInterface, which: Int) { try_upload(event_id, caption) }
       })
-      .setNeutralButton("Okay", clean_image())
-      .setOnCancelListener(clean_image())
+      .setNeutralButton("Okay", () => clean_image())
+      .setOnCancelListener(() => clean_image())
       .create()
       .show()
   }

diff --git a/src/main/scala/ScalaActivity.scala b/src/main/scala/ScalaActivity.scala
@@ -13,16 +13,16 @@ trait ScalaActivity extends Activity with PrefEditing {
       def run { block }
     })
   }
-  implicit def f2cancel(block: => Unit) = new DialogInterface.OnCancelListener {
+  implicit def f2cancel(block: () => Unit) = new DialogInterface.OnCancelListener {
     def onCancel(dialog: DialogInterface) { block }
   }
-  implicit def f2click(block: => Unit) = new DialogInterface.OnClickListener {
+  implicit def f2click(block: () => Unit) = new DialogInterface.OnClickListener {
     def onClick(dialog: DialogInterface, which: Int) { block }
   }
-  implicit def f2dismissal(block: => Unit) = new DialogInterface.OnDismissListener {
+  implicit def f2dismissal(block: () => Unit) = new DialogInterface.OnDismissListener {
     def onDismiss(dialog: DialogInterface) { block }
   }
-  implicit def f2viewclick(block: => Unit) = new View.OnClickListener {
+  implicit def f2viewclick(block: () => Unit) = new View.OnClickListener {
     def onClick(view: View) { block }
   }
   def text_!(id: Int) = findViewById(id).asInstanceOf[TextView]