Fix deprecation warnings

11 files changed, 13 insertions, 14 deletions

diff --git a/source/fb2code.cpp b/source/fb2code.cpp
index e3ef908..0facf90 100644
--- a/source/fb2code.cpp
+++ b/source/fb2code.cpp
@@ -561,7 +561,7 @@ int FbCodeEdit::lineNumberAreaWidth()
         ++digits;
     }
 
-    int space = 3 + fontMetrics().width(QLatin1Char('9')) * digits;
+    int space = 3 + fontMetrics().horizontalAdvance(QLatin1Char('9')) * digits;
 
     return space;
 }
diff --git a/source/fb2code.hpp b/source/fb2code.hpp
index 5e89a37..2aeb730 100644
--- a/source/fb2code.hpp
+++ b/source/fb2code.hpp
@@ -37,7 +37,7 @@ public:
     void load(const QByteArray data)
         { setPlainText(QString::fromUtf8(data.data())); }
 
-    bool findText(const QString &exp, QTextDocument::FindFlags options = 0);
+    bool findText(const QString &exp, QTextDocument::FindFlags options = {});
 
     bool isModified() const { return document()->isModified(); }
 
diff --git a/source/fb2dlgs.cpp b/source/fb2dlgs.cpp
index fda2702..845a7fc 100644
--- a/source/fb2dlgs.cpp
+++ b/source/fb2dlgs.cpp
@@ -41,7 +41,7 @@ void FbCodeFindDlg::find()
 {
     QString text = ui->editText->text();
     if (text.isEmpty()) return;
-    QTextDocument::FindFlags options = 0;
+    QTextDocument::FindFlags options;
     if (ui->radioUp->isChecked()) options |= QTextDocument::FindBackward;
     if (ui->checkCase->isChecked()) options |= QTextDocument::FindCaseSensitively;
     if (ui->checkHigh->isChecked()) options |= QTextDocument::FindWholeWords;
diff --git a/source/fb2head.cpp b/source/fb2head.cpp
index 825738c..7790418 100644
--- a/source/fb2head.cpp
+++ b/source/fb2head.cpp
@@ -536,7 +536,7 @@ bool FbHeadModel::setData(const QModelIndex &index, const QVariant &value, int r
 
 Qt::ItemFlags FbHeadModel::flags(const QModelIndex &index) const
 {
-    if (!index.isValid()) return 0;
+    if (!index.isValid()) return Qt::NoItemFlags;
     Qt::ItemFlags flags = Qt::ItemIsEnabled | Qt::ItemIsSelectable;
     if (canEdit(index)) flags |= Qt::ItemIsEditable;
     return flags;
diff --git a/source/fb2logs.cpp b/source/fb2logs.cpp
index 6dd4964..3cad42c 100644
--- a/source/fb2logs.cpp
+++ b/source/fb2logs.cpp
@@ -83,7 +83,7 @@ FbLogDock::FbLogDock(const QString &title, QWidget *parent, Qt::WindowFlags flag
 {

     m_list->setModel(m_model);

     connect(m_model, SIGNAL(changeCurrent(QModelIndex)), m_list, SLOT(setCurrentIndex(QModelIndex)));

-    setFeatures(QDockWidget::AllDockWidgetFeatures);

+    setFeatures(QDockWidget::DockWidgetClosable|QDockWidget::DockWidgetMovable|QDockWidget::DockWidgetFloatable);

     setAttribute(Qt::WA_DeleteOnClose);

     setWidget(m_list);

 }

diff --git a/source/fb2logs.hpp b/source/fb2logs.hpp
index a45a959..fc4398f 100644
--- a/source/fb2logs.hpp
+++ b/source/fb2logs.hpp
@@ -68,7 +68,7 @@ class FbLogDock: public QDockWidget
     Q_OBJECT

 

 public:

-    explicit FbLogDock(const QString &title, QWidget *parent = 0, Qt::WindowFlags flags = 0);

+    explicit FbLogDock(const QString &title, QWidget *parent = 0, Qt::WindowFlags flags = {});

     void append(QtMsgType type, const QString &message);

 

 private:

diff --git a/source/fb2page.cpp b/source/fb2page.cpp
index 60d2329..75f774e 100644
--- a/source/fb2page.cpp
+++ b/source/fb2page.cpp
@@ -370,7 +370,7 @@ FbTextElement FbTextPage::current()
 FbTextElement FbTextPage::element(const QString &location)
 {
     if (location.isEmpty()) return FbTextElement();
-    QStringList list = location.split(",", QString::SkipEmptyParts);
+    QStringList list = location.split(",", Qt::SkipEmptyParts);
     QStringListIterator iterator(list);
     QWebElement result = doc();
     while (iterator.hasNext()) {
diff --git a/source/fb2read.cpp b/source/fb2read.cpp
index c710dfe..93011f7 100644
--- a/source/fb2read.cpp
+++ b/source/fb2read.cpp
@@ -359,8 +359,7 @@ void FbReadHandler::BinaryHandler::TxtTag(const QString &text)
 void FbReadHandler::BinaryHandler::EndTag(const QString &name)
 {
     Q_UNUSED(name);
-    QByteArray in; in.append(m_text);
-    if (!m_file.isEmpty()) m_owner.addFile(m_file, QByteArray::fromBase64(in));
+    if (!m_file.isEmpty()) m_owner.addFile(m_file, QByteArray::fromBase64(m_text.toUtf8()));
 }
 
 //---------------------------------------------------------------------------
diff --git a/source/fb2save.cpp b/source/fb2save.cpp
index 62974a1..b8c4e3d 100644
--- a/source/fb2save.cpp
+++ b/source/fb2save.cpp
@@ -65,7 +65,7 @@ void FbSaveDialog::init()
     }
 
     setAcceptMode(AcceptSave);
-    setConfirmOverwrite(true);
+    setOption(DontConfirmOverwrite, false);
     setDefaultSuffix("fb2");
 
     QStringList filters;
@@ -274,7 +274,7 @@ void FbSaveWriter::writeStyle()
     writeAttribute("type", "text/css");
     writeCharacters(postfix);
 
-    QStringList list = m_style.split("}", QString::SkipEmptyParts);
+    QStringList list = m_style.split("}", Qt::SkipEmptyParts);
     QString line;
     for (const QString &str: list) {
         line = str.simplified();
diff --git a/source/fb2text.cpp b/source/fb2text.cpp
index e47ce61..165ec68 100644
--- a/source/fb2text.cpp
+++ b/source/fb2text.cpp
@@ -77,7 +77,7 @@ void FbTextAction::disconnectAction()
 FbDockWidget::FbDockWidget(const QString &title, QWidget *parent, Qt::WindowFlags flags)
     : QDockWidget(title, parent, flags)
 {
-    setFeatures(QDockWidget::AllDockWidgetFeatures);
+    setFeatures(QDockWidget::DockWidgetClosable|QDockWidget::DockWidgetMovable|QDockWidget::DockWidgetFloatable);
     setAttribute(Qt::WA_DeleteOnClose);
 }
 
@@ -424,7 +424,7 @@ void FbTextEdit::viewInspector(bool show)
         QWebInspector *inspector = new QWebInspector(this);
         inspector->setPage(page());
         dockInsp = new QDockWidget(tr("Web inspector"), this);
-        dockInsp->setFeatures(QDockWidget::AllDockWidgetFeatures);
+        dockInsp->setFeatures(QDockWidget::DockWidgetClosable|QDockWidget::DockWidgetMovable|QDockWidget::DockWidgetFloatable);
         dockInsp->setWidget(inspector);
         connect(dockInsp, SIGNAL(visibilityChanged(bool)), act(Fb::ViewInspector), SLOT(setChecked(bool)));
         m_owner->addDockWidget(Qt::BottomDockWidgetArea, dockInsp);
diff --git a/source/fb2text.hpp b/source/fb2text.hpp
index 41f8a6c..f68ffa0 100644
--- a/source/fb2text.hpp
+++ b/source/fb2text.hpp
@@ -25,7 +25,7 @@ class FbDockWidget : public QDockWidget
 {
     Q_OBJECT
 public:
-    explicit FbDockWidget(const QString &title, QWidget *parent = 0, Qt::WindowFlags flags = 0);
+    explicit FbDockWidget(const QString &title, QWidget *parent = 0, Qt::WindowFlags flags = {});
 };
 
 class FbTextBase : public QWebView