Account for old versions of Pygments

[lyx.git] / src / PrinterParams.cpp

diff --git a/src/PrinterParams.cpp b/src/PrinterParams.cpp
index 0518d27850d5eb8d7dbfef16a6352eb265f2bf30..9da9c9a891c66d2d44ad88253ac4f61e32355867 100644 (file)
--- a/src/PrinterParams.cpp
+++ b/src/PrinterParams.cpp
@@ -12,56 +12,26 @@
 
 #include "PrinterParams.h"
 
-#include "support/lstrings.h"
-
-#include "support/assert.h"
+#include "LyXRC.h"
 
+#include "support/lassert.h"
+#include "support/lstrings.h"
 
-using namespace std;
 
 namespace lyx {
 
-
-PrinterParams::PrinterParams(Target t,
-                            string const & pname,
-                            string const & fname,
-                            bool all,
-                            unsigned int from,
-                            unsigned int to,
-                            bool odd,
-                            bool even,
-                            unsigned int copies,
-                            bool sorted,
-                            bool reverse)
-       : target(t),
-         printer_name(pname),
-         file_name(fname),
-         all_pages(all),
-         from_page(from),
-         to_page(to),
-         odd_pages(odd),
-         even_pages(even),
-         count_copies(copies),
-         sorted_copies(sorted),
-         reverse_order(reverse)
+PrinterParams::PrinterParams() 
 {
-       testInvariant();
-}
+       target = PRINTER;
+       all_pages = true;
+       from_page = 1;
+       to_page = 0;
+       odd_pages = true;
+       even_pages = true;
+       count_copies = 1;
+       sorted_copies = false;
+       reverse_order = false;
 
-
-PrinterParams::PrinterParams(PrinterParams const & pp)
-       : target(pp.target),
-         printer_name(pp.printer_name),
-         file_name(pp.file_name),
-         all_pages(pp.all_pages),
-         from_page(pp.from_page),
-         to_page(pp.to_page),
-         odd_pages(pp.odd_pages),
-         even_pages(pp.even_pages),
-         count_copies(pp.count_copies),
-         sorted_copies(pp.sorted_copies),
-         reverse_order(pp.reverse_order)
-{
        testInvariant();
 }
 
@@ -71,13 +41,15 @@ void PrinterParams::testInvariant() const
 #ifdef ENABLE_ASSERTIONS
        switch (target) {
        case PRINTER:
-               //LASSERT(!printer_name.empty(), /**/);
+               // We can't do this test, because no default printer
+               // may have been set.
+               // LASSERT(!printer_name.empty(), /**/);
                break;
        case FILE:
-               LASSERT(!file_name.empty(), /**/);
+               LATTEST(!file_name.empty());
                break;
        default:
-               LASSERT(false, /**/);
+               LATTEST(false);
                break;
        }
 #endif