[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
cblu
cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 07:45:50 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit c1cf38b9e4d36679653f655ff49309d40c2d3512
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Jun 26 18:33:21 2003 +0000
Made WebCore compile with gcc 3.3.
Reviewed by darin.
* config.h:
* kwq/KWQLineEdit.mm:
(QLineEdit::selectAll):
(QLineEdit::setEdited):
* kwq/KWQString.h:
* kwq/KWQString.mm:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4564 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index e989805..06745b4 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,16 @@
+2003-06-26 Chris Blumenberg <cblu at apple.com>
+
+ Made WebCore compile with gcc 3.3.
+
+ Reviewed by darin.
+
+ * config.h:
+ * kwq/KWQLineEdit.mm:
+ (QLineEdit::selectAll):
+ (QLineEdit::setEdited):
+ * kwq/KWQString.h:
+ * kwq/KWQString.mm:
+
=== Safari-85.1 ===
2003-06-15 Vicki Murley <vicki at apple.com>
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index e989805..06745b4 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,16 @@
+2003-06-26 Chris Blumenberg <cblu at apple.com>
+
+ Made WebCore compile with gcc 3.3.
+
+ Reviewed by darin.
+
+ * config.h:
+ * kwq/KWQLineEdit.mm:
+ (QLineEdit::selectAll):
+ (QLineEdit::setEdited):
+ * kwq/KWQString.h:
+ * kwq/KWQString.mm:
+
=== Safari-85.1 ===
2003-06-15 Vicki Murley <vicki at apple.com>
diff --git a/WebCore/config.h b/WebCore/config.h
index 54d5533..daec459 100644
--- a/WebCore/config.h
+++ b/WebCore/config.h
@@ -1,5 +1,5 @@
-/* config.h. Generated automatically by configure. */
-/* config.h.in. Generated automatically from configure.in by autoheader. */
+/* config.h. Generated by configure. */
+/* config.h.in. Generated from configure.in by autoheader. */
#ifndef CONFIG_H_
#define CONFIG_H_
@@ -186,7 +186,7 @@
#define HAVE_SOCKET 1
/* Define if you have the stpcpy function. */
-/* #undef HAVE_STPCPY */
+#define HAVE_STPCPY 1
/* Define if you have the strcasecmp function. */
/* #undef HAVE_STRCASECMP */
@@ -195,7 +195,7 @@
/* #undef HAVE_STRCHR */
/* Define if you have the strfmon function. */
-/* #undef HAVE_STRFMON */
+#define HAVE_STRFMON 1
/* Define if you have the unlockpt function. */
/* #undef HAVE_UNLOCKPT */
@@ -390,7 +390,7 @@
/* #undef HAVE_TEMPLATE_REPOSITORY */
/* Define if you have stpcpy */
-/* #undef HAVE_STPCPY */
+#define HAVE_STPCPY 1
/* Define if your locale.h file contains LC_MESSAGES */
/* #undef HAVE_LC_MESSAGES */
@@ -703,19 +703,20 @@ int mkstemps (char* _template, int suffix_len); /* defined in fakes.c */
#endif
-/* Define if you have the <dirent.h> header file, and it defines `DIR'. */
+/* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'.
+ */
#define HAVE_DIRENT_H 1
-/* Define if you have the <dlfcn.h> header file. */
+/* Define to 1 if you have the <dlfcn.h> header file. */
/* #undef HAVE_DLFCN_H */
-/* Define if you have the <float.h> header file. */
+/* Define to 1 if you have the <float.h> header file. */
#define HAVE_FLOAT_H 1
-/* Define if you have the <fnmatch.h> header file. */
+/* Define to 1 if you have the <fnmatch.h> header file. */
#define HAVE_FNMATCH_H 1
-/* Define if you have the `fork' function. */
+/* Define to 1 if you have the `fork' function. */
#define HAVE_FORK 1
/* Define if Foundation source tree exists */
@@ -733,139 +734,156 @@ int mkstemps (char* _template, int suffix_len); /* defined in fakes.c */
/* Define if you have _finite */
/* #undef HAVE_FUNC__FINITE */
-/* Define if you have the `gettimeofday' function. */
+/* Define to 1 if you have the `gettimeofday' function. */
#define HAVE_GETTIMEOFDAY 1
-/* Define if you have the <ieeefp.h> header file. */
+/* Define to 1 if you have the <ieeefp.h> header file. */
/* #undef HAVE_IEEEFP_H */
-/* Define if you have the <inttypes.h> header file. */
+/* Define to 1 if you have the <inttypes.h> header file. */
#define HAVE_INTTYPES_H 1
-/* Define if you have the <limits.h> header file. */
+/* Define to 1 if you have the <limits.h> header file. */
#define HAVE_LIMITS_H 1
-/* Define if you have the <malloc.h> header file. */
+/* Define to 1 if you have the <malloc.h> header file. */
/* #undef HAVE_MALLOC_H */
-/* Define if you have the <memory.h> header file. */
+/* Define to 1 if you have the <memory.h> header file. */
#define HAVE_MEMORY_H 1
-/* Define if you have the `mkstemp' function. */
+/* Define to 1 if you have the `mkstemp' function. */
#define HAVE_MKSTEMP 1
-/* Define if you have the `mkstemps' function. */
+/* Define to 1 if you have the `mkstemps' function. */
#define HAVE_MKSTEMPS 1
-/* Define if you have the <ndir.h> header file, and it defines `DIR'. */
+/* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
/* #undef HAVE_NDIR_H */
-/* Define if you have the <paths.h> header file. */
+/* Define to 1 if you have the <paths.h> header file. */
#define HAVE_PATHS_H 1
-/* Define if you have the `random' function. */
+/* Define to 1 if you have the `random' function. */
#define HAVE_RANDOM 1
-/* Define if you have the `setegid' function. */
+/* Define to 1 if you have the `setegid' function. */
#define HAVE_SETEGID 1
-/* Define if you have the `setenv' function. */
+/* Define to 1 if you have the `setenv' function. */
#define HAVE_SETENV 1
-/* Define if you have the `seteuid' function. */
+/* Define to 1 if you have the `seteuid' function. */
#define HAVE_SETEUID 1
-/* Define if you have the <sigaction.h> header file. */
+/* Define to 1 if you have the <sigaction.h> header file. */
/* #undef HAVE_SIGACTION_H */
-/* Define if you have the `socket' function. */
+/* Define to 1 if you have the `socket' function. */
#define HAVE_SOCKET 1
-/* Define if you have the <socketbits.h> header file. */
+/* Define to 1 if you have the <socketbits.h> header file. */
/* #undef HAVE_SOCKETBITS_H */
-/* Define if you have the <stdint.h> header file. */
+/* Define to 1 if you have the <stdint.h> header file. */
#define HAVE_STDINT_H 1
-/* Define if you have the <stdlib.h> header file. */
+/* Define to 1 if you have the <stdlib.h> header file. */
#define HAVE_STDLIB_H 1
-/* Define if you have the `stpcpy' function. */
-/* #undef HAVE_STPCPY */
+/* Define to 1 if you have the `stpcpy' function. */
+#define HAVE_STPCPY 1
-/* Define if you have the `strfmon' function. */
-/* #undef HAVE_STRFMON */
+/* Define to 1 if you have the `strfmon' function. */
+#define HAVE_STRFMON 1
-/* Define if you have the <strings.h> header file. */
+/* Define to 1 if you have the <strings.h> header file. */
#define HAVE_STRINGS_H 1
-/* Define if you have the <string.h> header file. */
+/* Define to 1 if you have the <string.h> header file. */
#define HAVE_STRING_H 1
-/* Define if you have the <sysent.h> header file. */
+/* Define to 1 if you have the <sysent.h> header file. */
/* #undef HAVE_SYSENT_H */
-/* Define if you have the <sys/cdefs.h> header file. */
+/* Define to 1 if you have the <sys/cdefs.h> header file. */
#define HAVE_SYS_CDEFS_H 1
-/* Define if you have the <sys/dir.h> header file, and it defines `DIR'. */
+/* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'.
+ */
/* #undef HAVE_SYS_DIR_H */
-/* Define if you have the <sys/mman.h> header file. */
+/* Define to 1 if you have the <sys/mman.h> header file. */
#define HAVE_SYS_MMAN_H 1
-/* Define if you have the <sys/ndir.h> header file, and it defines `DIR'. */
+/* Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR'.
+ */
/* #undef HAVE_SYS_NDIR_H */
-/* Define if you have the <sys/param.h> header file. */
+/* Define to 1 if you have the <sys/param.h> header file. */
#define HAVE_SYS_PARAM_H 1
-/* Define if you have the <sys/select.h> header file. */
+/* Define to 1 if you have the <sys/select.h> header file. */
#define HAVE_SYS_SELECT_H 1
-/* Define if you have the <sys/socket.h> header file. */
+/* Define to 1 if you have the <sys/socket.h> header file. */
#define HAVE_SYS_SOCKET_H 1
-/* Define if you have the <sys/stat.h> header file. */
+/* Define to 1 if you have the <sys/stat.h> header file. */
#define HAVE_SYS_STAT_H 1
-/* Define if you have the <sys/time.h> header file. */
+/* Define to 1 if you have the <sys/time.h> header file. */
#define HAVE_SYS_TIME_H 1
-/* Define if you have the <sys/types.h> header file. */
+/* Define to 1 if you have the <sys/types.h> header file. */
#define HAVE_SYS_TYPES_H 1
-/* Define if you have the <unistd.h> header file. */
+/* Define to 1 if you have the <unistd.h> header file. */
#define HAVE_UNISTD_H 1
-/* Define if you have the `unsetenv' function. */
+/* Define to 1 if you have the `unsetenv' function. */
#define HAVE_UNSETENV 1
-/* Define if you have the `vfork' function. */
+/* Define to 1 if you have the `vfork' function. */
#define HAVE_VFORK 1
-/* Define if you have the <vfork.h> header file. */
+/* Define to 1 if you have the <vfork.h> header file. */
/* #undef HAVE_VFORK_H */
-/* Define if you have the `vsnprintf' function. */
+/* Define to 1 if you have the `vsnprintf' function. */
#define HAVE_VSNPRINTF 1
-/* Define if `fork' works. */
+/* Define to 1 if `fork' works. */
#define HAVE_WORKING_FORK 1
-/* Define if `vfork' works. */
+/* Define to 1 if `vfork' works. */
#define HAVE_WORKING_VFORK 1
/* Name of package */
#define PACKAGE "Labyrinth"
-/* Define if the `S_IS*' macros in <sys/stat.h> do not work properly. */
+/* Define to the address where bug reports for this package should be sent. */
+#define PACKAGE_BUGREPORT ""
+
+/* Define to the full name of this package. */
+#define PACKAGE_NAME ""
+
+/* Define to the full name and version of this package. */
+#define PACKAGE_STRING ""
+
+/* Define to the one symbol short name of this package. */
+#define PACKAGE_TARNAME ""
+
+/* Define to the version of this package. */
+#define PACKAGE_VERSION ""
+
+/* Define to 1 if the `S_IS*' macros in <sys/stat.h> do not work properly. */
/* #undef STAT_MACROS_BROKEN */
-/* Define if you have the ANSI C header files. */
+/* Define to 1 if you have the ANSI C header files. */
#define STDC_HEADERS 1
-/* Define if you can safely include both <sys/time.h> and <time.h>. */
+/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
#define TIME_WITH_SYS_TIME 1
/* Version number of package */
diff --git a/WebCore/kwq/KWQLineEdit.mm b/WebCore/kwq/KWQLineEdit.mm
index 36b9909..78076f7 100644
--- a/WebCore/kwq/KWQLineEdit.mm
+++ b/WebCore/kwq/KWQLineEdit.mm
@@ -109,7 +109,7 @@ int QLineEdit::maxLength() const
void QLineEdit::selectAll()
{
KWQTextField *textField = (KWQTextField *)getView();
- return [textField selectText:nil];
+ [textField selectText:nil];
}
bool QLineEdit::edited() const
@@ -121,7 +121,7 @@ bool QLineEdit::edited() const
void QLineEdit::setEdited(bool flag)
{
KWQTextField *textField = (KWQTextField *)getView();
- return [textField setEdited:flag];
+ [textField setEdited:flag];
}
QSize QLineEdit::sizeForCharacterWidth(int numCharacters) const
diff --git a/WebCore/kwq/KWQString.h b/WebCore/kwq/KWQString.h
index 6fb2bdb..6fd7aa6 100644
--- a/WebCore/kwq/KWQString.h
+++ b/WebCore/kwq/KWQString.h
@@ -332,7 +332,7 @@ struct KWQStringData {
class QString {
public:
- static const char * const null = 0; // not a QString as in Qt (can't have static constructor), but close enough to be compatible in most cases
+ static const char * const null; // not a QString as in Qt (can't have static constructor), but close enough to be compatible in most cases
QString();
QString(QChar);
diff --git a/WebCore/kwq/KWQString.mm b/WebCore/kwq/KWQString.mm
index 026ab63..24f5b55 100644
--- a/WebCore/kwq/KWQString.mm
+++ b/WebCore/kwq/KWQString.mm
@@ -221,6 +221,8 @@ static void freeHandle(void *free);
static const int caseDelta = ('a' - 'A');
+const char * const QString::null = 0;
+
KWQStringData *QString::shared_null = 0;
KWQStringData **QString::shared_null_handle = 0;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list