qpa: Remove references to lighthouse

Change-Id: I37646113f626c878883cff49f4e186ec71bcfa15
Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
bb10
Tor Arne Vestbø 2020-04-03 13:56:26 +02:00
parent 713cd83200
commit 1c23d34ad4
36 changed files with 9 additions and 83 deletions

View File

@ -98,7 +98,7 @@ struct BMP_INFOHDR { // BMP information header
// BMP-Handler, which is also able to read and write the DIB
// (Device-Independent-Bitmap) format used internally in the Windows operating
// system for OLE/clipboard operations. DIB is a subset of BMP (without file
// header). The Windows-Lighthouse plugin accesses the DIB-functionality.
// header). The Windows platform plugin accesses the DIB-functionality.
class QBmpHandler : public QImageIOHandler
{

View File

@ -78,7 +78,7 @@ static bool qt_pixmap_thread_test()
if (qApp->thread() != QThread::currentThread()) {
bool fail = false;
if (!QGuiApplicationPrivate::platformIntegration()->hasCapability(QPlatformIntegration::ThreadedPixmaps)) {
printf("Lighthouse plugin does not support threaded pixmaps!\n");
printf("Platform plugin does not support threaded pixmaps!\n");
fail = true;
}
if (fail) {

View File

@ -2268,7 +2268,7 @@ bool QFontEngineMulti::canRender(const QChar *string, int len) const
return true;
}
/* Implement alphaMapForGlyph() which is called by Lighthouse/Windows code.
/* Implement alphaMapForGlyph() which is called by QPA Windows code.
* Ideally, that code should be fixed to correctly handle QFontEngineMulti. */
QImage QFontEngineMulti::alphaMapForGlyph(glyph_t glyph)

View File

@ -53,11 +53,10 @@ QT_BEGIN_NAMESPACE
Maintains a global stack storing the current event dispatcher and
its processing flags for access from the Windows procedure
qWindowsWndProc. Handling the Lighthouse gui events should be done
qWindowsWndProc. Handling the QPA gui events should be done
from within the qWindowsWndProc to ensure correct processing of messages.
\internal
\ingroup qt-lighthouse-win
*/
QWindowsGuiEventDispatcher::QWindowsGuiEventDispatcher(QObject *parent) :

View File

@ -593,7 +593,7 @@ void QFontconfigDatabase::populateFontDatabase()
++f;
}
//Lighthouse has very lazy population of the font db. We want it to be initialized when
//QPA has very lazy population of the font db. We want it to be initialized when
//QApplication is constructed, so that the population procedure can do something like this to
//set the default font
// const FcDefaultFont *s = defaults;

View File

@ -587,7 +587,6 @@ namespace {
/*!
\struct QWindowsFontEngineData
\brief Static constant data shared by the font engines.
\ingroup qt-lighthouse-win
*/
QWindowsFontEngineData::QWindowsFontEngineData()
@ -673,10 +672,9 @@ static inline bool initDirectWrite(QWindowsFontEngineData *d)
delayed population of the database again passing a font name
to EnumFontFamiliesEx(), working around the fact that
EnumFontFamiliesEx() does not list all fonts by default.
This should be introduced to Lighthouse as well?
This should be introduced to QPA as well?
\internal
\ingroup qt-lighthouse-win
*/
#ifndef QT_NO_DEBUG_STREAM

View File

@ -215,7 +215,6 @@ int QWindowsFontEngine::getGlyphIndexes(const QChar *str, int numChars, QGlyphLa
\class QWindowsFontEngine
\brief Standard Windows font engine.
\internal
\ingroup qt-lighthouse-win
Will probably be superseded by a common Free Type font engine in Qt 5.X.
*/

View File

@ -207,7 +207,6 @@ static DWRITE_RENDERING_MODE hintingPreferenceToRenderingMode(QFont::HintingPref
\class QWindowsFontEngineDirectWrite
\brief Windows font engine using Direct Write.
\internal
\ingroup qt-lighthouse-win
Font engine for subpixel positioned text on Windows Vista
(with platform update) and Windows 7. If selected during

View File

@ -60,7 +60,6 @@ typedef struct {
\sa QWindowsBackingStore
\internal
\ingroup qt-lighthouse-win
*/
static inline HDC createDC()

View File

@ -45,7 +45,7 @@
// -------------
//
// This file is not part of the Qt API. It provides helper functions
// for the Cocoa lighthouse plugin. This header file may
// for the Cocoa plugin. This header file may
// change from version to version without notice, or even be removed.
//
// We mean it.

View File

@ -74,8 +74,6 @@ QT_BEGIN_NAMESPACE
Input method support in Cocoa uses NSTextInput protorol. Therefore
almost all functionality is implemented in QNSView.
\ingroup qt-lighthouse-cocoa
*/

View File

@ -58,7 +58,6 @@ QT_BEGIN_NAMESPACE
\class QWindowsDirect2DBackingStore
\brief Backing store for windows.
\internal
\ingroup qt-lighthouse-win
*/
static inline QWindowsDirect2DPlatformPixmap *platformPixmap(QPixmap *p)

View File

@ -46,10 +46,9 @@
QT_BEGIN_NAMESPACE
/*!
\group qt-lighthouse-win
\title Qt Lighthouse plugin for Windows
\title Qt platform plugin for Windows
\brief Class documentation of the Qt Lighthouse plugin for Windows.
\brief Class documentation of the Qt platform plugin for Windows.
\section1 Supported Parameters
@ -78,7 +77,6 @@ QT_BEGIN_NAMESPACE
\class QWindowsIntegrationPlugin
\brief Plugin.
\internal
\ingroup qt-lighthouse-win
*/
/*!
@ -86,7 +84,6 @@ QT_BEGIN_NAMESPACE
\brief Namespace for enumerations, etc.
\internal
\ingroup qt-lighthouse-win
*/
/*!
@ -97,7 +94,6 @@ QT_BEGIN_NAMESPACE
With flags that should help to structure the code.
\internal
\ingroup qt-lighthouse-win
*/
class QWindowsIntegrationPlugin : public QPlatformIntegrationPlugin

View File

@ -55,7 +55,6 @@ QT_BEGIN_NAMESPACE
\class QWindowsBackingStore
\brief Backing store for windows.
\internal
\ingroup qt-lighthouse-win
*/
QWindowsBackingStore::QWindowsBackingStore(QWindow *window) :

View File

@ -71,7 +71,6 @@ QT_BEGIN_NAMESPACE
\note The OLE-functions used in this class require OleInitialize().
\internal
\ingroup qt-lighthouse-win
*/
#ifndef QT_NO_DEBUG_STREAM
@ -110,7 +109,6 @@ static QDebug operator<<(QDebug d, const QMimeData *mimeData)
\sa QWindowsInternalMimeDataBase, QWindowsClipboard
\internal
\ingroup qt-lighthouse-win
*/
IDataObject *QWindowsClipboardRetrievalMimeData::retrieveDataObject() const

View File

@ -185,7 +185,6 @@ static bool enableNonClientDpiScaling(HWND hwnd)
\sa QWindowsShell32DLL
\internal
\ingroup qt-lighthouse-win
*/
void QWindowsUser32DLL::init()
@ -251,7 +250,6 @@ QWindowsContext *QWindowsContext::m_instance = nullptr;
Holds state information formerly stored in \c qapplication_win.cpp.
\internal
\ingroup qt-lighthouse-win
*/
typedef QHash<HWND, QWindowsWindow *> HandleBaseWindowHash;
@ -1673,7 +1671,6 @@ static inline bool isTopLevel(HWND hwnd)
There is another one for timers, sockets, etc in
QEventDispatcherWin32.
\ingroup qt-lighthouse-win
*/
extern "C" LRESULT QT_WIN_CALLBACK qWindowsWndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)

View File

@ -73,7 +73,6 @@ Q_GUI_EXPORT HBITMAP qt_createIconMask(const QBitmap &bitmap);
\brief Cache key for storing values in a QHash with a QCursor as key.
\internal
\ingroup qt-lighthouse-win
*/
QWindowsPixmapCursorCacheKey::QWindowsPixmapCursorCacheKey(const QCursor &c)
@ -97,7 +96,6 @@ QWindowsPixmapCursorCacheKey::QWindowsPixmapCursorCacheKey(const QCursor &c)
as do the Window manager frames (resize/move handles).
\internal
\ingroup qt-lighthouse-win
\sa QWindowsWindowCursor
*/
@ -816,7 +814,6 @@ HCURSOR QWindowsCursor::hCursor(const QCursor &c) const
cursor handle resource.
\internal
\ingroup qt-lighthouse-win
\sa QWindowsCursor
*/

View File

@ -128,7 +128,6 @@ namespace QWindowsDialogs
remove all those messages (usually 1) and post the last one with a
reset button state.
\ingroup qt-lighthouse-win
*/
void eatMouseMove()
@ -171,7 +170,6 @@ void eatMouseMove()
\sa QWindowsDialogHelperBase
\internal
\ingroup qt-lighthouse-win
*/
class QWindowsNativeDialogBase : public QObject
@ -211,7 +209,6 @@ private:
\sa QWindowsDialogThread, QWindowsNativeDialogBase
\internal
\ingroup qt-lighthouse-win
*/
template <class BaseClass>
@ -265,7 +262,6 @@ QWindowsNativeDialogBase *QWindowsDialogHelperBase<BaseClass>::ensureNativeDialo
\sa QWindowsDialogHelperBase
\internal
\ingroup qt-lighthouse-win
*/
class QWindowsDialogThread : public QThread
@ -406,7 +402,6 @@ void QWindowsDialogHelperBase<BaseClass>::exec()
does not reliably work. Provides thread-safe setters (for the non-modal case).
\internal
\ingroup qt-lighthouse-win
\sa QFileDialogOptions
*/
@ -500,7 +495,6 @@ inline void QWindowsFileDialogSharedData::fromOptions(const QSharedPointer<QFile
\sa QWindowsNativeFileDialogBase, QWindowsFileDialogHelper
\internal
\ingroup qt-lighthouse-win
*/
class QWindowsNativeFileDialogBase;
@ -546,7 +540,6 @@ IFileDialogEvents *QWindowsNativeFileDialogEventHandler::create(QWindowsNativeFi
\sa QWindowsNativeFileDialogBase
\internal
\ingroup qt-lighthouse-win
*/
class QWindowsShellItem
{
@ -789,7 +782,6 @@ QDebug operator<<(QDebug d, IShellItem *i)
\sa QWindowsNativeFileDialogEventHandler, QWindowsFileDialogHelper
\internal
\ingroup qt-lighthouse-win
*/
class QWindowsNativeFileDialogBase : public QWindowsNativeDialogBase
@ -1295,7 +1287,6 @@ HRESULT QWindowsNativeFileDialogEventHandler::OnFileOk(IFileDialog *)
Implements single-selection methods.
\internal
\ingroup qt-lighthouse-win
*/
class QWindowsNativeSaveFileDialog : public QWindowsNativeFileDialogBase
@ -1372,7 +1363,6 @@ QList<QUrl> QWindowsNativeSaveFileDialog::selectedFiles() const
Implements multi-selection methods.
\internal
\ingroup qt-lighthouse-win
*/
class QWindowsNativeOpenFileDialog : public QWindowsNativeFileDialogBase
@ -1545,7 +1535,6 @@ QWindowsNativeFileDialogBase *QWindowsNativeFileDialogBase::create(QFileDialogOp
but only on QQuickWindows, which do not have a fallback.
\internal
\ingroup qt-lighthouse-win
*/
class QWindowsFileDialogHelper : public QWindowsDialogHelperBase<QPlatformFileDialogHelper>
@ -1681,7 +1670,6 @@ QString QWindowsFileDialogHelper::selectedNameFilter() const
\internal
\sa QWindowsXpFileDialogHelper
\ingroup qt-lighthouse-win
*/
class QWindowsXpNativeFileDialog : public QWindowsNativeDialogBase
@ -1929,7 +1917,6 @@ QList<QUrl> QWindowsXpNativeFileDialog::execFileNames(HWND owner, int *selectedF
\sa QWindowsXpNativeFileDialog
\internal
\ingroup qt-lighthouse-win
*/
class QWindowsXpFileDialogHelper : public QWindowsDialogHelperBase<QPlatformFileDialogHelper>
@ -2006,7 +1993,6 @@ QString QWindowsXpFileDialogHelper::selectedNameFilter() const
\sa QWindowsColorDialogHelper
\sa #define USE_NATIVE_COLOR_DIALOG
\internal
\ingroup qt-lighthouse-win
*/
using SharedPointerColor = QSharedPointer<QColor>;
@ -2086,7 +2072,6 @@ void QWindowsNativeColorDialog::doExec(HWND owner)
\sa #define USE_NATIVE_COLOR_DIALOG
\sa QWindowsNativeColorDialog
\internal
\ingroup qt-lighthouse-win
*/
class QWindowsColorDialogHelper : public QWindowsDialogHelperBase<QPlatformColorDialogHelper>

View File

@ -75,7 +75,6 @@ QT_BEGIN_NAMESPACE
\sa QWindowsOleDropSource
\internal
\ingroup qt-lighthouse-win
*/
class QWindowsDragCursorWindow : public QRasterWindow
@ -135,7 +134,6 @@ void QWindowsDragCursorWindow::setPixmap(const QPixmap &p)
\sa QWindowsDrag
\internal
\ingroup qt-lighthouse-win
*/
IDataObject *QWindowsDropMimeData::retrieveDataObject() const
@ -217,7 +215,6 @@ static Qt::MouseButtons lastButtons = Qt::NoButton;
\sa QWindowsDrag
\internal
\ingroup qt-lighthouse-win
*/
class QWindowsOleDropSource : public QWindowsComBase<IDropSource>
@ -485,7 +482,6 @@ QWindowsOleDropSource::GiveFeedback(DWORD dwEffect)
\sa QWindowsDrag
\internal
\ingroup qt-lighthouse-win
*/
QWindowsOleDropTarget::QWindowsOleDropTarget(QWindow *w) : m_window(w)
@ -659,7 +655,6 @@ QWindowsOleDropTarget::Drop(LPDATAOBJECT pDataObj, DWORD grfKeyState,
\class QWindowsDrag
\brief Windows drag implementation.
\internal
\ingroup qt-lighthouse-win
*/
bool QWindowsDrag::m_canceled = false;

View File

@ -54,7 +54,6 @@ QT_BEGIN_NAMESPACE
(instead of creating local hyperlinks).
\internal
\ingroup qt-lighthouse-win
*/
QWindowsDropDataObject::QWindowsDropDataObject(QMimeData *mimeData) :

View File

@ -63,7 +63,6 @@ QT_BEGIN_NAMESPACE
there is no need to differentiate between dynamic or Angle-only builds in here.
\internal
\ingroup qt-lighthouse-win
*/
QWindowsLibEGL QWindowsEGLStaticContext::libEGL;
@ -376,7 +375,6 @@ QSurfaceFormat QWindowsEGLStaticContext::formatFromConfig(EGLDisplay display, EG
\endlist
\internal
\ingroup qt-lighthouse-win
*/
QWindowsEGLContext::QWindowsEGLContext(QWindowsEGLStaticContext *staticContext,

View File

@ -858,7 +858,6 @@ static inline QOpenGLContextData createDummyWindowOpenGLContextData()
context and to apply to a QSurfaceFormat.
\internal
\ingroup qt-lighthouse-win
*/
QWindowsOpenGLContextFormat QWindowsOpenGLContextFormat::current()
@ -913,7 +912,6 @@ void QWindowsOpenGLContextFormat::apply(QSurfaceFormat *format) const
is a current GL context.
\internal
\ingroup qt-lighthouse-win
*/
class QOpenGLTemporaryContext
@ -946,7 +944,6 @@ QOpenGLTemporaryContext::~QOpenGLTemporaryContext()
/*!
\class QWindowsOpenGLAdditionalFormat
\brief Additional format information that is not in QSurfaceFormat
\ingroup qt-lighthouse-win
*/
/*!
@ -964,7 +961,6 @@ QOpenGLTemporaryContext::~QOpenGLTemporaryContext()
\sa QWindowsGLContext
\internal
\ingroup qt-lighthouse-win
*/
#define SAMPLE_BUFFER_EXTENSION "GL_ARB_multisample"
@ -1051,7 +1047,6 @@ QOpenGLStaticContext *QOpenGLStaticContext::create(bool softwareRendering)
QOpenGLContextData and are released in doneCurrent().
\internal
\ingroup qt-lighthouse-win
*/
QWindowsGLContext::QWindowsGLContext(QOpenGLStaticContext *staticContext,

View File

@ -160,7 +160,6 @@ Q_CORE_EXPORT QLocale qt_localeFromLCID(LCID id); // from qlocale_win.cpp
needs to be checked (mouse grab might interfere with candidate window).
\internal
\ingroup qt-lighthouse-win
*/

View File

@ -128,7 +128,6 @@ QT_BEGIN_NAMESPACE
QWindowsUser32DLL and QWindowsShell32DLL. All function pointers should go to
these structs to avoid lookups in several places.
\ingroup qt-lighthouse-win
*/
struct QWindowsIntegrationPrivate

View File

@ -60,7 +60,6 @@
\sa QInternalMimeData, QWindowsMime, QWindowsMimeConverter
\internal
\ingroup qt-lighthouse-win
*/
bool QWindowsInternalMimeData::hasFormat_sys(const QString &mime) const

View File

@ -88,7 +88,6 @@ QT_BEGIN_NAMESPACE
\class QWindowsKeyMapper
\brief Translates Windows keys to QWindowSystemInterface events.
\internal
\ingroup qt-lighthouse-win
In addition, handles some special keys to display system menus, etc.
The code originates from \c qkeymapper_win.cpp.

View File

@ -65,7 +65,6 @@ QT_BEGIN_NAMESPACE
Qt Widgets, either the containers or the items might be deleted first.
\internal
\ingroup qt-lighthouse-win
*/
static uint nextId = 1;

View File

@ -447,7 +447,6 @@ QDebug operator<<(QDebug d, IDataObject *dataObj)
\class QWindowsMime
\brief The QWindowsMime class maps open-standard MIME to Window Clipboard formats.
\internal
\ingroup qt-lighthouse-win
Qt's drag-and-drop and clipboard facilities use the MIME standard.
On X11, this maps trivially to the Xdnd protocol, but on Windows
@ -1495,7 +1494,6 @@ QString QLastResortMimes::mimeForFormat(const FORMATETC &formatetc) const
\class QWindowsMimeConverter
\brief Manages the list of QWindowsMime instances.
\internal
\ingroup qt-lighthouse-win
\sa QWindowsMime
*/

View File

@ -145,7 +145,6 @@ static inline QTouchDevice *createTouchDevice()
Dispatches mouse and touch events. Separate for code cleanliness.
\internal
\ingroup qt-lighthouse-win
*/
QWindowsMouseHandler::QWindowsMouseHandler() = default;

View File

@ -58,7 +58,6 @@ QT_BEGIN_NAMESPACE
\endlist
\internal
\ingroup qt-lighthouse-win
*/
class QWindowsNativeInterface : public QPlatformNativeInterface

View File

@ -70,7 +70,6 @@ QT_BEGIN_NAMESPACE
\endlist
\internal
\ingroup qt-lighthouse-win
*/
QWindowsOleDataObject::QWindowsOleDataObject(QMimeData *mimeData) :
@ -228,7 +227,6 @@ QWindowsOleDataObject::EnumDAdvise(LPENUMSTATDATA FAR*)
\class QWindowsOleEnumFmtEtc
\brief Enumerates the FORMATETC structures supported by QWindowsOleDataObject.
\internal
\ingroup qt-lighthouse-win
*/
QWindowsOleEnumFmtEtc::QWindowsOleEnumFmtEtc(const QVector<FORMATETC> &fmtetcs)

View File

@ -171,7 +171,6 @@ static QDebug operator<<(QDebug dbg, const QWindowsScreenData &d)
\brief Windows screen.
\sa QWindowsScreenManager
\internal
\ingroup qt-lighthouse-win
*/
QWindowsScreen::QWindowsScreen(const QWindowsScreenData &data) :
@ -432,7 +431,6 @@ QPlatformScreen::SubpixelAntialiasingType QWindowsScreen::subpixelAntialiasingTy
\sa QWindowsScreen
\internal
\ingroup qt-lighthouse-win
*/
QWindowsScreenManager::QWindowsScreenManager() = default;

View File

@ -184,7 +184,6 @@ static inline HWND createTrayIconMessageWindow()
\brief Windows native system tray icon
\internal
\ingroup qt-lighthouse-win
*/
QWindowsSystemTrayIcon::QWindowsSystemTrayIcon()

View File

@ -173,7 +173,6 @@ QWindowsWinTab32DLL QWindowsTabletSupport::m_winTab32DLL;
\brief Functions from wintabl32.dll shipped with WACOM tablets used by QWindowsTabletSupport.
\internal
\ingroup qt-lighthouse-win
*/
bool QWindowsWinTab32DLL::init()
@ -205,7 +204,6 @@ bool QWindowsWinTab32DLL::init()
\internal
\since 5.2
\ingroup qt-lighthouse-win
*/
QWindowsTabletSupport::QWindowsTabletSupport(HWND window, HCTX context)

View File

@ -55,7 +55,6 @@ QT_BEGIN_NAMESPACE
to be done by using QWaitCondition/QMutex.
\internal
\ingroup qt-lighthouse-win
*/
class QWindowsThreadPoolRunner
{

View File

@ -489,7 +489,6 @@ static QMargins invisibleMargins(QPoint screenPoint)
\sa QWindowCreationContext
\internal
\ingroup qt-lighthouse-win
*/
struct WindowCreationData
@ -917,7 +916,6 @@ static QSize toNativeSizeConstrained(QSize dip, const QScreen *s)
into account.
\internal
\ingroup qt-lighthouse-win
*/
QMargins QWindowsGeometryHint::frameOnPrimaryScreen(DWORD style, DWORD exStyle)
@ -1087,7 +1085,6 @@ bool QWindowsGeometryHint::positionIncludesFrame(const QWindow *w)
\since 5.6
\internal
\ingroup qt-lighthouse-win
*/
bool QWindowsBaseWindow::isRtlLayout(HWND hwnd)
@ -1176,7 +1173,6 @@ QPoint QWindowsBaseWindow::mapFromGlobal(const QPoint &pos) const
\brief Window wrapping GetDesktopWindow not allowing any manipulation.
\since 5.6
\internal
\ingroup qt-lighthouse-win
*/
/*!
@ -1189,7 +1185,6 @@ QPoint QWindowsBaseWindow::mapFromGlobal(const QPoint &pos) const
\since 5.6
\internal
\ingroup qt-lighthouse-win
*/
QWindowsForeignWindow::QWindowsForeignWindow(QWindow *window, HWND hwnd)
@ -1248,7 +1243,6 @@ void QWindowsForeignWindow::setVisible(bool visible)
\sa WindowCreationData, QWindowsContext
\internal
\ingroup qt-lighthouse-win
*/
QWindowCreationContext::QWindowCreationContext(const QWindow *w, const QScreen *s,
@ -1318,7 +1312,6 @@ void QWindowCreationContext::applyToMinMaxInfo(MINMAXINFO *mmi) const
\endlist
\internal
\ingroup qt-lighthouse-win
*/
const char *QWindowsWindow::embeddedNativeParentHandleProperty = "_q_embedded_native_parent_handle";