[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
gramps
gramps at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 05:50:38 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 82c81df6c071fad5b8712c6b7312baf03ab58c76
Author: gramps <gramps at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Oct 17 20:14:53 2001 +0000
Anal-retentive tweaking
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@345 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/kwq/KWQTextCodec.h b/WebCore/kwq/KWQTextCodec.h
index e094684..e2b0246 100644
--- a/WebCore/kwq/KWQTextCodec.h
+++ b/WebCore/kwq/KWQTextCodec.h
@@ -68,7 +68,6 @@ public:
// static member functions -------------------------------------------------
static QTextCodec *codecForMib(int);
- //static QTextCodec *codecForName(const char *, int accuracy=0);
static QTextCodec *codecForName(const char *);
static QTextCodec *codecForLocale();
@@ -79,24 +78,20 @@ public:
// member functions --------------------------------------------------------
- //virtual const char* name() const=0;
const char* name() const;
- //virtual int mibEnum() const=0;
int mibEnum() const;
- //virtual QTextDecoder *makeDecoder() const;
QTextDecoder *makeDecoder() const;
QCString fromUnicode(const QString &) const;
- //virtual QString toUnicode(const char *, int) const;
QString toUnicode(const char *, int) const;
QString toUnicode(const QByteArray &, int) const;
QString toUnicode(const char *) const;
// private ---------------------------------------------------------------------
-//private:
+private:
// data members ------------------------------------------------------------
diff --git a/WebCore/kwq/qt/qtextcodec.h b/WebCore/kwq/qt/qtextcodec.h
index e094684..e2b0246 100644
--- a/WebCore/kwq/qt/qtextcodec.h
+++ b/WebCore/kwq/qt/qtextcodec.h
@@ -68,7 +68,6 @@ public:
// static member functions -------------------------------------------------
static QTextCodec *codecForMib(int);
- //static QTextCodec *codecForName(const char *, int accuracy=0);
static QTextCodec *codecForName(const char *);
static QTextCodec *codecForLocale();
@@ -79,24 +78,20 @@ public:
// member functions --------------------------------------------------------
- //virtual const char* name() const=0;
const char* name() const;
- //virtual int mibEnum() const=0;
int mibEnum() const;
- //virtual QTextDecoder *makeDecoder() const;
QTextDecoder *makeDecoder() const;
QCString fromUnicode(const QString &) const;
- //virtual QString toUnicode(const char *, int) const;
QString toUnicode(const char *, int) const;
QString toUnicode(const QByteArray &, int) const;
QString toUnicode(const char *) const;
// private ---------------------------------------------------------------------
-//private:
+private:
// data members ------------------------------------------------------------
diff --git a/WebCore/src/kwq/qt/qtextcodec.h b/WebCore/src/kwq/qt/qtextcodec.h
index e094684..e2b0246 100644
--- a/WebCore/src/kwq/qt/qtextcodec.h
+++ b/WebCore/src/kwq/qt/qtextcodec.h
@@ -68,7 +68,6 @@ public:
// static member functions -------------------------------------------------
static QTextCodec *codecForMib(int);
- //static QTextCodec *codecForName(const char *, int accuracy=0);
static QTextCodec *codecForName(const char *);
static QTextCodec *codecForLocale();
@@ -79,24 +78,20 @@ public:
// member functions --------------------------------------------------------
- //virtual const char* name() const=0;
const char* name() const;
- //virtual int mibEnum() const=0;
int mibEnum() const;
- //virtual QTextDecoder *makeDecoder() const;
QTextDecoder *makeDecoder() const;
QCString fromUnicode(const QString &) const;
- //virtual QString toUnicode(const char *, int) const;
QString toUnicode(const char *, int) const;
QString toUnicode(const QByteArray &, int) const;
QString toUnicode(const char *) const;
// private ---------------------------------------------------------------------
-//private:
+private:
// data members ------------------------------------------------------------
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list