Commit 7af9d9eb authored by kocienda's avatar kocienda

Various changes to remove files that are not explicitly included by KDE/QT code.


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@109 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 918bb055
......@@ -26,7 +26,7 @@
#ifndef QASYNCIO_H_
#define QASYNCIO_H_
#include <kwqdef.h>
#include <KWQDef.h>
class QAsynchIO {
protected:
......
......@@ -26,7 +26,7 @@
#ifndef QBUFFER_H_
#define QBUFFER_H_
#include <kwqdef.h>
#include <KWQDef.h>
#include "qstring.h"
......
......@@ -26,9 +26,9 @@
#ifndef QCHECKBOX_H_
#define QCHECKBOX_H_
#include "qbutton.h"
#include <KWQButton.h>
class QCheckBox : public QButton {
class QCheckBox : public KWQButton {
public:
QCheckBox();
QCheckBox(QWidget *parent);
......
/*
* Copyright (C) 2001 Apple Computer, Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
* EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
* PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
* PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
* OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef KWQCOMPLETION_H_
#define KWQCOMPLETION_H_
#include <qobject.h>
#include <qstringlist.h>
class KWQCompletion : public QObject {
public:
KWQCompletion();
void setItems(const QStringList &);
};
class KWQCompletionBase {
public:
KWQCompletionBase();
KWQCompletion *completionObject(bool hsig = true);
};
#endif
......@@ -23,31 +23,42 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef QOBJECTDEFS_H_
#define QOBJECTDEFS_H_
#define Q_PROPERTY(text)
class QObject;
class QEvent;
class QPaintDevice;
class QPaintDeviceMetrics;
class QWidget;
class QColor;
class QColorGroup;
class QPalette;
class QPainter;
class QRegion;
class QSize;
class QSizePolicy;
class QRect;
class QFont;
class QFontMetrics;
class QBrush;
class QBitmap;
class QMovie;
class QTimer;
class QImage;
#ifndef KWQDEF_H_
#define KWQDEF_H_
typedef unsigned char uchar;
typedef unsigned short ushort;
typedef unsigned uint;
typedef int Q_INT32;
typedef unsigned int Q_UINT32;
typedef Q_INT32 QCOORD;
typedef uint WFlags;
typedef int WId;
#define QMAX(a,b) ((a) > (b) ? (a) : (b))
#define QMIN(a,b) ((a) < (b) ? (a) : (b))
#define KMAX(a,b) QMAX(a, b)
#define KMIN(a,b) QMIN(a, b)
#define QABS(a) (((a) >= 0) ? (a) : -(a))
#ifndef TRUE
#define TRUE (1)
#endif
#ifndef FALSE
#define FALSE (0)
#endif
#define ASSERT(a)
void qDebug(const char *msg, ...);
#ifdef NEED_BOGUS_X_DEFINES
typedef int XEvent;
#endif
#endif
......@@ -26,8 +26,8 @@
#ifndef QDICT_H_
#define QDICT_H_
#include "qcollection.h"
#include "qstring.h"
#include "qcollection.h"
template <class T> class QDict : public QCollection {
public:
......
......@@ -30,6 +30,7 @@
class QFrame : public QWidget {
public:
enum Shape {
NoFrame,
Box,
......
/*
* Copyright (C) 2001 Apple Computer, Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
* EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
* PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
* PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
* OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef QIODEVICE_H_
#define QIODEVICE_H_
// constants added to help in compilation of html_document.cpp:184
#define IO_ReadOnly 0x0001 // readable device
#define IO_WriteOnly 0x0002 // writable device
#define IO_ReadWrite 0x0003 // read+write device
#define IO_Append 0x0004 // append
#define IO_Truncate 0x0008 // truncate device
#define IO_Translate 0x0010 // translate CR+LF
#define IO_ModeMask 0x00ff
#endif
......@@ -27,9 +27,10 @@
#define KCOMBOBOX_H_
#include <qcombobox.h>
#include <kcompletion.h>
class KComboBox : public QComboBox, public KCompletionBase {
#include <KWQCompletion.h>
class KComboBox : public QComboBox, public KWQCompletionBase {
public:
KComboBox(QWidget *parent=0, const char *name=0);
KComboBox(bool rw, QWidget *parent=0, const char *name=0);
......
......@@ -26,9 +26,26 @@
#ifndef KCONFIG_H_
#define KCONFIG_H_
#include "kconfigbase.h"
#include <qobject.h>
#include <qcolor.h>
#include <qfont.h>
#include <qdatetime.h>
#include <qstring.h>
#include <qstrlist.h>
#include <qstringlist.h>
#include <qvariant.h>
#include <qmap.h>
#include <qcolor.h>
class QString;
class KConfigBase {
public:
void setGroup(const QString& pGroup);
QString readEntry(const char *pKey, const QString& aDefault = QString::null) const;
int readNumEntry(const char *pKey, int nDefault = 0) const;
unsigned int readUnsignedNumEntry(const char *pKey, unsigned int nDefault = 0) const;
bool readBoolEntry(const char *pKey, bool nDefault = 0) const;
QColor readColorEntry(const char *pKey, const QColor* pDefault = 0L) const;
};
class KConfig : public KConfigBase {
public:
......
......@@ -29,12 +29,17 @@
#include <qpixmap.h>
#include <qstring.h>
#include <kinstance.h>
#include "kicontheme.h"
class KIcon {
public:
enum Context { Any, Action, Application, Device, FileSystem, MimeType };
enum States { DefaultState, ActiveState, DisabledState, LastState };
};
class KIconLoader {
public:
QPixmap loadIcon(const QString& name, int group, int size=0, int state=KIcon::DefaultState,
QString *path_store=0L, bool canReturnNull=false) const;
QPixmap loadIcon(const QString &name, int group, int size=0, int state=KIcon::DefaultState,
QString *path_store=0L, bool canReturnNull=false) const;
};
#endif
......@@ -27,10 +27,12 @@
#define KLINEEDIT_H_
#include <qlineedit.h>
#include <kcompletion.h>
#include <kcompletionbox.h>
class KLineEdit : public QLineEdit, public KCompletionBase {
#include <KWQCompletion.h>
#include "kcompletionbox.h"
class KLineEdit : public QLineEdit, public KWQCompletionBase {
public:
KLineEdit(QWidget *parent=0, const char *name=0);
......
......@@ -26,22 +26,18 @@
#ifndef BROWSEREXTENSION_H_
#define BROWSEREXTENSION_H_
// Added for compilation of khtml/dom/html_document.cpp:184
#include <qpoint.h>
#include <qevent.h>
#include <qdatastream.h>
// This is a bad hack to get some rendering code to work
#include <kxmlguiclient.h>
#include <kurl.h>
// classes and includes added for ecma directory
#include "part.h"
#include "browserinterface.h"
class KURL;
// Added for compilation of khtml/khtml_part.h:734
class QPoint;
// Added for compilation of khtml/khtml_part.h:755
class QEvent;
// This is a bad hack to get some rendering code to work
class KXMLGUIClient {
};
namespace KParts {
......
......@@ -26,7 +26,8 @@
#ifndef BROWSERINTERFACE_H_
#define BROWSERINTERFACE_H_
class QVariant;
#include <qobject.h>
#include <qvariant.h>
namespace KParts {
......
......@@ -26,7 +26,7 @@
#ifndef KWIN_H_
#define KWIN_H_
#include <qobjectdefs.h>
#include <qobject.h>
#include <qrect.h>
#include <qstring.h>
......
......@@ -27,6 +27,8 @@
#define QLABEL_H_
#include "qframe.h"
#include "qwidget.h"
#include "qstring.h"
class QLabel : public QFrame {
public:
......
......@@ -26,7 +26,7 @@
#ifndef QMAP_H_
#define QMAP_H_
#include <kwqdef.h>
#include <KWQDef.h>
template<class K, class T> class QMapIterator {
public:
......
......@@ -26,7 +26,7 @@
#ifndef QARRAY_H_
#define QARRAY_H_
#include <kwqdef.h>
#include <KWQDef.h>
template <class T> class QArray {
public:
......
......@@ -26,9 +26,8 @@
#ifndef QOBJECT_H_
#define QOBJECT_H_
#include <kwqdef.h>
#include <KWQDef.h>
#include "qobjectdefs.h"
#include "qnamespace.h"
#include "qstring.h"
#include "qevent.h"
......@@ -41,9 +40,30 @@
#define SIGNAL(x) "x"
#define emit
#define Q_OBJECT
#define Q_PROPERTY(text)
class QEvent;
class QPaintDevice;
class QPaintDeviceMetrics;
class QWidget;
class QColor;
class QColorGroup;
class QPalette;
class QPainter;
class QRegion;
class QSize;
class QSizePolicy;
class QRect;
class QFont;
class QFontMetrics;
class QBrush;
class QBitmap;
class QMovie;
class QTimer;
class QImage;
class QVariant;
class QObject : public Qt {
public:
QObject(QObject *parent=0, const char *name=0);
......
......@@ -26,7 +26,7 @@
#ifndef QPOINT_H_
#define QPOINT_H_
#include <kwqdef.h>
#include <KWQDef.h>
class QPoint {
public:
......
......@@ -26,7 +26,8 @@
#ifndef QPTRDICT_H_
#define QPTRDICT_H_
#include <kwqdef.h>
#include <KWQDef.h>
#include "qcollection.h"
template <class T> class QPtrDict : public QCollection {
......
......@@ -26,10 +26,11 @@
#ifndef QLIST_H_
#define QLIST_H_
#include <kwqdef.h>
#include <KWQDef.h>
#include "qcollection.h"
template <class T> class QList {
template <class T> class QList : public QCollection {
public:
// FIXME: should any of these functions be moved into a base collection
// class implementation?
......
......@@ -26,8 +26,9 @@
#ifndef QVECTOR_H_
#define QVECTOR_H_
#include <kwqdef.h>
#include <qcollection.h>
#include <KWQDef.h>
#include "qcollection.h"
typedef void *Item;
......
......@@ -26,11 +26,12 @@
#ifndef QPUSHBUTTON_H_
#define QPUSHBUTTON_H_
#include <KWQButton.h>
#include "qwidget.h"
#include "qbutton.h"
#include "qstring.h"
class QPushButton : public QButton {
class QPushButton : public KWQButton {
public:
QPushButton();
QPushButton(QWidget *);
......
......@@ -26,10 +26,11 @@
#ifndef QRADIOBUTTON_H_
#define QRADIOBUTTON_H_
#include <KWQButton.h>
#include "qwidget.h"
#include "qbutton.h"
class QRadioButton : public QButton {
class QRadioButton : public KWQButton {
public:
QRadioButton();
QRadioButton(QWidget *);
......
......@@ -23,12 +23,13 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef QSCROLLBAR_H_
#define QSCROLLBAR_H_
#ifndef KWQSCROLLVIEW_H_
#define KWQSCROLLVIEW_H_
#include "qwidget.h"
#include <qwidget.h>
#include <qpalette.h>
class QScrollBar : public QWidget {
class KWQScrollBar : public QWidget {
public:
virtual void setPalette(const QPalette &);
};
......
......@@ -26,9 +26,13 @@
#ifndef QSCROLLVIEW_H_
#define QSCROLLVIEW_H_
#include "qframe.h"
#include "qwidget.h"
#include "qscrollbar.h"
#include "qframe.h"
class QScrollBar : public QWidget {
public:
virtual void setPalette(const QPalette &);
};
class QScrollView : public QFrame {
public:
......
......@@ -31,14 +31,29 @@
class QString;
class QRegExp;
// =============================================================================
// QChar class
class QChar {
public:
// -------------------------------------------------------------------------
// enums
enum Direction {
// NOTE: alphabetical order
DirAL, DirAN, DirB, DirBN, DirCS, DirEN, DirES, DirET, DirL, DirLRE,
DirLRO, DirNSM, DirON, DirPDF, DirR, DirRLE, DirRLO, DirS, DirWS
};
// -------------------------------------------------------------------------
// constants
static const QChar null;
// -------------------------------------------------------------------------
// constructors, copy constructors, and destructors
QChar();
QChar(char);
QChar(uchar);
......@@ -48,6 +63,12 @@ public:
QChar(uint);
QChar(int);
// -------------------------------------------------------------------------
// static member functions
// -------------------------------------------------------------------------
// member functions
QChar lower() const;
QChar upper() const;
char latin1() const;
......@@ -62,6 +83,10 @@ public:
Direction direction() const;
bool mirrored() const;
QChar mirroredChar() const;
ushort unicode() const;
// -------------------------------------------------------------------------
// operators
friend int operator==(char, QChar);
friend int operator==(QChar, char);
......@@ -70,15 +95,27 @@ public:
friend int operator!=(char, QChar);
friend int operator!=(QChar, char);
operator char() const;
ushort unicode() const;
static const QChar null;
};
}; // end class QChar
// =============================================================================
// QString class
class QString {
public:
static QString fromLatin1(const char*, int len = -1);
// -------------------------------------------------------------------------
// enums
// -------------------------------------------------------------------------
// constants
static const QString null;
// -------------------------------------------------------------------------
// constructors, copy constructors, and destructors
QString();
QString(QChar);
QString(const QString&);
......@@ -92,33 +129,47 @@ public:
QString &operator=(QChar);
QString &operator=(char);
~QString();
// -------------------------------------------------------------------------
// static member functions
static QString number(long, int base = 10);
// -------------------------------------------------------------------------
// member functions
bool isNull() const;
bool isEmpty() const;
uint length() const;
bool startsWith(const QString &) const;
int toInt() const;
int toInt(bool *, int base=10) const;
uint toUInt(bool *ok = 0, int base = 10) const;
long toLong(bool *ok = 0, int base = 10) const;
QString &setNum(int, int base = 10 );
bool isNull() const;
const QChar *unicode() const;
float toFloat(bool *b = 0) const;
QString &prepend(const QString &);
QString &append(const char *);
QString &append(const QString &);
int contains(const char *, bool) const;
int contains(const char *) const;
int contains(char) const;
uint length() const;
QString &sprintf(const char *, ...);
QString lower() const;
QString stripWhiteSpace() const;
QString simplifyWhiteSpace() const;
bool isEmpty() const;
int find(char, int index=0) const;
int find(const char *, int index = 0, bool b = 0) const;
int find(const QString &, int index = 0, bool b = 0) const;
int find(const QRegExp &, int index = 0, bool b = 0) const;
int findRev(char, int index = 0) const;
int findRev(const char *, int index = 0) const;
QString &remove(uint, uint);
QString &replace(const QRegExp &, const QString &);
QString &insert(uint, char);
void truncate(uint pos);
bool startsWith(const QString &) const;
void fill(QChar, int len = -1);
QString arg (int &);
QString arg(int a, int fieldwidth=0, int base=