Reorder NetVis members

[netvis.git] / source / netvis.h

diff --git a/source/netvis.h b/source/netvis.h
index 35d9952ac826e3aed295da08405da580c1ce20d1..47f5de5bd31e7b05ea80248fe1ae32f32ffa5669 100644 (file)
--- a/source/netvis.h
+++ b/source/netvis.h
@@ -15,7 +15,7 @@ Distributed unter the GPL
 #include <msp/debug/profiler.h>
 #include <msp/gbase/display.h>
 #include <msp/gbase/glcontext.h>
-#include <msp/gbase/window.h>
+#include <msp/gbase/simplewindow.h>
 #include <msp/gl/color.h>
 #include <msp/gl/font.h>
 #include <msp/time/timestamp.h>
@@ -29,30 +29,33 @@ class NetVis: public Msp::Application
 private:
        std::string iface;
        pcap_t *pcap;
-       std::list<Packet *> packets;
+       Resolver *resolver;
+       unsigned localnet;
+       unsigned localnet_mask;
+
+       Msp::Graphics::SimpleGLWindow *wnd;
+       Msp::GL::Font *font;
+
        unsigned max_hosts;
        unsigned max_visible_hosts;
        std::map<unsigned, Host *> hosts;
        std::map<unsigned, Host *> disabled_hosts;
-       Msp::Graphics::Display *dpy;
-       Msp::Graphics::Window *wnd;
-       Msp::Graphics::GLContext *glc;
-       Msp::Time::TimeStamp tick_t;
+       std::list<Packet *> packets;
        std::map<unsigned, Msp::GL::Color> port_colors;
-       Msp::GL::Font *font;
-       Msp::Debug::Profiler profiler;
        bool draw_labels;
        bool blend;
-       Resolver *resolver;
-       unsigned localnet;
-       unsigned localnet_mask;
+
+       Msp::Time::TimeStamp tick_t;
        Msp::Time::TimeStamp fps_t;
        unsigned frames;
        float fps;
 
+       Msp::Debug::Profiler profiler;
+
 public:
        NetVis(int, char **);
-       int main();
+       ~NetVis();
+
        const Msp::GL::Font &get_font() const { return *font; }
        const std::map<unsigned, Host *> &get_hosts() const { return hosts; }
 private: