[PyKDE] PyQt4 + Qt4.0.1-debug or Qt4.1.0

[Andreas Pakulat]

On 22.12.05 01:09:37, Andreas Pakulat wrote:
> On 21.12.05 23:05:54, Phil Thompson wrote:
> > No - but just mark those ctors as private in the .sip files.
> 
> Ah, ok that was easy. Lets see how far I can get compiling the snapshot
> with Qt4.1.0. I'll post a diff if I get through.

As I said, here's the diff for yesterdays snapshot:

Andreas

-- 
You will be traveling and coming into a fortune.
-------------- next part --------------
Nur in PyQt4-gpl-snapshot-20051221-Qt4.1/: cfgtest.
Nur in PyQt4-gpl-snapshot-20051221-Qt4.1/: cfgtest.cpp.
Nur in PyQt4-gpl-snapshot-20051221-Qt4.1/: Makefile.
Nur in PyQt4-gpl-snapshot-20051221-Qt4.1/pylupdate: Makefile.
Nur in PyQt4-gpl-snapshot-20051221-Qt4.1/: pyqtconfig.py.
Nur in PyQt4-gpl-snapshot-20051221-Qt4.1/pyrcc: Makefile.
Nur in PyQt4-gpl-snapshot-20051221-Qt4.1/pyuic: Makefile.
Nur in PyQt4-gpl-snapshot-20051221-Qt4.1/pyuic: pyuic4.
Nur in PyQt4-gpl-snapshot-20051221-Qt4.1/: QtCore.
Nur in PyQt4-gpl-snapshot-20051221-Qt4.1/: QtGui.
Nur in PyQt4-gpl-snapshot-20051221-Qt4.1/: QtNetwork.
Nur in PyQt4-gpl-snapshot-20051221-Qt4.1/: QtOpenGL.
Nur in PyQt4-gpl-snapshot-20051221-Qt4.1/: QtSql.
Nur in PyQt4-gpl-snapshot-20051221-Qt4.1/: QtXml.
diff -ur PyQt4-gpl-snapshot-20051221/sip/QtCore/qtextcodec.sip PyQt4-gpl-snapshot-20051221-Qt4.1/sip/QtCore/qtextcodec.sip
--- PyQt4-gpl-snapshot-20051221/sip/QtCore/qtextcodec.sip	2005-12-21 04:31:27.000000000 +0100
+++ PyQt4-gpl-snapshot-20051221-Qt4.1/sip/QtCore/qtextcodec.sip	2005-12-22 01:21:57.911078368 +0100
@@ -66,6 +66,8 @@
 
         ConverterState(QFlags<QTextCodec::ConversionFlag> f = QTextCodec::DefaultConversion);
         ~ConverterState();
+	private:
+	    ConverterState(const QTextCodec::ConverterState&);
     };
 
     QString toUnicode(const char *in /Array/, int length /ArraySize/, QTextCodec::ConverterState *state = 0) const;
@@ -80,6 +82,9 @@
     QTextCodec();
     virtual ~QTextCodec();
 
+private:
+    QTextCodec(const QTextCodec&);
+
 public:
     static QTextCodec *codecForTr();
     static void setCodecForTr(QTextCodec *c);
@@ -96,6 +101,9 @@
 #include <qtextcodec.h>
 %End
 
+private:
+    QTextEncoder(const QTextEncoder&);
+
 public:
     explicit QTextEncoder(const QTextCodec *codec);
     ~QTextEncoder();
@@ -108,9 +116,13 @@
 #include <qtextcodec.h>
 %End
 
+private:
+    QTextDecoder(const QTextDecoder&);
+
 public:
     explicit QTextDecoder(const QTextCodec *codec);
     ~QTextDecoder();
     QString toUnicode(const char *chars /Array/, int len /ArraySize/);
     QString toUnicode(const QByteArray &ba);
+
 };
diff -ur PyQt4-gpl-snapshot-20051221/sip/QtGui/qtextformat.sip PyQt4-gpl-snapshot-20051221-Qt4.1/sip/QtGui/qtextformat.sip
--- PyQt4-gpl-snapshot-20051221/sip/QtGui/qtextformat.sip	2005-12-21 04:31:27.000000000 +0100
+++ PyQt4-gpl-snapshot-20051221-Qt4.1/sip/QtGui/qtextformat.sip	2005-12-22 01:35:00.892047168 +0100
@@ -119,7 +119,6 @@
         ImageName,
         ImageWidth,
         ImageHeight,
-        DocumentFragmentMark,
         UserProperty
     };