Preparing for upstream merge

src/tools/toolfactory.cpp

@@ -22,6 +22,7 @@
 #include "copy/copytool.h"
 #include "exit/exittool.h"
 #include "launcher/applaunchertool.h"
+#include "imgur/imguruploadertool.h"
 #include "line/linetool.h"
 #include "marker/markertool.h"
 #include "move/movetool.h"
@@ -34,7 +35,6 @@
 #include "selection/selectiontool.h"
 #include "sizeindicator/sizeindicatortool.h"
 #include "src/utils/confighandler.h"
-#include "storage/storagemanager.h"
 #include "text/texttool.h"
 #include "undo/undotool.h"
 
@@ -45,7 +45,6 @@ ToolFactory::ToolFactory(QObject* parent)
 CaptureTool* ToolFactory::CreateTool(CaptureToolButton::ButtonType t,
                                      QObject* parent)
 {
-    StorageManager storageManager;
     CaptureTool* tool;
     switch (t) {
         case CaptureToolButton::TYPE_ARROW:
@@ -61,8 +60,7 @@ CaptureTool* ToolFactory::CreateTool(CaptureToolButton::ButtonType t,
             tool = new ExitTool(parent);
             break;
         case CaptureToolButton::TYPE_IMAGEUPLOADER:
-            tool = storageManager.imgUploaderTool(
-              ConfigHandler().uploadStorage(), parent);
+            tool = new ImgurUploaderTool(parent);
             break;
         case CaptureToolButton::TYPE_DRAWER:
             tool = new LineTool(parent);