removed olive:: qualifier from MainWindow class

app/core.cpp

@@ -126,7 +126,7 @@ void Core::Stop()
   delete main_window_;
 }
 
-olive::MainWindow *Core::main_window()
+MainWindow *Core::main_window()
 {
   return main_window_;
 }
@@ -366,7 +366,7 @@ void Core::StartGUI(bool full_screen)
           SLOT(FocusChanged(QWidget*, QWidget*)));
 
   // Create main window and open it
-  main_window_ = new olive::MainWindow();
+  main_window_ = new MainWindow();
   if (full_screen) {
     main_window_->showFullScreen();
   } else {

app/core.h

@@ -72,7 +72,7 @@ public:
    *
    * Pointer to the olive::MainWindow object, or nullptr if running in CLI mode.
    */
-  olive::MainWindow* main_window();
+  MainWindow* main_window();
 
   /**
    * @brief Import a list of files
@@ -252,7 +252,7 @@ private:
   /**
    * @brief Internal main window object
    */
-  olive::MainWindow* main_window_;
+  MainWindow* main_window_;
 
   /**
    * @brief Internal startup project object

app/window/mainwindow/mainwindow.cpp

@@ -38,7 +38,7 @@
 // Main menu bar
 #include "mainmenu.h"
 
-olive::MainWindow::MainWindow(QWidget *parent) :
+MainWindow::MainWindow(QWidget *parent) :
   QMainWindow(parent)
 {
 #ifdef Q_OS_WINDOWS
@@ -64,7 +64,7 @@ olive::MainWindow::MainWindow(QWidget *parent) :
   setMenuBar(main_menu);
 }
 
-void olive::MainWindow::SetFullscreen(bool fullscreen)
+void MainWindow::SetFullscreen(bool fullscreen)
 {
   if (fullscreen) {
     setWindowState(windowState() | Qt::WindowFullScreen);
@@ -73,7 +73,7 @@ void olive::MainWindow::SetFullscreen(bool fullscreen)
   }
 }
 
-void olive::MainWindow::ToggleMaximizedPanel()
+void MainWindow::ToggleMaximizedPanel()
 {
   if (premaximized_state_.isEmpty()) {
     // Assume nothing is maximized at the moment
@@ -107,7 +107,7 @@ void olive::MainWindow::ToggleMaximizedPanel()
   }
 }
 
-void olive::MainWindow::ProjectOpen(Project* p)
+void MainWindow::ProjectOpen(Project* p)
 {
   // FIXME Use settings data to create panels and restore state if they exist
   NodePanel* node_panel = PanelManager::instance()->CreatePanel<NodePanel>(this);
@@ -145,7 +145,7 @@ void olive::MainWindow::ProjectOpen(Project* p)
 #include "common/filefunctions.h"
 // End test code
 
-void olive::MainWindow::closeEvent(QCloseEvent *e)
+void MainWindow::closeEvent(QCloseEvent *e)
 {
   PanelManager::instance()->DeleteAllPanels();
 

app/window/mainwindow/mainwindow.h

@@ -25,8 +25,6 @@
 
 #include "project/project.h"
 
-namespace olive {
-
 /**
  * @brief Olive's main window responsible for docking widgets and the main menu bar.
  */
@@ -48,6 +46,4 @@ private:
 
 };
 
-}
-
 #endif