[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdebindings/qtjava
From:       Richard Dale <Richard_Dale () tipitina ! demon ! co ! uk>
Date:       2004-06-07 13:36:47
Message-ID: 20040607133647.851BD1265A () office ! kde ! org
[Download RAW message or body]

CVS commit by rdale: 


* Regenerated QImage.bits() and colorTable() to use Michal Ceresna's kalyptus patch
* Regenerated QCheckListItem to remove unwanted copy constructor


  M +5 -0      ChangeLog   1.75
  M +0 -5      javalib/org/kde/qt/QCheckListItem.java   1.9
  M +0 -11     javalib/qtjava/QCheckListItem.cpp   1.10
  M +0 -8      javalib/qtjava/QCheckListItem.h   1.7
  M +12 -9     javalib/qtjava/QImage.cpp   1.12


--- kdebindings/qtjava/ChangeLog  #1.74:1.75
@@ -1,2 +1,7 @@
+2004-06-07  Richard Dale  <Richard_Dale@tipitina.demon.co.uk>
+
+        * Regenerated QImage.bits() and colorTable() to use Michal Ceresna's \
kalyptus patch +        * Regenerated QCheckListItem to remove unwanted copy \
constructor +
 2004-06-06  Richard Dale  <Richard_Dale@tipitina.demon.co.uk>
 

--- kdebindings/qtjava/javalib/qtjava/QCheckListItem.cpp  #1.9:1.10
@@ -27,5 +27,4 @@ public:
         QCheckListItemJBridge(QListViewItem* arg1,const QString& arg2,const QPixmap& \
                arg3) : QCheckListItem(arg1,arg2,arg3) {};
         QCheckListItemJBridge(QListView* arg1,const QString& arg2,const QPixmap& \
                arg3) : QCheckListItem(arg1,arg2,arg3) {};
-        QCheckListItemJBridge(const QCheckListItem& arg1) : QCheckListItem(arg1) {};
         void protected_activate() {
                 QCheckListItem::activate();
@@ -88,14 +87,4 @@ Java_org_kde_qt_QCheckListItem_isTristat
 
 JNIEXPORT void JNICALL
-Java_org_kde_qt_QCheckListItem_newQCheckListItem__Lorg_kde_qt_QCheckListItem_2(JNIEnv* \
                env, jobject obj, jobject arg1)
-{
-        if (QtSupport::getQt(env, obj) == 0) {
-                QtSupport::setQt(env, obj, new QCheckListItemJBridge((const \
                QCheckListItem&)*(const QCheckListItem*) QtSupport::getQt(env, \
                arg1)));
-                QtSupport::setObjectForQtKey(env, obj, QtSupport::getQt(env, obj));
-        }
-        return;
-}
-
-JNIEXPORT void JNICALL
 Java_org_kde_qt_QCheckListItem_newQCheckListItem__Lorg_kde_qt_QCheckListItem_2Ljava_lang_String_2(JNIEnv* \
env, jobject obj, jobject parent, jstring text)  {

--- kdebindings/qtjava/javalib/qtjava/QCheckListItem.h  #1.6:1.7
@@ -1401,12 +1401,4 @@ JNIEXPORT jint JNICALL Java_org_kde_qt_Q
 /*
  * Class:     org_kde_qt_QCheckListItem
- * Method:    newQCheckListItem
- * Signature: (Lorg/kde/qt/QCheckListItem;)V
- */
-JNIEXPORT void JNICALL \
                Java_org_kde_qt_QCheckListItem_newQCheckListItem__Lorg_kde_qt_QCheckListItem_2
                
-  (JNIEnv *, jobject, jobject);
-
-/*
- * Class:     org_kde_qt_QCheckListItem
  * Method:    activate
  * Signature: ()V

--- kdebindings/qtjava/javalib/qtjava/QImage.cpp  #1.11:1.12
@@ -53,12 +53,4 @@ Java_org_kde_qt_QImage_bytesPerLine(JNIE
 }
 
-JNIEXPORT jintArray JNICALL
-Java_org_kde_qt_QImage_colorTable(JNIEnv* env, jobject obj)
-{
-        QRgb* _qint;
-        _qint = ((QImage*) QtSupport::getQt(env, obj))->colorTable();
-        return QtSupport::fromIntPtr(env, (int*)_qint);
-}
-
 JNIEXPORT jint JNICALL
 Java_org_kde_qt_QImage_color(JNIEnv* env, jobject obj, jint i)
@@ -886,5 +878,5 @@ Java_org_kde_qt_QImage_bits(JNIEnv *env,
 static uchar * ptr = 0;
         ptr = ((QImageJBridge*) QtSupport::getQt(env, obj))->bits();
-        int len = ((QImageJBridge*) QtSupport::getQt(env, obj))->numBytes() / \
((QImageJBridge*) QtSupport::getQt(env, obj))->height(); +        int len = \
((QImageJBridge*) QtSupport::getQt(env, obj))->numBytes();  jbyteArray result = \
env->NewByteArray(len);  env->SetByteArrayRegion(result, 0, len, (jbyte *) ptr);
@@ -903,2 +895,13 @@ static uchar * ptr = 0;
 }
 
+JNIEXPORT jintArray JNICALL
+Java_org_kde_qt_QImage_colorTable(JNIEnv *env, jobject obj)
+{
+static QRgb * ptr = 0;
+        ptr = ((QImageJBridge*) QtSupport::getQt(env, obj))->colorTable();
+        int len = ((QImageJBridge*) QtSupport::getQt(env, obj))->numColors();
+        jintArray result = env->NewIntArray(len);
+        env->SetIntArrayRegion(result, 0, len, (jint *) ptr);
+        return result;
+}
+

--- kdebindings/qtjava/javalib/org/kde/qt/QCheckListItem.java  #1.8:1.9
@@ -100,9 +100,4 @@
         public native void setState(int s);
         public native int rtti();
-        public QCheckListItem(QCheckListItem arg1) {
-                super((Class) null);
-                newQCheckListItem(arg1);
-        }
-        private native void newQCheckListItem(QCheckListItem arg1);
         protected native void activate();
         protected native void turnOffChild();


[prev in list] [next in list] [prev in thread] [next in thread]