Port deprecated Qt functionality (#70)

* porting: from QFontMetric.width to horizontalAdvance

* porting: from deprecated QDesktopWidget

* porting: from deprecated QListWidgetItem methods

* porting: from deprecated QPlainTextEdit.setTabStopDistance

* porting: from deprecated QWheelEvent.delta

* porting: use Qt::endl

Author: alexfikl

app/configappearancewidget.cpp

@@ -117,7 +117,7 @@ void ConfigAppearanceWidget::setItemToolTip(QTableWidgetItem *item, const QFont
 {
     const QFontMetrics metrics(font);
     ui.itemTable->setRowHeight(m_itemHighlighted, metrics.height() + m_itemMargin);
-    if (metrics.width(item->text()) >= ui.itemTable->contentsRect().width() - 30)
+    if (metrics.horizontalAdvance(item->text()) >= ui.itemTable->contentsRect().width() - 30)
         item->setToolTip(item->text());
     else
         item->setToolTip(QString());

app/linenumberwidget.cpp

@@ -72,7 +72,7 @@ void LineNumberWidget::paintEvent(QPaintEvent *event)
         if (bottom >= event->rect().top()) {
             for (int i = 0; i < userBookmarks.length(); ++i) {
                 if (userBookmarks.at(i) == lineNumber) {
-                    painter.fillRect(2, top, fm.width(QLatin1Char('B')) + 4, lineHeight,
+                    painter.fillRect(2, top, fm.horizontalAdvance(QLatin1Char('B')) + 4, lineHeight,
                                      m_highlightBrush);
                     painter.setPen(m_highlightedTextPen);
                     painter.drawText(4, top, width() - 4, lineHeight, Qt::AlignLeft | Qt::AlignTop,

app/mainwindow.cpp

@@ -36,6 +36,7 @@
 #endif
 
 #include <QMenuBar>
+#include <QScreen>
 #include <QStatusBar>
 #include <QtCore/QTextCodec>
 #include <QtCore/QProcess>
@@ -44,7 +45,6 @@
 #include <QtCore/QTimer>
 #include <QtGui/QCloseEvent>
 #include <QtGui/QDesktopServices>
-#include <QtWidgets/QDesktopWidget>
 #include <QtWidgets/QDockWidget>
 #include <QtWidgets/QLabel>
 #include <QtWidgets/QMessageBox>
@@ -955,7 +955,7 @@ void MainWindow::readSettings()
 
     QSettings settings;
     settings.beginGroup(QLatin1String("MainWindow"));
-    const int screenWidth = QApplication::desktop()->availableGeometry().width();
+    const int screenWidth = this->screen()->geometry().width();
     QSize size;
     if (screenWidth > 1200)
         size = settings.value(QLatin1String("size"), QSize(1200, 600)).toSize();

app/tikzcommandinserter.cpp

@@ -482,8 +482,8 @@ void TikzCommandInserter::addListWidgetItems(QListWidget *listWidget,
         QString itemText = commandList.children.at(i).title;
         item->setText(itemText.remove(QLatin1Char('&')));
 
-        item->setBackgroundColor(titleBg);
-        item->setTextColor(titleFg);
+        item->setBackground(titleBg);
+        item->setForeground(titleFg);
         item->setFont(titleFont);
 
         addListWidgetItems(listWidget, standardPalette, commandList.children.at(i));

app/tikzeditor.cpp

@@ -314,7 +314,7 @@ void TikzEditor::paintSpace(QPainter &painter, qreal x, qreal y, int spaceWidth)
 void TikzEditor::printWhiteSpaces(QPainter &painter)
 {
     const QFontMetrics fontMetrics = QFontMetrics(document()->defaultFont());
-    const int spaceWidth = fontMetrics.width(QLatin1Char(' '));
+    const int spaceWidth = fontMetrics.horizontalAdvance(QLatin1Char(' '));
     const int fontHeight = fontMetrics.height();
     QTextCursor cursor = textCursor();
 
@@ -747,7 +747,8 @@ int TikzEditor::lineNumberAreaWidth()
         ++digits;
     digits = qMax(4, digits) + 1;
 
-    return m_showLineNumberArea ? 3 + fontMetrics().width(QLatin1Char('9')) * digits : 0;
+    return m_showLineNumberArea ? 3 + fontMetrics().horizontalAdvance(QLatin1Char('9')) * digits
+                                : 0;
 }
 
 void TikzEditor::updateLineNumberAreaWidth()

app/tikzeditorview.cpp

@@ -157,7 +157,8 @@ void TikzEditorView::setFont(const QFont &editorFont)
     fm.setFontPointSize(editorFont.pointSize());
     m_tikzEditor->setCurrentCharFormat(fm);
 
-    m_tikzEditor->setTabStopWidth(m_tikzEditor->fontMetrics().width(QLatin1String("    ")));
+    m_tikzEditor->setTabStopDistance(
+            m_tikzEditor->fontMetrics().horizontalAdvance(QLatin1String("    ")));
 }
 
 void TikzEditorView::createActions()

common/tikzpreview.cpp

@@ -25,6 +25,7 @@
 #include <QDesktopWidget>
 #include <QGraphicsProxyWidget>
 #include <QMenu>
+#include <QScreen>
 #include <QScrollBar>
 #include <QToolBar>
 
@@ -92,7 +93,7 @@ void TikzPreview::contextMenuEvent(QContextMenuEvent *event)
 
 QSize TikzPreview::sizeHint() const
 {
-    const int screenWidth = QApplication::desktop()->availableGeometry().width();
+    const int screenWidth = this->screen()->geometry().width();
     if (screenWidth > 1200)
         return QSize(500, 400);
     else if (screenWidth > 1024)
@@ -404,7 +405,7 @@ void TikzPreview::setBackgroundColor(QColor color)
 void TikzPreview::wheelEvent(QWheelEvent *event)
 {
     if (event->modifiers() == Qt::ControlModifier) {
-        if (event->delta() > 0)
+        if (event->angleDelta().y() > 0)
             zoomIn();
         else
             zoomOut();

common/tikzpreviewgenerator.cpp

@@ -476,7 +476,7 @@ static QString createTempTikzFile(const QString &tikzFileBaseName, const QString
     QTextStream tikzStream(&tikzFile);
     codecProfile->configureStreamEncoding(tikzStream);
 
-    tikzStream << tikzCode << endl;
+    tikzStream << tikzCode << Qt::endl;
     tikzStream.flush();
 
     tikzFile.close();