From 0cd3f649205dd079843914d2977a650dd9bd3a92 Mon Sep 17 00:00:00 2001 From: "Felix (xq) Queißner" Date: Sun, 21 Jun 2020 14:49:25 +0200 Subject: Removes deprecation warning for setTabStopWidth, tries to fix netbsd build. --- src/browsertab.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'src/browsertab.cpp') diff --git a/src/browsertab.cpp b/src/browsertab.cpp index 041f886..49456f1 100644 --- a/src/browsertab.cpp +++ b/src/browsertab.cpp @@ -62,6 +62,12 @@ BrowserTab::BrowserTab(MainWindow *mainWindow) : QWidget(nullptr), this->ui->graphics_browser->setVisible(false); this->ui->text_browser->setVisible(true); +#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0) + this->ui->text_browser->setTabStopDistance(40); +#else + this->ui->text_browser->setTabStopWidth(40); +#endif + this->ui->text_browser->setContextMenuPolicy(Qt::CustomContextMenu); connect(this->ui->url_bar, &SearchBar::escapePressed, this, &BrowserTab::on_url_bar_escapePressed); @@ -269,7 +275,7 @@ static QByteArray convertToUtf8(QByteArray const & input, QString const & charSe char temp_buffer[4096]; - char const * input_ptr = reinterpret_cast(input.data()); + char * input_ptr = const_cast(reinterpret_cast(input.data())); size_t input_size = input.size(); while(input_size > 0) @@ -277,7 +283,7 @@ static QByteArray convertToUtf8(QByteArray const & input, QString const & charSe char * out_ptr = temp_buffer; size_t out_size = sizeof(temp_buffer); - size_t n = iconv(cd, const_cast(&input_ptr), &input_size, &out_ptr, &out_size); + size_t n = iconv(cd, &input_ptr, &input_size, &out_ptr, &out_size); if (n == size_t(-1)) { if(errno == E2BIG) { -- cgit v1.2.3