Commit 6d3fa577 authored by kocienda's avatar kocienda
Browse files

Another batch of changes for moving forward in khtml/dom


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@29 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 2ec8963b
......@@ -33,4 +33,7 @@
class QCString {
};
inline bool operator!=( const char *s1, const QCString &s2 ) { return 0; } // FIXME
inline bool operator!=( const QCString &s1, const char *s2 ) { return 0; } // FIXME
#endif
......@@ -32,8 +32,16 @@ class QByteArray;
// KApplication needs this
class DCOPClient {
public:
bool call(const char *remApp, const char *remObj, const char *remFun, const QByteArray &data,
QCString& replyType, QByteArray &replyData, bool useEventLoop=false, bool fast=false);
bool call(const QCString &remApp, const QCString &remObj, const QCString &remFun, const QByteArray &data,
QCString& replyType, QByteArray &replyData, bool useEventLoop=false, bool fast=false);
bool send(const char *remApp, const char *remObj, const char *remFun, const QByteArray &data, bool fast=false);
bool send(const QCString &remApp, const QCString &remObj, const QCString &remFun, const QByteArray &data,
bool fast=false);
};
#endif
......@@ -26,4 +26,26 @@
#ifndef KDEBUG_H_
#define KDEBUG_H_
#include <qstring.h>
class kdbgstream;
typedef kdbgstream & (*KDBGFUNC)(kdbgstream &);
class kdbgstream {
public:
kdbgstream &operator<<(const char *string);
kdbgstream &operator<<(const QString& string);
kdbgstream &operator<<(const QCString& string);
kdbgstream &operator<<(KDBGFUNC f);
};
inline kdbgstream &endl( kdbgstream &s) { s << "\n"; return s; }
kdbgstream kdWarning(int area = 0);
kdbgstream kdWarning(bool cond, int area = 0);
kdbgstream kdError(int area = 0);
kdbgstream kdError(bool cond, int area = 0);
kdbgstream kdFatal(int area = 0);
kdbgstream kdFatal(bool cond, int area = 0);
#endif
......@@ -26,7 +26,9 @@
#ifndef QSCROLLVIEW_H_
#define QSCROLLVIEW_H_
class QScrollView {
#include "qwidget.h"
class QScrollView : public QWidget {
typedef int ScrollBarMode;
};
......
......@@ -47,6 +47,7 @@ class QString {
public:
QString();
QString(const QChar *, uint);
QString(const char *s);
int toInt() const;
int toInt(bool *) const;
bool isNull() const;
......@@ -58,6 +59,11 @@ public:
bool isEmpty() const;
int contains(const char *) const;
QString &append(const char *s);
QString &append(const QString &s);
QCString utf8() const;
static const QString null;
// FIXME: bogus constructor hack for "conversion from int to non-scalar
......
......@@ -27,6 +27,8 @@
#define QWIDGET_H_
class QWidget {
public:
int winId() const;
};
#endif
......@@ -32,8 +32,16 @@ class QByteArray;
// KApplication needs this
class DCOPClient {
public:
bool call(const char *remApp, const char *remObj, const char *remFun, const QByteArray &data,
QCString& replyType, QByteArray &replyData, bool useEventLoop=false, bool fast=false);
bool call(const QCString &remApp, const QCString &remObj, const QCString &remFun, const QByteArray &data,
QCString& replyType, QByteArray &replyData, bool useEventLoop=false, bool fast=false);
bool send(const char *remApp, const char *remObj, const char *remFun, const QByteArray &data, bool fast=false);
bool send(const QCString &remApp, const QCString &remObj, const QCString &remFun, const QByteArray &data,
bool fast=false);
};
#endif
......@@ -26,4 +26,26 @@
#ifndef KDEBUG_H_
#define KDEBUG_H_
#include <qstring.h>
class kdbgstream;
typedef kdbgstream & (*KDBGFUNC)(kdbgstream &);
class kdbgstream {
public:
kdbgstream &operator<<(const char *string);
kdbgstream &operator<<(const QString& string);
kdbgstream &operator<<(const QCString& string);
kdbgstream &operator<<(KDBGFUNC f);
};
inline kdbgstream &endl( kdbgstream &s) { s << "\n"; return s; }
kdbgstream kdWarning(int area = 0);
kdbgstream kdWarning(bool cond, int area = 0);
kdbgstream kdError(int area = 0);
kdbgstream kdError(bool cond, int area = 0);
kdbgstream kdFatal(int area = 0);
kdbgstream kdFatal(bool cond, int area = 0);
#endif
......@@ -33,4 +33,7 @@
class QCString {
};
inline bool operator!=( const char *s1, const QCString &s2 ) { return 0; } // FIXME
inline bool operator!=( const QCString &s1, const char *s2 ) { return 0; } // FIXME
#endif
......@@ -36,6 +36,8 @@ public:
QDataStream &operator<<( const char *str );
QDataStream &operator<<( const QString &str );
QDataStream &operator<<( const QCString &str );
QDataStream &operator>>( const QString &str );
};
#endif
......@@ -26,7 +26,9 @@
#ifndef QSCROLLVIEW_H_
#define QSCROLLVIEW_H_
class QScrollView {
#include "qwidget.h"
class QScrollView : public QWidget {
typedef int ScrollBarMode;
};
......
......@@ -47,6 +47,7 @@ class QString {
public:
QString();
QString(const QChar *, uint);
QString(const char *s);
int toInt() const;
int toInt(bool *) const;
bool isNull() const;
......@@ -58,6 +59,11 @@ public:
bool isEmpty() const;
int contains(const char *) const;
QString &append(const char *s);
QString &append(const QString &s);
QCString utf8() const;
static const QString null;
// FIXME: bogus constructor hack for "conversion from int to non-scalar
......
......@@ -27,6 +27,8 @@
#define QWIDGET_H_
class QWidget {
public:
int winId() const;
};
#endif
......@@ -32,8 +32,16 @@ class QByteArray;
// KApplication needs this
class DCOPClient {
public:
bool call(const char *remApp, const char *remObj, const char *remFun, const QByteArray &data,
QCString& replyType, QByteArray &replyData, bool useEventLoop=false, bool fast=false);
bool call(const QCString &remApp, const QCString &remObj, const QCString &remFun, const QByteArray &data,
QCString& replyType, QByteArray &replyData, bool useEventLoop=false, bool fast=false);
bool send(const char *remApp, const char *remObj, const char *remFun, const QByteArray &data, bool fast=false);
bool send(const QCString &remApp, const QCString &remObj, const QCString &remFun, const QByteArray &data,
bool fast=false);
};
#endif
......@@ -26,4 +26,26 @@
#ifndef KDEBUG_H_
#define KDEBUG_H_
#include <qstring.h>
class kdbgstream;
typedef kdbgstream & (*KDBGFUNC)(kdbgstream &);
class kdbgstream {
public:
kdbgstream &operator<<(const char *string);
kdbgstream &operator<<(const QString& string);
kdbgstream &operator<<(const QCString& string);
kdbgstream &operator<<(KDBGFUNC f);
};
inline kdbgstream &endl( kdbgstream &s) { s << "\n"; return s; }
kdbgstream kdWarning(int area = 0);
kdbgstream kdWarning(bool cond, int area = 0);
kdbgstream kdError(int area = 0);
kdbgstream kdError(bool cond, int area = 0);
kdbgstream kdFatal(int area = 0);
kdbgstream kdFatal(bool cond, int area = 0);
#endif
......@@ -33,4 +33,7 @@
class QCString {
};
inline bool operator!=( const char *s1, const QCString &s2 ) { return 0; } // FIXME
inline bool operator!=( const QCString &s1, const char *s2 ) { return 0; } // FIXME
#endif
......@@ -36,6 +36,8 @@ public:
QDataStream &operator<<( const char *str );
QDataStream &operator<<( const QString &str );
QDataStream &operator<<( const QCString &str );
QDataStream &operator>>( const QString &str );
};
#endif
......@@ -26,7 +26,9 @@
#ifndef QSCROLLVIEW_H_
#define QSCROLLVIEW_H_
class QScrollView {
#include "qwidget.h"
class QScrollView : public QWidget {
typedef int ScrollBarMode;
};
......
......@@ -47,6 +47,7 @@ class QString {
public:
QString();
QString(const QChar *, uint);
QString(const char *s);
int toInt() const;
int toInt(bool *) const;
bool isNull() const;
......@@ -58,6 +59,11 @@ public:
bool isEmpty() const;
int contains(const char *) const;
QString &append(const char *s);
QString &append(const QString &s);
QCString utf8() const;
static const QString null;
// FIXME: bogus constructor hack for "conversion from int to non-scalar
......
......@@ -27,6 +27,8 @@
#define QWIDGET_H_
class QWidget {
public:
int winId() const;
};
#endif
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment