From 6392f5a9dfce2bf83617d49bb7f332181ec6004e Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sun, 25 May 2014 15:37:31 +0900 Subject: Revert "Finish renaming tdevelop components" This reverts commit 722ce1efbac31c61b1d4b13f7e075c9f311e3e73. --- lib/cppparser/CMakeLists.txt | 6 +++--- lib/cppparser/Makefile.am | 12 ++++++------ lib/cppparser/lexer.cpp | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) (limited to 'lib/cppparser') diff --git a/lib/cppparser/CMakeLists.txt b/lib/cppparser/CMakeLists.txt index 20db36c5..3b53e900 100644 --- a/lib/cppparser/CMakeLists.txt +++ b/lib/cppparser/CMakeLists.txt @@ -31,13 +31,13 @@ install( FILES DESTINATION ${INCLUDE_INSTALL_DIR}/tdevelop/cppparser ) -##### tdevcppparser (shared) #################### +##### kdevcppparser (shared) #################### -tde_add_library( tdevcppparser SHARED AUTOMOC +tde_add_library( kdevcppparser SHARED AUTOMOC SOURCES ast.cpp cachemanager.cpp driver.cpp errors.cpp lexer.cpp lexercache.cpp lookup.cpp parser.cpp tree_parser.cpp VERSION 0.0.0 - LINK tdevinterfaces-static tdeio-shared + LINK kdevinterfaces-static tdeio-shared DESTINATION ${LIB_INSTALL_DIR} ) diff --git a/lib/cppparser/Makefile.am b/lib/cppparser/Makefile.am index 082c8227..4e62cebf 100644 --- a/lib/cppparser/Makefile.am +++ b/lib/cppparser/Makefile.am @@ -1,11 +1,11 @@ INCLUDES = -I$(top_srcdir)/lib/interfaces $(all_includes) AM_CXXFLAGS = -DKDEVELOP_BGPARSER -lib_LTLIBRARIES = libtdevcppparser.la -libtdevcppparser_la_LDFLAGS = $(all_libraries) -libtdevcppparser_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(top_builddir)/lib/interfaces/libtdevinterfaces.la -lDCOP $(LIB_TDEUI) $(LIB_TDEPARTS) -ltdetexteditor $(LIB_TDEIO) -ltdescript -libtdevcppparser_la_SOURCES = ast.cpp cachemanager.cpp driver.cpp errors.cpp \ +lib_LTLIBRARIES = libkdevcppparser.la +libkdevcppparser_la_LDFLAGS = $(all_libraries) +libkdevcppparser_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(top_builddir)/lib/interfaces/libkdevinterfaces.la -lDCOP $(LIB_TDEUI) $(LIB_TDEPARTS) -ltdetexteditor $(LIB_TDEIO) -ltdescript +libkdevcppparser_la_SOURCES = ast.cpp cachemanager.cpp driver.cpp errors.cpp \ lexer.cpp lexercache.cpp lookup.cpp parser.cpp tree_parser.cpp -tdevcppparserincludedir = $(includedir)/tdevelop/cppparser -tdevcppparserinclude_HEADERS = ast.h driver.h lexer.h parser.h tree_parser.h errors.h lookup.h cachemanager.h lexercache.h macro.h +kdevcppparserincludedir = $(includedir)/tdevelop/cppparser +kdevcppparserinclude_HEADERS = ast.h driver.h lexer.h parser.h tree_parser.h errors.h lookup.h cachemanager.h lexercache.h macro.h diff --git a/lib/cppparser/lexer.cpp b/lib/cppparser/lexer.cpp index 5f01a19e..5325c80f 100644 --- a/lib/cppparser/lexer.cpp +++ b/lib/cppparser/lexer.cpp @@ -30,7 +30,7 @@ #if defined( KDEVELOP_BGPARSER ) #include -class TDevTread: public TQThread +class KDevTread: public TQThread { public: static void yield() @@ -41,7 +41,7 @@ public: inline void qthread_yield() { - TDevTread::yield(); + KDevTread::yield(); } #endif -- cgit v1.2.1