[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
darin
darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 06:24:31 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 7e875e6c18b04706e497ae3d885d16d6000b74b0
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Jul 15 15:50:57 2002 +0000
top level:
* Tests/qt/*.cpp:
Removed unnecessary includes of <config.h>.
WebCore:
* WebCore.pbproj/project.pbxproj: Removed unused qpopupmenu.h.
* kwq/kdecore/ksimpleconfig.h: Removed unnecessary include of <config.h>.
* kwq/kio/global.h: Removed unnecessary include of <config.h>.
* kwq/kio/kprinter.h: Emptied out this file.
* kwq/qt/qpopupmenu.h: Removed.
* kwq/qt/qstylesheet.h: Removed unnecessary include of <config.h>.
* kwq/qt/qtextedit.h: Removed unnecessary include of <config.h>.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1561 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 0341d86..bfafc65 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,5 +1,15 @@
2002-07-15 Darin Adler <darin at apple.com>
+ * WebCore.pbproj/project.pbxproj: Removed unused qpopupmenu.h.
+ * kwq/kdecore/ksimpleconfig.h: Removed unnecessary include of <config.h>.
+ * kwq/kio/global.h: Removed unnecessary include of <config.h>.
+ * kwq/kio/kprinter.h: Emptied out this file.
+ * kwq/qt/qpopupmenu.h: Removed.
+ * kwq/qt/qstylesheet.h: Removed unnecessary include of <config.h>.
+ * kwq/qt/qtextedit.h: Removed unnecessary include of <config.h>.
+
+2002-07-15 Darin Adler <darin at apple.com>
+
* kwq/qt/qfontmetrics.h: Remove unused, and not properly implemented,
empty constructor. Add some const that was missing. Remove most of the
parameters of size().
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 0341d86..bfafc65 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,15 @@
2002-07-15 Darin Adler <darin at apple.com>
+ * WebCore.pbproj/project.pbxproj: Removed unused qpopupmenu.h.
+ * kwq/kdecore/ksimpleconfig.h: Removed unnecessary include of <config.h>.
+ * kwq/kio/global.h: Removed unnecessary include of <config.h>.
+ * kwq/kio/kprinter.h: Emptied out this file.
+ * kwq/qt/qpopupmenu.h: Removed.
+ * kwq/qt/qstylesheet.h: Removed unnecessary include of <config.h>.
+ * kwq/qt/qtextedit.h: Removed unnecessary include of <config.h>.
+
+2002-07-15 Darin Adler <darin at apple.com>
+
* kwq/qt/qfontmetrics.h: Remove unused, and not properly implemented,
empty constructor. Add some const that was missing. Remove most of the
parameters of size().
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 0341d86..bfafc65 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,15 @@
2002-07-15 Darin Adler <darin at apple.com>
+ * WebCore.pbproj/project.pbxproj: Removed unused qpopupmenu.h.
+ * kwq/kdecore/ksimpleconfig.h: Removed unnecessary include of <config.h>.
+ * kwq/kio/global.h: Removed unnecessary include of <config.h>.
+ * kwq/kio/kprinter.h: Emptied out this file.
+ * kwq/qt/qpopupmenu.h: Removed.
+ * kwq/qt/qstylesheet.h: Removed unnecessary include of <config.h>.
+ * kwq/qt/qtextedit.h: Removed unnecessary include of <config.h>.
+
+2002-07-15 Darin Adler <darin at apple.com>
+
* kwq/qt/qfontmetrics.h: Remove unused, and not properly implemented,
empty constructor. Add some const that was missing. Remove most of the
parameters of size().
diff --git a/WebCore/WebCore.pbproj/project.pbxproj b/WebCore/WebCore.pbproj/project.pbxproj
index cc2b0fd..65b9bc3 100644
--- a/WebCore/WebCore.pbproj/project.pbxproj
+++ b/WebCore/WebCore.pbproj/project.pbxproj
@@ -336,7 +336,6 @@
F58786F702DE3B8601EA4122,
F58786F802DE3B8601EA4122,
F58786F902DE3B8601EA4122,
- F58786FA02DE3B8601EA4122,
F58786FB02DE3B8601EA4122,
F58786FC02DE3B8601EA4122,
F58786FD02DE3B8601EA4122,
@@ -6846,12 +6845,6 @@
path = kwq/qt/qpointarray.h;
refType = 4;
};
- F58786A902DE3B8601EA4122 = {
- isa = PBXFileReference;
- name = qpopupmenu.h;
- path = kwq/qt/qpopupmenu.h;
- refType = 4;
- };
F58786AA02DE3B8601EA4122 = {
isa = PBXFileReference;
name = qprinter.h;
@@ -7332,12 +7325,6 @@
settings = {
};
};
- F58786FA02DE3B8601EA4122 = {
- fileRef = F58786A902DE3B8601EA4122;
- isa = PBXBuildFile;
- settings = {
- };
- };
F58786FB02DE3B8601EA4122 = {
fileRef = F58786AA02DE3B8601EA4122;
isa = PBXBuildFile;
@@ -7608,7 +7595,6 @@
F587852302DE375901EA4122,
F58786A802DE3B8601EA4122,
F587852402DE375901EA4122,
- F58786A902DE3B8601EA4122,
F58786AA02DE3B8601EA4122,
F58786AB02DE3B8601EA4122,
F587852502DE375901EA4122,
diff --git a/WebCore/kwq/KWQKIOGlobal.h b/WebCore/kwq/KWQKIOGlobal.h
index af372da..7811a65 100644
--- a/WebCore/kwq/KWQKIOGlobal.h
+++ b/WebCore/kwq/KWQKIOGlobal.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2001 Apple Computer, Inc. All rights reserved.
+ * Copyright (C) 2001, 2002 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
@@ -26,7 +26,6 @@
#ifndef KIO_GLOBAL_H_
#define KIO_GLOBAL_H_
-#include <config.h>
#include <qstring.h>
#include <qmap.h>
diff --git a/WebCore/kwq/KWQKSimpleConfig.h b/WebCore/kwq/KWQKSimpleConfig.h
index 3f856dc..c137bba 100644
--- a/WebCore/kwq/KWQKSimpleConfig.h
+++ b/WebCore/kwq/KWQKSimpleConfig.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2001 Apple Computer, Inc. All rights reserved.
+ * Copyright (C) 2001, 2002 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
@@ -26,10 +26,6 @@
#ifndef KSIMPLECONFIG_H_
#define KSIMPLECONFIG_H_
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <kconfig.h>
#include <qstring.h>
diff --git a/WebCore/kwq/KWQStyleSheet.h b/WebCore/kwq/KWQStyleSheet.h
index d664511..7b67c12 100644
--- a/WebCore/kwq/KWQStyleSheet.h
+++ b/WebCore/kwq/KWQStyleSheet.h
@@ -26,8 +26,6 @@
#ifndef QSTYLESHEET_H_
#define QSTYLESHEET_H_
-#include <config.h>
-
class QString;
class QStyleSheet
diff --git a/WebCore/kwq/KWQTextEdit.h b/WebCore/kwq/KWQTextEdit.h
index 3d4fe8b..b8d3732 100644
--- a/WebCore/kwq/KWQTextEdit.h
+++ b/WebCore/kwq/KWQTextEdit.h
@@ -26,7 +26,6 @@
#ifndef QTEXTEDIT_H_
#define QTEXTEDIT_H_
-#include <config.h>
#include <qscrollview.h>
class QTextEdit : public QScrollView
diff --git a/WebCore/kwq/kdecore/ksimpleconfig.h b/WebCore/kwq/kdecore/ksimpleconfig.h
index 3f856dc..c137bba 100644
--- a/WebCore/kwq/kdecore/ksimpleconfig.h
+++ b/WebCore/kwq/kdecore/ksimpleconfig.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2001 Apple Computer, Inc. All rights reserved.
+ * Copyright (C) 2001, 2002 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
@@ -26,10 +26,6 @@
#ifndef KSIMPLECONFIG_H_
#define KSIMPLECONFIG_H_
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <kconfig.h>
#include <qstring.h>
diff --git a/WebCore/kwq/kio/global.h b/WebCore/kwq/kio/global.h
index af372da..7811a65 100644
--- a/WebCore/kwq/kio/global.h
+++ b/WebCore/kwq/kio/global.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2001 Apple Computer, Inc. All rights reserved.
+ * Copyright (C) 2001, 2002 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
@@ -26,7 +26,6 @@
#ifndef KIO_GLOBAL_H_
#define KIO_GLOBAL_H_
-#include <config.h>
#include <qstring.h>
#include <qmap.h>
diff --git a/WebCore/kwq/kio/kprinter.h b/WebCore/kwq/kio/kprinter.h
index 2ff09b4..e69de29 100644
--- a/WebCore/kwq/kio/kprinter.h
+++ b/WebCore/kwq/kio/kprinter.h
@@ -1,55 +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 KPRINTER_H_
-#define KPRINTER_H_
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <qpaintdevice.h>
-#include <qstring.h>
-#include <qwidget.h>
-#include <qsize.h>
-#include <qprinter.h>
-
-// NOTE: I stuck this file here rather than create a whole new
-// kdeprint directory
-
-class KPrinter : public QPaintDevice {
-public:
- KPrinter(QPrinter::PrinterMode m = QPrinter::ScreenResolution);
-
- bool setup(QWidget *parent=0);
- bool newPage();
- void setDocName(const QString &);
- void setCreator(const QString &);
- void setFullPage(bool);
- QSize margins() const;
-};
-
-#endif
-
diff --git a/WebCore/kwq/qt/qpopupmenu.h b/WebCore/kwq/qt/qpopupmenu.h
deleted file mode 100644
index 6cb02a3..0000000
--- a/WebCore/kwq/qt/qpopupmenu.h
+++ /dev/null
@@ -1,62 +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 QPOPUPMENU_H_
-#define QPOPUPMENU_H_
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-// class QPopupMenu ============================================================
-
-class QPopupMenu {
-public:
-
- // typedefs ----------------------------------------------------------------
- // enums -------------------------------------------------------------------
- // constants ---------------------------------------------------------------
- // static member functions -------------------------------------------------
-
- // constructors, copy constructors, and destructors ------------------------
-
- QPopupMenu();
- ~QPopupMenu();
-
- // member functions --------------------------------------------------------
- // operators ---------------------------------------------------------------
-
-// protected -------------------------------------------------------------------
-// private ---------------------------------------------------------------------
-
-private:
- // no copying or assignment
- // note that these are "standard" (no pendantic stuff needed)
- QPopupMenu(const QPopupMenu &);
- QPopupMenu &operator=(const QPopupMenu &);
-
-}; // class QPopupMenu =========================================================
-
-#endif
diff --git a/WebCore/kwq/qt/qstylesheet.h b/WebCore/kwq/qt/qstylesheet.h
index d664511..7b67c12 100644
--- a/WebCore/kwq/qt/qstylesheet.h
+++ b/WebCore/kwq/qt/qstylesheet.h
@@ -26,8 +26,6 @@
#ifndef QSTYLESHEET_H_
#define QSTYLESHEET_H_
-#include <config.h>
-
class QString;
class QStyleSheet
diff --git a/WebCore/kwq/qt/qtextedit.h b/WebCore/kwq/qt/qtextedit.h
index 3d4fe8b..b8d3732 100644
--- a/WebCore/kwq/qt/qtextedit.h
+++ b/WebCore/kwq/qt/qtextedit.h
@@ -26,7 +26,6 @@
#ifndef QTEXTEDIT_H_
#define QTEXTEDIT_H_
-#include <config.h>
#include <qscrollview.h>
class QTextEdit : public QScrollView
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list