Skip to content

Commit 91462df

Browse files
committed
SVG ClipBoard: minor changes
1 parent 1808aef commit 91462df

File tree

4 files changed

+10
-8
lines changed

4 files changed

+10
-8
lines changed

src/app/GUI/menu.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ void MainWindow::setupMenuBar()
231231
mEditMenu->addAction(QIcon::fromTheme("paste"),
232232
tr("Paste from Clipboard"),
233233
[this]() {
234-
const QString svg = Ui::SvgClipboard::getContent();
234+
const QString svg = Ui::SvgClipBoard::getContent();
235235
if (!svg.isEmpty()) {
236236
try { mActions.importClipboard(svg); }
237237
catch (const std::exception& e) { gPrintExceptionCritical(e); }

src/ui/system/svgclipboard.cpp

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,17 +25,18 @@
2525
#include <QDomDocument>
2626
#include <QGuiApplication>
2727
#include <QClipboard>
28+
#include <QDebug>
2829

2930
using namespace Friction::Ui;
3031

3132
#ifndef Q_OS_MAC
32-
const QString SvgClipboard::getContent()
33+
const QString SvgClipBoard::getContent()
3334
{
3435
return getClipboard();
3536
}
3637
#endif
3738

38-
const QString SvgClipboard::getContent(const QMimeData *mime)
39+
const QString SvgClipBoard::getContent(const QMimeData *mime)
3940
{
4041
if (!mime) { return QString(); }
4142

@@ -61,8 +62,9 @@ const QString SvgClipboard::getContent(const QMimeData *mime)
6162
return QString();
6263
}
6364

64-
bool SvgClipboard::isSvg(const QString &content)
65+
bool SvgClipBoard::isSvg(const QString &content)
6566
{
67+
qDebug() << "SVG in clipboard?" << content;
6668
if (content.isEmpty() ||
6769
!content.contains("<svg", Qt::CaseInsensitive)) {
6870
return false;
@@ -77,7 +79,7 @@ bool SvgClipboard::isSvg(const QString &content)
7779
return false;
7880
}
7981

80-
const QString SvgClipboard::getClipboard()
82+
const QString SvgClipBoard::getClipboard()
8183
{
8284
const auto clipboard = QGuiApplication::clipboard();
8385
if (clipboard) { return getContent(clipboard->mimeData()); }

src/ui/system/svgclipboard.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ namespace Friction
3232
{
3333
namespace Ui
3434
{
35-
class UI_EXPORT SvgClipboard
35+
class UI_EXPORT SvgClipBoard
3636
{
3737
public:
3838
static const QString getContent();

src/ui/system/svgclipboard.mm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727

2828
using namespace Friction::Ui;
2929

30-
const QString SvgClipboard::getContent()
30+
const QString SvgClipBoard::getContent()
3131
{
3232
@autoreleasepool{
3333
NSPasteboard* pb = [NSPasteboard generalPasteboard];
@@ -42,7 +42,7 @@
4242
for (NSString* type in types) {
4343
NSString* str = [pb stringForType:type];
4444
if (!str) { continue; }
45-
QString qStr = QString::fromUtf8([str UTF8String]);
45+
const QString qStr = QString::fromUtf8([str UTF8String]);
4646
if (isSvg(qStr)) { return qStr; }
4747
}
4848
}

0 commit comments

Comments
 (0)