aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Lubomir I. Ivanov <neolit123@gmail.com>2013-12-04 15:44:31 +0200
committerGravatar Lubomir I. Ivanov <neolit123@gmail.com>2013-12-04 15:47:33 +0200
commite4f35fb51a549ed666728eaa947728686a415ac9 (patch)
treea1bd67794f0558222d5e93974551978cc6e538d9
parent95e00b0acd28117bbc3aded76f8079c08449bc17 (diff)
downloadsubsurface-e4f35fb51a549ed666728eaa947728686a415ac9.tar.gz
Print: fix some forward declarations
In the PrintLayout constructor we receive a pointer of PrintDialog, but the type is incomplete, as we only forward declare it in the class header. If we decide to eventually call a method from PrintDialog we also need to include printdialog.h in printlayout.cpp. The patch also fixes a similar issue in printdialog.h. Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
-rw-r--r--qt-ui/printdialog.cpp2
-rw-r--r--qt-ui/printdialog.h5
-rw-r--r--qt-ui/printlayout.cpp3
3 files changed, 7 insertions, 3 deletions
diff --git a/qt-ui/printdialog.cpp b/qt-ui/printdialog.cpp
index 683d584ad..48c5a5619 100644
--- a/qt-ui/printdialog.cpp
+++ b/qt-ui/printdialog.cpp
@@ -1,4 +1,6 @@
#include "printdialog.h"
+#include "printoptions.h"
+#include "printlayout.h"
#include "mainwindow.h"
#include <QDebug>
diff --git a/qt-ui/printdialog.h b/qt-ui/printdialog.h
index 924f21acc..e75502997 100644
--- a/qt-ui/printdialog.h
+++ b/qt-ui/printdialog.h
@@ -4,8 +4,9 @@
#include <QDialog>
#include <QPrinter>
#include "../display.h"
-#include "printoptions.h"
-#include "printlayout.h"
+
+class PrintOptions;
+class PrintLayout;
// should be based on a custom QPrintDialog class
class PrintDialog : public QDialog {
diff --git a/qt-ui/printlayout.cpp b/qt-ui/printlayout.cpp
index aa703698a..485d8a1d2 100644
--- a/qt-ui/printlayout.cpp
+++ b/qt-ui/printlayout.cpp
@@ -7,9 +7,10 @@
#include <QHeaderView>
#include "mainwindow.h"
#include "profilegraphics.h"
-#include "printlayout.h"
#include "../dive.h"
#include "../display.h"
+#include "printdialog.h"
+#include "printlayout.h"
#include "models.h"
#include "modeldelegates.h"