From b90600e674c744c97427b0de3ca69b5d35579056 Mon Sep 17 00:00:00 2001 From: Cristian Adam Date: Tue, 23 May 2023 14:04:40 +0200 Subject: [PATCH] CMakePM: Move cmListFileLexer.c as cmListFileLexer.cxx This way Qt Creator will not have two code model language contexts for the CMakeProjectManager. Change-Id: Ie71b845779aff472836b164a5c65fdc7d75debb1 Reviewed-by: hjk Reviewed-by: Reviewed-by: Qt CI Bot --- .../3rdparty/cmake/{cmListFileLexer.c => cmListFileLexer.cxx} | 2 +- .../cmakeprojectmanager/3rdparty/cmake/cmListFileLexer.in.l | 4 ++-- src/plugins/cmakeprojectmanager/CMakeLists.txt | 2 +- src/plugins/cmakeprojectmanager/cmakeprojectmanager.qbs | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) rename src/plugins/cmakeprojectmanager/3rdparty/cmake/{cmListFileLexer.c => cmListFileLexer.cxx} (99%) diff --git a/src/plugins/cmakeprojectmanager/3rdparty/cmake/cmListFileLexer.c b/src/plugins/cmakeprojectmanager/3rdparty/cmake/cmListFileLexer.cxx similarity index 99% rename from src/plugins/cmakeprojectmanager/3rdparty/cmake/cmListFileLexer.c rename to src/plugins/cmakeprojectmanager/3rdparty/cmake/cmListFileLexer.cxx index fae62886a73..380e360addc 100644 --- a/src/plugins/cmakeprojectmanager/3rdparty/cmake/cmListFileLexer.c +++ b/src/plugins/cmakeprojectmanager/3rdparty/cmake/cmListFileLexer.cxx @@ -2596,7 +2596,7 @@ static void cmListFileLexerAppend(cmListFileLexer* lexer, const char* text, } /* We need to extend the buffer. */ - temp = malloc(newSize); + temp = (char *) malloc(newSize); if (lexer->token.text) { memcpy(temp, lexer->token.text, lexer->token.length); free(lexer->token.text); diff --git a/src/plugins/cmakeprojectmanager/3rdparty/cmake/cmListFileLexer.in.l b/src/plugins/cmakeprojectmanager/3rdparty/cmake/cmListFileLexer.in.l index 2cf9f8cf2cb..d0c950a6143 100644 --- a/src/plugins/cmakeprojectmanager/3rdparty/cmake/cmListFileLexer.in.l +++ b/src/plugins/cmakeprojectmanager/3rdparty/cmake/cmListFileLexer.in.l @@ -7,7 +7,7 @@ This file must be translated to C and modified to build everywhere. Run flex >= 2.6 like this: - flex --nounistd -DFLEXINT_H --noline -ocmListFileLexer.c cmListFileLexer.in.l + flex --nounistd -DFLEXINT_H --noline -ocmListFileLexer.cxx cmListFileLexer.in.l Modify cmListFileLexer.c: - remove trailing whitespace: sed -i 's/\s*$//' cmListFileLexer.c @@ -309,7 +309,7 @@ static void cmListFileLexerAppend(cmListFileLexer* lexer, const char* text, } /* We need to extend the buffer. */ - temp = malloc(newSize); + temp = (char *)malloc(newSize); if (lexer->token.text) { memcpy(temp, lexer->token.text, lexer->token.length); free(lexer->token.text); diff --git a/src/plugins/cmakeprojectmanager/CMakeLists.txt b/src/plugins/cmakeprojectmanager/CMakeLists.txt index 3d9dc4849e0..057b4139459 100644 --- a/src/plugins/cmakeprojectmanager/CMakeLists.txt +++ b/src/plugins/cmakeprojectmanager/CMakeLists.txt @@ -44,6 +44,6 @@ add_qtc_plugin(CMakeProjectManager presetsmacros.cpp presetsmacros.h projecttreehelper.cpp projecttreehelper.h 3rdparty/cmake/cmListFileCache.cxx - 3rdparty/cmake/cmListFileLexer.c + 3rdparty/cmake/cmListFileLexer.cxx 3rdparty/cmake/cmListFileCache.h ) diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.qbs b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.qbs index 79d8c219f27..3597a948713 100644 --- a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.qbs +++ b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.qbs @@ -98,7 +98,7 @@ QtcPlugin { files: [ "cmListFileCache.cxx", "cmListFileCache.h", - "cmListFileLexer.c", + "cmListFileLexer.cxx", "cmListFileLexer.h", "cmStandardLexer.h", ]