diff options
author | Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> | 2018-06-13 23:40:40 +0200 |
---|---|---|
committer | Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> | 2018-06-28 20:40:40 +0000 |
commit | ce6c4349f7faca167f09f910952de9798352484e (patch) | |
tree | d53d5da4aa10587a8fcd293dcb57e6208649edb3 /src/gui | |
parent | dbcaa6d01ed6fd510f8b36bbe69fc1c9d8e21d88 (diff) |
Tracepoints: refactor the existing tracepoint names
Use CamelCase, like the API they're tracing.
Change-Id: Ie718ab624d17c9186bcf05cc1276c8eccad7f454
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
Diffstat (limited to 'src/gui')
-rw-r--r-- | src/gui/kernel/qguiapplication.cpp | 8 | ||||
-rw-r--r-- | src/gui/qtgui.tracepoints | 18 | ||||
-rw-r--r-- | src/gui/text/qfontdatabase.cpp | 8 |
3 files changed, 18 insertions, 16 deletions
diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp index 10defabd4f..57123f4831 100644 --- a/src/gui/kernel/qguiapplication.cpp +++ b/src/gui/kernel/qguiapplication.cpp @@ -1404,7 +1404,7 @@ void QGuiApplicationPrivate::eventDispatcherReady() void QGuiApplicationPrivate::init() { - Q_TRACE(qguiapplicationprivate_init_entry); + Q_TRACE(QGuiApplicationPrivate_init_entry); #if defined(Q_OS_MACOS) QMacAutoReleasePool pool; @@ -1569,7 +1569,7 @@ void QGuiApplicationPrivate::init() QObject::connect(q, &QGuiApplication::applicationNameChanged, q, &QGuiApplication::applicationDisplayNameChanged); - Q_TRACE(qguiapplicationprivate_init_exit); + Q_TRACE(QGuiApplicationPrivate_init_exit); } extern void qt_cleanupFontDatabase(); @@ -1807,7 +1807,7 @@ bool QGuiApplicationPrivate::processNativeEvent(QWindow *window, const QByteArra void QGuiApplicationPrivate::processWindowSystemEvent(QWindowSystemInterfacePrivate::WindowSystemEvent *e) { - Q_TRACE(qguiapplicationprivate_processwsevents_entry, e->type); + Q_TRACE(QGuiApplicationPrivate_processWindowSystemEvent_entry, e->type); switch(e->type) { case QWindowSystemInterfacePrivate::Mouse: @@ -1918,7 +1918,7 @@ void QGuiApplicationPrivate::processWindowSystemEvent(QWindowSystemInterfacePriv break; } - Q_TRACE(qguiapplicationprivate_processwsevents_exit, e->type); + Q_TRACE(QGuiApplicationPrivate_processWindowSystemEvent_exit, e->type); } /*! \internal diff --git a/src/gui/qtgui.tracepoints b/src/gui/qtgui.tracepoints index aa8a8ede57..2c232a0af8 100644 --- a/src/gui/qtgui.tracepoints +++ b/src/gui/qtgui.tracepoints @@ -1,8 +1,10 @@ -qfontdatabase_addapplicationfont(const QString &filename) -qfontdatabase_load(const QString &family, int pointSize) -qfontdatabase_loadengine(const QString &family, int pointSize) -qfontdatabaseprivate_addappfont(const QString &fileName) -qguiapplicationprivate_init_entry() -qguiapplicationprivate_init_exit() -qguiapplicationprivate_processwsevents_entry(int type) -qguiapplicationprivate_processwsevents_exit(int type) +QGuiApplicationPrivate_init_entry() +QGuiApplicationPrivate_init_exit() + +QGuiApplicationPrivate_processWindowSystemEvent_entry(int type) +QGuiApplicationPrivate_processWindowSystemEvent_exit(int type) + +QFontDatabase_addApplicationFont(const QString &filename) +QFontDatabase_load(const QString &family, int pointSize) +QFontDatabase_loadEngine(const QString &family, int pointSize) +QFontDatabasePrivate_addAppFont(const QString &fileName) diff --git a/src/gui/text/qfontdatabase.cpp b/src/gui/text/qfontdatabase.cpp index 42c449a0c8..196eebb353 100644 --- a/src/gui/text/qfontdatabase.cpp +++ b/src/gui/text/qfontdatabase.cpp @@ -1009,7 +1009,7 @@ QFontEngine *loadEngine(int script, const QFontDef &request, QFontEngine *engine = loadSingleEngine(script, request, family, foundry, style, size); if (engine && !(request.styleStrategy & QFont::NoFontMerging) && !engine->symbol) { - Q_TRACE(qfontdatabase_loadengine, request.family, request.pointSize); + Q_TRACE(QFontDatabase_loadEngine, request.family, request.pointSize); QPlatformFontDatabase *pfdb = QGuiApplicationPrivate::platformIntegration()->fontDatabase(); QFontEngineMulti *pfMultiEngine = pfdb->fontEngineMulti(engine, QChar::Script(script)); @@ -2441,7 +2441,7 @@ int QFontDatabasePrivate::addAppFont(const QByteArray &fontData, const QString & font.data = fontData; font.fileName = fileName; - Q_TRACE(qfontdatabaseprivate_addappfont, fileName); + Q_TRACE(QFontDatabasePrivate_addAppFont, fileName); int i; for (i = 0; i < applicationFonts.count(); ++i) @@ -2499,7 +2499,7 @@ int QFontDatabase::addApplicationFont(const QString &fileName) if (!f.open(QIODevice::ReadOnly)) return -1; - Q_TRACE(qfontdatabase_addapplicationfont, fileName); + Q_TRACE(QFontDatabase_addApplicationFont, fileName); data = f.readAll(); } @@ -2799,7 +2799,7 @@ void QFontDatabase::load(const QFontPrivate *d, int script) QFontEngine *fe = nullptr; - Q_TRACE(qfontdatabase_load, req.family, req.pointSize); + Q_TRACE(QFontDatabase_load, req.family, req.pointSize); req.fallBackFamilies = fallBackFamilies; if (!req.fallBackFamilies.isEmpty()) |