New upstream version 3.3.3+dfsg1.upstream/3.3.3+dfsg1

2 files changed, 5 insertions, 5 deletions

diff --git a/SQLiteStudio3/guiSQLiteStudio/completer/completeritemdelegate.cpp b/SQLiteStudio3/guiSQLiteStudio/completer/completeritemdelegate.cpp
index 3268960..7b17ffe 100644
--- a/SQLiteStudio3/guiSQLiteStudio/completer/completeritemdelegate.cpp
+++ b/SQLiteStudio3/guiSQLiteStudio/completer/completeritemdelegate.cpp
@@ -124,13 +124,13 @@ void CompleterItemDelegate::paintPrefix(QPainter* painter, const QFontMetrics& m
 
     QString value = text + ".";
     painter->drawText(QPoint(x, y), value);
-    x += metrics.width(value);
+    x += metrics.horizontalAdvance(value);
 }
 
 void CompleterItemDelegate::paintValue(QPainter* painter, const QFontMetrics& metrics, int& x, int y, const QString& text) const
 {
     painter->drawText(QPoint(x, y), text);
-    x += metrics.width(text);
+    x += metrics.horizontalAdvance(text);
 }
 
 void CompleterItemDelegate::paintLabel(QPainter* painter, int& x, int y, const QString& text, bool emptyValue) const
diff --git a/SQLiteStudio3/guiSQLiteStudio/completer/completerwindow.cpp b/SQLiteStudio3/guiSQLiteStudio/completer/completerwindow.cpp
index 87ad64c..89a0848 100644
--- a/SQLiteStudio3/guiSQLiteStudio/completer/completerwindow.cpp
+++ b/SQLiteStudio3/guiSQLiteStudio/completer/completerwindow.cpp
@@ -42,12 +42,12 @@ void CompleterWindow::init()
 void CompleterWindow::reset()
 {
     model->clear();
-    ui->status->showMessage(QString::null);
+    ui->status->showMessage(QString());
 }
 
 void CompleterWindow::setData(const CompletionHelper::Results& completionResults)
 {
-    ui->status->showMessage(QString::null);
+    ui->status->showMessage(QString());
     model->setData(completionResults.expectedTokens);
     filter = completionResults.partialToken;
     wrappedFilter = completionResults.wrappedToken;
@@ -89,7 +89,7 @@ void CompleterWindow::shringFilterBy(int chars)
 
 void CompleterWindow::extendFilterBy(const QString& text)
 {
-    if (filter.isEmpty() && text.size() == 1 && isWrapperChar(text[0], db->getDialect()))
+    if (filter.isEmpty() && text.size() == 1 && isWrapperChar(text[0]))
     {
         wrappedFilter = true;
         updateFilter();