Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline

5 files changed, 0 insertions, 144 deletions

diff --git a/src/plugins/cpptools/rpp/pp-fwd.h b/src/plugins/cpptools/rpp/pp-fwd.h
deleted file mode 100644
index 05b68774cf..0000000000
--- a/src/plugins/cpptools/rpp/pp-fwd.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/***************************************************************************
-**
-** This file is part of Qt Creator
-**
-** Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies).
-**
-** Contact:  Qt Software Information (qt-info@nokia.com)
-**
-** 
-** Non-Open Source Usage  
-** 
-** Licensees may use this file in accordance with the Qt Beta Version
-** License Agreement, Agreement version 2.2 provided with the Software or,
-** alternatively, in accordance with the terms contained in a written
-** agreement between you and Nokia.  
-** 
-** GNU General Public License Usage 
-** 
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License versions 2.0 or 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the packaging
-** of this file.  Please review the following information to ensure GNU
-** General Public Licensing requirements will be met:
-**
-** http://www.fsf.org/licensing/licenses/info/GPLv2.html and
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt GPL Exception version
-** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
-** 
-***************************************************************************/
-/*
-  Copyright 2005 Roberto Raggi <roberto@kdevelop.org>
-
-  Permission to use, copy, modify, distribute, and sell this software and its
-  documentation for any purpose is hereby granted without fee, provided that
-  the above copyright notice appear in all copies and that both that
-  copyright notice and this permission notice appear in supporting
-  documentation.
-
-  The above copyright notice and this permission notice shall be included in
-  all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-  KDEVELOP TEAM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-  AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-#ifndef PP_FWD_H
-#define PP_FWD_H
-
-namespace rpp {
-
-} // namespace rpp
-
-#endif // PP_FWD_H
-
-// kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/src/plugins/cpptools/rpp/pp-internal.h b/src/plugins/cpptools/rpp/pp-internal.h
index eed958372c..cbecb9eb6d 100644
--- a/src/plugins/cpptools/rpp/pp-internal.h
+++ b/src/plugins/cpptools/rpp/pp-internal.h
@@ -60,27 +60,6 @@ namespace rpp {
     namespace _PP_internal
     {
 
-        inline void output_line(const QByteArray &__filename, int __line, QByteArray *__result)
-        {
-            QByteArray __msg;
-
-            __msg += "# ";
-
-            char __line_descr[16];
-            qsnprintf (__line_descr, 16, "%d", __line);
-            __msg += __line_descr;
-
-            __msg += " \"";
-
-            if (__filename.isEmpty ())
-                __msg += "<editor>";
-            else
-                __msg += __filename;
-
-            __msg += "\"\n";
-            __result->append(__msg);
-        }
-
         inline bool comment_p (const char *__first, const char *__last)
         {
             if (__first == __last)
diff --git a/src/plugins/cpptools/rpp/pp-symbol.h b/src/plugins/cpptools/rpp/pp-symbol.h
deleted file mode 100644
index 37e2a623e5..0000000000
--- a/src/plugins/cpptools/rpp/pp-symbol.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/***************************************************************************
-**
-** This file is part of Qt Creator
-**
-** Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies).
-**
-** Contact:  Qt Software Information (qt-info@nokia.com)
-**
-** 
-** Non-Open Source Usage  
-** 
-** Licensees may use this file in accordance with the Qt Beta Version
-** License Agreement, Agreement version 2.2 provided with the Software or,
-** alternatively, in accordance with the terms contained in a written
-** agreement between you and Nokia.  
-** 
-** GNU General Public License Usage 
-** 
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License versions 2.0 or 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the packaging
-** of this file.  Please review the following information to ensure GNU
-** General Public Licensing requirements will be met:
-**
-** http://www.fsf.org/licensing/licenses/info/GPLv2.html and
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt GPL Exception version
-** 1.2, included in the file GPL_EXCEPTION.txt in this package.  
-** 
-***************************************************************************/
-/*
-  Copyright 2005 Roberto Raggi <roberto@kdevelop.org>
-
-  Permission to use, copy, modify, distribute, and sell this software and its
-  documentation for any purpose is hereby granted without fee, provided that
-  the above copyright notice appear in all copies and that both that
-  copyright notice and this permission notice appear in supporting
-  documentation.
-
-  The above copyright notice and this permission notice shall be included in
-  all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-  KDEVELOP TEAM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-  AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-
diff --git a/src/plugins/cpptools/rpp/pp.h b/src/plugins/cpptools/rpp/pp.h
index 52411f7624..1e007bee68 100644
--- a/src/plugins/cpptools/rpp/pp.h
+++ b/src/plugins/cpptools/rpp/pp.h
@@ -53,18 +53,11 @@
 #ifndef PP_H
 #define PP_H
 
-#if defined(_WIN64) || defined(WIN64) || defined(__WIN64__) \
-    || defined(_WIN32) || defined(WIN32) || defined(__WIN32__)
-#  define PP_OS_WIN
-#endif
-
 #include <cassert>
 #include <cstring>
 #include <cctype>
 
-#include "pp-fwd.h"
 #include "pp-cctype.h"
-#include "pp-symbol.h"
 #include "pp-internal.h"
 #include "pp-macro.h"
 #include "pp-environment.h"
diff --git a/src/plugins/cpptools/rpp/rpp.pri b/src/plugins/cpptools/rpp/rpp.pri
index f47976e6fe..a79b0028a0 100644
--- a/src/plugins/cpptools/rpp/rpp.pri
+++ b/src/plugins/cpptools/rpp/rpp.pri
@@ -4,12 +4,10 @@ INCLUDEPATH += $$PWD
 HEADERS += $$PWD/pp-cctype.h \
            $$PWD/pp-engine.h \
            $$PWD/pp-environment.h \
-           $$PWD/pp-fwd.h \
            $$PWD/pp-internal.h \
            $$PWD/pp-macro-expander.h \
            $$PWD/pp-macro.h \
            $$PWD/pp-scanner.h \
-           $$PWD/pp-symbol.h \
            $$PWD/pp.h \
            $$PWD/pp-client.h