Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-06 19:59:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Cleanup after merge conflict

Browse source
This commit is contained in:
Zach Fox 2018-05-10 09:51:45 -07:00
parent ce575d367a
commit 0236bc0c44
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/src/ui/Snapshot.cpp
View file

@ -333,7 +333,7 @@ QTemporaryFile* Snapshot::saveTempSnapshot(QImage image) {
return static_cast<QTemporaryFile*>(savedFileForSnapshot(image, true)); return static_cast<QTemporaryFile*>(savedFileForSnapshot(image, true));
} }
QFile* Snapshot::savedFileForSnapshot(QImage & shot, bool isTemporary, const QString& userSelectedFilename) { QFile* Snapshot::savedFileForSnapshot(QImage & shot, bool isTemporary, const QString& userSelectedFilename, const QString& userSelectedPathname) {
// adding URL to snapshot // adding URL to snapshot
QUrl currentURL = DependencyManager::get<AddressManager>()->currentPublicAddress(); QUrl currentURL = DependencyManager::get<AddressManager>()->currentPublicAddress();

2
interface/src/ui/Snapshot.h
View file

@ -17,6 +17,7 @@
#include <QString> #include <QString>
#include <QStandardPaths> #include <QStandardPaths>
#include <QUrl> #include <QUrl>
#include <QTimer>
#include <SettingHandle.h> #include <SettingHandle.h>
#include <DependencyManager.h> #include <DependencyManager.h>
@ -62,7 +63,6 @@ private:
bool isTemporary, bool isTemporary,
const QString& userSelectedFilename = QString(), const QString& userSelectedFilename = QString(),
const QString& userSelectedPathname = QString()); const QString& userSelectedPathname = QString());
static QString snapshotFilename; static QString snapshotFilename;
static bool cubemapOutputFormat; static bool cubemapOutputFormat;
static QTimer snapshotTimer; static QTimer snapshotTimer;