gui: make FS part of the main window

4 files changed, 9 insertions, 7 deletions

diff --git a/src/gui/debate.cc b/src/gui/debate.cc
index b09d80a5..efa3bb3d 100644
--- a/src/gui/debate.cc
+++ b/src/gui/debate.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2011, Gabriel Dos Reis.
+// Copyright (C) 2011-2013, Gabriel Dos Reis.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -51,7 +51,7 @@ namespace OpenAxiom {
    }
 
   Debate::Debate(QWidget* parent, Command& cmd)
-        : QScrollArea(parent), conv(*this), fs(cmd.root_dir) {
+        : QScrollArea(parent), conv(*this) {
       setWidget(&conv);
       setViewportMargins(0, 0, 0, 0);
       viewport()->setAutoFillBackground(true);
diff --git a/src/gui/debate.h b/src/gui/debate.h
index 6fc9b84d..35463fcc 100644
--- a/src/gui/debate.h
+++ b/src/gui/debate.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2011, Gabriel Dos Reis.
+// Copyright (C) 2011-2013, Gabriel Dos Reis.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -48,7 +48,6 @@ namespace OpenAxiom {
       ~Debate();
 
       Conversation* exchanges() { return &conv; }
-      Filesystem* filesystem() { return &fs; }
 
    protected:
       void resizeEvent(QResizeEvent*);
@@ -58,7 +57,6 @@ namespace OpenAxiom {
 
    private:
       Conversation conv;
-      Filesystem fs;
    };
 }
 
diff --git a/src/gui/main-window.cc b/src/gui/main-window.cc
index c429d753..ea8b94f5 100644
--- a/src/gui/main-window.cc
+++ b/src/gui/main-window.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2011, Gabriel Dos Reis.
+// Copyright (C) 2011-2013, Gabriel Dos Reis.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -55,7 +55,7 @@ namespace OpenAxiom {
       w->resize(w->size() + diff);
    }
 
-  MainWindow::MainWindow(Command& cmd) : tabs(this) {
+   MainWindow::MainWindow(Command& cmd) : fs(cmd.root_dir), tabs(this) {
       setCentralWidget(&tabs);
       Debate* debate = new Debate(&tabs, cmd);
       tabs.addTab(debate, "Main Frame");
diff --git a/src/gui/main-window.h b/src/gui/main-window.h
index 5d270df3..1e6eeb20 100644
--- a/src/gui/main-window.h
+++ b/src/gui/main-window.h
@@ -44,7 +44,11 @@ namespace OpenAxiom {
      MainWindow(Command&);
       ~MainWindow();
 
+      // Pointer to the root file system of the OpenAxiom installation
+      Filesystem* filesystem() { return &fs; }
+      
    private:
+      Filesystem fs;
       QTabWidget tabs;
    };
 }