From f6fbb274ae715c05fcdee61cba5395b4fd4814b9 Mon Sep 17 00:00:00 2001
From: Roberto Raggi <qtc-committer@nokia.com>
Date: Mon, 8 Dec 2008 12:24:40 +0100
Subject: [PATCH] Moved the preprocessor.
---
src/libs/cplusplus/cplusplus.pro | 16 ++++++++++++++--
.../rpp => libs/cplusplus}/pp-cctype.h | 0
.../rpp => libs/cplusplus}/pp-client.h | 0
.../rpp => libs/cplusplus}/pp-engine.cpp | 0
.../rpp => libs/cplusplus}/pp-engine.h | 0
.../rpp => libs/cplusplus}/pp-environment.cpp | 0
.../rpp => libs/cplusplus}/pp-environment.h | 0
.../cpptools/rpp => libs/cplusplus}/pp-fwd.h | 0
.../rpp => libs/cplusplus}/pp-internal.h | 0
.../cplusplus}/pp-macro-expander.cpp | 0
.../rpp => libs/cplusplus}/pp-macro-expander.h | 0
.../cpptools/rpp => libs/cplusplus}/pp-macro.h | 0
.../rpp => libs/cplusplus}/pp-scanner.h | 0
.../cpptools/rpp => libs/cplusplus}/pp.h | 0
src/plugins/cpptools/cpptools.pro | 2 +-
src/plugins/cpptools/rpp/rpp.pri | 18 ------------------
16 files changed, 15 insertions(+), 21 deletions(-)
rename src/{plugins/cpptools/rpp => libs/cplusplus}/pp-cctype.h (100%)
rename src/{plugins/cpptools/rpp => libs/cplusplus}/pp-client.h (100%)
rename src/{plugins/cpptools/rpp => libs/cplusplus}/pp-engine.cpp (100%)
rename src/{plugins/cpptools/rpp => libs/cplusplus}/pp-engine.h (100%)
rename src/{plugins/cpptools/rpp => libs/cplusplus}/pp-environment.cpp (100%)
rename src/{plugins/cpptools/rpp => libs/cplusplus}/pp-environment.h (100%)
rename src/{plugins/cpptools/rpp => libs/cplusplus}/pp-fwd.h (100%)
rename src/{plugins/cpptools/rpp => libs/cplusplus}/pp-internal.h (100%)
rename src/{plugins/cpptools/rpp => libs/cplusplus}/pp-macro-expander.cpp (100%)
rename src/{plugins/cpptools/rpp => libs/cplusplus}/pp-macro-expander.h (100%)
rename src/{plugins/cpptools/rpp => libs/cplusplus}/pp-macro.h (100%)
rename src/{plugins/cpptools/rpp => libs/cplusplus}/pp-scanner.h (100%)
rename src/{plugins/cpptools/rpp => libs/cplusplus}/pp.h (100%)
delete mode 100644 src/plugins/cpptools/rpp/rpp.pri
diff --git a/src/libs/cplusplus/cplusplus.pro b/src/libs/cplusplus/cplusplus.pro
index 1a2b5326623..49d78fda8b3 100644
--- a/src/libs/cplusplus/cplusplus.pro
+++ b/src/libs/cplusplus/cplusplus.pro
@@ -21,7 +21,16 @@ HEADERS += \
TypeOfExpression.h \
TypePrettyPrinter.h \
ResolveExpression.h \
- LookupContext.h
+ LookupContext.h \
+ pp-cctype.h \
+ pp-engine.h \
+ pp-fwd.h \
+ pp-macro-expander.h \
+ pp-scanner.h \
+ pp-client.h \
+ pp-environment.h \
+ pp-internal.h \
+ pp-macro.h
SOURCES += \
SimpleLexer.cpp \
@@ -35,6 +44,9 @@ SOURCES += \
TypeOfExpression.cpp \
TypePrettyPrinter.cpp \
ResolveExpression.cpp \
- LookupContext.cpp
+ LookupContext.cpp \
+ pp-engine.cpp \
+ pp-environment.cpp \
+ pp-macro-expander.cpp
RESOURCES += cplusplus.qrc
diff --git a/src/plugins/cpptools/rpp/pp-cctype.h b/src/libs/cplusplus/pp-cctype.h
similarity index 100%
rename from src/plugins/cpptools/rpp/pp-cctype.h
rename to src/libs/cplusplus/pp-cctype.h
diff --git a/src/plugins/cpptools/rpp/pp-client.h b/src/libs/cplusplus/pp-client.h
similarity index 100%
rename from src/plugins/cpptools/rpp/pp-client.h
rename to src/libs/cplusplus/pp-client.h
diff --git a/src/plugins/cpptools/rpp/pp-engine.cpp b/src/libs/cplusplus/pp-engine.cpp
similarity index 100%
rename from src/plugins/cpptools/rpp/pp-engine.cpp
rename to src/libs/cplusplus/pp-engine.cpp
diff --git a/src/plugins/cpptools/rpp/pp-engine.h b/src/libs/cplusplus/pp-engine.h
similarity index 100%
rename from src/plugins/cpptools/rpp/pp-engine.h
rename to src/libs/cplusplus/pp-engine.h
diff --git a/src/plugins/cpptools/rpp/pp-environment.cpp b/src/libs/cplusplus/pp-environment.cpp
similarity index 100%
rename from src/plugins/cpptools/rpp/pp-environment.cpp
rename to src/libs/cplusplus/pp-environment.cpp
diff --git a/src/plugins/cpptools/rpp/pp-environment.h b/src/libs/cplusplus/pp-environment.h
similarity index 100%
rename from src/plugins/cpptools/rpp/pp-environment.h
rename to src/libs/cplusplus/pp-environment.h
diff --git a/src/plugins/cpptools/rpp/pp-fwd.h b/src/libs/cplusplus/pp-fwd.h
similarity index 100%
rename from src/plugins/cpptools/rpp/pp-fwd.h
rename to src/libs/cplusplus/pp-fwd.h
diff --git a/src/plugins/cpptools/rpp/pp-internal.h b/src/libs/cplusplus/pp-internal.h
similarity index 100%
rename from src/plugins/cpptools/rpp/pp-internal.h
rename to src/libs/cplusplus/pp-internal.h
diff --git a/src/plugins/cpptools/rpp/pp-macro-expander.cpp b/src/libs/cplusplus/pp-macro-expander.cpp
similarity index 100%
rename from src/plugins/cpptools/rpp/pp-macro-expander.cpp
rename to src/libs/cplusplus/pp-macro-expander.cpp
diff --git a/src/plugins/cpptools/rpp/pp-macro-expander.h b/src/libs/cplusplus/pp-macro-expander.h
similarity index 100%
rename from src/plugins/cpptools/rpp/pp-macro-expander.h
rename to src/libs/cplusplus/pp-macro-expander.h
diff --git a/src/plugins/cpptools/rpp/pp-macro.h b/src/libs/cplusplus/pp-macro.h
similarity index 100%
rename from src/plugins/cpptools/rpp/pp-macro.h
rename to src/libs/cplusplus/pp-macro.h
diff --git a/src/plugins/cpptools/rpp/pp-scanner.h b/src/libs/cplusplus/pp-scanner.h
similarity index 100%
rename from src/plugins/cpptools/rpp/pp-scanner.h
rename to src/libs/cplusplus/pp-scanner.h
diff --git a/src/plugins/cpptools/rpp/pp.h b/src/libs/cplusplus/pp.h
similarity index 100%
rename from src/plugins/cpptools/rpp/pp.h
rename to src/libs/cplusplus/pp.h
diff --git a/src/plugins/cpptools/cpptools.pro b/src/plugins/cpptools/cpptools.pro
index 8a096900ebf..92905e42ef9 100644
--- a/src/plugins/cpptools/cpptools.pro
+++ b/src/plugins/cpptools/cpptools.pro
@@ -10,7 +10,7 @@ unix:QMAKE_CXXFLAGS_DEBUG += -O3
INCLUDEPATH += .
DEFINES += CPPTOOLS_LIBRARY
CONFIG += help
-include(rpp/rpp.pri)|error("Can't find RPP")
+
HEADERS += cpptools_global.h \
cppquickopenfilter.h \
cppclassesfilter.h \
diff --git a/src/plugins/cpptools/rpp/rpp.pri b/src/plugins/cpptools/rpp/rpp.pri
deleted file mode 100644
index a79b0028a05..00000000000
--- a/src/plugins/cpptools/rpp/rpp.pri
+++ /dev/null
@@ -1,18 +0,0 @@
-DEPENDPATH += $$PWD
-INCLUDEPATH += $$PWD
-
-HEADERS += $$PWD/pp-cctype.h \
- $$PWD/pp-engine.h \
- $$PWD/pp-environment.h \
- $$PWD/pp-internal.h \
- $$PWD/pp-macro-expander.h \
- $$PWD/pp-macro.h \
- $$PWD/pp-scanner.h \
- $$PWD/pp.h \
- $$PWD/pp-client.h
-
-SOURCES += $$PWD/pp-engine.cpp \
- $$PWD/pp-environment.cpp \
- $$PWD/pp-macro-expander.cpp
-
-
--
GitLab