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

1 files changed, 4 insertions, 3 deletions

diff --git a/SQLiteStudio3/guiSQLiteStudio/multieditor/multieditor.cpp b/SQLiteStudio3/guiSQLiteStudio/multieditor/multieditor.cpp
index d766738..0f965cd 100644
--- a/SQLiteStudio3/guiSQLiteStudio/multieditor/multieditor.cpp
+++ b/SQLiteStudio3/guiSQLiteStudio/multieditor/multieditor.cpp
@@ -14,6 +14,8 @@
 #include "uiconfig.h"
 #include "dialogs/configdialog.h"
 #include "formview.h"
+#include "themetuner.h"
+#include "common/compatibility.h"
 #include <QVBoxLayout>
 #include <QHBoxLayout>
 #include <QTabWidget>
@@ -26,7 +28,6 @@
 #include <QToolButton>
 #include <QDebug>
 #include <QKeyEvent>
-#include <themetuner.h>
 
 static QHash<QString,bool> missingEditorPluginsAlreadyWarned;
 
@@ -55,7 +56,7 @@ void MultiEditor::init(TabsMode tabsMode)
     QFont font = cornerLabel->font();
     font.setBold(true);
     cornerLabel->setFont(font);
-    cornerLabel->setFrameStyle(QFrame::StyledPanel|QFrame::Plain);
+    cornerLabel->setFrameStyle(QFrame::NoFrame);
     hbox->addWidget(cornerLabel);
     cornerLabel->setVisible(false);
 
@@ -365,7 +366,7 @@ QList<MultiEditorWidget*> MultiEditor::getEditorTypes(const DataType& dataType)
         sortedEditors << editorWithPrio;
     }
 
-    qSort(sortedEditors.begin(), sortedEditors.end(), [=](const EditorWithPriority& ed1, const EditorWithPriority& ed2) -> bool
+    sSort(sortedEditors, [=](const EditorWithPriority& ed1, const EditorWithPriority& ed2) -> bool
     {
         return ed1.first < ed2.first;
     });