Making use of qtgui's backgroundfileformat

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

Hide file tree

Showing 6 changed files with 11 additions and 198 deletions.
diff --git a/avogadro/qtgui/backgroundfileformat.cpp b/avogadro/qtgui/backgroundfileformat.cpp
@@ -25,7 +25,8 @@ namespace QtGui {
 BackgroundFileFormat::BackgroundFileFormat(Io::FileFormat* format,
                                            QObject* aparent)
   : QObject(aparent), m_format(format), m_molecule(nullptr), m_success(false)
-{}
+{
+}
 
 BackgroundFileFormat::~BackgroundFileFormat()
 {

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>
@@ -28,6 +28,7 @@
 #include <QtWidgets/QProgressDialog>
 
 using Avogadro::QtGui::Molecule;
+using Avogadro::QtGui::BackgroundFileFormat;
 
 namespace Avogadro {
 namespace QtPlugins {
@@ -47,7 +48,9 @@ CustomElements::CustomElements(QObject* parent_)
   updateReassignAction();
 }
 
-CustomElements::~CustomElements() {}
+CustomElements::~CustomElements()
+{
+}
 
 QString CustomElements::description() const
 {

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;