# HG changeset patch
# User eldar
# Date 1242526122 0
# Node ID a5cc4ada07f54cb595dcecefe4ee9529f0294b7d
# Parent  a5cba313c9245db7894267a56fe12e7c365f2917
remove obsolete stuff

diff -r a5cba313c924 -r a5cc4ada07f5 common/qnativepointer.h
--- a/common/qnativepointer.h	Sun May 17 01:44:06 2009 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,60 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 1992-2008 Nokia. All rights reserved.
-**
-** This file is part of Qt Jambi.
-**
-** * Commercial Usage
-* Licensees holding valid Qt Commercial licenses may use this file in
-* accordance with the Qt Commercial License Agreement 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.
-* 
-* Qt for Windows(R) Licensees
-* As a special exception, Nokia, as the sole copyright holder for Qt
-* Designer, grants users of the Qt/Eclipse Integration plug-in the
-* right for the Qt/Eclipse Integration to link to functionality
-* provided by Qt Designer and its related libraries.
-*
-*
-* If you are unsure which license is appropriate for your use, please
-* contact the sales department at qt-sales@nokia.com.
-
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-****************************************************************************/
-
-#ifndef QNATIVEPOINTER_H
-#define QNATIVEPOINTER_H
-
-// Make sure this in sync with QNativePointer.java's enum Type
-enum PointerType {
-    BooleanType         = 0,
-    ByteType            = 1,
-    CharType            = 2,
-    ShortType           = 3,
-    IntType             = 4,
-    LongType            = 5,
-    FloatType           = 6,
-    DoubleType          = 7,
-    PointerType         = 8,
-    StringType          = 9
-};
-
-#endif // QNATIVEPOINTER_H
-
diff -r a5cba313c924 -r a5cc4ada07f5 generator/cppimplgenerator.cpp
--- a/generator/cppimplgenerator.cpp	Sun May 17 01:44:06 2009 +0000
+++ b/generator/cppimplgenerator.cpp	Sun May 17 02:08:42 2009 +0000
@@ -42,7 +42,6 @@
 #include "cppimplgenerator.h"
 #include "dgenerator.h"
 #include "reporthandler.h"
-#include <qnativepointer.h>
 
 #include <QDir>
 #include <QtDebug>
@@ -2916,36 +2915,6 @@
 // qtd    s << INDENT << "QTJAMBI_EXCEPTION_CHECK(__jni_env);" << endl;
 }
 
-static int nativePointerType(const AbstractMetaType *java_type)
-{
-    Q_ASSERT(java_type);
-    Q_ASSERT(java_type->isNativePointer());
-
-    if (!java_type->typeEntry()->isPrimitive())
-        return PointerType;
-
-    if (java_type->indirections() > 1)
-        return PointerType;
-
-    static QHash<QString, int> types;
-    if (types.isEmpty()) {
-        types["boolean"] = BooleanType;
-        types["byte"] = ByteType;
-        types["char"] = CharType;
-        types["short"] = ShortType;
-        types["int"] = IntType;
-        types["long"] = LongType;
-        types["float"] = FloatType;
-        types["double"] = DoubleType;
-    }
-
-    QString targetLangName = java_type->typeEntry()->targetLangName();
-    if (!types.contains(targetLangName))
-        return PointerType;
-
-    return types[targetLangName];
-}
-
 void CppImplGenerator::writeQtToJava(QTextStream &s,
                                      const AbstractMetaType *java_type,
                                      const QString &qt_name,