diff options
-rw-r--r-- | display.h | 11 | ||||
-rw-r--r-- | qt-ui/printdialog.h | 2 | ||||
-rw-r--r-- | qt-ui/printoptions.cpp | 1 | ||||
-rw-r--r-- | qt-ui/printoptions.h | 11 |
4 files changed, 12 insertions, 13 deletions
@@ -35,17 +35,6 @@ typedef enum { extern struct divecomputer *select_dc(struct dive *); -struct print_options { - enum print_type { - DIVELIST, - TABLE, - STATISTICS - } type; - bool print_selected; - bool color_selected; - bool landscape; -}; - extern unsigned int dc_number; extern unsigned int amount_selected; diff --git a/qt-ui/printdialog.h b/qt-ui/printdialog.h index aaba7645b..bdcfbf733 100644 --- a/qt-ui/printdialog.h +++ b/qt-ui/printdialog.h @@ -3,7 +3,7 @@ #include <QDialog> #include <QPrinter> -#include "../display.h" +#include "printoptions.h" class QProgressBar; class PrintOptions; diff --git a/qt-ui/printoptions.cpp b/qt-ui/printoptions.cpp index 03f9d19e2..50ca8b7c2 100644 --- a/qt-ui/printoptions.cpp +++ b/qt-ui/printoptions.cpp @@ -1,5 +1,4 @@ #include "printoptions.h" -#include "display.h" PrintOptions::PrintOptions(QWidget *parent, struct print_options *printOpt) { diff --git a/qt-ui/printoptions.h b/qt-ui/printoptions.h index af845cb19..1e12efae7 100644 --- a/qt-ui/printoptions.h +++ b/qt-ui/printoptions.h @@ -5,6 +5,17 @@ #include "ui_printoptions.h" +struct print_options { + enum print_type { + DIVELIST, + TABLE, + STATISTICS + } type; + bool print_selected; + bool color_selected; + bool landscape; +}; + // should be based on a custom QPrintDialog class class PrintOptions : public QWidget { Q_OBJECT |