Rename Input to InputDialog to avoid the conflict with the Msp::Input namespace

[r2c2.git] / source / designer / designer.h

diff --git a/source/designer/designer.h b/source/designer/designer.h
index 0f9b35d6792aad4bd601335e72624a7b782352cb..d2cc5d212def4b2c520969b0e32ae0d0aef4c8ed 100644 (file)
--- a/source/designer/designer.h
+++ b/source/designer/designer.h
@@ -31,7 +31,6 @@ Distributed under the GPL
 #include "measure.h"
 #include "selection.h"
 
-class Input;
 class Toolbar;
 
 class Designer: public Msp::Application
@@ -42,8 +41,7 @@ private:
                SELECT,
                CATALOGUE,
                MANIPULATE,
-               MEASURE,
-               INPUT
+               MEASURE
        };
 
        Msp::Graphics::SimpleGLWindow window;
@@ -70,11 +68,8 @@ private:
        Selection selection;
        Manipulator manipulator;
        Measure measure;
-       Input *input;
        CameraController camera_ctl;
 
-       bool shift;
-
        Msp::Time::TimeStamp last_tick;
 
        static Msp::Application::RegApp<Designer> reg;
@@ -92,6 +87,11 @@ public:
        const Msp::GL::Camera &get_camera() const { return camera; }
        const Msp::GLtk::Resources &get_ui_resources() const { return ui_res; }
        Msp::GLtk::Root &get_root() const { return *root; }
+
+       void new_track();
+       void set_turnout_id();
+       void set_sensor_id();
+
        void edit_route(Marklin::Route &);
        Marklin::Route *get_current_route() const { return cur_route; }
        void add_selection_to_route();
@@ -100,7 +100,6 @@ public:
 private:
        void tick();
        void key_press(unsigned, unsigned, wchar_t);
-       void key_release(unsigned, unsigned);
        void button_press(int, int, unsigned, unsigned);
        void pointer_motion(int, int);
        void apply_camera();
@@ -111,12 +110,8 @@ private:
        void manipulation_done(bool);
        void measure_changed();
        void measure_done();
-       void set_tooltip(int, int, const std::string &);
-       void clear_tooltip();
-       void save_accept();
-       void turnout_id_accept();
-       void sensor_id_accept();
-       void input_dismiss();
+       void turnout_id_accept(const std::string &);
+       void sensor_id_accept(const std::string &);
        void view_all();
        std::string tooltip(int, int);
 };