From e64f652281f0ef29c4015d5884981e671a6b4b01 Mon Sep 17 00:00:00 2001
From: Alison Watson <marrub.xz@gmail.com>
Date: Mon, 17 Jun 2019 07:15:26 -0400
Subject: [PATCH] tycho: organize better

---
 source/tycho/bindings.json                   | 4 ++--
 source/tycho/cc_source/project.cc            | 2 +-
 source/tycho/source/gui.rs                   | 8 ++++++++
 source/tycho/source/{qintr.rs => gui/ffi.rs} | 2 +-
 source/tycho/source/{qimpl => gui}/map.rs    | 2 +-
 source/tycho/source/main.rs                  | 3 +--
 source/tycho/source/qimpl.rs                 | 7 -------
 7 files changed, 14 insertions(+), 14 deletions(-)
 create mode 100644 source/tycho/source/gui.rs
 rename source/tycho/source/{qintr.rs => gui/ffi.rs} (65%)
 rename source/tycho/source/{qimpl => gui}/map.rs (99%)
 delete mode 100644 source/tycho/source/qimpl.rs

diff --git a/source/tycho/bindings.json b/source/tycho/bindings.json
index 8983c88..dd1f0cb 100644
--- a/source/tycho/bindings.json
+++ b/source/tycho/bindings.json
@@ -2,8 +2,8 @@
    "cppFile": "",
    "rust": {
       "dir": "",
-      "interfaceModule": "qintr",
-      "implementationModule": "qimpl"
+      "interfaceModule": "ffi",
+      "implementationModule": "gui"
    },
    "objects": {
       "MapModel": {
diff --git a/source/tycho/cc_source/project.cc b/source/tycho/cc_source/project.cc
index c08c9cf..1068140 100644
--- a/source/tycho/cc_source/project.cc
+++ b/source/tycho/cc_source/project.cc
@@ -21,7 +21,7 @@ ProjectModel::ProjectModel(ProjectModel &&o) :
 ProjectModel::~ProjectModel()
 {
    switch(modelType) {
-      case Map: delete modelMap;
+      case Map: delete modelMap; break;
    }
 }
 
diff --git a/source/tycho/source/gui.rs b/source/tycho/source/gui.rs
new file mode 100644
index 0000000..7ba0178
--- /dev/null
+++ b/source/tycho/source/gui.rs
@@ -0,0 +1,8 @@
+//! GUI implementation.
+
+mod ffi;
+mod map;
+
+pub use self::map::MapModel;
+
+// EOF
diff --git a/source/tycho/source/qintr.rs b/source/tycho/source/gui/ffi.rs
similarity index 65%
rename from source/tycho/source/qintr.rs
rename to source/tycho/source/gui/ffi.rs
index 5351b6a..9f2ec3f 100644
--- a/source/tycho/source/qintr.rs
+++ b/source/tycho/source/gui/ffi.rs
@@ -4,6 +4,6 @@
 
 use maraiah::ffi as libc;
 
-include!(concat!(env!("OUT_DIR"), "/src/qintr.rs"));
+include!(concat!(env!("OUT_DIR"), "/src/ffi.rs"));
 
 // EOF
diff --git a/source/tycho/source/qimpl/map.rs b/source/tycho/source/gui/map.rs
similarity index 99%
rename from source/tycho/source/qimpl/map.rs
rename to source/tycho/source/gui/map.rs
index 66cdb0d..4101746 100644
--- a/source/tycho/source/qimpl/map.rs
+++ b/source/tycho/source/gui/map.rs
@@ -1,6 +1,6 @@
 //! Map model.
 
-use crate::qintr::*;
+use super::ffi::*;
 //use memmap::Mmap;
 use maraiah::map;
 
diff --git a/source/tycho/source/main.rs b/source/tycho/source/main.rs
index 15625f4..79dbf54 100644
--- a/source/tycho/source/main.rs
+++ b/source/tycho/source/main.rs
@@ -1,8 +1,7 @@
 use maraiah::{err::*, ffi};
 
+mod gui;
 mod meta;
-mod qimpl;
-mod qintr;
 
 extern "C" {
    fn main_cc(app_name: *mut ffi::c_char);
diff --git a/source/tycho/source/qimpl.rs b/source/tycho/source/qimpl.rs
deleted file mode 100644
index c649578..0000000
--- a/source/tycho/source/qimpl.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-//! Qt implementation.
-
-mod map;
-
-pub use self::map::*;
-
-// EOF