mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-30 05:12:40 +00:00
fix memory leak, using boost::shared_ptr because std::auto_ptr as no value semantic
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24344 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
parent
eaa86aaaf7
commit
1833d310af
@ -53,6 +53,8 @@
|
|||||||
#include <objidl.h>
|
#include <objidl.h>
|
||||||
#endif // Q_WS_WIN
|
#endif // Q_WS_WIN
|
||||||
|
|
||||||
|
#include <boost/shared_ptr.hpp>
|
||||||
|
|
||||||
#include <map>
|
#include <map>
|
||||||
|
|
||||||
using namespace std;
|
using namespace std;
|
||||||
@ -169,7 +171,7 @@ QVector<FORMATETC> QWindowsMimeMetafile::formatsForMime(
|
|||||||
return formats;
|
return formats;
|
||||||
}
|
}
|
||||||
|
|
||||||
static QWindowsMimeMetafile * metafileWindowsMime;
|
static boost::shared_ptr<QWindowsMimeMetafile> metafileWindowsMime;
|
||||||
|
|
||||||
#endif // Q_WS_WIN
|
#endif // Q_WS_WIN
|
||||||
|
|
||||||
@ -234,7 +236,7 @@ QList<QByteArray> QMacPasteboardMimeGraphics::convertFromMime(QString const & mi
|
|||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
static QMacPasteboardMimeGraphics * graphicsPasteboardMime;
|
static boost::shared_ptr<QMacPasteboardMimeGraphics> graphicsPasteboardMime;
|
||||||
|
|
||||||
#endif // Q_WS_MACX
|
#endif // Q_WS_MACX
|
||||||
|
|
||||||
@ -248,12 +250,16 @@ GuiClipboard::GuiClipboard()
|
|||||||
|
|
||||||
#ifdef Q_WS_MACX
|
#ifdef Q_WS_MACX
|
||||||
if (!graphicsPasteboardMime)
|
if (!graphicsPasteboardMime)
|
||||||
graphicsPasteboardMime = new QMacPasteboardMimeGraphics();
|
graphicsPasteboardMime =
|
||||||
|
boost::shared_ptr<QMacPasteboardMimeGraphics>
|
||||||
|
(new QMacPasteboardMimeGraphics());
|
||||||
#endif // Q_WS_MACX
|
#endif // Q_WS_MACX
|
||||||
|
|
||||||
#ifdef Q_WS_WIN
|
#ifdef Q_WS_WIN
|
||||||
if (!metafileWindowsMime)
|
if (!metafileWindowsMime)
|
||||||
metafileWindowsMime = new QWindowsMimeMetafile();
|
metafileWindowsMime =
|
||||||
|
boost::shared_ptr<QWindowsMimeMetafile>
|
||||||
|
(new QWindowsMimeMetafile());
|
||||||
#endif // Q_WS_WIN
|
#endif // Q_WS_WIN
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user