1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Tracepoints: refactor the existing tracepoint names

Browse Source 
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>
This commit is contained in:
Giuseppe D'Angelo 2018-06-13 23:40:40 +02:00
parent dbcaa6d01e
commit ce6c4349f7
7 changed files with 30 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/corelib/kernel/qcoreapplication.cpp
View File

@ -777,7 +777,7 @@ QCoreApplication::QCoreApplication(int &argc, char **argv
void QCoreApplicationPrivate::init()
{
Q_TRACE(qcoreapplicationprivate_init_entry);
Q_TRACE(QCoreApplicationPrivate_init_entry);
#if defined(Q_OS_MACOS)
QMacAutoReleasePool pool;
@ -872,7 +872,7 @@ void QCoreApplicationPrivate::init()
is_app_running = true; // No longer starting up.
#endif
Q_TRACE(qcoreapplicationprivate_init_exit);
Q_TRACE(QCoreApplicationPrivate_init_exit);
}
/*!

2
src/corelib/plugin/qfactoryloader.cpp
View File

@ -138,7 +138,7 @@ void QFactoryLoader::update()
qDebug() << "QFactoryLoader::QFactoryLoader() looking at" << fileName;
}
Q_TRACE(qfactoryloader_update, fileName);
Q_TRACE(QFactoryLoader_update, fileName);
library = QLibraryPrivate::findOrCreate(QFileInfo(fileName).canonicalFilePath());
if (!library->isPlugin()) {

4
src/corelib/plugin/qlibrary.cpp
View File

@ -550,7 +550,7 @@ bool QLibraryPrivate::load()
if (fileName.isEmpty())
return false;
Q_TRACE(qlibraryprivate_load_entry, fileName);
Q_TRACE(QLibraryPrivate_load_entry, fileName);
bool ret = load_sys();
if (qt_debug_component()) {
@ -568,7 +568,7 @@ bool QLibraryPrivate::load()
installCoverageTool(this);
}
Q_TRACE(qlibraryprivate_load_exit, ret);
Q_TRACE(QLibraryPrivate_load_exit, ret);
return ret;
}

12
src/corelib/qtcore.tracepoints
View File

@ -1,8 +1,10 @@
qcoreapplicationprivate_init_entry()
qcoreapplicationprivate_init_exit()
qfactoryloader_update(const QString &fileName)
qlibraryprivate_load_entry(const QString &fileName)
qlibraryprivate_load_exit(bool success)
QCoreApplicationPrivate_init_entry()
QCoreApplicationPrivate_init_exit()
QFactoryLoader_update(const QString &fileName)
QLibraryPrivate_load_entry(const QString &fileName)
QLibraryPrivate_load_exit(bool success)
QEvent_ctor(QEvent *event, int type)
QEvent_dtor(QEvent *event, int type)

8
src/gui/kernel/qguiapplication.cpp
View File

@ -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

18
src/gui/qtgui.tracepoints
View File

@ -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)

8
src/gui/text/qfontdatabase.cpp
View File

@ -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())