Commit 6ccf6473 authored by kocienda's avatar kocienda

Moved some more files around to remove dependencies on all files not explicitly included by KDE/QT


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@110 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 7af9d9eb
......@@ -28,7 +28,7 @@
#include <KWQButton.h>
class QCheckBox : public KWQButton {
class QCheckBox : public QButton {
public:
QCheckBox();
QCheckBox(QWidget *parent);
......
......@@ -26,8 +26,8 @@
#ifndef QCOMBOBOX_H_
#define QCOMBOBOX_H_
#include <KWQListBox.h>
#include "qwidget.h"
#include "qlistbox.h"
class QComboBox : public QWidget {
public:
......
......@@ -29,16 +29,16 @@
#include <qobject.h>
#include <qstringlist.h>
class KWQCompletion : public QObject {
class QCompletion : public QObject {
public:
KWQCompletion();
QCompletion();
void setItems(const QStringList &);
};
class KWQCompletionBase {
class QCompletionBase {
public:
KWQCompletionBase();
KWQCompletion *completionObject(bool hsig = true);
QCompletionBase();
QCompletion *completionObject(bool hsig = true);
};
#endif
......@@ -23,28 +23,31 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef QFRAME_H_
#define QFRAME_H_
#ifndef KWQDATASTREAM_H_
#define KWQDATASTREAM_H_
#include "qwidget.h"
#include "qarray.h"
#include "qstring.h"
#include "qcstring.h"
class QFrame : public QWidget {
public:
enum Shape {
NoFrame,
Box,
StyledPanel,
};
enum Shadow {
Sunken,
};
#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
QFrame();
QFrame(QWidget *parent);
class QDataStream {
public:
QDataStream( QByteArray, int mode );
virtual ~QDataStream();
virtual void setFrameStyle(int);
int frameWidth() const;
QDataStream &operator<<(long int);
QDataStream &operator<<(const char *);
QDataStream &operator<<(const QString &);
QDataStream &operator<<(const QCString &);
QDataStream &operator>>(const QString &);
};
#endif
......@@ -26,8 +26,8 @@
#ifndef QDICT_H_
#define QDICT_H_
#include <KWQCollection.h>
#include "qstring.h"
#include "qcollection.h"
template <class T> class QDict : public QCollection {
public:
......
......@@ -30,7 +30,7 @@
#include <KWQCompletion.h>
class KComboBox : public QComboBox, public KWQCompletionBase {
class KComboBox : public QComboBox, public QCompletionBase {
public:
KComboBox(QWidget *parent=0, const char *name=0);
KComboBox(bool rw, QWidget *parent=0, const char *name=0);
......
......@@ -31,11 +31,11 @@
#include <qfont.h>
#include <qdatetime.h>
#include <qstring.h>
#include <qstrlist.h>
#include <qstringlist.h>
#include <qvariant.h>
#include <qmap.h>
#include <qcolor.h>
#include <KWQStrList.h>
class KConfigBase {
public:
......
......@@ -26,6 +26,8 @@
#ifndef KIMAGEIO_H_
#define KIMAGEIO_H_
#include <qstringlist.h>
class KImageIO {
public:
enum Mode { Reading, Writing };
......
......@@ -26,7 +26,8 @@
#ifndef JOBCLASSES_H_
#define JOBCLASSES_H_
class QString;
#include <qobject.h>
#include <qstring.h>
namespace KIO {
......
......@@ -32,7 +32,7 @@
#include "kcompletionbox.h"
class KLineEdit : public QLineEdit, public KWQCompletionBase {
class KLineEdit : public QLineEdit, public QCompletionBase {
public:
KLineEdit(QWidget *parent=0, const char *name=0);
......
......@@ -26,7 +26,7 @@
#ifndef KLISTBOX_H_
#define KLISTBOX_H_
#include <qlistbox.h>
#include <KWQListBox.h>
#include <qwidget.h>
class KListBox : public QListBox {
......
......@@ -28,7 +28,7 @@
#include <qpoint.h>
#include <qevent.h>
#include <qdatastream.h>
#include <KWQDataStream.h>
#include <kurl.h>
......
......@@ -26,7 +26,7 @@
#ifndef QLABEL_H_
#define QLABEL_H_
#include "qframe.h"
#include <KWQFrame.h>
#include "qwidget.h"
#include "qstring.h"
......
......@@ -23,11 +23,11 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef QLISTBOX_H_
#define QLISTBOX_H_
#ifndef KWQLISTBOX_H_
#define KWQLISTBOX_H_
#include "qscrollview.h"
#include "qstring.h"
#include <qscrollview.h>
#include <qstring.h>
class QListBoxItem;
class QListBoxText;
......
......@@ -27,8 +27,7 @@
#define QPTRDICT_H_
#include <KWQDef.h>
#include "qcollection.h"
#include <KWQCollection.h>
template <class T> class QPtrDict : public QCollection {
public:
......
......@@ -27,8 +27,7 @@
#define QLIST_H_
#include <KWQDef.h>
#include "qcollection.h"
#include <KWQCollection.h>
template <class T> class QList : public QCollection {
public:
......
......@@ -27,8 +27,7 @@
#define QVECTOR_H_
#include <KWQDef.h>
#include "qcollection.h"
#include <KWQCollection.h>
typedef void *Item;
......
......@@ -31,7 +31,7 @@
#include "qwidget.h"
#include "qstring.h"
class QPushButton : public KWQButton {
class QPushButton : public QButton {
public:
QPushButton();
QPushButton(QWidget *);
......
......@@ -30,7 +30,7 @@
#include "qwidget.h"
class QRadioButton : public KWQButton {
class QRadioButton : public QButton {
public:
QRadioButton();
QRadioButton(QWidget *);
......
......@@ -29,7 +29,7 @@
#include <qwidget.h>
#include <qpalette.h>
class KWQScrollBar : public QWidget {
class QScrollBar : public QWidget {
public:
virtual void setPalette(const QPalette &);
};
......
......@@ -26,13 +26,9 @@
#ifndef QSCROLLVIEW_H_
#define QSCROLLVIEW_H_
#include <KWQScrollBar.h>
#include <KWQFrame.h>
#include "qwidget.h"
#include "qframe.h"
class QScrollBar : public QWidget {
public:
virtual void setPalette(const QPalette &);
};
class QScrollView : public QFrame {
public:
......
......@@ -23,15 +23,14 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef QCOLLECTION_H_
#define QCOLLECTION_H_
#ifndef KWQSTRLIST_H_
#define KWQSTRLIST_H_
class QCollection {
#include <qstring.h>
#include <qlist.h>
class QStrList : public QList<char> {
public:
typedef void *Item;
void setAutoDelete(bool);
protected:
virtual Item newItem(Item);
};
#endif
......@@ -35,7 +35,7 @@
#include "qfont.h"
#include "qcursor.h"
#include "qevent.h"
#include "qstyle.h"
#include <KWQStyle.h>
class QWidget : public QObject, public QPaintDevice {
public:
......
......@@ -31,11 +31,11 @@
#include <qfont.h>
#include <qdatetime.h>
#include <qstring.h>
#include <qstrlist.h>
#include <qstringlist.h>
#include <qvariant.h>
#include <qmap.h>
#include <qcolor.h>
#include <KWQStrList.h>
class KConfigBase {
public:
......
......@@ -30,7 +30,7 @@
#include <qobject.h>
#include <qstring.h>
#include <qstrlist.h>
#include <KWQStrList.h>
class KProcess : public QObject {
public:
......
......@@ -30,7 +30,7 @@
#include <KWQCompletion.h>
class KComboBox : public QComboBox, public KWQCompletionBase {
class KComboBox : public QComboBox, public QCompletionBase {
public:
KComboBox(QWidget *parent=0, const char *name=0);
KComboBox(bool rw, QWidget *parent=0, const char *name=0);
......
......@@ -27,7 +27,7 @@
#define KEDITCL_H_
#include <qwidget.h>
#include <qframe.h>
#include <KWQFrame.h>
#include <KWQScrollbar.h>
#include <qstring.h>
......
......@@ -32,7 +32,7 @@
#include "kcompletionbox.h"
class KLineEdit : public QLineEdit, public KWQCompletionBase {
class KLineEdit : public QLineEdit, public QCompletionBase {
public:
KLineEdit(QWidget *parent=0, const char *name=0);
......
......@@ -26,7 +26,7 @@
#ifndef KLISTBOX_H_
#define KLISTBOX_H_
#include <qlistbox.h>
#include <KWQListBox.h>
#include <qwidget.h>
class KListBox : public QListBox {
......
......@@ -26,7 +26,8 @@
#ifndef JOBCLASSES_H_
#define JOBCLASSES_H_
class QString;
#include <qobject.h>
#include <qstring.h>
namespace KIO {
......
......@@ -26,6 +26,8 @@
#ifndef KIMAGEIO_H_
#define KIMAGEIO_H_
#include <qstringlist.h>
class KImageIO {
public:
enum Mode { Reading, Writing };
......
......@@ -28,7 +28,7 @@
#include <qpoint.h>
#include <qevent.h>
#include <qdatastream.h>
#include <KWQDataStream.h>
#include <kurl.h>
......
......@@ -28,7 +28,7 @@
#include <KWQButton.h>
class QCheckBox : public KWQButton {
class QCheckBox : public QButton {
public:
QCheckBox();
QCheckBox(QWidget *parent);
......
......@@ -26,8 +26,8 @@
#ifndef QCOMBOBOX_H_
#define QCOMBOBOX_H_
#include <KWQListBox.h>
#include "qwidget.h"
#include "qlistbox.h"
class QComboBox : public QWidget {
public:
......
......@@ -26,8 +26,8 @@
#ifndef QDICT_H_
#define QDICT_H_
#include <KWQCollection.h>
#include "qstring.h"
#include "qcollection.h"
template <class T> class QDict : public QCollection {
public:
......
......@@ -27,7 +27,7 @@
#define QHBOX_H_
#include "qwidget.h"
#include "qframe.h"
#include <KWQFrame.h>
class QHBox : public QFrame {
public:
......
......@@ -26,7 +26,7 @@
#ifndef QLABEL_H_
#define QLABEL_H_
#include "qframe.h"
#include <KWQFrame.h>
#include "qwidget.h"
#include "qstring.h"
......
......@@ -27,8 +27,7 @@
#define QLIST_H_
#include <KWQDef.h>
#include "qcollection.h"
#include <KWQCollection.h>
template <class T> class QList : public QCollection {
public:
......
......@@ -27,8 +27,7 @@
#define QPTRDICT_H_
#include <KWQDef.h>
#include "qcollection.h"
#include <KWQCollection.h>
template <class T> class QPtrDict : public QCollection {
public:
......
......@@ -31,7 +31,7 @@
#include "qwidget.h"
#include "qstring.h"
class QPushButton : public KWQButton {
class QPushButton : public QButton {
public:
QPushButton();
QPushButton(QWidget *);
......
......@@ -30,7 +30,7 @@
#include "qwidget.h"
class QRadioButton : public KWQButton {
class QRadioButton : public QButton {
public:
QRadioButton();
QRadioButton(QWidget *);
......
......@@ -26,13 +26,9 @@
#ifndef QSCROLLVIEW_H_
#define QSCROLLVIEW_H_
#include <KWQScrollBar.h>
#include <KWQFrame.h>
#include "qwidget.h"
#include "qframe.h"
class QScrollBar : public QWidget {
public:
virtual void setPalette(const QPalette &);
};
class QScrollView : public QFrame {
public:
......
/*
* 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 QSTYLE_H_
#define QSTYLE_H_
#include <qobject.h>
#include <qsize.h>
class QStyle : public QObject {
public:
GUIStyle guiStyle() const;
virtual QSize indicatorSize() const = 0;
virtual QSize exclusiveIndicatorSize() const = 0;
};
#endif
......@@ -27,8 +27,7 @@
#define QVECTOR_H_
#include <KWQDef.h>
#include "qcollection.h"
#include <KWQCollection.h>
typedef void *Item;
......
......@@ -35,7 +35,7 @@
#include "qfont.h"
#include "qcursor.h"
#include "qevent.h"
#include "qstyle.h"
#include <KWQStyle.h>
class QWidget : public QObject, public QPaintDevice {
public:
......
......@@ -29,10 +29,10 @@
#include <qwidget.h>
#include <qstring.h>
class KWQButton : public QWidget {
class QButton : public QWidget {
public:
KWQButton();
KWQButton(QWidget *);
QButton();
QButton(QWidget *);
virtual void setText(const QString &);
QString text() const;
......
......@@ -29,16 +29,16 @@
#include <qobject.h>
#include <qstringlist.h>
class KWQCompletion : public QObject {
class QCompletion : public QObject {
public:
KWQCompletion();
QCompletion();
void setItems(const QStringList &);
};
class KWQCompletionBase {
class QCompletionBase {
public:
KWQCompletionBase();
KWQCompletion *completionObject(bool hsig = true);
QCompletionBase();
QCompletion *completionObject(bool hsig = true);
};
#endif
......@@ -23,28 +23,31 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef QFRAME_H_
#define QFRAME_H_
#ifndef KWQDATASTREAM_H_
#define KWQDATASTREAM_H_
#include "qwidget.h"
#include "qarray.h"
#include "qstring.h"
#include "qcstring.h"
class QFrame : public QWidget {
public:
enum Shape {
NoFrame,
Box,
StyledPanel,
};
enum Shadow {
Sunken,
};
#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
QFrame();
QFrame(QWidget *parent);
class QDataStream {
public:
QDataStream( QByteArray, int mode );
virtual ~QDataStream();
virtual void setFrameStyle(int);
int frameWidth() const;
QDataStream &operator<<(long int);
QDataStream &operator<<(const char *);
QDataStream &operator<<(const QString &);
QDataStream &operator<<(const QCString &);
QDataStream &operator>>(const QString &);
};
#endif
......@@ -26,7 +26,7 @@
#ifndef QFRAME_H_
#define QFRAME_H_
#include "qwidget.h"
#include <qwidget.h>
class QFrame : public QWidget {
public:
......
......@@ -23,11 +23,11 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef QLISTBOX_H_
#define QLISTBOX_H_
#ifndef KWQLISTBOX_H_
#define KWQLISTBOX_H_