Making use of qtgui's backgroundfileformat

Signed-off-by: Adarsh Balasubramanian <[email protected]>
OpenChemistry · Sep 28, 2018 · 84f72b7 · 84f72b7
1 parent 584d7d7
commit 84f72b7
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 196 deletions.
diff --git a/avogadro/qtplugins/customelements/CMakeLists.txt b/avogadro/qtplugins/customelements/CMakeLists.txt
@@ -3,5 +3,5 @@ avogadro_plugin(CustomElements
   ExtensionPlugin
   customelements.h
   CustomElements
-  "customelements.cpp;backgroundfileformat.cpp"
+  "customelements.cpp"
 )
diff --git a/avogadro/qtplugins/customelements/backgroundfileformat.cpp b/avogadro/qtplugins/customelements/backgroundfileformat.cpp
diff --git a/avogadro/qtplugins/customelements/backgroundfileformat.h b/avogadro/qtplugins/customelements/backgroundfileformat.h
diff --git a/avogadro/qtplugins/customelements/customelements.cpp b/avogadro/qtplugins/customelements/customelements.cpp
@@ -15,8 +15,8 @@
 ******************************************************************************/
 
 #include "customelements.h"
-#include "backgroundfileformat.h"
 
+#include <avogadro/qtgui/backgroundfileformat.h>
 #include <avogadro/qtgui/customelementdialog.h>
 #include <avogadro/qtgui/fileformatdialog.h>
 #include <avogadro/qtgui/molecule.h>
@@ -27,6 +27,7 @@
 #include <QtWidgets/QMessageBox>
 #include <QtWidgets/QProgressDialog>
 
+using Avogadro::QtGui::BackgroundFileFormat;
 using Avogadro::QtGui::Molecule;
 
 namespace Avogadro {

diff --git a/avogadro/qtplugins/customelements/customelements.h b/avogadro/qtplugins/customelements/customelements.h
@@ -24,7 +24,9 @@ class QThread;
 
 namespace Avogadro {
 
+namespace QtGui {
 class BackgroundFileFormat;
+}
 
 namespace QtPlugins {
 
@@ -57,7 +59,7 @@ private slots:
   QAction* m_reassignUsingTool;
   QAction* m_reassignFromFile;
   QThread* m_fileReadThread;
-  BackgroundFileFormat* m_threadedReader;
+  QtGui::BackgroundFileFormat* m_threadedReader;
   QtGui::Molecule* m_fileReadMolecule;
   QProgressDialog* m_progressDialog;