Skip to content

Commit 4bfef18

Browse files
committed
Fix deprecation warnings
1 parent c1a6e37 commit 4bfef18

File tree

4 files changed

+7
-6
lines changed

4 files changed

+7
-6
lines changed

codeeditor.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ int CodeEditor::lineNumberAreaWidth()
7878
++digits;
7979
}
8080

81-
int space = fontMetrics().width(QLatin1Char('9')) * digits + debugAreaWidth;
81+
int space = fontMetrics().horizontalAdvance(QLatin1Char('9')) * digits + debugAreaWidth;
8282

8383
return space;
8484
}

finddialog.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,8 @@ FindDialog::FindDialog(QWidget *parent)
9898
searchLayout = new QHBoxLayout;
9999
searchLayout->addWidget(searchLabel);
100100
searchSpacer = new QSpacerItem(
101-
replaceLabel->fontMetrics().width(tr("Replace with:")) -
102-
searchLabel->fontMetrics().width(tr("Find what:")),
101+
replaceLabel->fontMetrics().horizontalAdvance(tr("Replace with:")) -
102+
searchLabel->fontMetrics().horizontalAdvance(tr("Find what:")),
103103
0, QSizePolicy::Fixed, QSizePolicy::Fixed);
104104
searchLayout->addSpacerItem(searchSpacer);
105105
searchLayout->addWidget(searchEdit);

mainwindow.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@
4545
#include <QStackedWidget>
4646
#include <QTextBrowser>
4747
#include <QTimer>
48+
#include <QElapsedTimer>
4849
#include <QMenuBar>
4950
#include <QMessageBox>
5051
#include <QFileDialog>
@@ -165,7 +166,7 @@ class MainWindow : public QMainWindow
165166
QProcess *runProcess;
166167
CodeEditor *prevCodeEditor;
167168
QTimer *timer;
168-
QTime programExecutionTime;
169+
QElapsedTimer programExecutionTime;
169170
Debugger *debugger;
170171
bool programIsBuilded;
171172
QPointer<DebugTableWidget> registersWindow;

watchsettingswidget.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -93,14 +93,14 @@ WatchSettingsWidget::WatchSettingsWidget(QWidget *parent) :
9393
int WatchSettingsWidget::sumSize()
9494
{
9595
return typeComboBox->sizeHint().width() + sizeComboBox->sizeHint().width()
96-
+ arraySizeEdit->fontMetrics().width(arraySizeEdit->placeholderText())
96+
+ arraySizeEdit->fontMetrics().horizontalAdvance(arraySizeEdit->placeholderText())
9797
+ addressCheckbox->sizeHint().width() + 50;
9898
}
9999

100100
QSize WatchSettingsWidget::sizeHint() const
101101
{
102102
return QSize(typeComboBox->sizeHint().width() + sizeComboBox->sizeHint().width()
103-
+ arraySizeEdit->fontMetrics().width(arraySizeEdit->placeholderText())
103+
+ arraySizeEdit->fontMetrics().horizontalAdvance(arraySizeEdit->placeholderText())
104104
+ addressCheckbox->sizeHint().width() + 50, 0);
105105
}
106106

0 commit comments

Comments
 (0)