[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
kocienda
kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 05:44:13 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit cbf0b7ee7dbf18c6a6dcbad91af20488fc8ee60d
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Sep 5 18:10:17 2001 +0000
Some small code cleanups
Removed a couple of files that we don't need, rolling their functionality into files that are keepers
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@107 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/kwq/KWQString.h b/WebCore/kwq/KWQString.h
index 49ac0a8..961d585 100644
--- a/WebCore/kwq/KWQString.h
+++ b/WebCore/kwq/KWQString.h
@@ -63,17 +63,16 @@ public:
bool mirrored() const;
QChar mirroredChar() const;
- friend inline int operator==(char, QChar);
- friend inline int operator==(QChar, char);
- friend inline int operator==(QChar, QChar);
- friend inline int operator!=(QChar, QChar);
- friend inline int operator!=(char, QChar);
- friend inline int operator!=(QChar, char);
+ friend int operator==(char, QChar);
+ friend int operator==(QChar, char);
+ friend int operator==(QChar, QChar);
+ friend int operator!=(QChar, QChar);
+ friend int operator!=(char, QChar);
+ friend int operator!=(QChar, char);
operator char() const;
ushort unicode() const;
static const QChar null;
-
};
class QString {
@@ -119,7 +118,7 @@ public:
QString &replace(const QRegExp &, const QString &);
QString &insert(uint, char);
void truncate(uint pos);
- bool startsWith(const QString&) const;
+ bool startsWith(const QString &) const;
QString arg (int &);
QString arg(int a, int fieldwidth=0, int base=10) const;
diff --git a/WebCore/kwq/kdeui/keditcl.h b/WebCore/kwq/kdeui/keditcl.h
index c71477e..2207a60 100644
--- a/WebCore/kwq/kdeui/keditcl.h
+++ b/WebCore/kwq/kdeui/keditcl.h
@@ -26,8 +26,51 @@
#ifndef KEDITCL_H_
#define KEDITCL_H_
-#include <qmultilineedit.h>
#include <qwidget.h>
+#include <qframe.h>
+#include <qscrollbar.h>
+#include <qstring.h>
+
+class QTableView : public QFrame {
+public:
+ QScrollBar *verticalScrollBar() const;
+ QScrollBar *horizontalScrollBar() const;
+
+ virtual void setTableFlags(uint);
+ void clearTableFlags(uint f = ~0);
+};
+
+const uint Tbl_vScrollBar = 0x00000001;
+const uint Tbl_hScrollBar = 0x00000002;
+const uint Tbl_autoVScrollBar = 0x00000004;
+const uint Tbl_autoHScrollBar = 0x00000008;
+const uint Tbl_autoScrollBars = 0x0000000C;
+
+
+class QMultiLineEdit : public QTableView {
+public:
+
+ enum WordWrap {
+ NoWrap,
+ WidgetWidth,
+ FixedPixelWidth,
+ FixedColumnWidth
+ };
+
+ void setWordWrap(WordWrap);
+ WordWrap wordWrap() const;
+ bool hasMarkedText() const;
+ bool isReadOnly() const;
+ virtual void setReadOnly(bool);
+ virtual void setCursorPosition(int line, int col, bool mark = FALSE);
+ void getCursorPosition(int *line, int *col) const;
+ virtual void setText(const QString &);
+ QString text();
+ QString textLine(int line) const;
+ int numLines() const;
+ void selectAll();
+};
+
class KEdit : public QMultiLineEdit {
public:
diff --git a/WebCore/kwq/qt/qmultilineedit.h b/WebCore/kwq/qt/qmultilineedit.h
deleted file mode 100644
index 92fccd4..0000000
--- a/WebCore/kwq/qt/qmultilineedit.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * 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 QMULTILINEEDIT_H_
-#define QMULTILINEEDIT_H_
-
-#include "qtableview.h"
-#include "qscrollbar.h"
-#include "qstring.h"
-
-class QMultiLineEdit : public QTableView {
-public:
-
- enum WordWrap {
- NoWrap,
- WidgetWidth,
- FixedPixelWidth,
- FixedColumnWidth
- };
-
- void setWordWrap(WordWrap);
- WordWrap wordWrap() const;
- bool hasMarkedText() const;
- bool isReadOnly() const;
- virtual void setReadOnly(bool);
- virtual void setCursorPosition(int line, int col, bool mark = FALSE);
- void getCursorPosition(int *line, int *col) const;
- virtual void setText(const QString &);
- QString text();
- QString textLine(int line) const;
- int numLines() const;
- void selectAll();
-};
-
-#endif
diff --git a/WebCore/kwq/qt/qstring.h b/WebCore/kwq/qt/qstring.h
index 49ac0a8..961d585 100644
--- a/WebCore/kwq/qt/qstring.h
+++ b/WebCore/kwq/qt/qstring.h
@@ -63,17 +63,16 @@ public:
bool mirrored() const;
QChar mirroredChar() const;
- friend inline int operator==(char, QChar);
- friend inline int operator==(QChar, char);
- friend inline int operator==(QChar, QChar);
- friend inline int operator!=(QChar, QChar);
- friend inline int operator!=(char, QChar);
- friend inline int operator!=(QChar, char);
+ friend int operator==(char, QChar);
+ friend int operator==(QChar, char);
+ friend int operator==(QChar, QChar);
+ friend int operator!=(QChar, QChar);
+ friend int operator!=(char, QChar);
+ friend int operator!=(QChar, char);
operator char() const;
ushort unicode() const;
static const QChar null;
-
};
class QString {
@@ -119,7 +118,7 @@ public:
QString &replace(const QRegExp &, const QString &);
QString &insert(uint, char);
void truncate(uint pos);
- bool startsWith(const QString&) const;
+ bool startsWith(const QString &) const;
QString arg (int &);
QString arg(int a, int fieldwidth=0, int base=10) const;
diff --git a/WebCore/kwq/qt/qtableview.h b/WebCore/kwq/qt/qtableview.h
deleted file mode 100644
index 44066e4..0000000
--- a/WebCore/kwq/qt/qtableview.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * 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 QTABLEVIEW_H_
-#define QTABLEVIEW_H_
-
-#include "qframe.h"
-#include "qscrollbar.h"
-
-class QTableView : public QFrame {
-public:
- QScrollBar *verticalScrollBar() const;
- QScrollBar *horizontalScrollBar() const;
-
- virtual void setTableFlags(uint);
- void clearTableFlags(uint f = ~0);
-};
-
-const uint Tbl_vScrollBar = 0x00000001;
-const uint Tbl_hScrollBar = 0x00000002;
-const uint Tbl_autoVScrollBar = 0x00000004;
-const uint Tbl_autoHScrollBar = 0x00000008;
-const uint Tbl_autoScrollBars = 0x0000000C;
-
-#endif
diff --git a/WebCore/src/kwq/kdeui/keditcl.h b/WebCore/src/kwq/kdeui/keditcl.h
index c71477e..2207a60 100644
--- a/WebCore/src/kwq/kdeui/keditcl.h
+++ b/WebCore/src/kwq/kdeui/keditcl.h
@@ -26,8 +26,51 @@
#ifndef KEDITCL_H_
#define KEDITCL_H_
-#include <qmultilineedit.h>
#include <qwidget.h>
+#include <qframe.h>
+#include <qscrollbar.h>
+#include <qstring.h>
+
+class QTableView : public QFrame {
+public:
+ QScrollBar *verticalScrollBar() const;
+ QScrollBar *horizontalScrollBar() const;
+
+ virtual void setTableFlags(uint);
+ void clearTableFlags(uint f = ~0);
+};
+
+const uint Tbl_vScrollBar = 0x00000001;
+const uint Tbl_hScrollBar = 0x00000002;
+const uint Tbl_autoVScrollBar = 0x00000004;
+const uint Tbl_autoHScrollBar = 0x00000008;
+const uint Tbl_autoScrollBars = 0x0000000C;
+
+
+class QMultiLineEdit : public QTableView {
+public:
+
+ enum WordWrap {
+ NoWrap,
+ WidgetWidth,
+ FixedPixelWidth,
+ FixedColumnWidth
+ };
+
+ void setWordWrap(WordWrap);
+ WordWrap wordWrap() const;
+ bool hasMarkedText() const;
+ bool isReadOnly() const;
+ virtual void setReadOnly(bool);
+ virtual void setCursorPosition(int line, int col, bool mark = FALSE);
+ void getCursorPosition(int *line, int *col) const;
+ virtual void setText(const QString &);
+ QString text();
+ QString textLine(int line) const;
+ int numLines() const;
+ void selectAll();
+};
+
class KEdit : public QMultiLineEdit {
public:
diff --git a/WebCore/src/kwq/qt/qmultilineedit.h b/WebCore/src/kwq/qt/qmultilineedit.h
deleted file mode 100644
index 92fccd4..0000000
--- a/WebCore/src/kwq/qt/qmultilineedit.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * 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 QMULTILINEEDIT_H_
-#define QMULTILINEEDIT_H_
-
-#include "qtableview.h"
-#include "qscrollbar.h"
-#include "qstring.h"
-
-class QMultiLineEdit : public QTableView {
-public:
-
- enum WordWrap {
- NoWrap,
- WidgetWidth,
- FixedPixelWidth,
- FixedColumnWidth
- };
-
- void setWordWrap(WordWrap);
- WordWrap wordWrap() const;
- bool hasMarkedText() const;
- bool isReadOnly() const;
- virtual void setReadOnly(bool);
- virtual void setCursorPosition(int line, int col, bool mark = FALSE);
- void getCursorPosition(int *line, int *col) const;
- virtual void setText(const QString &);
- QString text();
- QString textLine(int line) const;
- int numLines() const;
- void selectAll();
-};
-
-#endif
diff --git a/WebCore/src/kwq/qt/qstring.h b/WebCore/src/kwq/qt/qstring.h
index 49ac0a8..961d585 100644
--- a/WebCore/src/kwq/qt/qstring.h
+++ b/WebCore/src/kwq/qt/qstring.h
@@ -63,17 +63,16 @@ public:
bool mirrored() const;
QChar mirroredChar() const;
- friend inline int operator==(char, QChar);
- friend inline int operator==(QChar, char);
- friend inline int operator==(QChar, QChar);
- friend inline int operator!=(QChar, QChar);
- friend inline int operator!=(char, QChar);
- friend inline int operator!=(QChar, char);
+ friend int operator==(char, QChar);
+ friend int operator==(QChar, char);
+ friend int operator==(QChar, QChar);
+ friend int operator!=(QChar, QChar);
+ friend int operator!=(char, QChar);
+ friend int operator!=(QChar, char);
operator char() const;
ushort unicode() const;
static const QChar null;
-
};
class QString {
@@ -119,7 +118,7 @@ public:
QString &replace(const QRegExp &, const QString &);
QString &insert(uint, char);
void truncate(uint pos);
- bool startsWith(const QString&) const;
+ bool startsWith(const QString &) const;
QString arg (int &);
QString arg(int a, int fieldwidth=0, int base=10) const;
diff --git a/WebCore/src/kwq/qt/qtableview.h b/WebCore/src/kwq/qt/qtableview.h
deleted file mode 100644
index 44066e4..0000000
--- a/WebCore/src/kwq/qt/qtableview.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * 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 QTABLEVIEW_H_
-#define QTABLEVIEW_H_
-
-#include "qframe.h"
-#include "qscrollbar.h"
-
-class QTableView : public QFrame {
-public:
- QScrollBar *verticalScrollBar() const;
- QScrollBar *horizontalScrollBar() const;
-
- virtual void setTableFlags(uint);
- void clearTableFlags(uint f = ~0);
-};
-
-const uint Tbl_vScrollBar = 0x00000001;
-const uint Tbl_hScrollBar = 0x00000002;
-const uint Tbl_autoVScrollBar = 0x00000004;
-const uint Tbl_autoHScrollBar = 0x00000008;
-const uint Tbl_autoScrollBars = 0x0000000C;
-
-#endif
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list