merged with master

2019-03-25 12:43:23 +11:00
parent e2c5c87a0a a3c1342f77
commit 93c009c7fd
83 changed files with 7823 additions and 1469 deletions
@@ -35,7 +35,7 @@ class LoadThread : public QThread
 {
  Q_OBJECT
 public:
-  LoadThread(const QString& filename, bool autorecovery, bool clear);
+  LoadThread(const QString& filename, bool autorecovery);
  void run();
 public slots:
  void cancel();
@@ -50,7 +50,6 @@ private slots:
  void success_func();
 private:
  bool autorecovery_;
-  bool clear_;
  QString filename_;

  bool load_worker(QFile& f, QXmlStreamReader& stream, int type);