From b976c7d136e145ced735a3574f565c1d7daa4276 Mon Sep 17 00:00:00 2001
From: Christian <chris@trinity.localdomain>
Date: Tue, 3 Apr 2007 10:37:26 +0200
Subject: [PATCH] remove all usages of QT3 backward lib     [ xca-Feature
 Requests-1692800 ]

---
 changelog         |  8 +++++++-
 lib/db.cpp        |  1 -
 lib/x509v3ext.cpp | 23 +++++++++--------------
 lib/x509v3ext.h   |  4 ++--
 ui/ExportCert.ui  |  1 -
 ui/ExportDer.ui   |  1 -
 ui/Help.ui        |  1 -
 ui/NewKey.ui      |  1 -
 ui/v3ext.ui       |  1 -
 9 files changed, 18 insertions(+), 23 deletions(-)

diff --git a/changelog b/changelog
index d3f60585..ccc01c0b 100644
--- a/changelog
+++ b/changelog
@@ -1,6 +1,12 @@
+
+  * remove all usages of QT3 backward lib 
+    [ xca-Feature Requests-1692800 ]
+
+xca 0.6.0
+
   * set initial sorting to ascending order
   * add RFC2253 representation of subject and issuer
-  * to copy&paste
+    to copy & paste
   * fix dialog sizes for long DNs
   * move hash algo into signer box [ 1656260 ]
   * make QA serial a compile time option
diff --git a/lib/db.cpp b/lib/db.cpp
index 7b161dc4..3b7ffee2 100644
--- a/lib/db.cpp
+++ b/lib/db.cpp
@@ -233,7 +233,6 @@ int db::set(const unsigned char *p, int len, int ver, enum pki_type type,
 	first();
 	ret = find(type, name);
 	if (ret == 1) {
-		printf("## Name not found -> add\n");
 		return add(p, len, ver, type, name);
 	}
 	if (ret == 0) {
diff --git a/lib/x509v3ext.cpp b/lib/x509v3ext.cpp
index b1567dc8..0b895542 100644
--- a/lib/x509v3ext.cpp
+++ b/lib/x509v3ext.cpp
@@ -195,8 +195,8 @@ QString extList::getHtml(const QString &sep)
 {
 	x509v3ext e;
 	QStringList s;
-	for (int i=0; i< count(); i++)
-		s << operator[](i).getHtml();
+	for (int i=0; i< size(); i++)
+		s << at(i).getHtml();
 	QString a = s.join(sep);
 	return a;
 }
@@ -204,11 +204,9 @@ QString extList::getHtml(const QString &sep)
 int extList::delByNid(int nid)
 {
 	int removed=0;
-	extList::Iterator it;
-	for( it = begin(); it != end(); ++it ) {
-		if ((*it).nid() == nid) {
-			remove(it);
-			it = begin();
+	for(int i = 0; i< size(); i++) {
+		if (at(i).nid() == nid) {
+			removeAt(i);
 			removed=1;
 		}
 	}
@@ -218,14 +216,11 @@ int extList::delByNid(int nid)
 int extList::delInvalid(void)
 {
 	int removed=0;
-	extList::Iterator it;
-	for( it = begin(); it != end(); ) {
-		if (!(*it).isValid()) {
-			remove(it);
-			it = begin();
+	for(int i = 0; i<size(); i++) {
+		if (!at(i).isValid()) {
+			removeAt(i);
 			removed=1;
-		} else {
-			++it;
+			i--;
 		}
 	}
 	return removed;
diff --git a/lib/x509v3ext.h b/lib/x509v3ext.h
index f3b80213..cd3773e7 100644
--- a/lib/x509v3ext.h
+++ b/lib/x509v3ext.h
@@ -49,7 +49,7 @@
 #ifndef X509V3EXT_H
 #define X509V3EXT_H
 
-#include <Qt/q3valuelist.h>
+#include <Qt/qlist.h>
 #include <openssl/x509.h>
 #include <openssl/x509v3.h>
 
@@ -78,7 +78,7 @@ class x509v3ext
 	void *d2i();
 };
 
-class extList : public Q3ValueList<x509v3ext>
+class extList : public QList<x509v3ext>
 {
     public:
 	void setStack(STACK_OF(X509_EXTENSION) *st);
diff --git a/ui/ExportCert.ui b/ui/ExportCert.ui
index 67d1e0b2..18712bf3 100644
--- a/ui/ExportCert.ui
+++ b/ui/ExportCert.ui
@@ -329,7 +329,6 @@
    </item>
   </layout>
  </widget>
- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
  <tabstops>
   <tabstop>filename</tabstop>
   <tabstop>fileBut</tabstop>
diff --git a/ui/ExportDer.ui b/ui/ExportDer.ui
index 99682a7e..7d48a499 100644
--- a/ui/ExportDer.ui
+++ b/ui/ExportDer.ui
@@ -249,7 +249,6 @@ p, li { white-space: pre-wrap; }
    </item>
   </layout>
  </widget>
- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
  <tabstops>
   <tabstop>filename</tabstop>
   <tabstop>fileBut</tabstop>
diff --git a/ui/Help.ui b/ui/Help.ui
index e559397b..a02fb66f 100644
--- a/ui/Help.ui
+++ b/ui/Help.ui
@@ -86,7 +86,6 @@
    </item>
   </layout>
  </widget>
- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
  <resources/>
  <connections>
   <connection>
diff --git a/ui/NewKey.ui b/ui/NewKey.ui
index 2f85c7ea..32e460ec 100644
--- a/ui/NewKey.ui
+++ b/ui/NewKey.ui
@@ -240,7 +240,6 @@
    </item>
   </layout>
  </widget>
- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
  <tabstops>
   <tabstop>keyDesc</tabstop>
   <tabstop>keyLength</tabstop>
diff --git a/ui/v3ext.ui b/ui/v3ext.ui
index 02a0f869..ce7b9788 100644
--- a/ui/v3ext.ui
+++ b/ui/v3ext.ui
@@ -191,7 +191,6 @@
    </property>
   </widget>
  </widget>
- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
  <resources/>
  <connections>
   <connection>