summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArno <arno@disconnect.de>2019-11-22 13:34:39 +0100
committerArno <arno@disconnect.de>2019-11-22 13:34:39 +0100
commit9b0b4cbd087eb1315a51d609ea2abc75e12bf083 (patch)
tree5e50dddf46180d749df2f4778fb9c662aadfd290
parentb41db9bfac46ead20e1c9d3b6924231886cfee0c (diff)
downloadSheMov-9b0b4cbd087eb1315a51d609ea2abc75e12bf083.tar.gz
SheMov-9b0b4cbd087eb1315a51d609ea2abc75e12bf083.tar.bz2
SheMov-9b0b4cbd087eb1315a51d609ea2abc75e12bf083.zip
Fix deprecation warnings
-rw-r--r--configurationdialog.cpp2
-rw-r--r--helper.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/configurationdialog.cpp b/configurationdialog.cpp
index f5fc7d1..ce957bc 100644
--- a/configurationdialog.cpp
+++ b/configurationdialog.cpp
@@ -487,7 +487,7 @@ void ConfigurationDialog::readSettings(){
mColors.insert(mBaseColor, base.value<QColor>());
QVariant alternate = s.value("ui/alternatecolor", qApp->palette().alternateBase().color());
mColors.insert(mAlternateBaseColor, alternate.value<QColor>());
- QVariant font = s.value("ui/fontcolor", qApp->palette().foreground().color());
+ QVariant font = s.value("ui/fontcolor", qApp->palette().windowText().color());
mColors.insert(mFontColor, font.value<QColor>());
QVariant local = s.value("ui/localcolor", QVariant(QColor(Qt::darkBlue)));
mColors.insert(mLocalColor, local.value<QColor>());
diff --git a/helper.cpp b/helper.cpp
index 4b42f0e..627aec7 100644
--- a/helper.cpp
+++ b/helper.cpp
@@ -300,7 +300,7 @@ namespace Helper {
Duration dur(where);
QFont font("Monospace", 10);
QFontMetrics fm(font);
- int width = fm.width(dur.toString());
+ int width = fm.horizontalAdvance(dur.toString());
int height = fm.height();
QPainter p(&retval);
p.setBrush(QBrush(QColor(255, 255, 255, 70)));