diff options
| -rw-r--r-- | qt/ScintillaEditBase/ScintillaQt.cpp | 24 | ||||
| -rw-r--r-- | qt/ScintillaEditBase/ScintillaQt.h | 36 | 
2 files changed, 0 insertions, 60 deletions
| diff --git a/qt/ScintillaEditBase/ScintillaQt.cpp b/qt/ScintillaEditBase/ScintillaQt.cpp index b1e6221e7..66beaed92 100644 --- a/qt/ScintillaEditBase/ScintillaQt.cpp +++ b/qt/ScintillaEditBase/ScintillaQt.cpp @@ -75,30 +75,6 @@ static const QString sMimeRectangularMarker("text/x-rectangular-marker");  #ifdef Q_OS_MAC -#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0) - -class QMacPasteboardMime; -typedef QList<QMacPasteboardMime*> MimeList; -Q_GLOBAL_STATIC(MimeList, globalMimeList) - -QMacPasteboardMime::QMacPasteboardMime(char t) : type(t) -{ -    globalMimeList()->append(this); -} - -QMacPasteboardMime::~QMacPasteboardMime() -{ -    if(!QApplication::closingDown()) -        globalMimeList()->removeAll(this); -} - -Q_GLOBAL_STATIC(QStringList, globalDraggedTypesList) -void qRegisterDraggedTypes(const QStringList &types) -{ -    (*globalDraggedTypesList()) += types; -} -#endif -  class ScintillaRectangularMime : public QMacPasteboardMime {  public:  	ScintillaRectangularMime() : QMacPasteboardMime(MIME_ALL) { diff --git a/qt/ScintillaEditBase/ScintillaQt.h b/qt/ScintillaEditBase/ScintillaQt.h index d4e2e789c..d3c5be594 100644 --- a/qt/ScintillaEditBase/ScintillaQt.h +++ b/qt/ScintillaEditBase/ScintillaQt.h @@ -53,7 +53,6 @@  #endif  #include <QObject> -#include <QList>  #include <QAbstractScrollArea>  #include <QAction>  #include <QClipboard> @@ -63,41 +62,6 @@  namespace Scintilla {  #endif -#ifdef Q_OS_MAC -#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0) - -class QMacPasteboardMime { -    char type; -public: -    enum QMacPasteboardMimeType { MIME_DND=0x01, -                                  MIME_CLIP=0x02, -                                  MIME_QT_CONVERTOR=0x04, -                                  MIME_QT3_CONVERTOR=0x08, -                                  MIME_ALL=MIME_DND|MIME_CLIP -    }; -    explicit QMacPasteboardMime(char t); -    virtual ~QMacPasteboardMime(); - -    static void initialize(); - -    static QList<QMacPasteboardMime*> all(uchar); -    static QMacPasteboardMime *convertor(uchar, const QString &mime, QString flav); -    static QString flavorToMime(uchar, QString flav); - -    virtual QString convertorName() = 0; - -    virtual bool canConvert(const QString &mime, QString flav) = 0; -    virtual QString mimeFor(QString flav) = 0; -    virtual QString flavorFor(const QString &mime) = 0; -    virtual QVariant convertToMime(const QString &mime, QList<QByteArray> data, QString flav) = 0; -    virtual QList<QByteArray> convertFromMime(const QString &mime, QVariant data, QString flav) = 0; -}; - -// ### Qt 5: Add const QStringList& QMacPasteboardMime::supportedFlavours() -Q_GUI_EXPORT void qRegisterDraggedTypes(const QStringList &types); -#endif -#endif -  class ScintillaQt : public QObject, public ScintillaBase {  	Q_OBJECT | 
