Skip to content

Commit 84f72b7

Browse files
committed
Making use of qtgui's backgroundfileformat
Signed-off-by: Adarsh Balasubramanian <[email protected]>
1 parent 584d7d7 commit 84f72b7

File tree

5 files changed

+6
-196
lines changed

5 files changed

+6
-196
lines changed

avogadro/qtplugins/customelements/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@ avogadro_plugin(CustomElements
33
ExtensionPlugin
44
customelements.h
55
CustomElements
6-
"customelements.cpp;backgroundfileformat.cpp"
6+
"customelements.cpp"
77
)

avogadro/qtplugins/customelements/backgroundfileformat.cpp

Lines changed: 0 additions & 86 deletions
This file was deleted.

avogadro/qtplugins/customelements/backgroundfileformat.h

Lines changed: 0 additions & 107 deletions
This file was deleted.

avogadro/qtplugins/customelements/customelements.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
******************************************************************************/
1616

1717
#include "customelements.h"
18-
#include "backgroundfileformat.h"
1918

19+
#include <avogadro/qtgui/backgroundfileformat.h>
2020
#include <avogadro/qtgui/customelementdialog.h>
2121
#include <avogadro/qtgui/fileformatdialog.h>
2222
#include <avogadro/qtgui/molecule.h>
@@ -27,6 +27,7 @@
2727
#include <QtWidgets/QMessageBox>
2828
#include <QtWidgets/QProgressDialog>
2929

30+
using Avogadro::QtGui::BackgroundFileFormat;
3031
using Avogadro::QtGui::Molecule;
3132

3233
namespace Avogadro {

avogadro/qtplugins/customelements/customelements.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,9 @@ class QThread;
2424

2525
namespace Avogadro {
2626

27+
namespace QtGui {
2728
class BackgroundFileFormat;
29+
}
2830

2931
namespace QtPlugins {
3032

@@ -57,7 +59,7 @@ private slots:
5759
QAction* m_reassignUsingTool;
5860
QAction* m_reassignFromFile;
5961
QThread* m_fileReadThread;
60-
BackgroundFileFormat* m_threadedReader;
62+
QtGui::BackgroundFileFormat* m_threadedReader;
6163
QtGui::Molecule* m_fileReadMolecule;
6264
QProgressDialog* m_progressDialog;
6365

0 commit comments

Comments
 (0)