From 8df553058b76818d13bca8ec2fc7fc83d147dca8 Mon Sep 17 00:00:00 2001 From: Neil Date: Sat, 10 Aug 2013 12:43:55 +1000 Subject: Backed out change #4739 for Qt 5 on OS X as the code was LGPL. --- qt/ScintillaEditBase/ScintillaQt.h | 36 ------------------------------------ 1 file changed, 36 deletions(-) (limited to 'qt/ScintillaEditBase/ScintillaQt.h') 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 -#include #include #include #include @@ -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 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 data, QString flav) = 0; - virtual QList 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 -- cgit v1.2.3