diff options
| author | Arno <am@disconnect.de> | 2013-03-03 12:05:21 +0100 |
|---|---|---|
| committer | Arno <am@disconnect.de> | 2013-03-03 12:05:21 +0100 |
| commit | a0fe997bbe54b98a6338aa28d8b008266e423081 (patch) | |
| tree | a949fcccf3485359684344a2a64e0b67a3962073 | |
| parent | 1ddfe1550f718f268c8fd6f333f83898907c9ba9 (diff) | |
| download | SheMov-a0fe997bbe54b98a6338aa28d8b008266e423081.tar.gz SheMov-a0fe997bbe54b98a6338aa28d8b008266e423081.tar.bz2 SheMov-a0fe997bbe54b98a6338aa28d8b008266e423081.zip | |
Port to Qt5
* Change #include to qt5
* Fix missing QX11Info
* use explicit constructor for QVariant(QColor)
* use beginResetModel() and endResetModel() instead of reset(). The
latter was removed. Hopefully it still works :)
49 files changed, 269 insertions, 266 deletions
diff --git a/archivetreeview.cpp b/archivetreeview.cpp index 5eaa857..79d3af0 100644 --- a/archivetreeview.cpp +++ b/archivetreeview.cpp @@ -5,10 +5,10 @@ 2 of the License, or (at your option) any later version. */ -#include <QTreeView> -#include <QSplitter> -#include <QHBoxLayout> -#include <QVBoxLayout> +#include <QtWidgets/QTreeView> +#include <QtWidgets/QSplitter> +#include <QtWidgets/QHBoxLayout> +#include <QtWidgets/QVBoxLayout> #include <QItemSelectionModel> #include <QAbstractItemModel> #include <QItemSelection> @@ -16,22 +16,22 @@ #include <QSettings> #include <QHash> #include <QProcess> -#include <QMessageBox> +#include <QtWidgets/QMessageBox> #include <QSqlDatabase> #include <QSqlQuery> -#include <QMenu> -#include <QAction> +#include <QtWidgets/QMenu> +#include <QtWidgets/QAction> #include <QContextMenuEvent> -#include <QLabel> -#include <QPushButton> -#include <QHBoxLayout> -#include <QVBoxLayout> +#include <QtWidgets/QLabel> +#include <QtWidgets/QPushButton> +#include <QtWidgets/QHBoxLayout> +#include <QtWidgets/QVBoxLayout> #include <QProcess> #include <QUrl> -#include <QMessageBox> +#include <QtWidgets/QMessageBox> #include <QClipboard> -#include <QApplication> -#include <QHeaderView> +#include <QtWidgets/QApplication> +#include <QtWidgets/QHeaderView> #include "archivetreeview.h" #include "smglobals.h" diff --git a/archivetreeview.h b/archivetreeview.h index 392e2ec..08173db 100644 --- a/archivetreeview.h +++ b/archivetreeview.h @@ -8,11 +8,11 @@ #ifndef ARCHIVETREEVIEW_H #define ARCHIVETREEVIEW_H -#include <QWidget> +#include <QtWidgets/QWidget> #include <QModelIndexList> #include <QList> #include <QSqlDatabase> -#include <QTreeView> +#include <QtWidgets/QTreeView> #include "smtreemodel.h" #include "smdialog.h" diff --git a/configurationdialog.cpp b/configurationdialog.cpp index 82623e8..ce36ee6 100644 --- a/configurationdialog.cpp +++ b/configurationdialog.cpp @@ -5,38 +5,38 @@ 2 of the License, or (at your option) any later version. */ -#include <QPushButton> -#include <QTabWidget> -#include <QHBoxLayout> -#include <QVBoxLayout> -#include <QGridLayout> -#include <QFormLayout> -#include <QLineEdit> -#include <QLabel> -#include <QComboBox> -#include <QDirModel> -#include <QCompleter> -#include <QApplication> +#include <QtWidgets/QPushButton> +#include <QtWidgets/QTabWidget> +#include <QtWidgets/QHBoxLayout> +#include <QtWidgets/QVBoxLayout> +#include <QtWidgets/QGridLayout> +#include <QtWidgets/QFormLayout> +#include <QtWidgets/QLineEdit> +#include <QtWidgets/QLabel> +#include <QtWidgets/QComboBox> +#include <QtWidgets/QDirModel> +#include <QtWidgets/QCompleter> +#include <QtWidgets/QApplication> #include <QSettings> #include <QRegExp> #include <QFileInfo> -#include <QGroupBox> -#include <QCheckBox> -#include <QSpinBox> +#include <QtWidgets/QGroupBox> +#include <QtWidgets/QCheckBox> +#include <QtWidgets/QSpinBox> #include <QFileInfo> -#include <QMessageBox> +#include <QtWidgets/QMessageBox> #include <QFile> #include <QTextStream> #include <QRegExpValidator> #include <QSignalMapper> #include <QColor> -#include <QColorDialog> +#include <QtWidgets/QColorDialog> #include <QPalette> #include <QImage> #include <QPainter> #include <QStandardItemModel> #include <QStandardItem> -#include <QDesktopWidget> +#include <QtWidgets/QDesktopWidget> #include "configurationdialog.h" #include "programconfigurator.h" @@ -422,9 +422,9 @@ void ConfigurationDialog::readSettings(){ mDatabasePassword->setText(s.value("database/dbpass").toString()); //read colors - QVariant seen = s.value("ui/seencolor", Qt::red); + QVariant seen = s.value("ui/seencolor", QVariant(QColor(Qt::red))); mColors.insert(mSeenColor, seen.value<QColor>()); - QVariant clip = s.value("ui/clipcolor", Qt::darkBlue); + QVariant clip = s.value("ui/clipcolor", QVariant(QColor(Qt::darkBlue))); mColors.insert(mClipboardColor, clip.value<QColor>()); QVariant base = s.value("ui/basecolor", qApp->palette().base().color()); mColors.insert(mBaseColor, base.value<QColor>()); @@ -432,13 +432,13 @@ void ConfigurationDialog::readSettings(){ mColors.insert(mAlternateBaseColor, alternate.value<QColor>()); QVariant font = s.value("ui/fontcolor", qApp->palette().foreground().color()); mColors.insert(mFontColor, font.value<QColor>()); - QVariant local = s.value("ui/localcolor", Qt::darkBlue); + QVariant local = s.value("ui/localcolor", QVariant(QColor(Qt::darkBlue))); mColors.insert(mLocalColor, local.value<QColor>()); - QVariant archived = s.value("ui/archivedcolor", Qt::black); + QVariant archived = s.value("ui/archivedcolor", QVariant(QColor(Qt::black))); mColors.insert(mArchivedColor, archived.value<QColor>()); - QVariant favorite = s.value("ui/favoritecolor", Qt::red); + QVariant favorite = s.value("ui/favoritecolor", QVariant(QColor(Qt::red))); mColors.insert(mFavoriteColor, favorite.value<QColor>()); - QVariant pvbackground = s.value("ui/pvbgcolor", Qt::red); + QVariant pvbackground = s.value("ui/pvbgcolor", QVariant(QColor(Qt::red))); mColors.insert(mPVBgColor, pvbackground.value<QColor>()); QHash<QWidget*, QColor>::const_iterator it; for(it = mColors.constBegin(); it != mColors.constEnd(); ++it){ @@ -475,7 +475,7 @@ void ConfigurationDialog::writeSettings(){ s.setValue("paths/strippath", mStripPath->text()); s.setValue("paths/coverpath", mCoverPath->text()); - s.setValue("ui/folderIcon", mIconForFolder->currentText()); + s.setValue("ui/foldericon", mIconForFolder->currentText()); s.setValue("ui/hoverpics", (mHoverPics->checkState() == Qt::Checked)); s.setValue("ui/hoverarchive", (mHoverArchive->checkState() == Qt::Checked)); s.setValue("ui/hoveropacity", mHoverOpacity->value()); diff --git a/consistencycheck.cpp b/consistencycheck.cpp index 7330cd2..759e2ae 100644 --- a/consistencycheck.cpp +++ b/consistencycheck.cpp @@ -5,11 +5,11 @@ 2 of the License, or (at your option) any later version. */ -#include <QLabel> -#include <QPushButton> -#include <QPlainTextEdit> -#include <QHBoxLayout> -#include <QVBoxLayout> +#include <QtWidgets/QLabel> +#include <QtWidgets/QPushButton> +#include <QtWidgets/QPlainTextEdit> +#include <QtWidgets/QHBoxLayout> +#include <QtWidgets/QVBoxLayout> #include <QSqlQuery> #include <QFileInfo> #include <QSignalMapper> @@ -19,13 +19,13 @@ #include <QTextCharFormat> #include <QBrush> #include <QTextBlock> -#include <QCheckBox> +#include <QtWidgets/QCheckBox> #include <QSettings> #include <QDir> -#include <QFileDialog> -#include <QMessageBox> -#include <QProgressBar> -#include <QGroupBox> +#include <QtWidgets/QFileDialog> +#include <QtWidgets/QMessageBox> +#include <QtWidgets/QProgressBar> +#include <QtWidgets/QGroupBox> #include "consistencycheck.h" #include "helper.h" diff --git a/dbanalyzer.cpp b/dbanalyzer.cpp index 7243e68..2996fa0 100644 --- a/dbanalyzer.cpp +++ b/dbanalyzer.cpp @@ -6,19 +6,19 @@ */ #include <QSqlQuery> -#include <QTableWidget> -#include <QTreeView> -#include <QPushButton> -#include <QHBoxLayout> -#include <QVBoxLayout> +#include <QtWidgets/QTableWidget> +#include <QtWidgets/QTreeView> +#include <QtWidgets/QPushButton> +#include <QtWidgets/QHBoxLayout> +#include <QtWidgets/QVBoxLayout> #include <QMutexLocker> -#include <QTableWidget> +#include <QtWidgets/QTableWidget> #include <QModelIndex> -#include <QLabel> +#include <QtWidgets/QLabel> #include <QColor> -#include <QMenu> -#include <QAction> -#include <QStackedLayout> +#include <QtWidgets/QMenu> +#include <QtWidgets/QAction> +#include <QtWidgets/QStackedLayout> #include "dbanalyzer.h" #include "smtreemodel.h" diff --git a/dbanalyzer.h b/dbanalyzer.h index c0b8f14..eec9f5a 100644 --- a/dbanalyzer.h +++ b/dbanalyzer.h @@ -12,7 +12,7 @@ #include <QVariant> #include <QList> #include <QHash> -#include <QDialog> +#include <QtWidgets/QDialog> #include <QSqlDatabase> #include <QMutex> #include <QModelIndex> diff --git a/filepropertiesdialog.cpp b/filepropertiesdialog.cpp index 60b4ea8..a49b863 100644 --- a/filepropertiesdialog.cpp +++ b/filepropertiesdialog.cpp @@ -5,16 +5,16 @@ 2 of the License, or (at your option) any later version. */ -#include <QVBoxLayout> -#include <QHBoxLayout> -#include <QLabel> -#include <QTreeView> -#include <QPushButton> +#include <QtWidgets/QVBoxLayout> +#include <QtWidgets/QHBoxLayout> +#include <QtWidgets/QLabel> +#include <QtWidgets/QTreeView> +#include <QtWidgets/QPushButton> #include <QSettings> #include <QColor> #include <QVariant> #include <QPalette> -#include <QTabWidget> +#include <QtWidgets/QTabWidget> #include "filepropertiesdialog.h" #include "seriesmetadatamodel.h" diff --git a/filestreemodel.cpp b/filestreemodel.cpp index 4f57267..b841e8a 100644 --- a/filestreemodel.cpp +++ b/filestreemodel.cpp @@ -14,7 +14,7 @@ #include <QProcess> #include <QImage> #include <QDataStream> -#include <QDesktopServices> +#include <QStandardPaths> #include <QDir> #include <QFont> #include <QSettings> @@ -518,8 +518,8 @@ bool FilesTreeModel::updateSeries(int newSeries, QList<QPersistentModelIndex> fi void FilesTreeModel::readCache(){ - QString settingsDir = QDesktopServices::storageLocation(QDesktopServices::DataLocation); - QString cacheFile = QString("%1/%2").arg(settingsDir).arg("sizeduration.cache"); + QString settingsDir = QStandardPaths::writableLocation(QStandardPaths::DataLocation); + QString cacheFile = QString("%1/%2").arg(settingsDir).arg("sizeduration.cache"); QFileInfo fi(cacheFile); if(!fi.exists()){ return; @@ -542,12 +542,12 @@ void FilesTreeModel::readCache(){ } void FilesTreeModel::writeCache(){ - QString settingsDir = QDesktopServices::storageLocation(QDesktopServices::DataLocation); + QString settingsDir = QStandardPaths::writableLocation(QStandardPaths::DataLocation); QFileInfo fi(settingsDir); if(!fi.exists()){ QDir root = QDir::root(); root.mkpath(settingsDir); - } + } QString cacheFile = QString("%1/%2").arg(settingsDir).arg("sizeduration.cache"); QFile cache(cacheFile); cache.open(QIODevice::WriteOnly); @@ -562,11 +562,11 @@ void FilesTreeModel::writeCache(){ void FilesTreeModel::readSettings(){ QSettings s; - QVariant local = s.value("ui/localcolor", Qt::darkBlue); + QVariant local = s.value("ui/localcolor", QVariant(QColor(Qt::darkBlue))); mLocalColor = local.value<QColor>(); - QVariant archived = s.value("ui/archivedcolor", Qt::black); + QVariant archived = s.value("ui/archivedcolor", QVariant(QColor(Qt::black))); mArchivedColor = archived.value<QColor>(); - QVariant favorite = s.value("ui/favoritecolor", Qt::red); + QVariant favorite = s.value("ui/favoritecolor", QVariant(QColor(Qt::red))); mFavoriteColor = favorite.value<QColor>(); } diff --git a/filestreewidget.cpp b/filestreewidget.cpp index 401578a..669a57a 100644 --- a/filestreewidget.cpp +++ b/filestreewidget.cpp @@ -5,24 +5,24 @@ 2 of the License, or (at your option) any later version. */ -#include <QHBoxLayout> -#include <QVBoxLayout> +#include <QtWidgets/QHBoxLayout> +#include <QtWidgets/QVBoxLayout> #include <QSettings> -#include <QMessageBox> +#include <QtWidgets/QMessageBox> #include <QFile> #include <QDir> #include <QContextMenuEvent> -#include <QMenu> -#include <QLabel> -#include <QSpinBox> -#include <QPushButton> +#include <QtWidgets/QMenu> +#include <QtWidgets/QLabel> +#include <QtWidgets/QSpinBox> +#include <QtWidgets/QPushButton> #include <QProcess> -#include <QFileDialog> +#include <QtWidgets/QFileDialog> #include <QSettings> #include <QEvent> #include <QSettings> -#include <QHeaderView> -#include <QInputDialog> +#include <QtWidgets/QHeaderView> +#include <QtWidgets/QInputDialog> #include <QPainter> #include <QTextDocument> #include <QImage> diff --git a/filestreewidget.h b/filestreewidget.h index 77c1da3..5068b91 100644 --- a/filestreewidget.h +++ b/filestreewidget.h @@ -8,9 +8,9 @@ #ifndef FILESTREEWIDGET_H #define FILESTREEWIDGET_H -#include <QWidget> -#include <QTreeView> -#include <QDialog> +#include <QtWidgets/QWidget> +#include <QtWidgets/QTreeView> +#include <QtWidgets/QDialog> #include <QPersistentModelIndex> #include <QSortFilterProxyModel> diff --git a/filesystemdirproxy.cpp b/filesystemdirproxy.cpp index b43fe62..67cf2a4 100644 --- a/filesystemdirproxy.cpp +++ b/filesystemdirproxy.cpp @@ -5,7 +5,7 @@ 2 of the License, or (at your option) any later version. */ -#include <QFileSystemModel> +#include <QtWidgets/QFileSystemModel> #include <QModelIndex> #include "filesystemdirproxy.h" diff --git a/filesystemfileproxy.cpp b/filesystemfileproxy.cpp index 7c49258..ddf5d86 100644 --- a/filesystemfileproxy.cpp +++ b/filesystemfileproxy.cpp @@ -7,7 +7,7 @@ #include <QModelIndex> #include <QVariant> -#include <QFileSystemModel> +#include <QtWidgets/QFileSystemModel> #include <QFileInfo> #include <QDateTime> diff --git a/filesystemwidget.cpp b/filesystemwidget.cpp index 60ae550..b3ab4e1 100644 --- a/filesystemwidget.cpp +++ b/filesystemwidget.cpp @@ -5,21 +5,21 @@ 2 of the License, or (at your option) any later version. */ -#include <QFileSystemModel> -#include <QTreeView> +#include <QtWidgets/QFileSystemModel> +#include <QtWidgets/QTreeView> #include <QSettings> #include <QDir> -#include <QSplitter> -#include <QVBoxLayout> -#include <QHBoxLayout> -#include <QLineEdit> -#include <QLabel> -#include <QCompleter> +#include <QtWidgets/QSplitter> +#include <QtWidgets/QVBoxLayout> +#include <QtWidgets/QHBoxLayout> +#include <QtWidgets/QLineEdit> +#include <QtWidgets/QLabel> +#include <QtWidgets/QCompleter> #include <QProcess> -#include <QApplication> -#include <QMessageBox> +#include <QtWidgets/QApplication> +#include <QtWidgets/QMessageBox> #include <QFile> -#include <QAction> +#include <QtWidgets/QAction> #include <QRegExp> #include <QFile> #include <QTextStream> diff --git a/filesystemwidget.h b/filesystemwidget.h index 9541404..744a3d3 100644 --- a/filesystemwidget.h +++ b/filesystemwidget.h @@ -8,9 +8,9 @@ #ifndef FILESYSTEMWIDGET_H #define FILESYSTEMWIDGET_H -#include <QWidget> +#include <QtWidgets/QWidget> #include <QPair> -#include <QFileSystemModel> +#include <QtWidgets/QFileSystemModel> #include <QHash> #include <QSqlDatabase> #include <QDateTime> diff --git a/fileview.cpp b/fileview.cpp index bedd6ef..dba2948 100644 --- a/fileview.cpp +++ b/fileview.cpp @@ -6,15 +6,15 @@ */ #include <QContextMenuEvent> -#include <QMenu> -#include <QAction> +#include <QtWidgets/QMenu> +#include <QtWidgets/QAction> #include <QKeyEvent> #include <QModelIndex> #include <QRegExp> -#include <QFileSystemModel> +#include <QtWidgets/QFileSystemModel> #include <QSortFilterProxyModel> -#include <QAction> -#include <QApplication> +#include <QtWidgets/QAction> +#include <QtWidgets/QApplication> #include <QEvent> #include <QSettings> #include <QModelIndex> @@ -23,7 +23,7 @@ #include <QList> #include <QDir> #include <QSortFilterProxyModel> -#include <QInputDialog> +#include <QtWidgets/QInputDialog> #include "fileview.h" #include "hoverwindow.h" @@ -8,7 +8,7 @@ #ifndef FILEVIEW_H #define FILEVIEW_H -#include <QTreeView> +#include <QtWidgets/QTreeView> class QContextMenuEvent; class QKeyEvent; @@ -18,9 +18,9 @@ #include <QTemporaryFile> #include <QProcess> #include <QRect> -#include <QWidget> -#include <QDesktopWidget> -#include <QApplication> +#include <QtWidgets/QWidget> +#include <QtWidgets/QDesktopWidget> +#include <QtWidgets/QApplication> #include <stdio.h> @@ -200,7 +200,7 @@ namespace Helper { const QString colorToHtml(const QColor &color){ char colString[7]; ::snprintf(colString, 7, "%0x%0x%0x", color.red(), color.green(), color.blue()); - return QString::fromAscii(colString); + return QString::fromLatin1(colString); } void centerWidget(QWidget *widget){ diff --git a/hoverwindow.cpp b/hoverwindow.cpp index 5c9db7a..db1be8a 100644 --- a/hoverwindow.cpp +++ b/hoverwindow.cpp @@ -5,9 +5,9 @@ 2 of the License, or (at your option) any later version. */ -#include <QHBoxLayout> -#include <QLabel> -#include <QDesktopWidget> +#include <QtWidgets/QHBoxLayout> +#include <QtWidgets/QLabel> +#include <QtWidgets/QDesktopWidget> #include <QSize> #include <QTextDocument> #include <QSettings> @@ -18,7 +18,7 @@ #include <QBrush> #include <QPen> #include <QColor> -#include <QApplication> +#include <QtWidgets/QApplication> #include <QStaticText> #include "hoverwindow.h" diff --git a/hoverwindow.h b/hoverwindow.h index 4ed210e..ac52df4 100644 --- a/hoverwindow.h +++ b/hoverwindow.h @@ -8,7 +8,7 @@ #ifndef HOVERWINDOW_H #define HOVERWINDOW_H -#include <QWidget> +#include <QtWidgets/QWidget> #include <QList> #include <QVariant> @@ -5,7 +5,7 @@ 2 of the License, or (at your option) any later version. */ -#include <QApplication> +#include <QtWidgets/QApplication> #include "shemov.h" diff --git a/mappingtableeditor.cpp b/mappingtableeditor.cpp index 83015ef..f7ac64c 100644 --- a/mappingtableeditor.cpp +++ b/mappingtableeditor.cpp @@ -8,14 +8,14 @@ #include <QSqlDatabase> #include <QSqlQuery> #include <QContextMenuEvent> -#include <QMenu> -#include <QVBoxLayout> -#include <QHBoxLayout> -#include <QLineEdit> -#include <QPushButton> -#include <QLabel> -#include <QMessageBox> -#include <QAction> +#include <QtWidgets/QMenu> +#include <QtWidgets/QVBoxLayout> +#include <QtWidgets/QHBoxLayout> +#include <QtWidgets/QLineEdit> +#include <QtWidgets/QPushButton> +#include <QtWidgets/QLabel> +#include <QtWidgets/QMessageBox> +#include <QtWidgets/QAction> #include <QSortFilterProxyModel> #include "mappingtableeditor.h" diff --git a/mappingtableeditor.h b/mappingtableeditor.h index d372d0b..a87e636 100644 --- a/mappingtableeditor.h +++ b/mappingtableeditor.h @@ -8,7 +8,7 @@ #ifndef MAPPINGTABLEEDITOR_H #define MAPPINGTABLEEDITOR_H -#include <QTreeView> +#include <QtWidgets/QTreeView> #include <QSqlDatabase> #include "smdialog.h" diff --git a/mappingtablewidget.cpp b/mappingtablewidget.cpp index a5058d9..ee9e645 100644 --- a/mappingtablewidget.cpp +++ b/mappingtablewidget.cpp @@ -6,14 +6,14 @@ */ #include <QIcon> -#include <QTreeView> -#include <QPushButton> -#include <QLineEdit> -#include <QHBoxLayout> -#include <QVBoxLayout> -#include <QLabel> -#include <QCompleter> -#include <QGroupBox> +#include <QtWidgets/QTreeView> +#include <QtWidgets/QPushButton> +#include <QtWidgets/QLineEdit> +#include <QtWidgets/QHBoxLayout> +#include <QtWidgets/QVBoxLayout> +#include <QtWidgets/QLabel> +#include <QtWidgets/QCompleter> +#include <QtWidgets/QGroupBox> #include <QSettings> #include "mappingtablewidget.h" diff --git a/mappingtablewidget.h b/mappingtablewidget.h index 256f4ce..7c9e893 100644 --- a/mappingtablewidget.h +++ b/mappingtablewidget.h @@ -8,8 +8,9 @@ #ifndef MAPPINGTABLEWIDGET_H #define MAPPINGTABLEWIDGET_H -#include <QWidget> +#include <QtWidgets/QWidget> #include <QStringListModel> +#include <QIcon> #include "smdialog.h" diff --git a/mappingtreewidget.cpp b/mappingtreewidget.cpp index 4cde673..d001d8b 100644 --- a/mappingtreewidget.cpp +++ b/mappingtreewidget.cpp @@ -6,20 +6,20 @@ */ #include <QSortFilterProxyModel> -#include <QComboBox> -#include <QPushButton> -#include <QLineEdit> -#include <QVBoxLayout> -#include <QHBoxLayout> -#include <QInputDialog> -#include <QCheckBox> -#include <QLabel> +#include <QtWidgets/QComboBox> +#include <QtWidgets/QPushButton> +#include <QtWidgets/QLineEdit> +#include <QtWidgets/QVBoxLayout> +#include <QtWidgets/QHBoxLayout> +#include <QtWidgets/QInputDialog> +#include <QtWidgets/QCheckBox> +#include <QtWidgets/QLabel> #include <QStringListModel> -#include <QMessageBox> +#include <QtWidgets/QMessageBox> #include <QSettings> #include <QHideEvent> -#include <QAction> -#include <QMenu> +#include <QtWidgets/QAction> +#include <QtWidgets/QMenu> #include <QSqlError> #include "mappingtreewidget.h" diff --git a/mappingtreewidget.h b/mappingtreewidget.h index 50bbddf..1bd77f4 100644 --- a/mappingtreewidget.h +++ b/mappingtreewidget.h @@ -8,9 +8,9 @@ #ifndef MAPPINGTREEWIDGET_H #define MAPPINGTREEWIDGET_H -#include <QWidget> -#include <QTreeView> -#include <QDialog> +#include <QtWidgets/QWidget> +#include <QtWidgets/QTreeView> +#include <QtWidgets/QDialog> class MappingTreeView; class MappingTreeModel; diff --git a/newmoviewizard.cpp b/newmoviewizard.cpp index 7f1f869..36bf016 100644 --- a/newmoviewizard.cpp +++ b/newmoviewizard.cpp @@ -5,27 +5,27 @@ 2 of the License, or (at your option) any later version. */ -#include <QLabel> -#include <QTreeView> -#include <QHBoxLayout> -#include <QVBoxLayout> -#include <QPushButton> -#include <QComboBox> -#include <QLineEdit> -#include <QSpinBox> +#include <QtWidgets/QLabel> +#include <QtWidgets/QTreeView> +#include <QtWidgets/QHBoxLayout> +#include <QtWidgets/QVBoxLayout> +#include <QtWidgets/QPushButton> +#include <QtWidgets/QComboBox> +#include <QtWidgets/QLineEdit> +#include <QtWidgets/QSpinBox> #include <QSettings> -#include <QFileDialog> +#include <QtWidgets/QFileDialog> #include <QFileInfo> #include <QLocale> -#include <QCompleter> -#include <QCheckBox> -#include <QMessageBox> +#include <QtWidgets/QCompleter> +#include <QtWidgets/QCheckBox> +#include <QtWidgets/QMessageBox> #include <QFile> #include <QSettings> -#include <QFormLayout> +#include <QtWidgets/QFormLayout> #include <QDate> -#include <QPlainTextEdit> -#include <QFormLayout> +#include <QtWidgets/QPlainTextEdit> +#include <QtWidgets/QFormLayout> #include "newmoviewizard.h" #include "smtreeitem.h" diff --git a/newmoviewizard.h b/newmoviewizard.h index 3ae93a2..9717a2d 100644 --- a/newmoviewizard.h +++ b/newmoviewizard.h @@ -8,8 +8,8 @@ #ifndef NEWMOVIEWIZARD_H #define NEWMOVIEWIZARD_H -#include <QWizard> -#include <QWizardPage> +#include <QtWidgets/QWizard> +#include <QtWidgets/QWizardPage> #include <QHash> #include <QList> diff --git a/newpicsdialog.cpp b/newpicsdialog.cpp index 761e3ab..5269e18 100644 --- a/newpicsdialog.cpp +++ b/newpicsdialog.cpp @@ -8,16 +8,16 @@ #include <QFileInfo> #include <QSqlDatabase> #include <QSqlQuery> -#include <QLabel> -#include <QTreeView> +#include <QtWidgets/QLabel> +#include <QtWidgets/QTreeView> #include <QSortFilterProxyModel> -#include <QPushButton> +#include <QtWidgets/QPushButton> #include <QSettings> #include <QDir> -#include <QFileDialog> +#include <QtWidgets/QFileDialog> #include <QPersistentModelIndex> -#include <QHBoxLayout> -#include <QVBoxLayout> +#include <QtWidgets/QHBoxLayout> +#include <QtWidgets/QVBoxLayout> #include "newpicsdialog.h" #include "smtreeitem.h" diff --git a/newpicsdialog.h b/newpicsdialog.h index 110f4fc..148795a 100644 --- a/newpicsdialog.h +++ b/newpicsdialog.h @@ -8,9 +8,9 @@ #ifndef NEWPICSDIALOG_H #define NEWPICSDIALOG_H -#include <QDialog> +#include <QtWidgets/QDialog> #include <QSqlDatabase> -#include <QTreeView> +#include <QtWidgets/QTreeView> #include "smtreemodel.h" diff --git a/pictureswidget.cpp b/pictureswidget.cpp index 29506e6..703953a 100644 --- a/pictureswidget.cpp +++ b/pictureswidget.cpp @@ -5,21 +5,21 @@ 2 of the License, or (at your option) any later version. */ -#include <QSplitter> -#include <QHBoxLayout> +#include <QtWidgets/QSplitter> +#include <QtWidgets/QHBoxLayout> #include <QSqlQuery> #include <QSortFilterProxyModel> #include <QLocale> #include <QHideEvent> #include <QHoverEvent> #include <QEvent> -#include <QHeaderView> +#include <QtWidgets/QHeaderView> #include <QSettings> -#include <QMessageBox> -#include <QMenu> +#include <QtWidgets/QMessageBox> +#include <QtWidgets/QMenu> #include <QFile> #include <QSettings> -#include <QActionGroup> +#include <QtWidgets/QActionGroup> #include <QHash> #include "pictureswidget.h" diff --git a/pictureswidget.h b/pictureswidget.h index 17894d1..850d7ae 100644 --- a/pictureswidget.h +++ b/pictureswidget.h @@ -8,8 +8,8 @@ #ifndef PICTURESWIDGET_H #define PICTURESWIDGET_H -#include <QWidget> -#include <QTreeView> +#include <QtWidgets/QWidget> +#include <QtWidgets/QTreeView> #include <QSqlDatabase> #include "smtreemodel.h" diff --git a/pictureviewer2.cpp b/pictureviewer2.cpp index f385abc..7a5ab14 100644 --- a/pictureviewer2.cpp +++ b/pictureviewer2.cpp @@ -5,18 +5,18 @@ 2 of the License, or (at your option) any later version. */ -#include <QDesktopWidget> -#include <QApplication> -#include <QGraphicsScene> -#include <QGraphicsPixmapItem> +#include <QtWidgets/QDesktopWidget> +#include <QtWidgets/QApplication> +#include <QtWidgets/QGraphicsScene> +#include <QtWidgets/QGraphicsPixmapItem> #include <QImage> #include <QWheelEvent> #include <QContextMenuEvent> -#include <QMenu> +#include <QtWidgets/QMenu> #include <QTimer> #include <QDateTime> #include <QPainter> -#include <QStyleOptionGraphicsItem> +#include <QtWidgets/QStyleOptionGraphicsItem> #include <QSettings> #include <QTextDocument> #include <QTextCursor> @@ -24,9 +24,9 @@ #include <QDir> #include <QFileInfo> #include <QFileInfoList> -#include <QFileDialog> +#include <QtWidgets/QFileDialog> #include <QFile> -#include <QMessageBox> +#include <QtWidgets/QMessageBox> #include "pictureviewer2.h" #include "picfilesmodel.h" diff --git a/pictureviewer2.h b/pictureviewer2.h index 631f5f8..cfd6ce6 100644 --- a/pictureviewer2.h +++ b/pictureviewer2.h @@ -8,10 +8,10 @@ #ifndef PICTUREVIEWER2_H #define PICTUREVIEWER2_H -#include <QGraphicsView> +#include <QtWidgets/QGraphicsView> #include <QList> #include <QVariant> -#include <QGraphicsItem> +#include <QtWidgets/QGraphicsItem> #include <QStaticText> class QGraphicsScene; diff --git a/programconfigurator.cpp b/programconfigurator.cpp index 435a828..68bbe73 100644 --- a/programconfigurator.cpp +++ b/programconfigurator.cpp @@ -5,16 +5,16 @@ 2 of the License, or (at your option) any later version. */ -#include <QPushButton> -#include <QComboBox> -#include <QLineEdit> -#include <QLabel> -#include <QGridLayout> -#include <QHBoxLayout> -#include <QCompleter> +#include <QtWidgets/QPushButton> +#include <QtWidgets/QComboBox> +#include <QtWidgets/QLineEdit> +#include <QtWidgets/QLabel> +#include <QtWidgets/QGridLayout> +#include <QtWidgets/QHBoxLayout> +#include <QtWidgets/QCompleter> #include <QSettings> -#include <QDirModel> -#include <QMessageBox> +#include <QtWidgets/QDirModel> +#include <QtWidgets/QMessageBox> #include <QRegExp> #include <QFileInfo> diff --git a/programconfigurator.h b/programconfigurator.h index 03fb047..05e3e9e 100644 --- a/programconfigurator.h +++ b/programconfigurator.h @@ -8,7 +8,7 @@ #ifndef PROGRAMCONFIGURATOR_H #define PROGRAMCONFIGURATOR_H -#include <QWidget> +#include <QtWidgets/QWidget> #include <QString> #include <QHash> #include <QVariant> diff --git a/seriesmetadatamodel.cpp b/seriesmetadatamodel.cpp index 3b8cdc3..df8635b 100644 --- a/seriesmetadatamodel.cpp +++ b/seriesmetadatamodel.cpp @@ -7,18 +7,18 @@ #include <QSqlDatabase> #include <QSqlQuery> -#include <QSpinBox> -#include <QLineEdit> -#include <QComboBox> -#include <QPlainTextEdit> -#include <QDateEdit> -#include <QFormLayout> -#include <QVBoxLayout> -#include <QLabel> -#include <QGroupBox> +#include <QtWidgets/QSpinBox> +#include <QtWidgets/QLineEdit> +#include <QtWidgets/QComboBox> +#include <QtWidgets/QPlainTextEdit> +#include <QtWidgets/QDateEdit> +#include <QtWidgets/QFormLayout> +#include <QtWidgets/QVBoxLayout> +#include <QtWidgets/QLabel> +#include <QtWidgets/QGroupBox> #include <QSettings> #include <QColor> -#include <QTreeView> +#include <QtWidgets/QTreeView> #include "seriesmetadatamodel.h" #include "smtreeitem.h" diff --git a/seriesmetadatamodel.h b/seriesmetadatamodel.h index b96ef90..2bf0665 100644 --- a/seriesmetadatamodel.h +++ b/seriesmetadatamodel.h @@ -10,7 +10,7 @@ #include <QSqlDatabase> #include <QHash> -#include <QWidget> +#include <QtWidgets/QWidget> class QSqlQuery; class QSpinBox; diff --git a/seriestreemodel.cpp b/seriestreemodel.cpp index c8260c4..4ec9f3f 100644 --- a/seriestreemodel.cpp +++ b/seriestreemodel.cpp @@ -577,6 +577,7 @@ bool SeriesTreeModel::mergeSeries(const QModelIndex &from, const QModelIndex &to mUpdateSeriesIdQuery->bindValue(":oldid", oldSeriesId); mUpdateSeriesIdQuery->bindValue(":newid", newSeriesId); if(mUpdateSeriesIdQuery->exec()){ + beginResetModel(); SmTreeItem *oldParent = static_cast<SmTreeItem*>(from.internalPointer()); SmTreeItem *newParent = static_cast<SmTreeItem*>(to.internalPointer()); //reparent items to new series @@ -598,8 +599,7 @@ bool SeriesTreeModel::mergeSeries(const QModelIndex &from, const QModelIndex &to mSeriesPartSeriesMap.remove(seriesPartId); mSeriesPartSeriesMap.insert(seriesPartId, newSeriesId); } - - reset(); + endResetModel(); return true; } return false; diff --git a/seriestreewidget.cpp b/seriestreewidget.cpp index 50f06c0..ff174d4 100644 --- a/seriestreewidget.cpp +++ b/seriestreewidget.cpp @@ -5,38 +5,38 @@ 2 of the License, or (at your option) any later version. */ -#include <QHBoxLayout> -#include <QVBoxLayout> -#include <QPushButton> -#include <QLineEdit> -#include <QLabel> +#include <QtWidgets/QHBoxLayout> +#include <QtWidgets/QVBoxLayout> +#include <QtWidgets/QPushButton> +#include <QtWidgets/QLineEdit> +#include <QtWidgets/QLabel> #include <QSortFilterProxyModel> #include <QRegExp> #include <QContextMenuEvent> -#include <QMenu> -#include <QAction> -#include <QMessageBox> +#include <QtWidgets/QMenu> +#include <QtWidgets/QAction> +#include <QtWidgets/QMessageBox> #include <QSettings> -#include <QFileDialog> +#include <QtWidgets/QFileDialog> #include <QSettings> #include <QFileInfo> -#include <QComboBox> -#include <QInputDialog> +#include <QtWidgets/QComboBox> +#include <QtWidgets/QInputDialog> #include <QFile> #include <QEvent> #include <QHoverEvent> #include <QPalette> -#include <QCompleter> +#include <QtWidgets/QCompleter> #include <QStringListModel> #include <QSqlQuery> #include <QSqlDatabase> #include <QThread> -#include <QGroupBox> -#include <QFormLayout> -#include <QCheckBox> -#include <QSpinBox> +#include <QtWidgets/QGroupBox> +#include <QtWidgets/QFormLayout> +#include <QtWidgets/QCheckBox> +#include <QtWidgets/QSpinBox> #include <QFontMetrics> -#include <QApplication> +#include <QtWidgets/QApplication> #include "seriestreewidget.h" #include "smtreemodel.h" diff --git a/seriestreewidget.h b/seriestreewidget.h index 48f40a0..39de162 100644 --- a/seriestreewidget.h +++ b/seriestreewidget.h @@ -8,8 +8,8 @@ #ifndef SERIESTREEWIDGET_H #define SERIESTREEWIDGET_H -#include <QWidget> -#include <QTreeView> +#include <QtWidgets/QWidget> +#include <QtWidgets/QTreeView> #include <QSortFilterProxyModel> #include <QSqlDatabase> #include <QHash> @@ -5,18 +5,18 @@ 2 of the License, or (at your option) any later version. */ -#include <QApplication> -#include <QTabWidget> -#include <QVBoxLayout> -#include <QAction> -#include <QMenuBar> -#include <QMenu> -#include <QStatusBar> -#include <QLabel> +#include <QtWidgets/QApplication> +#include <QtWidgets/QTabWidget> +#include <QtWidgets/QVBoxLayout> +#include <QtWidgets/QAction> +#include <QtWidgets/QMenuBar> +#include <QtWidgets/QMenu> +#include <QtWidgets/QStatusBar> +#include <QtWidgets/QLabel> #include <QItemSelection> #include <QSignalMapper> #include <QSettings> -#include <QMessageBox> +#include <QtWidgets/QMessageBox> #include <QSqlDatabase> #include <QImage> #include <QPainter> @@ -24,14 +24,14 @@ #include <QFontMetrics> #include <QLocale> #include <QCloseEvent> -#include <QActionGroup> -#include <QFileSystemModel> -#include <QToolBar> +#include <QtWidgets/QActionGroup> +#include <QtWidgets/QFileSystemModel> +#include <QtWidgets/QToolBar> #include <QIcon> -#include <QHeaderView> +#include <QtWidgets/QHeaderView> #include <QDir> #include <QFileInfo> -#include <QSplashScreen> +#include <QtWidgets/QSplashScreen> #include <sys/vfs.h> @@ -8,7 +8,7 @@ #ifndef SHEMOV_H #define SHEMOV_H -#include <QMainWindow> +#include <QtWidgets/QMainWindow> #include <QList> #include <QThread> @@ -4,7 +4,7 @@ CONFIG += warn_on \ qt \ debug CONFIG -= release -QT += sql +QT += core gui widgets sql SOURCES = main.cpp \ filesystemdirproxy.cpp \ filesystemwidget.cpp \ diff --git a/shemoviconprovider.h b/shemoviconprovider.h index 04af45b..2793ab7 100644 --- a/shemoviconprovider.h +++ b/shemoviconprovider.h @@ -8,7 +8,7 @@ #ifndef SHEMOVICONPROVIDER_H #define SHEMOVICONPROVIDER_H -#include <QFileIconProvider> +#include <QtWidgets/QFileIconProvider> class QIcon; class QFileInfo; @@ -8,7 +8,7 @@ #ifndef SMDIALOG_H #define SMDIALOG_H -#include <QDialog> +#include <QtWidgets/QDialog> class SmDialog : public QDialog { Q_OBJECT diff --git a/smglobals.cpp b/smglobals.cpp index 419f15c..6ef4ceb 100644 --- a/smglobals.cpp +++ b/smglobals.cpp @@ -8,7 +8,7 @@ #include <QSqlDatabase> #include <QAbstractItemModel> #include <QStringList> -#include <QMessageBox> +#include <QtWidgets/QMessageBox> #include <QSettings> #include <QDir> #include <QFile> @@ -17,7 +17,6 @@ #include <QTemporaryFile> #include <QProcess> -#include <QX11Info> #include <X11/Xlib.h> #include <X11/extensions/Xfixes.h> @@ -129,7 +128,8 @@ SeriesTreeWidget *SmGlobals::seriesTreeWidget(){ QSize SmGlobals::cursorSize() { if(!mCursorSize.isValid()){ - XFixesCursorImage *curImage = XFixesGetCursorImage(QX11Info::display()); + Display *dpy = XOpenDisplay(0); + XFixesCursorImage *curImage = XFixesGetCursorImage(dpy); mCursorSize = QSize(curImage->width, curImage->height); XFree(curImage); } diff --git a/smglobals.h b/smglobals.h index 5621fc4..31a90e7 100644 --- a/smglobals.h +++ b/smglobals.h @@ -8,6 +8,8 @@ #ifndef SMUBERMODELSINGLETON_H #define SMUBERMODELSINGLETON_H +#include <QObject> + #include <QHash> #include <QSize> #include <QPair> diff --git a/statisticsdialog.cpp b/statisticsdialog.cpp index 595811d..1862513 100644 --- a/statisticsdialog.cpp +++ b/statisticsdialog.cpp @@ -5,17 +5,17 @@ 2 of the License, or (at your option) any later version. */ -#include <QTabWidget> -#include <QVBoxLayout> -#include <QHBoxLayout> +#include <QtWidgets/QTabWidget> +#include <QtWidgets/QVBoxLayout> +#include <QtWidgets/QHBoxLayout> #include <QSqlQuery> #include <QVariant> -#include <QPushButton> +#include <QtWidgets/QPushButton> #include <QLocale> #include <QFile> #include <QFontMetrics> #include <QFont> -#include <QApplication> +#include <QtWidgets/QApplication> #include <QPainter> #include <QBrush> #include <QPen> @@ -24,9 +24,9 @@ #include <QColor> #include <QPainterPath> #include <QTextOption> -#include <QScrollArea> +#include <QtWidgets/QScrollArea> #include <QPalette> -#include <QLabel> +#include <QtWidgets/QLabel> class GraphWidget; |