Merge ssh://192.168.222.14/home/amoeller/devel/SheMov into archive_view

Conflicts:
	shemov.cpp
	shemov.h

1 files changed, 2 insertions, 4 deletions

diff --git a/shemov.h b/shemov.h
index 07d14cf..efccaa2 100644
--- a/shemov.h
+++ b/shemov.h
@@ -8,7 +8,7 @@
 #ifndef SHEMOV_H
 #define SHEMOV_H
 
-#include <QtWidgets/QMainWindow>
+#include <QMainWindow>
 #include <QVariant>
 
 class QTabWidget;
@@ -18,7 +18,6 @@ class QSignalMapper;
 class QActionGroup;
 class ArchiveTreeView;
 class NewMovieWizard;
-class DbAnalyzerDialog;
 class PicturesWidget;
 class SmTreeModel;
 class NewPicsDialog;
@@ -204,7 +203,7 @@ class SheMov : public QMainWindow {
         QAction *mArchiveFilesTypeA;
         QAction *mArchiveFilesFileNoA;
 
-        //DB analyzer actions
+        //DB analyze actions
         QAction *mAnalyzeActorsA;
         QAction *mAnalyzeGenresA;
         QAction *mAnalyzeSeriesA;
@@ -242,7 +241,6 @@ class SheMov : public QMainWindow {
 		ArchiveTreeView *mATree;
 		NewMovieWizard *mNewMovieWizard;
         NewPicsDialog *mNewPicsDialog;
-        DbAnalyzerDialog *mDbAnalyzerDialog;
         PicturesWidget *mPicWidget;
         ArchiveView *mArchive;
 };