Merge branch 'master' of https://github.com/lupoDharkael/flameshot into save

src/utils/confighandler.cpp

@@ -325,6 +325,14 @@ void ConfigHandler::setCloseAfterScreenshot(const bool close) {
     m_settings.setValue(QStringLiteral("closeAfterScreenshot"), close);
 }
 
+bool ConfigHandler::copyAndCloseAfterUploadEnabled() {
+    return m_settings.value(QStringLiteral("copyAndCloseAfterUpload")).toBool();
+}
+
+void ConfigHandler::setCopyAndCloseAfterUploadEnabled(const bool value) {
+    m_settings.setValue(QStringLiteral("copyAndCloseAfterUpload"), value);
+}
+
 bool ConfigHandler::saveAfterCopyValue() {
     return m_settings.value(QStringLiteral("saveAfterCopy")).toBool();
 }

src/utils/confighandler.h

@@ -71,6 +71,9 @@ public:
     bool closeAfterScreenshotValue();
     void setCloseAfterScreenshot(const bool);
 
+    bool copyAndCloseAfterUploadEnabled();
+    void setCopyAndCloseAfterUploadEnabled(const bool);
+
     bool saveAfterCopyValue();
     void setSaveAfterCopy(const bool);
 

src/utils/globalvalues.h

@@ -15,10 +15,7 @@
 //     You should have received a copy of the GNU General Public License
 //     along with Flameshot.  If not, see <http://www.gnu.org/licenses/>.
 
-#define pragma once
-
-#include <QVector>
-#include "src/widgets/capture/capturebutton.h"
+#pragma once
 
 namespace GlobalValues {