diff options
Diffstat (limited to 'configurationdialog.cpp')
| -rw-r--r-- | configurationdialog.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/configurationdialog.cpp b/configurationdialog.cpp index e65a4b0..acb7b46 100644 --- a/configurationdialog.cpp +++ b/configurationdialog.cpp @@ -28,7 +28,7 @@ #include <QPalette> #include <QStandardItemModel> #include <QStandardItem> -#include <QDesktopWidget> +#include <QScreen> #include <QInputDialog> #include "configurationdialog.h" @@ -287,7 +287,7 @@ ConfigurationDialog::ConfigurationDialog(QWidget *parent, Qt::WindowFlags f) : S mClipboardColor->setFrameStyle(QFrame::Sunken | QFrame::Panel); mClipboardColor->setScaledContents(true); QPushButton *clipboardButton = new QPushButton(tr("Choose...")); - connect(clipboardButton, &QPushButton::clicked, [=] { chooseColor(mClipboardColor); }); + connect(clipboardButton, &QPushButton::clicked, this, [=] { chooseColor(mClipboardColor); }); colorGrid->addWidget(colorl2, 1, 0); colorGrid->addWidget(mClipboardColor, 1, 1); colorGrid->addWidget(clipboardButton, 1, 2); @@ -296,7 +296,7 @@ ConfigurationDialog::ConfigurationDialog(QWidget *parent, Qt::WindowFlags f) : S mBaseColor->setFrameStyle(QFrame::Sunken | QFrame::Panel); mBaseColor->setScaledContents(true); mBaseButton = new QPushButton(tr("Choose...")); - connect(mBaseButton, &QPushButton::clicked, [=] { chooseColor(mBaseColor); }); + connect(mBaseButton, &QPushButton::clicked, this, [=] { chooseColor(mBaseColor); }); colorGrid->addWidget(colorl3, 2, 0); colorGrid->addWidget(mBaseColor, 2, 1); colorGrid->addWidget(mBaseButton, 2, 2); @@ -305,7 +305,7 @@ ConfigurationDialog::ConfigurationDialog(QWidget *parent, Qt::WindowFlags f) : S mAlternateBaseColor->setFrameStyle(QFrame::Sunken | QFrame::Panel); mAlternateBaseColor->setScaledContents(true); mAlternateBaseButton = new QPushButton(tr("Choose...")); - connect(mAlternateBaseButton, &QPushButton::clicked, [=] { chooseColor(mAlternateBaseColor); }); + connect(mAlternateBaseButton, &QPushButton::clicked, this, [=] { chooseColor(mAlternateBaseColor); }); colorGrid->addWidget(colorl4, 3, 0); colorGrid->addWidget(mAlternateBaseColor, 3, 1); colorGrid->addWidget(mAlternateBaseButton, 3, 2); @@ -314,7 +314,7 @@ ConfigurationDialog::ConfigurationDialog(QWidget *parent, Qt::WindowFlags f) : S mFontColor->setFrameStyle(QFrame::Sunken | QFrame::Panel); mFontColor->setScaledContents(true); QPushButton *fontColorBtn = new QPushButton(tr("Choose...")); - connect(fontColorBtn, &QPushButton::clicked, [=] { chooseColor(mFontColor); }); + connect(fontColorBtn, &QPushButton::clicked, this, [=] { chooseColor(mFontColor); }); colorGrid->addWidget(colorl5, 4, 0); colorGrid->addWidget(mFontColor, 4, 1); colorGrid->addWidget(fontColorBtn, 4, 2); @@ -323,7 +323,7 @@ ConfigurationDialog::ConfigurationDialog(QWidget *parent, Qt::WindowFlags f) : S mLocalColor->setFrameStyle(QFrame::Sunken | QFrame::Panel); mLocalColor->setScaledContents(true); QPushButton *localColorBtn = new QPushButton(tr("Choose...")); - connect(localColorBtn, &QPushButton::clicked, [=] { chooseColor(mLocalColor); }); + connect(localColorBtn, &QPushButton::clicked, this, [=] { chooseColor(mLocalColor); }); colorGrid->addWidget(colorl6, 5, 0); colorGrid->addWidget(mLocalColor, 5, 1); colorGrid->addWidget(localColorBtn, 5, 2); @@ -332,7 +332,7 @@ ConfigurationDialog::ConfigurationDialog(QWidget *parent, Qt::WindowFlags f) : S mArchivedColor->setFrameStyle(QFrame::Sunken | QFrame::Panel); mArchivedColor->setScaledContents(true); QPushButton *archivedColorBtn = new QPushButton(tr("Choose...")); - connect(archivedColorBtn, &QPushButton::clicked, [=] { chooseColor(mArchivedColor); }); + connect(archivedColorBtn, &QPushButton::clicked, this, [=] { chooseColor(mArchivedColor); }); colorGrid->addWidget(colorl7, 6, 0); colorGrid->addWidget(mArchivedColor, 6, 1); colorGrid->addWidget(archivedColorBtn, 6, 2); @@ -341,7 +341,7 @@ ConfigurationDialog::ConfigurationDialog(QWidget *parent, Qt::WindowFlags f) : S mFavoriteColor->setFrameStyle(QFrame::Sunken | QFrame::Panel); mFavoriteColor->setScaledContents(true); QPushButton *favoriteColorBtn = new QPushButton(tr("Choose...")); - connect(favoriteColorBtn, &QPushButton::clicked, [=] { chooseColor(mFavoriteColor); }); + connect(favoriteColorBtn, &QPushButton::clicked, this, [=] { chooseColor(mFavoriteColor); }); colorGrid->addWidget(colorl8, 7, 0); colorGrid->addWidget(mFavoriteColor, 7, 1); colorGrid->addWidget(favoriteColorBtn, 7, 2); @@ -356,7 +356,7 @@ ConfigurationDialog::ConfigurationDialog(QWidget *parent, Qt::WindowFlags f) : S mPVBgColor->setFrameStyle(QFrame::Sunken | QFrame::Panel); mPVBgColor->setScaledContents(true); mPVBgButton = new QPushButton(tr("Choose...")); - connect(mPVBgButton, &QPushButton::clicked, [=] { chooseColor(mPVBgColor); }); + connect(mPVBgButton, &QPushButton::clicked, this, [=] { chooseColor(mPVBgColor); }); QGridLayout *pvGrid = new QGridLayout; pvGrid->addWidget(color9, 0, 0); pvGrid->addWidget(mPVBgColor, 0, 1); @@ -574,7 +574,7 @@ bool ConfigurationDialog::checkDvdPath(){ do { line = fStream.readLine(); if(line.contains(path)){ - QStringList fsParts = line.split(QRegExp("\\s+")); + QStringList fsParts = line.split(QRegularExpression("\\s+")); if(fsParts.isEmpty() || (fsParts.size() < 4)){ continue; } |