aboutsummaryrefslogtreecommitdiff
path: root/src/browsertab.cpp
diff options
context:
space:
mode:
authorFelix (xq) Queißner <git@mq32.de>2020-06-21 14:49:25 +0200
committerFelix (xq) Queißner <git@mq32.de>2020-06-21 14:49:25 +0200
commit0cd3f649205dd079843914d2977a650dd9bd3a92 (patch)
treeff934cd5a2d7131e17679f32a4a38cd1ec559b66 /src/browsertab.cpp
parent3219eda19bf596287d665e7709b728af0ef8de2f (diff)
downloadkristall-0cd3f649205dd079843914d2977a650dd9bd3a92.tar.gz
Removes deprecation warning for setTabStopWidth, tries to fix netbsd build.
Diffstat (limited to 'src/browsertab.cpp')
-rw-r--r--src/browsertab.cpp10
1 files changed, 8 insertions, 2 deletions
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<char const *>(input.data());
+ char * input_ptr = const_cast<char *>(reinterpret_cast<char const *>(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<char **>(&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) {