Preparing for upstream merge

2020-10-20 06:53:59 -05:00
parent ffb119fabb
commit 62466d6581
42 changed files with 308 additions and 1961 deletions
--- a/src/widgets/capture/capturewidget.cpp
+++ b/src/widgets/capture/capturewidget.cpp
@@ -25,7 +25,6 @@

 #include "capturewidget.h"
 #include "src/core/controller.h"
-#include "src/tools/storage/storagemanager.h"
 #include "src/tools/toolfactory.h"
 #include "src/utils/colorutils.h"
 #include "src/utils/screengrabber.h"
@@ -1094,16 +1093,6 @@ void CaptureWidget::childLeave()
    update();
 }

-void CaptureWidget::uploadScreenshot()
-{
-    StorageManager storageManager;
-    m_activeTool =
-      storageManager.imgUploaderTool(ConfigHandler().uploadStorage());
-    m_activeTool->setCapture(pixmap());
-    handleButtonSignal(CaptureTool::REQ_ADD_EXTERNAL_WIDGETS);
-    close();
-}
-
 void CaptureWidget::copyScreenshot()
 {
    m_captureDone = true;