[Kde-bindings] KDE/kdebindings/csharp/qyoto
Richard Dale
Richard_Dale at tipitina.demon.co.uk
Tue May 6 16:39:56 UTC 2008
SVN commit 804626 by rdale:
* Regenerate the C# sources from the Qt 4.4 release headers
CCMAIL: kde-bindings at kde.org
M +4 -0 ChangeLog
M +6 -6 core/QChar.cs
M +8 -4 core/QDataStream.cs
M +18 -0 gui/QInputMethodEvent.cs
M +12 -0 gui/QPainterPath.cs
M +4 -4 gui/QPalette.cs
M +0 -6 webkit/QWebFrame.cs
M +4 -0 webkit/QWebPage.cs
M +2 -8 webkit/QWebView.cs
--- trunk/KDE/kdebindings/csharp/qyoto/ChangeLog #804625:804626
@@ -1,3 +1,7 @@
+2008-05-06 Richard Dale <richard.j.dale at gmail.com>
+
+ * Regenerate the C# sources from the Qt 4.4 release headers
+
2008-04-10 Richard Dale <richard.j.dale at gmail.com>
* Added the missing QWebHitTestResult.cs source. Thanks to annma for
--- trunk/KDE/kdebindings/csharp/qyoto/core/QChar.cs #804625:804626
@@ -184,8 +184,8 @@
public bool HasMirrored() {
return (bool) interceptor.Invoke("hasMirrored", "hasMirrored() const", typeof(bool));
}
- public ushort combiningClass() {
- return (ushort) interceptor.Invoke("combiningClass", "combiningClass() const", typeof(ushort));
+ public uchar combiningClass() {
+ return (uchar) interceptor.Invoke("combiningClass", "combiningClass() const", typeof(uchar));
}
public char MirroredChar() {
return (char) interceptor.Invoke("mirroredChar", "mirroredChar() const", typeof(char));
@@ -322,11 +322,11 @@
public static char joining(ushort ucs2) {
return (char) staticInterceptor.Invoke("joining$", "joining(ushort)", typeof(char), typeof(ushort), ucs2);
}
- public static ushort combiningClass(uint ucs4) {
- return (ushort) staticInterceptor.Invoke("combiningClass$", "combiningClass(uint)", typeof(ushort), typeof(uint), ucs4);
+ public static uchar combiningClass(uint ucs4) {
+ return (uchar) staticInterceptor.Invoke("combiningClass$", "combiningClass(uint)", typeof(uchar), typeof(uint), ucs4);
}
- public static ushort combiningClass(ushort ucs2) {
- return (ushort) staticInterceptor.Invoke("combiningClass$", "combiningClass(ushort)", typeof(ushort), typeof(ushort), ucs2);
+ public static uchar combiningClass(ushort ucs2) {
+ return (uchar) staticInterceptor.Invoke("combiningClass$", "combiningClass(ushort)", typeof(uchar), typeof(ushort), ucs2);
}
public static uint MirroredChar(uint ucs4) {
return (uint) staticInterceptor.Invoke("mirroredChar$", "mirroredChar(uint)", typeof(uint), typeof(uint), ucs4);
--- trunk/KDE/kdebindings/csharp/qyoto/core/QDataStream.cs #804625:804626
@@ -38,8 +38,6 @@
// QDataStream& operator>>(quint32& arg1); >>>> NOT CONVERTED
// QDataStream& operator>>(qint64& arg1); >>>> NOT CONVERTED
// QDataStream& operator>>(quint64& arg1); >>>> NOT CONVERTED
- // QDataStream& operator<<(qint8 arg1); >>>> NOT CONVERTED
- // QDataStream& operator<<(quint8 arg1); >>>> NOT CONVERTED
public QDataStream() : this((Type) null) {
CreateProxy();
interceptor.Invoke("QDataStream", "QDataStream()", typeof(void));
@@ -83,8 +81,8 @@
public void SetVersion(int arg1) {
interceptor.Invoke("setVersion$", "setVersion(int)", typeof(void), typeof(int), arg1);
}
- public QDataStream Read(int i) {
- return (QDataStream) interceptor.Invoke("operator>>$", "operator>>(qint32&)", typeof(QDataStream), typeof(int), i);
+ public QDataStream Read(int& i) {
+ return (QDataStream) interceptor.Invoke("operator>>$", "operator>>(qint32&)", typeof(QDataStream), typeof(int&), i);
}
public QDataStream Read(bool i) {
return (QDataStream) interceptor.Invoke("operator>>$", "operator>>(bool&)", typeof(QDataStream), typeof(bool), i);
@@ -98,6 +96,12 @@
public QDataStream Read(string str) {
return (QDataStream) interceptor.Invoke("operator>>?", "operator>>(char*&)", typeof(QDataStream), typeof(string), str);
}
+ public QDataStream Write(char i) {
+ return (QDataStream) interceptor.Invoke("operator<<$", "operator<<(qint8)", typeof(QDataStream), typeof(char), i);
+ }
+ public QDataStream Write(uchar i) {
+ return (QDataStream) interceptor.Invoke("operator<<$", "operator<<(quint8)", typeof(QDataStream), typeof(uchar), i);
+ }
public QDataStream Write(short i) {
return (QDataStream) interceptor.Invoke("operator<<$", "operator<<(qint16)", typeof(QDataStream), typeof(short), i);
}
--- trunk/KDE/kdebindings/csharp/qyoto/gui/QInputMethodEvent.cs #804625:804626
@@ -13,6 +13,24 @@
protected SmokeInvocation interceptor = null;
private IntPtr smokeObject;
protected Attribute(Type dummy) {}
+ private int start() {
+ return (int) interceptor.Invoke("start", "start()", typeof(int));
+ }
+ public int Start {
+ get { return start(); }
+ }
+ private int length() {
+ return (int) interceptor.Invoke("length", "length()", typeof(int));
+ }
+ public int Length {
+ get { return length(); }
+ }
+ private QVariant value() {
+ return (QVariant) interceptor.Invoke("value", "value()", typeof(QVariant));
+ }
+ public QVariant Value {
+ get { return value(); }
+ }
// Attribute(,,,); >>>> NOT CONVERTED
}
protected new void CreateProxy() {
--- trunk/KDE/kdebindings/csharp/qyoto/gui/QPainterPath.cs #804625:804626
@@ -19,6 +19,18 @@
protected void CreateProxy() {
interceptor = new SmokeInvocation(typeof(Element), this);
}
+ private double x() {
+ return (double) interceptor.Invoke("x", "x()", typeof(double));
+ }
+ public double X {
+ get { return x(); }
+ }
+ private double y() {
+ return (double) interceptor.Invoke("y", "y()", typeof(double));
+ }
+ public double Y {
+ get { return y(); }
+ }
// operator QPointF(); >>>> NOT CONVERTED
// bool operator==(); >>>> NOT CONVERTED
public bool IsMoveTo() {
--- trunk/KDE/kdebindings/csharp/qyoto/gui/QPalette.cs #804625:804626
@@ -42,10 +42,10 @@
Link = 14,
LinkVisited = 15,
AlternateBase = 16,
- ToolTipBase = 17,
- ToolTipText = 18,
- NoRole = 19,
- NColorRoles = NoRole,
+ NoRole = 17,
+ ToolTipBase = 18,
+ ToolTipText = 19,
+ NColorRoles = ToolTipText+1,
Foreground = WindowText,
Background = Window,
}
--- trunk/KDE/kdebindings/csharp/qyoto/webkit/QWebFrame.cs #804625:804626
@@ -57,12 +57,6 @@
public void SetHtml(string html) {
interceptor.Invoke("setHtml$", "setHtml(const QString&)", typeof(void), typeof(string), html);
}
- public void SetHtml(QByteArray html, QUrl baseUrl) {
- interceptor.Invoke("setHtml##", "setHtml(const QByteArray&, const QUrl&)", typeof(void), typeof(QByteArray), html, typeof(QUrl), baseUrl);
- }
- public void SetHtml(QByteArray html) {
- interceptor.Invoke("setHtml#", "setHtml(const QByteArray&)", typeof(void), typeof(QByteArray), html);
- }
public void SetContent(QByteArray data, string mimeType, QUrl baseUrl) {
interceptor.Invoke("setContent#$#", "setContent(const QByteArray&, const QString&, const QUrl&)", typeof(void), typeof(QByteArray), data, typeof(string), mimeType, typeof(QUrl), baseUrl);
}
--- trunk/KDE/kdebindings/csharp/qyoto/webkit/QWebPage.cs #804625:804626
@@ -280,8 +280,12 @@
}
public interface IQWebPageSignals : IQObjectSignals {
+ [Q_SIGNAL("void loadStarted()")]
+ void LoadStarted();
[Q_SIGNAL("void loadProgress(int)")]
void LoadProgress(int progress);
+ [Q_SIGNAL("void loadFinished(bool)")]
+ void LoadFinished(bool ok);
[Q_SIGNAL("void linkHovered(const QString&, const QString&, const QString&)")]
void LinkHovered(string link, string title, string textContent);
[Q_SIGNAL("void statusBarMessage(const QString&)")]
--- trunk/KDE/kdebindings/csharp/qyoto/webkit/QWebView.cs #804625:804626
@@ -74,12 +74,6 @@
public void SetHtml(string html) {
interceptor.Invoke("setHtml$", "setHtml(const QString&)", typeof(void), typeof(string), html);
}
- public void SetHtml(QByteArray html, QUrl baseUrl) {
- interceptor.Invoke("setHtml##", "setHtml(const QByteArray&, const QUrl&)", typeof(void), typeof(QByteArray), html, typeof(QUrl), baseUrl);
- }
- public void SetHtml(QByteArray html) {
- interceptor.Invoke("setHtml#", "setHtml(const QByteArray&)", typeof(void), typeof(QByteArray), html);
- }
public void SetContent(QByteArray data, string mimeType, QUrl baseUrl) {
interceptor.Invoke("setContent#$#", "setContent(const QByteArray&, const QString&, const QUrl&)", typeof(void), typeof(QByteArray), data, typeof(string), mimeType, typeof(QUrl), baseUrl);
}
@@ -244,8 +238,8 @@
void LoadStarted();
[Q_SIGNAL("void loadProgress(int)")]
void LoadProgress(int progress);
- [Q_SIGNAL("void loadFinished()")]
- void LoadFinished();
+ [Q_SIGNAL("void loadFinished(bool)")]
+ void LoadFinished(bool arg1);
[Q_SIGNAL("void titleChanged(const QString&)")]
void TitleChanged(string title);
[Q_SIGNAL("void statusBarMessage(const QString&)")]
More information about the Kde-bindings
mailing list