Update upstream source from tag 'upstream/3.4.4+dfsg'

Update to upstream version '3.4.4+dfsg'
with Debian dir 482614bd23f0ef52dabc9803477204ad88e917ed

1 files changed, 6 insertions, 5 deletions

diff --git a/Plugins/MultiEditorImage/multieditorimage.cpp b/Plugins/MultiEditorImage/multieditorimage.cpp
index 68ed77b..9571b8f 100644
--- a/Plugins/MultiEditorImage/multieditorimage.cpp
+++ b/Plugins/MultiEditorImage/multieditorimage.cpp
@@ -1,5 +1,4 @@
 #include "multieditorimage.h"
-#include "common/unused.h"
 #include "iconmanager.h"
 #include "uiconfig.h"
 #include "services/notifymanager.h"
@@ -163,7 +162,7 @@ void MultiEditorImage::saveFile()
     QFile file(fileName);
     if (!file.open(QIODevice::WriteOnly))
     {
-        notifyError(tr("Could not nopen file %1 for writting.").arg(fileName));
+        notifyError(tr("Could not open file %1 for writting.").arg(fileName));
         return;
     }
 
@@ -205,6 +204,7 @@ bool MultiEditorImagePlugin::validFor(const DataType& dataType)
     switch (dataType.getType())
     {
         case DataType::BLOB:
+        case DataType::ANY:
         case DataType::NONE:
         case DataType::unknown:
             return true;
@@ -235,6 +235,7 @@ int MultiEditorImagePlugin::getPriority(const DataType& dataType)
         case DataType::BLOB:
             return 10;
         case DataType::NONE:
+        case DataType::ANY:
         case DataType::unknown:
             return 50;
         case DataType::BOOLEAN:
@@ -264,17 +265,17 @@ QString MultiEditorImagePlugin::getTabLabel()
 
 bool MultiEditorImagePlugin::init()
 {
-    Q_INIT_RESOURCE(multieditorimage);
+    SQLS_INIT_RESOURCE(multieditorimage);
     return GenericPlugin::init();
 }
 
 void MultiEditorImagePlugin::deinit()
 {
-    for (MultiEditorImage* editor : instances)
+    for (MultiEditorImage*& editor : instances)
     {
         editor->notifyAboutUnload();
         delete editor;
     }
 
-    Q_CLEANUP_RESOURCE(multieditorimage);
+    SQLS_CLEANUP_RESOURCE(multieditorimage);
 }