[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
rjw
rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 05:49:21 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit c8211d23ed95d2f88a85bfe3ac0bcb40ba0ee5c4
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Oct 5 03:01:46 2001 +0000
More stubs. Created a khtml_settings in kwq.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@280 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/khtml/Makefile.in b/WebCore/khtml/Makefile.in
index 15c1793..3cb88e1 100644
--- a/WebCore/khtml/Makefile.in
+++ b/WebCore/khtml/Makefile.in
@@ -36,13 +36,14 @@ CLEAN_FILES = $(OBJECTS) \
CXXFLAGS = $(BASECXXFLAGS) \
-I$(TOPSRCDIR)/src/kwq \
- -I$(TOPSRCDIR)/src/kwq/kde \
- -I$(TOPSRCDIR)/src/kwq/qt \
-I$(TOPSRCDIR)/src/kwq/dcop \
+ -I$(TOPSRCDIR)/src/kwq/kde \
-I$(TOPSRCDIR)/src/kwq/kdecore \
- -I$(TOPSRCDIR)/src/kwq/kio \
-I$(TOPSRCDIR)/src/kwq/kdeui \
+ -I$(TOPSRCDIR)/src/kwq/kio \
+ -I$(TOPSRCDIR)/src/kwq/khtml \
-I$(TOPSRCDIR)/src/kwq/kparts \
+ -I$(TOPSRCDIR)/src/kwq/qt \
-I../kdecore \
-I../kjs \
-I./misc \
diff --git a/WebCore/khtml/css/Makefile.in b/WebCore/khtml/css/Makefile.in
index 8be1d68..295171c 100644
--- a/WebCore/khtml/css/Makefile.in
+++ b/WebCore/khtml/css/Makefile.in
@@ -57,13 +57,14 @@ CLEAN_FILES = $(OBJECTS) \
CXXFLAGS = $(BASECXXFLAGS) \
-I$(TOPSRCDIR) \
-I$(TOPSRCDIR)/src/kwq \
- -I$(TOPSRCDIR)/src/kwq/qt \
- -I$(TOPSRCDIR)/src/kwq/kde \
-I$(TOPSRCDIR)/src/kwq/dcop \
+ -I$(TOPSRCDIR)/src/kwq/kde \
-I$(TOPSRCDIR)/src/kwq/kdecore \
-I$(TOPSRCDIR)/src/kwq/kdeui \
+ -I$(TOPSRCDIR)/src/kwq/khtml \
-I$(TOPSRCDIR)/src/kwq/kio \
-I$(TOPSRCDIR)/src/kwq/kparts \
+ -I$(TOPSRCDIR)/src/kwq/qt \
-I../dom \
-I../html \
-I../misc \
diff --git a/WebCore/khtml/html/Makefile.in b/WebCore/khtml/html/Makefile.in
index a072f25..9ee41d8 100644
--- a/WebCore/khtml/html/Makefile.in
+++ b/WebCore/khtml/html/Makefile.in
@@ -33,13 +33,14 @@ CLEAN_FILES = $(OBJECTS) \
CXXFLAGS = $(BASECXXFLAGS) \
-I$(TOPSRCDIR)/src/kwq \
- -I$(TOPSRCDIR)/src/kwq/kde \
- -I$(TOPSRCDIR)/src/kwq/qt \
-I$(TOPSRCDIR)/src/kwq/dcop \
+ -I$(TOPSRCDIR)/src/kwq/kde \
-I$(TOPSRCDIR)/src/kwq/kdecore \
- -I$(TOPSRCDIR)/src/kwq/kio \
-I$(TOPSRCDIR)/src/kwq/kdeui \
+ -I$(TOPSRCDIR)/src/kwq/khtml \
+ -I$(TOPSRCDIR)/src/kwq/kio \
-I$(TOPSRCDIR)/src/kwq/kparts \
+ -I$(TOPSRCDIR)/src/kwq/qt \
-I../../kdecore \
-I../../kjs \
-I.. \
diff --git a/WebCore/khtml/khtml_settings.cc b/WebCore/khtml/khtml_settings.cc
deleted file mode 100644
index 19ca5b1..0000000
--- a/WebCore/khtml/khtml_settings.cc
+++ /dev/null
@@ -1,527 +0,0 @@
-/* This file is part of the KDE project
- Copyright (C) 1999 David Faure <faure at kde.org>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
-*/
-
-#include "khtml_settings.h"
-#include "khtmldefaults.h"
-#include <kglobalsettings.h>
-#include <kconfig.h>
-#include <kapp.h>
-#include <kglobal.h>
-#include <klocale.h>
-#include <kcharsets.h>
-#include <kdebug.h>
-
-#define MAXFONTSIZES 15
-
-typedef QMap<QString,KHTMLSettings::KJavaScriptAdvice> PolicyMap;
-
-KHTMLSettings::KJavaScriptAdvice KHTMLSettings::strToAdvice(const QString& _str)
-{
- KJavaScriptAdvice ret = KJavaScriptDunno;
-
- if (!_str)
- ret = KJavaScriptDunno;
-
- if (_str.lower() == QString::fromLatin1("accept"))
- ret = KJavaScriptAccept;
- else if (_str.lower() == QString::fromLatin1("reject"))
- ret = KJavaScriptReject;
-
- return ret;
-}
-
-const char* KHTMLSettings::adviceToStr(KJavaScriptAdvice _advice)
-{
- switch( _advice ) {
- case KJavaScriptAccept: return I18N_NOOP("Accept");
- case KJavaScriptReject: return I18N_NOOP("Reject");
- default: return 0;
- }
- return 0;
-}
-
-
-void KHTMLSettings::splitDomainAdvice(const QString& configStr, QString &domain,
- KJavaScriptAdvice &javaAdvice, KJavaScriptAdvice& javaScriptAdvice)
-{
- QString tmp(configStr);
- int splitIndex = tmp.find(':');
- if ( splitIndex == -1)
- {
- domain = configStr;
- javaAdvice = KJavaScriptDunno;
- javaScriptAdvice = KJavaScriptDunno;
- }
- else
- {
- domain = tmp.left(splitIndex);
- QString adviceString = tmp.mid( splitIndex+1, tmp.length() );
- int splitIndex2 = adviceString.find( ':' );
- if( splitIndex2 == -1 ) {
- // Java advice only
- javaAdvice = strToAdvice( adviceString );
- javaScriptAdvice = KJavaScriptDunno;
- } else {
- // Java and JavaScript advice
- javaAdvice = strToAdvice( adviceString.left( splitIndex2 ) );
- javaScriptAdvice = strToAdvice( adviceString.mid( splitIndex2+1,
- adviceString.length() ) );
- }
- }
-}
-
-
-KHTMLSettings::KHTMLSettings()
-{
- init();
-}
-
-void KHTMLSettings::init()
-{
- KConfig global( "khtmlrc", true );
- global.setGroup( "HTML Settings" );
- init( &global );
-
- KConfig *local = KGlobal::config();
- if ( !local )
- return;
-
- if ( !local->hasGroup( "HTML Settings" ) )
- return;
-
- local->setGroup( "HTML Settings" );
- init( local, false );
-}
-
-void KHTMLSettings::init( KConfig * config, bool reset )
-{
- // Fonts and colors
- if( reset ) {
- defaultFonts = QStringList();
- defaultFonts.append( config->readEntry( "StandardFont", KGlobalSettings::generalFont().family() ) );
- defaultFonts.append( config->readEntry( "FixedFont", KGlobalSettings::fixedFont().family() ) );
- defaultFonts.append( config->readEntry( "SerifFont", HTML_DEFAULT_VIEW_SERIF_FONT ) );
- defaultFonts.append( config->readEntry( "SansSerifFont", HTML_DEFAULT_VIEW_SANSSERIF_FONT ) );
- defaultFonts.append( config->readEntry( "CursiveFont", HTML_DEFAULT_VIEW_CURSIVE_FONT ) );
- defaultFonts.append( config->readEntry( "FantasyFont", HTML_DEFAULT_VIEW_FANTASY_FONT ) );
- defaultFonts.append( QString( "0" ) ); // font size adjustment
- }
-
- if ( reset || config->hasKey( "MinimumFontSize" ) )
- m_minFontSize = config->readNumEntry( "MinimumFontSize", HTML_DEFAULT_MIN_FONT_SIZE );
-
- if ( reset || config->hasKey( "MediumFontSize" ) ) {
- m_fontSize = config->readNumEntry( "MediumFontSize", 10 );
- resetFontSizes();
- }
-
- QStringList chSets = KGlobal::charsets()->availableCharsetNames();
- for ( QStringList::Iterator it = chSets.begin(); it != chSets.end(); ++it ) {
- if ( reset || config->hasKey( *it ) ){
- QStringList fonts = config->readListEntry( *it );
- if( fonts.count() == 6 ) // backwards compatibility
- fonts.append( QString( "0" ) );
- if ( fonts.count() != 7 )
- fonts = defaultFonts;
- fontsForCharset[KGlobal::charsets()->xNameToID(*it)] = fonts;
- }
- }
-
- if ( reset || config->hasKey( "DefaultEncoding" ) ) {
- m_encoding = config->readEntry( "DefaultEncoding", "" );
- if ( m_encoding.isEmpty() )
- m_encoding = KGlobal::locale()->charset();
-
- m_defaultCharset = KGlobal::charsets()->nameToID( m_encoding );
- internalSetCharset( m_defaultCharset );
- }
-
- if ( reset || config->hasKey( "EnforceDefaultCharset" ) )
- enforceCharset = config->readBoolEntry( "EnforceDefaultCharset", false );
-
- // Behaviour
- if ( reset || config->hasKey( "ChangeCursor" ) )
- m_bChangeCursor = config->readBoolEntry( "ChangeCursor", KDE_DEFAULT_CHANGECURSOR );
-
- if ( reset || config->hasKey("UnderlineLinks") )
- m_underlineLink = config->readBoolEntry( "UnderlineLinks", true );
-
- if ( reset || config->hasKey( "HoverLinks" ) )
- {
- if ( ( m_hoverLink = config->readBoolEntry( "HoverLinks", false ) ) )
- m_underlineLink = false;
- }
-
- // Colors
- if ( reset || config->hasGroup( "General" ) )
- {
- config->setGroup( "General" ); // group will be restored by cgs anyway
- if ( reset || config->hasKey( "TextColor" ) )
- m_textColor = config->readColorEntry( "foreground", &HTML_DEFAULT_TXT_COLOR );
-
- if ( reset || config->hasKey( "linkColor" ) )
- m_linkColor = config->readColorEntry( "linkColor", &HTML_DEFAULT_LNK_COLOR );
-
- if ( reset || config->hasKey( "visitedLinkColor" ) )
- m_vLinkColor = config->readColorEntry( "visitedLinkColor", &HTML_DEFAULT_VLNK_COLOR);
- }
-
- // Other
-
- if ( reset || config->hasGroup( "HTML Settings" ) )
- {
- config->setGroup( "HTML Settings" ); // group will be restored by cgs anyway
-
- if ( reset || config->hasKey( "AutoLoadImages" ) )
- m_bAutoLoadImages = config->readBoolEntry( "AutoLoadImages", true );
-
- // The global setting for CSS
- if ( reset || config->hasKey( "EnableCSS" ) )
- m_bEnableCSS = config->readBoolEntry( "EnableCSS", true );
-
- if ( config->readBoolEntry( "UserStyleSheetEnabled", false ) == true ) {
- if ( reset || config->hasKey( "UserStyleSheet" ) )
- m_userSheet = config->readEntry( "UserStyleSheet", "" );
- }
-
- m_formCompletionEnabled = config->readBoolEntry("FormCompletion", true);
- m_maxFormCompletionItems = config->readNumEntry("MaxFormCompletionItems", 10);
- }
-
- if( reset || config->hasGroup( "Java/JavaScript Settings" ) ) {
- config->setGroup( "Java/JavaScript Settings" );
-
- // The global setting for Java
- if ( reset || config->hasKey( "EnableJava" ) )
- m_bEnableJava = config->readBoolEntry( "EnableJava", false );
-
- // The global setting for JavaScript
- if ( reset || config->hasKey( "EnableJavaScript" ) )
- m_bEnableJavaScript = config->readBoolEntry( "EnableJavaScript", false );
-
- // The global setting for Plugins (there's no local setting yet)
- if ( reset || config->hasKey( "EnablePlugins" ) )
- m_bEnablePlugins = config->readBoolEntry( "EnablePlugins", true );
-
- // The domain-specific settings.
- bool check_old_java = true;
- if( reset || config->hasKey( "JavaDomainSettings" ) ){
- check_old_java = false;
- QStringList domainList = config->readListEntry( "JavaDomainSettings" );
- for ( QStringList::ConstIterator it = domainList.begin();
- it != domainList.end(); ++it) {
- QString domain;
- KJavaScriptAdvice javaAdvice;
- KJavaScriptAdvice javaScriptAdvice;
- splitDomainAdvice(*it, domain, javaAdvice, javaScriptAdvice);
- javaDomainPolicy[domain] = javaAdvice;
- }
- }
-
- bool check_old_ecma = true;
- if( reset || config->hasKey( "ECMADomainSettings" ) ){
- check_old_ecma = false;
- QStringList domainList = config->readListEntry( "ECMADomainSettings" );
- for ( QStringList::ConstIterator it = domainList.begin();
- it != domainList.end(); ++it) {
- QString domain;
- KJavaScriptAdvice javaAdvice;
- KJavaScriptAdvice javaScriptAdvice;
- splitDomainAdvice(*it, domain, javaAdvice, javaScriptAdvice);
- javaScriptDomainPolicy[domain] = javaScriptAdvice;
- }
- }
-
- if( reset || config->hasKey( "JavaScriptDomainAdvice" )
- && ( check_old_java || check_old_ecma ) ) {
- QStringList domainList = config->readListEntry( "JavaScriptDomainAdvice" );
- for ( QStringList::ConstIterator it = domainList.begin();
- it != domainList.end(); ++it) {
- QString domain;
- KJavaScriptAdvice javaAdvice;
- KJavaScriptAdvice javaScriptAdvice;
- splitDomainAdvice(*it, domain, javaAdvice, javaScriptAdvice);
- if( check_old_java )
- javaDomainPolicy[domain] = javaAdvice;
- if( check_old_ecma )
- javaScriptDomainPolicy[domain] = javaScriptAdvice;
- }
-
- //save all the settings into the new keywords if they don't exist
- if( check_old_java ){
- QStringList domainConfig;
- PolicyMap::Iterator it;
- for( it = javaDomainPolicy.begin(); it != javaDomainPolicy.end(); ++it ){
- QCString javaPolicy = adviceToStr( it.data() );
- QCString javaScriptPolicy = adviceToStr( KJavaScriptDunno );
- domainConfig.append(QString::fromLatin1("%1:%2:%3").arg(it.key()).arg(javaPolicy).arg(javaScriptPolicy));
- }
- config->writeEntry( "JavaDomainSettings", domainConfig );
- }
-
- if( check_old_ecma ){
- QStringList domainConfig;
- PolicyMap::Iterator it;
- for( it = javaScriptDomainPolicy.begin(); it != javaScriptDomainPolicy.end(); ++it ){
- QCString javaPolicy = adviceToStr( KJavaScriptDunno );
- QCString javaScriptPolicy = adviceToStr( it.data() );
- domainConfig.append(QString::fromLatin1("%1:%2:%3").arg(it.key()).arg(javaPolicy).arg(javaScriptPolicy));
- }
- config->writeEntry( "ECMADomainSettings", domainConfig );
- }
- }
- }
-}
-
-
-// Local helper for isJavaEnabled & isJavaScriptEnabled.
-static bool lookup_hostname_policy(const QString& hostname,
- const PolicyMap& policy,
- const bool default_retval)
-{
- if (hostname.isEmpty()) {
- return default_retval;
- }
-
- // First check whether there is a perfect match.
- if( policy.contains( hostname ) ) {
- // yes, use it (unless dunno)
- KHTMLSettings::KJavaScriptAdvice adv = policy[ hostname ];
- if( adv == KHTMLSettings::KJavaScriptReject ) {
- return false;
- } else if( adv == KHTMLSettings::KJavaScriptAccept ) {
- return true;
- }
- }
-
- // Now, check for partial match. Chop host from the left until
- // there's no dots left.
- QString host_part = hostname;
- int dot_idx = -1;
- while( (dot_idx = host_part.find(QChar('.'))) >= 0 ) {
- host_part.remove(0,dot_idx);
- if( policy.contains( host_part ) ) {
- KHTMLSettings::KJavaScriptAdvice adv = policy[ host_part ];
- if( adv == KHTMLSettings::KJavaScriptReject ) {
- return false;
- } else if( adv == KHTMLSettings::KJavaScriptAccept ) {
- return true;
- }
- }
- // assert(host_part[0] == QChar('.'));
- host_part.remove(0,1); // Chop off the dot.
- }
-
- // No domain-specific entry, or was dunno: use global setting
- return default_retval;
-}
-
-bool KHTMLSettings::isJavaEnabled( const QString& hostname )
-{
- return lookup_hostname_policy(hostname, javaDomainPolicy, m_bEnableJava);
-}
-
-bool KHTMLSettings::isJavaScriptEnabled( const QString& hostname )
-{
- return lookup_hostname_policy(hostname, javaScriptDomainPolicy, m_bEnableJavaScript);
-}
-
-bool KHTMLSettings::isPluginsEnabled( const QString& hostname )
-{
- // FIXME: hostname is ignored (dnaber, 2001-01-03)
- return m_bEnablePlugins;
-}
-
-bool KHTMLSettings::isCSSEnabled( const QString& /*hostname*/ )
-{
-#if 0
- // First check whether there is a Domain-specific entry.
- if( cssDomainPolicy.contains( hostname ) ) {
- // yes, use it (unless dunno)
- KJavaScriptAdvice adv = cssDomainPolicy[ hostname ];
- if( adv == KJavaScriptReject )
- return false;
- else if( adv == KJavaScriptAccept )
- return true;
- }
-
-#endif
- // No domain-specific entry, or was dunno: use global setting
- return m_bEnableCSS;
-}
-
-
-void KHTMLSettings::resetFontSizes()
-{
- m_fontSizes.clear();
- int sizeAdjust = m_fontSize + lookupFont(m_charset,6).toInt() + 3;
- if ( sizeAdjust < 0 )
- sizeAdjust = 0;
- if ( sizeAdjust > 9 )
- sizeAdjust = 9;
- //kdDebug(6050) << "KHTMLSettings::resetFontSizes adjustment is " << sizeAdjust << endl;
- const float factor = 1.11820715;
- float scale = 1.0 / ( factor*factor*factor );
- for ( int i = 0; i < MAXFONTSIZES; i++ ) {
- m_fontSizes << ( KMAX( int( m_fontSize * scale + 0.5), m_minFontSize ) );
- scale *= factor;
- }
-}
-
-void KHTMLSettings::setFontSizes(const QValueList<int> &_newFontSizes )
-{
- QValueList<int> newFontSizes;
- newFontSizes = _newFontSizes;
- while ( newFontSizes.count() > m_fontSizes.count() )
- newFontSizes.remove( newFontSizes.fromLast() );
-
- QValueList<int>::ConstIterator it = newFontSizes.begin();
- QValueList<int>::ConstIterator end = newFontSizes.end();
- for (int i = 0; it != end; it++ )
- m_fontSizes[ i++ ] = *it;
-}
-
-
-QString KHTMLSettings::settingsToCSS() const
-{
- // lets start with the link properties
- QString str = "a:link {\ncolor: ";
- str += m_linkColor.name();
- str += ";";
- if(m_underlineLink)
- str += "\ntext-decoration: underline;";
-
- if( m_bChangeCursor )
- {
- str += "\ncursor: pointer;";
- str += "\n}\ninput[type=image] { cursor: pointer;";
- }
- str += "\n}\n";
- str += "a:visited {\ncolor: ";
- str += m_vLinkColor.name();
- str += ";";
- if(m_underlineLink)
- str += "\ntext-decoration: underline;";
-
- if( m_bChangeCursor )
- str += "\ncursor: pointer;";
- str += "\n}\n";
-
- if(m_hoverLink)
- str += "a:link:hover, a:visited:hover { text-decoration: underline; }\n";
-
- return str;
-}
-
-QString KHTMLSettings::lookupFont(const QFont::CharSet &charset, int i) const
-{
- QString font;
- const QStringList &fontList = fontsForCharset[charset];
- if (fontList.count() > (uint) i)
- font = fontList[i];
- if (font.isEmpty())
- font = defaultFonts[i];
- return font;
-}
-
-QString KHTMLSettings::stdFontName() const
-{
- return lookupFont(m_charset,0);
-}
-
-QString KHTMLSettings::fixedFontName() const
-{
- return lookupFont(m_charset,1);
-}
-
-QString KHTMLSettings::serifFontName() const
-{
- return lookupFont(m_charset,2);
-}
-
-QString KHTMLSettings::sansSerifFontName() const
-{
- return lookupFont(m_charset,3);
-}
-
-QString KHTMLSettings::cursiveFontName() const
-{
- return lookupFont(m_charset,4);
-}
-
-QString KHTMLSettings::fantasyFontName() const
-{
- return lookupFont(m_charset,5);
-}
-
-void KHTMLSettings::setFont(const QFont::CharSet &charset, int i, const QString &n)
-{
- QStringList fontList = fontsForCharset[charset];
- while (fontList.count() <= (uint)i)
- fontList.append(QString::null);
- fontList[i] = n;
-}
-
-void KHTMLSettings::setStdFontName(const QString &n)
-{
- setFont(m_charset, 0, n);
-}
-
-void KHTMLSettings::setFixedFontName(const QString &n)
-{
- setFont(m_charset, 1, n);
-}
-
-void KHTMLSettings::setDefaultCharset( QFont::CharSet c, bool enforce )
-{
- m_defaultCharset = c;
- enforceCharset = enforce;
- if(enforce)
- internalSetCharset(c);
-}
-
-void KHTMLSettings::resetCharset()
-{
- internalSetCharset(m_defaultCharset);
- setScript( m_defaultCharset );
-}
-
-void KHTMLSettings::setCharset( QFont::CharSet c)
-{
- if (!enforceCharset)
- internalSetCharset(c);
-}
-
-void KHTMLSettings::internalSetCharset( QFont::CharSet c )
-{
- m_charset = c;
- availFamilies = KGlobal::charsets()->availableFamilies( m_charset ).join(",");
- resetFontSizes();
-}
-
-void KHTMLSettings::setScript( QFont::CharSet c )
-{
- //kdDebug(6050) << "KHTMLSettings::setScript to " << c << endl;
- m_script = c;
-}
-
-QString KHTMLSettings::userStyleSheet() const
-{
- return m_userSheet;
-}
diff --git a/WebCore/khtml/khtml_settings.h b/WebCore/khtml/khtml_settings.h
deleted file mode 100644
index d15e47a..0000000
--- a/WebCore/khtml/khtml_settings.h
+++ /dev/null
@@ -1,167 +0,0 @@
-/* This file is part of the KDE project
- Copyright (C) 1999 David Faure <faure at kde.org>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
-*/
-
-#ifndef __konq_htmlsettings_h__
-#define __konq_htmlsettings_h__
-
-class KConfig;
-#include <qcolor.h>
-#include <qstring.h>
-#include <qstringlist.h>
-#include <qfont.h>
-#include <qmap.h>
-
-/**
- * Settings for the HTML view.
- */
-class KHTMLSettings
-{
-public:
-
- /**
- * This enum specifies whether Java/JavaScript execution is allowed.
- */
- enum KJavaScriptAdvice {
- KJavaScriptDunno=0,
- KJavaScriptAccept,
- KJavaScriptReject
- };
-
- /**
- * @internal Constructor
- */
- KHTMLSettings();
-
- /** Called by constructor and reparseConfiguration */
- void init();
-
- /** Read settings from @p config.
- * @param reset if true, settings are always set; if false,
- * settings are only set if the config file has a corresponding key.
- */
- void init( KConfig * config, bool reset = true );
-
- /** Destructor. Don't delete any instance by yourself. */
- virtual ~KHTMLSettings() {};
-
- // Behaviour settings
- bool changeCursor() { return m_bChangeCursor; }
- bool underlineLink() { return m_underlineLink; }
- bool hoverLink() { return m_hoverLink; }
-
- // Font settings
- QString stdFontName() const;
- QString fixedFontName() const;
- QString serifFontName() const;
- QString sansSerifFontName() const;
- QString cursiveFontName() const;
- QString fantasyFontName() const;
-
- // these two can be set. Mainly for historical reasons (the method in KHTMLPart exists...)
- void setStdFontName(const QString &n);
- void setFixedFontName(const QString &n);
-
- const QValueList<int> &fontSizes() const { return m_fontSizes; }
- void setFontSizes(const QValueList<int> &newFontSizes );
- void resetFontSizes();
-
- int minFontSize() const { return m_minFontSize; }
-
- // the charset used to display the current document.
- QFont::CharSet charset() const { return m_charset; }
- void setCharset( QFont::CharSet c );
- QFont::CharSet script() const { return m_script; }
- void setScript( QFont::CharSet c );
- void resetCharset( );
-
- void setDefaultCharset( QFont::CharSet c, bool b );
-
- const QString &encoding() const { return m_encoding; }
-
- // Color settings
- const QColor& textColor() { return m_textColor; }
- const QColor& linkColor() { return m_linkColor; }
- const QColor& vLinkColor() { return m_vLinkColor; }
-
- // Autoload images
- bool autoLoadImages() { return m_bAutoLoadImages; }
-
- // Java and JavaScript
- bool isJavaEnabled( const QString& hostname = QString::null );
- bool isJavaScriptEnabled( const QString& hostname = QString::null );
- bool isPluginsEnabled( const QString& hostname = QString::null );
- bool isCSSEnabled( const QString& hostname = QString::null );
-
- // helpers for parsing domain-specific configuration, used in KControl module as well
- static KJavaScriptAdvice strToAdvice(const QString& _str);
- static void splitDomainAdvice(const QString& configStr, QString &domain,
- KJavaScriptAdvice &javaAdvice, KJavaScriptAdvice& javaScriptAdvice);
- static const char* adviceToStr(KJavaScriptAdvice _advice);
-
- QString settingsToCSS() const;
- QString availableFamilies() const { return availFamilies; }
-
- QString userStyleSheet() const;
-
- // Form completion
- bool isFormCompletionEnabled() const { return m_formCompletionEnabled; }
- int maxFormCompletionItems() const { return m_maxFormCompletionItems; }
-
-private:
- void setFont(const QFont::CharSet &charset, int i, const QString &n);
- QString lookupFont(const QFont::CharSet &charset, int i) const;
-
- void internalSetCharset( QFont::CharSet c );
-
-private:
- bool m_bChangeCursor;
- bool m_underlineLink;
- bool m_hoverLink;
-
- int m_fontSize;
- QValueList<int> m_fontSizes;
- int m_minFontSize;
-
- QFont::CharSet m_charset;
- QFont::CharSet m_script;
- QFont::CharSet m_defaultCharset;
- bool enforceCharset;
- QString m_encoding;
- QString m_userSheet;
-
- QColor m_textColor;
- QColor m_linkColor;
- QColor m_vLinkColor;
-
- bool m_bAutoLoadImages;
- bool m_bEnableJava;
- bool m_bEnableJavaScript;
- bool m_bEnablePlugins;
- bool m_bEnableCSS;
- QMap<QString,KJavaScriptAdvice> javaDomainPolicy;
- QMap<QString,KJavaScriptAdvice> javaScriptDomainPolicy;
- QMap<QFont::CharSet, QStringList> fontsForCharset;
- QStringList defaultFonts;
- QString availFamilies;
-
- bool m_formCompletionEnabled;
- int m_maxFormCompletionItems;
-};
-
-#endif
diff --git a/WebCore/khtml/xml/Makefile.in b/WebCore/khtml/xml/Makefile.in
index 6845082..a9f363c 100644
--- a/WebCore/khtml/xml/Makefile.in
+++ b/WebCore/khtml/xml/Makefile.in
@@ -55,9 +55,10 @@ CXXFLAGS = $(BASECXXFLAGS) \
-I$(TOPSRCDIR) \
-I$(TOPSRCDIR)/src/kwq \
-I$(TOPSRCDIR)/src/kwq/kde \
- -I$(TOPSRCDIR)/src/kwq/qt \
-I$(TOPSRCDIR)/src/kwq/kdecore \
-I$(TOPSRCDIR)/src/kwq/kdeui \
+ -I$(TOPSRCDIR)/src/kwq/khtml \
+ -I$(TOPSRCDIR)/src/kwq/qt \
-I../css \
-I../dom \
-I../html \
diff --git a/WebCore/kwq/KWQCursor.mm b/WebCore/kwq/KWQCursor.mm
index 89a487c..41e9a15 100644
--- a/WebCore/kwq/KWQCursor.mm
+++ b/WebCore/kwq/KWQCursor.mm
@@ -30,6 +30,11 @@ QCursor::QCursor()
}
+QCursor::QCursor(const QPixmap &pixmap, int hotX, int hotY)
+{
+}
+
+
QCursor::QCursor(const QCursor &)
{
}
diff --git a/WebCore/src/kwq/KWQKProcess.mm b/WebCore/kwq/KWQImage.mm
similarity index 70%
copy from WebCore/src/kwq/KWQKProcess.mm
copy to WebCore/kwq/KWQImage.mm
index 9505adc..e32168d 100644
--- a/WebCore/src/kwq/KWQKProcess.mm
+++ b/WebCore/kwq/KWQImage.mm
@@ -23,51 +23,86 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <kprocess.h>
+#include <qimage.h>
-KProcess::KProcess()
+
+QImage::QImage()
+{
+}
+
+
+QImage::QImage(const QImage &)
+{
+}
+
+
+QImage::~QImage()
+{
+}
+
+
+bool QImage::isNull()
+{
+}
+
+
+QRgb QImage::color(int) const
+{
+}
+
+
+void QImage::setColor(int, QRgb)
{
}
-KProcess::~KProcess()
+int QImage::width() const
{
}
-QStrList *KProcess::args()
+int QImage::height() const
{
}
-bool KProcess::isRunning() const
+int QImage::depth() const
{
}
-bool KProcess::writeStdin(const char *buffer, int buflen)
+int QImage::pixelIndex(int,int) const
{
}
-bool KProcess::start(RunMode runmode, Communication comm)
+bool QImage::create(int,int,int,int numColors=0)
{
}
-bool KProcess::kill(int signo=SIGTERM)
+QImage QImage::createAlphaMask(int conversion_flags=0) const
{
}
-void KProcess::resume()
+bool QImage::hasAlphaBuffer() const
{
}
-KProcess &KProcess::operator<<(const QString& arg)
+uchar **QImage::jumpTable() const
{
}
+uchar *QImage::scanLine(int) const
+{
+}
+
+
+QImage &QImage::operator=(const QImage &)
+{
+}
+
diff --git a/WebCore/kwq/KWQKProcess.mm b/WebCore/kwq/KWQKHTMLSettings.mm
similarity index 64%
copy from WebCore/kwq/KWQKProcess.mm
copy to WebCore/kwq/KWQKHTMLSettings.mm
index 9505adc..b4d3163 100644
--- a/WebCore/kwq/KWQKProcess.mm
+++ b/WebCore/kwq/KWQKHTMLSettings.mm
@@ -23,51 +23,82 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <kprocess.h>
-KProcess::KProcess()
+#include <khtml_settings.h>
+
+QString KHTMLSettings::stdFontName() const
{
}
-KProcess::~KProcess()
+QString KHTMLSettings::fixedFontName() const
{
}
-QStrList *KProcess::args()
+QString KHTMLSettings::serifFontName() const
{
}
-bool KProcess::isRunning() const
+QString KHTMLSettings::sansSerifFontName() const
{
}
-bool KProcess::writeStdin(const char *buffer, int buflen)
+QString KHTMLSettings::cursiveFontName() const
{
}
-bool KProcess::start(RunMode runmode, Communication comm)
+QString KHTMLSettings::fantasyFontName() const
{
}
-bool KProcess::kill(int signo=SIGTERM)
+QString KHTMLSettings::settingsToCSS() const
+{
+}
+
+QFont::CharSet KHTMLSettings::charset() const
{
}
-void KProcess::resume()
+int KHTMLSettings::minFontSize() const
{
}
-KProcess &KProcess::operator<<(const QString& arg)
+QString KHTMLSettings::availableFamilies() const
{
}
+QFont::CharSet KHTMLSettings::script() const
+{
+}
+
+
+const QValueList<int> &KHTMLSettings::fontSizes() const
+{
+}
+
+
+bool KHTMLSettings::changeCursor()
+{
+}
+
+
+bool KHTMLSettings::isFormCompletionEnabled() const
+{
+}
+
+
+int KHTMLSettings::maxFormCompletionItems() const
+{
+}
+
+
+
diff --git a/WebCore/src/kwq/KWQButton.mm b/WebCore/kwq/KWQKPrinter.mm
similarity index 85%
copy from WebCore/src/kwq/KWQButton.mm
copy to WebCore/kwq/KWQKPrinter.mm
index 465137b..003f79f 100644
--- a/WebCore/src/kwq/KWQButton.mm
+++ b/WebCore/kwq/KWQKPrinter.mm
@@ -23,29 +23,35 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <qbutton.h>
+#include <kprinter.h>
-QButton::QButton()
+bool KPrinter::setup(QWidget *parent=0)
{
}
-QButton::QButton(QWidget *parent)
+bool KPrinter::newPage()
{
}
-QButton::~QButton()
+void KPrinter::setDocName(const QString &)
{
}
-void QButton::setText(const QString &)
+void KPrinter::setCreator(const QString &)
{
}
-QString QButton::text() const
+void KPrinter::setFullPage(bool)
{
}
+
+QSize KPrinter::margins() const
+{
+}
+
+
diff --git a/WebCore/kwq/KWQKProcess.mm b/WebCore/kwq/KWQMovie.mm
similarity index 60%
copy from WebCore/kwq/KWQKProcess.mm
copy to WebCore/kwq/KWQMovie.mm
index 9505adc..8f38b63 100644
--- a/WebCore/kwq/KWQKProcess.mm
+++ b/WebCore/kwq/KWQMovie.mm
@@ -23,49 +23,104 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <kprocess.h>
+#include <qmovie.h>
-KProcess::KProcess()
+QMovie::QMovie()
{
}
-KProcess::~KProcess()
+QMovie::QMovie(QDataSource*, int bufsize)
{
}
-QStrList *KProcess::args()
+QMovie::QMovie(const QMovie &)
{
}
-bool KProcess::isRunning() const
+QMovie::~QMovie()
{
}
-bool KProcess::writeStdin(const char *buffer, int buflen)
+void QMovie::unpause()
{
}
-bool KProcess::start(RunMode runmode, Communication comm)
+void QMovie::pause()
{
}
-bool KProcess::kill(int signo=SIGTERM)
+void QMovie::restart()
{
}
-void KProcess::resume()
+bool QMovie::finished()
{
}
-KProcess &KProcess::operator<<(const QString& arg)
+bool QMovie::running()
+{
+}
+
+
+int QMovie::frameNumber() const
+{
+}
+
+
+const QRect& QMovie::getValidRect() const
+{
+}
+
+
+const QPixmap& QMovie::framePixmap() const
+{
+}
+
+
+const QImage& QMovie::frameImage() const
+{
+}
+
+
+void QMovie::connectResize(QObject* receiver, const char *member)
+{
+}
+
+
+void QMovie::connectUpdate(QObject* receiver, const char *member)
+{
+}
+
+
+void QMovie::connectStatus(QObject* receiver, const char *member)
+{
+}
+
+
+void QMovie::disconnectResize(QObject* receiver, const char *member=0)
+{
+}
+
+
+void QMovie::disconnectUpdate(QObject* receiver, const char *member=0)
+{
+}
+
+
+void QMovie::disconnectStatus(QObject* receiver, const char *member=0)
+{
+}
+
+
+QMovie &QMovie::operator=(const QMovie &)
{
}
diff --git a/WebCore/kwq/KWQPixmap.mm b/WebCore/kwq/KWQPixmap.mm
index 4109c53..03801cd 100644
--- a/WebCore/kwq/KWQPixmap.mm
+++ b/WebCore/kwq/KWQPixmap.mm
@@ -119,10 +119,16 @@ int QPixmap::height() const
void QPixmap::resize(const QSize &sz)
{
- [nsimage setSize: NSMakeSize ((float)(sz.width()), (float)(sz.height()))];
+ resize (sz.width(), sz.height());
}
+void QPixmap::resize(int w, int h) {
+ [nsimage setSize: NSMakeSize ((float)(w), (float)(h))];
+}
+
+
+
QPixmap QPixmap::xForm(const QWMatrix &xmatrix) const
{
QPixmap xPix = *this;
diff --git a/WebCore/src/kwq/KWQKGlobal.mm b/WebCore/kwq/KWQToolTip.mm
similarity index 84%
copy from WebCore/src/kwq/KWQKGlobal.mm
copy to WebCore/kwq/KWQToolTip.mm
index e1e3848..a530aaf 100644
--- a/WebCore/src/kwq/KWQKGlobal.mm
+++ b/WebCore/kwq/KWQToolTip.mm
@@ -22,38 +22,20 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#include <qtooltip.h>
-#include <kglobal.h>
-
-
-KInstance *KGlobal::instance()
-{
-}
-
-
-KCharsets *KGlobal::charsets()
+QPalette QToolTip::palette()
{
}
-KLocale *KGlobal::locale()
+QToolTip::QToolTip(QWidget *)
{
}
-KStandardDirs *KGlobal::dirs()
-{
-}
-
-
-KConfig KGlobal::*config()
-{
-}
-
-
-
-const QString &KGlobal::staticQString(const QString &)
+void QToolTip::tip(const QRect &, const QString &)
{
}
diff --git a/WebCore/kwq/KWQWidget.mm b/WebCore/kwq/KWQWidget.mm
index c613da8..da8c62b 100644
--- a/WebCore/kwq/KWQWidget.mm
+++ b/WebCore/kwq/KWQWidget.mm
@@ -428,6 +428,25 @@ void QWidget::setAcceptDrops(bool)
}
+void QWidget::erase()
+{
+ NSLog (@"WARNING %s:%s:%d (NOT YET IMPLEMENTED)\n", __FILE__, __FUNCTION__, __LINE__);
+}
+
+
+QWidget *QWidget::focusWidget() const
+{
+ NSLog (@"WARNING %s:%s:%d (NOT YET IMPLEMENTED)\n", __FILE__, __FUNCTION__, __LINE__);
+}
+
+
+QPoint QWidget::mapFromGlobal(const QPoint &) const
+{
+ NSLog (@"WARNING %s:%s:%d (NOT YET IMPLEMENTED)\n", __FILE__, __FUNCTION__, __LINE__);
+}
+
+
+
#ifdef _KWQ_
void QWidget::paint (void *)
diff --git a/WebCore/kwq/Makefile.in b/WebCore/kwq/Makefile.in
index 147a682..677f3f1 100644
--- a/WebCore/kwq/Makefile.in
+++ b/WebCore/kwq/Makefile.in
@@ -36,6 +36,7 @@ MMOBJECTS = \
KWQFont.o \
KWQFontMetrics.o \
KWQFrame.o \
+ KWQImage.o \
KWQKApplication.o \
KWQKCharsets.o \
KWQKComboBox.o \
@@ -46,11 +47,13 @@ MMOBJECTS = \
KWQKGlobal.o \
KWQKGlobalSettings.o \
KWQKHTMLPart.o \
+ KWQKHTMLSettings.o \
KWQKIconLoader.o \
KWQKInstance.o \
KWQKLineEdit.o \
KWQKListBox.o \
KWQKMessageBox.o \
+ KWQKPrinter.o \
KWQKProcess.o \
KWQKSimpleConfig.o \
KWQKStringHandler.o \
@@ -58,6 +61,7 @@ MMOBJECTS = \
KWQKWinModule.o \
KWQListBox.o \
KWQLineEdit.o \
+ KWQMovie.o \
KWQObject.o \
KWQPainter.o \
KWQPaintDevice.o \
@@ -71,6 +75,7 @@ MMOBJECTS = \
KWQRadioButton.o \
KWQScrollView.o \
KWQTextEdit.o \
+ KWQToolTip.o \
KWQView.o \
KWQWMatrix.o \
KWQWidget.o \
@@ -104,6 +109,8 @@ CMMFLAGS = $(BASECMMFLAGS) \
-I$(TOPSRCDIR)/src/kwq/kde \
-I$(TOPSRCDIR)/src/kwq/kdecore \
-I$(TOPSRCDIR)/src/kwq/kdeui \
+ -I$(TOPSRCDIR)/src/kwq/khtml \
+ -I$(TOPSRCDIR)/src/kwq/kio \
-I$(TOPSRCDIR)/src/kwq/kparts \
-I. \
$(NULL)
diff --git a/WebCore/src/kdelibs/khtml/Makefile.in b/WebCore/src/kdelibs/khtml/Makefile.in
index 15c1793..3cb88e1 100644
--- a/WebCore/src/kdelibs/khtml/Makefile.in
+++ b/WebCore/src/kdelibs/khtml/Makefile.in
@@ -36,13 +36,14 @@ CLEAN_FILES = $(OBJECTS) \
CXXFLAGS = $(BASECXXFLAGS) \
-I$(TOPSRCDIR)/src/kwq \
- -I$(TOPSRCDIR)/src/kwq/kde \
- -I$(TOPSRCDIR)/src/kwq/qt \
-I$(TOPSRCDIR)/src/kwq/dcop \
+ -I$(TOPSRCDIR)/src/kwq/kde \
-I$(TOPSRCDIR)/src/kwq/kdecore \
- -I$(TOPSRCDIR)/src/kwq/kio \
-I$(TOPSRCDIR)/src/kwq/kdeui \
+ -I$(TOPSRCDIR)/src/kwq/kio \
+ -I$(TOPSRCDIR)/src/kwq/khtml \
-I$(TOPSRCDIR)/src/kwq/kparts \
+ -I$(TOPSRCDIR)/src/kwq/qt \
-I../kdecore \
-I../kjs \
-I./misc \
diff --git a/WebCore/src/kdelibs/khtml/css/Makefile.in b/WebCore/src/kdelibs/khtml/css/Makefile.in
index 8be1d68..295171c 100644
--- a/WebCore/src/kdelibs/khtml/css/Makefile.in
+++ b/WebCore/src/kdelibs/khtml/css/Makefile.in
@@ -57,13 +57,14 @@ CLEAN_FILES = $(OBJECTS) \
CXXFLAGS = $(BASECXXFLAGS) \
-I$(TOPSRCDIR) \
-I$(TOPSRCDIR)/src/kwq \
- -I$(TOPSRCDIR)/src/kwq/qt \
- -I$(TOPSRCDIR)/src/kwq/kde \
-I$(TOPSRCDIR)/src/kwq/dcop \
+ -I$(TOPSRCDIR)/src/kwq/kde \
-I$(TOPSRCDIR)/src/kwq/kdecore \
-I$(TOPSRCDIR)/src/kwq/kdeui \
+ -I$(TOPSRCDIR)/src/kwq/khtml \
-I$(TOPSRCDIR)/src/kwq/kio \
-I$(TOPSRCDIR)/src/kwq/kparts \
+ -I$(TOPSRCDIR)/src/kwq/qt \
-I../dom \
-I../html \
-I../misc \
diff --git a/WebCore/src/kdelibs/khtml/html/Makefile.in b/WebCore/src/kdelibs/khtml/html/Makefile.in
index a072f25..9ee41d8 100644
--- a/WebCore/src/kdelibs/khtml/html/Makefile.in
+++ b/WebCore/src/kdelibs/khtml/html/Makefile.in
@@ -33,13 +33,14 @@ CLEAN_FILES = $(OBJECTS) \
CXXFLAGS = $(BASECXXFLAGS) \
-I$(TOPSRCDIR)/src/kwq \
- -I$(TOPSRCDIR)/src/kwq/kde \
- -I$(TOPSRCDIR)/src/kwq/qt \
-I$(TOPSRCDIR)/src/kwq/dcop \
+ -I$(TOPSRCDIR)/src/kwq/kde \
-I$(TOPSRCDIR)/src/kwq/kdecore \
- -I$(TOPSRCDIR)/src/kwq/kio \
-I$(TOPSRCDIR)/src/kwq/kdeui \
+ -I$(TOPSRCDIR)/src/kwq/khtml \
+ -I$(TOPSRCDIR)/src/kwq/kio \
-I$(TOPSRCDIR)/src/kwq/kparts \
+ -I$(TOPSRCDIR)/src/kwq/qt \
-I../../kdecore \
-I../../kjs \
-I.. \
diff --git a/WebCore/src/kdelibs/khtml/khtml_settings.cc b/WebCore/src/kdelibs/khtml/khtml_settings.cc
deleted file mode 100644
index 19ca5b1..0000000
--- a/WebCore/src/kdelibs/khtml/khtml_settings.cc
+++ /dev/null
@@ -1,527 +0,0 @@
-/* This file is part of the KDE project
- Copyright (C) 1999 David Faure <faure at kde.org>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
-*/
-
-#include "khtml_settings.h"
-#include "khtmldefaults.h"
-#include <kglobalsettings.h>
-#include <kconfig.h>
-#include <kapp.h>
-#include <kglobal.h>
-#include <klocale.h>
-#include <kcharsets.h>
-#include <kdebug.h>
-
-#define MAXFONTSIZES 15
-
-typedef QMap<QString,KHTMLSettings::KJavaScriptAdvice> PolicyMap;
-
-KHTMLSettings::KJavaScriptAdvice KHTMLSettings::strToAdvice(const QString& _str)
-{
- KJavaScriptAdvice ret = KJavaScriptDunno;
-
- if (!_str)
- ret = KJavaScriptDunno;
-
- if (_str.lower() == QString::fromLatin1("accept"))
- ret = KJavaScriptAccept;
- else if (_str.lower() == QString::fromLatin1("reject"))
- ret = KJavaScriptReject;
-
- return ret;
-}
-
-const char* KHTMLSettings::adviceToStr(KJavaScriptAdvice _advice)
-{
- switch( _advice ) {
- case KJavaScriptAccept: return I18N_NOOP("Accept");
- case KJavaScriptReject: return I18N_NOOP("Reject");
- default: return 0;
- }
- return 0;
-}
-
-
-void KHTMLSettings::splitDomainAdvice(const QString& configStr, QString &domain,
- KJavaScriptAdvice &javaAdvice, KJavaScriptAdvice& javaScriptAdvice)
-{
- QString tmp(configStr);
- int splitIndex = tmp.find(':');
- if ( splitIndex == -1)
- {
- domain = configStr;
- javaAdvice = KJavaScriptDunno;
- javaScriptAdvice = KJavaScriptDunno;
- }
- else
- {
- domain = tmp.left(splitIndex);
- QString adviceString = tmp.mid( splitIndex+1, tmp.length() );
- int splitIndex2 = adviceString.find( ':' );
- if( splitIndex2 == -1 ) {
- // Java advice only
- javaAdvice = strToAdvice( adviceString );
- javaScriptAdvice = KJavaScriptDunno;
- } else {
- // Java and JavaScript advice
- javaAdvice = strToAdvice( adviceString.left( splitIndex2 ) );
- javaScriptAdvice = strToAdvice( adviceString.mid( splitIndex2+1,
- adviceString.length() ) );
- }
- }
-}
-
-
-KHTMLSettings::KHTMLSettings()
-{
- init();
-}
-
-void KHTMLSettings::init()
-{
- KConfig global( "khtmlrc", true );
- global.setGroup( "HTML Settings" );
- init( &global );
-
- KConfig *local = KGlobal::config();
- if ( !local )
- return;
-
- if ( !local->hasGroup( "HTML Settings" ) )
- return;
-
- local->setGroup( "HTML Settings" );
- init( local, false );
-}
-
-void KHTMLSettings::init( KConfig * config, bool reset )
-{
- // Fonts and colors
- if( reset ) {
- defaultFonts = QStringList();
- defaultFonts.append( config->readEntry( "StandardFont", KGlobalSettings::generalFont().family() ) );
- defaultFonts.append( config->readEntry( "FixedFont", KGlobalSettings::fixedFont().family() ) );
- defaultFonts.append( config->readEntry( "SerifFont", HTML_DEFAULT_VIEW_SERIF_FONT ) );
- defaultFonts.append( config->readEntry( "SansSerifFont", HTML_DEFAULT_VIEW_SANSSERIF_FONT ) );
- defaultFonts.append( config->readEntry( "CursiveFont", HTML_DEFAULT_VIEW_CURSIVE_FONT ) );
- defaultFonts.append( config->readEntry( "FantasyFont", HTML_DEFAULT_VIEW_FANTASY_FONT ) );
- defaultFonts.append( QString( "0" ) ); // font size adjustment
- }
-
- if ( reset || config->hasKey( "MinimumFontSize" ) )
- m_minFontSize = config->readNumEntry( "MinimumFontSize", HTML_DEFAULT_MIN_FONT_SIZE );
-
- if ( reset || config->hasKey( "MediumFontSize" ) ) {
- m_fontSize = config->readNumEntry( "MediumFontSize", 10 );
- resetFontSizes();
- }
-
- QStringList chSets = KGlobal::charsets()->availableCharsetNames();
- for ( QStringList::Iterator it = chSets.begin(); it != chSets.end(); ++it ) {
- if ( reset || config->hasKey( *it ) ){
- QStringList fonts = config->readListEntry( *it );
- if( fonts.count() == 6 ) // backwards compatibility
- fonts.append( QString( "0" ) );
- if ( fonts.count() != 7 )
- fonts = defaultFonts;
- fontsForCharset[KGlobal::charsets()->xNameToID(*it)] = fonts;
- }
- }
-
- if ( reset || config->hasKey( "DefaultEncoding" ) ) {
- m_encoding = config->readEntry( "DefaultEncoding", "" );
- if ( m_encoding.isEmpty() )
- m_encoding = KGlobal::locale()->charset();
-
- m_defaultCharset = KGlobal::charsets()->nameToID( m_encoding );
- internalSetCharset( m_defaultCharset );
- }
-
- if ( reset || config->hasKey( "EnforceDefaultCharset" ) )
- enforceCharset = config->readBoolEntry( "EnforceDefaultCharset", false );
-
- // Behaviour
- if ( reset || config->hasKey( "ChangeCursor" ) )
- m_bChangeCursor = config->readBoolEntry( "ChangeCursor", KDE_DEFAULT_CHANGECURSOR );
-
- if ( reset || config->hasKey("UnderlineLinks") )
- m_underlineLink = config->readBoolEntry( "UnderlineLinks", true );
-
- if ( reset || config->hasKey( "HoverLinks" ) )
- {
- if ( ( m_hoverLink = config->readBoolEntry( "HoverLinks", false ) ) )
- m_underlineLink = false;
- }
-
- // Colors
- if ( reset || config->hasGroup( "General" ) )
- {
- config->setGroup( "General" ); // group will be restored by cgs anyway
- if ( reset || config->hasKey( "TextColor" ) )
- m_textColor = config->readColorEntry( "foreground", &HTML_DEFAULT_TXT_COLOR );
-
- if ( reset || config->hasKey( "linkColor" ) )
- m_linkColor = config->readColorEntry( "linkColor", &HTML_DEFAULT_LNK_COLOR );
-
- if ( reset || config->hasKey( "visitedLinkColor" ) )
- m_vLinkColor = config->readColorEntry( "visitedLinkColor", &HTML_DEFAULT_VLNK_COLOR);
- }
-
- // Other
-
- if ( reset || config->hasGroup( "HTML Settings" ) )
- {
- config->setGroup( "HTML Settings" ); // group will be restored by cgs anyway
-
- if ( reset || config->hasKey( "AutoLoadImages" ) )
- m_bAutoLoadImages = config->readBoolEntry( "AutoLoadImages", true );
-
- // The global setting for CSS
- if ( reset || config->hasKey( "EnableCSS" ) )
- m_bEnableCSS = config->readBoolEntry( "EnableCSS", true );
-
- if ( config->readBoolEntry( "UserStyleSheetEnabled", false ) == true ) {
- if ( reset || config->hasKey( "UserStyleSheet" ) )
- m_userSheet = config->readEntry( "UserStyleSheet", "" );
- }
-
- m_formCompletionEnabled = config->readBoolEntry("FormCompletion", true);
- m_maxFormCompletionItems = config->readNumEntry("MaxFormCompletionItems", 10);
- }
-
- if( reset || config->hasGroup( "Java/JavaScript Settings" ) ) {
- config->setGroup( "Java/JavaScript Settings" );
-
- // The global setting for Java
- if ( reset || config->hasKey( "EnableJava" ) )
- m_bEnableJava = config->readBoolEntry( "EnableJava", false );
-
- // The global setting for JavaScript
- if ( reset || config->hasKey( "EnableJavaScript" ) )
- m_bEnableJavaScript = config->readBoolEntry( "EnableJavaScript", false );
-
- // The global setting for Plugins (there's no local setting yet)
- if ( reset || config->hasKey( "EnablePlugins" ) )
- m_bEnablePlugins = config->readBoolEntry( "EnablePlugins", true );
-
- // The domain-specific settings.
- bool check_old_java = true;
- if( reset || config->hasKey( "JavaDomainSettings" ) ){
- check_old_java = false;
- QStringList domainList = config->readListEntry( "JavaDomainSettings" );
- for ( QStringList::ConstIterator it = domainList.begin();
- it != domainList.end(); ++it) {
- QString domain;
- KJavaScriptAdvice javaAdvice;
- KJavaScriptAdvice javaScriptAdvice;
- splitDomainAdvice(*it, domain, javaAdvice, javaScriptAdvice);
- javaDomainPolicy[domain] = javaAdvice;
- }
- }
-
- bool check_old_ecma = true;
- if( reset || config->hasKey( "ECMADomainSettings" ) ){
- check_old_ecma = false;
- QStringList domainList = config->readListEntry( "ECMADomainSettings" );
- for ( QStringList::ConstIterator it = domainList.begin();
- it != domainList.end(); ++it) {
- QString domain;
- KJavaScriptAdvice javaAdvice;
- KJavaScriptAdvice javaScriptAdvice;
- splitDomainAdvice(*it, domain, javaAdvice, javaScriptAdvice);
- javaScriptDomainPolicy[domain] = javaScriptAdvice;
- }
- }
-
- if( reset || config->hasKey( "JavaScriptDomainAdvice" )
- && ( check_old_java || check_old_ecma ) ) {
- QStringList domainList = config->readListEntry( "JavaScriptDomainAdvice" );
- for ( QStringList::ConstIterator it = domainList.begin();
- it != domainList.end(); ++it) {
- QString domain;
- KJavaScriptAdvice javaAdvice;
- KJavaScriptAdvice javaScriptAdvice;
- splitDomainAdvice(*it, domain, javaAdvice, javaScriptAdvice);
- if( check_old_java )
- javaDomainPolicy[domain] = javaAdvice;
- if( check_old_ecma )
- javaScriptDomainPolicy[domain] = javaScriptAdvice;
- }
-
- //save all the settings into the new keywords if they don't exist
- if( check_old_java ){
- QStringList domainConfig;
- PolicyMap::Iterator it;
- for( it = javaDomainPolicy.begin(); it != javaDomainPolicy.end(); ++it ){
- QCString javaPolicy = adviceToStr( it.data() );
- QCString javaScriptPolicy = adviceToStr( KJavaScriptDunno );
- domainConfig.append(QString::fromLatin1("%1:%2:%3").arg(it.key()).arg(javaPolicy).arg(javaScriptPolicy));
- }
- config->writeEntry( "JavaDomainSettings", domainConfig );
- }
-
- if( check_old_ecma ){
- QStringList domainConfig;
- PolicyMap::Iterator it;
- for( it = javaScriptDomainPolicy.begin(); it != javaScriptDomainPolicy.end(); ++it ){
- QCString javaPolicy = adviceToStr( KJavaScriptDunno );
- QCString javaScriptPolicy = adviceToStr( it.data() );
- domainConfig.append(QString::fromLatin1("%1:%2:%3").arg(it.key()).arg(javaPolicy).arg(javaScriptPolicy));
- }
- config->writeEntry( "ECMADomainSettings", domainConfig );
- }
- }
- }
-}
-
-
-// Local helper for isJavaEnabled & isJavaScriptEnabled.
-static bool lookup_hostname_policy(const QString& hostname,
- const PolicyMap& policy,
- const bool default_retval)
-{
- if (hostname.isEmpty()) {
- return default_retval;
- }
-
- // First check whether there is a perfect match.
- if( policy.contains( hostname ) ) {
- // yes, use it (unless dunno)
- KHTMLSettings::KJavaScriptAdvice adv = policy[ hostname ];
- if( adv == KHTMLSettings::KJavaScriptReject ) {
- return false;
- } else if( adv == KHTMLSettings::KJavaScriptAccept ) {
- return true;
- }
- }
-
- // Now, check for partial match. Chop host from the left until
- // there's no dots left.
- QString host_part = hostname;
- int dot_idx = -1;
- while( (dot_idx = host_part.find(QChar('.'))) >= 0 ) {
- host_part.remove(0,dot_idx);
- if( policy.contains( host_part ) ) {
- KHTMLSettings::KJavaScriptAdvice adv = policy[ host_part ];
- if( adv == KHTMLSettings::KJavaScriptReject ) {
- return false;
- } else if( adv == KHTMLSettings::KJavaScriptAccept ) {
- return true;
- }
- }
- // assert(host_part[0] == QChar('.'));
- host_part.remove(0,1); // Chop off the dot.
- }
-
- // No domain-specific entry, or was dunno: use global setting
- return default_retval;
-}
-
-bool KHTMLSettings::isJavaEnabled( const QString& hostname )
-{
- return lookup_hostname_policy(hostname, javaDomainPolicy, m_bEnableJava);
-}
-
-bool KHTMLSettings::isJavaScriptEnabled( const QString& hostname )
-{
- return lookup_hostname_policy(hostname, javaScriptDomainPolicy, m_bEnableJavaScript);
-}
-
-bool KHTMLSettings::isPluginsEnabled( const QString& hostname )
-{
- // FIXME: hostname is ignored (dnaber, 2001-01-03)
- return m_bEnablePlugins;
-}
-
-bool KHTMLSettings::isCSSEnabled( const QString& /*hostname*/ )
-{
-#if 0
- // First check whether there is a Domain-specific entry.
- if( cssDomainPolicy.contains( hostname ) ) {
- // yes, use it (unless dunno)
- KJavaScriptAdvice adv = cssDomainPolicy[ hostname ];
- if( adv == KJavaScriptReject )
- return false;
- else if( adv == KJavaScriptAccept )
- return true;
- }
-
-#endif
- // No domain-specific entry, or was dunno: use global setting
- return m_bEnableCSS;
-}
-
-
-void KHTMLSettings::resetFontSizes()
-{
- m_fontSizes.clear();
- int sizeAdjust = m_fontSize + lookupFont(m_charset,6).toInt() + 3;
- if ( sizeAdjust < 0 )
- sizeAdjust = 0;
- if ( sizeAdjust > 9 )
- sizeAdjust = 9;
- //kdDebug(6050) << "KHTMLSettings::resetFontSizes adjustment is " << sizeAdjust << endl;
- const float factor = 1.11820715;
- float scale = 1.0 / ( factor*factor*factor );
- for ( int i = 0; i < MAXFONTSIZES; i++ ) {
- m_fontSizes << ( KMAX( int( m_fontSize * scale + 0.5), m_minFontSize ) );
- scale *= factor;
- }
-}
-
-void KHTMLSettings::setFontSizes(const QValueList<int> &_newFontSizes )
-{
- QValueList<int> newFontSizes;
- newFontSizes = _newFontSizes;
- while ( newFontSizes.count() > m_fontSizes.count() )
- newFontSizes.remove( newFontSizes.fromLast() );
-
- QValueList<int>::ConstIterator it = newFontSizes.begin();
- QValueList<int>::ConstIterator end = newFontSizes.end();
- for (int i = 0; it != end; it++ )
- m_fontSizes[ i++ ] = *it;
-}
-
-
-QString KHTMLSettings::settingsToCSS() const
-{
- // lets start with the link properties
- QString str = "a:link {\ncolor: ";
- str += m_linkColor.name();
- str += ";";
- if(m_underlineLink)
- str += "\ntext-decoration: underline;";
-
- if( m_bChangeCursor )
- {
- str += "\ncursor: pointer;";
- str += "\n}\ninput[type=image] { cursor: pointer;";
- }
- str += "\n}\n";
- str += "a:visited {\ncolor: ";
- str += m_vLinkColor.name();
- str += ";";
- if(m_underlineLink)
- str += "\ntext-decoration: underline;";
-
- if( m_bChangeCursor )
- str += "\ncursor: pointer;";
- str += "\n}\n";
-
- if(m_hoverLink)
- str += "a:link:hover, a:visited:hover { text-decoration: underline; }\n";
-
- return str;
-}
-
-QString KHTMLSettings::lookupFont(const QFont::CharSet &charset, int i) const
-{
- QString font;
- const QStringList &fontList = fontsForCharset[charset];
- if (fontList.count() > (uint) i)
- font = fontList[i];
- if (font.isEmpty())
- font = defaultFonts[i];
- return font;
-}
-
-QString KHTMLSettings::stdFontName() const
-{
- return lookupFont(m_charset,0);
-}
-
-QString KHTMLSettings::fixedFontName() const
-{
- return lookupFont(m_charset,1);
-}
-
-QString KHTMLSettings::serifFontName() const
-{
- return lookupFont(m_charset,2);
-}
-
-QString KHTMLSettings::sansSerifFontName() const
-{
- return lookupFont(m_charset,3);
-}
-
-QString KHTMLSettings::cursiveFontName() const
-{
- return lookupFont(m_charset,4);
-}
-
-QString KHTMLSettings::fantasyFontName() const
-{
- return lookupFont(m_charset,5);
-}
-
-void KHTMLSettings::setFont(const QFont::CharSet &charset, int i, const QString &n)
-{
- QStringList fontList = fontsForCharset[charset];
- while (fontList.count() <= (uint)i)
- fontList.append(QString::null);
- fontList[i] = n;
-}
-
-void KHTMLSettings::setStdFontName(const QString &n)
-{
- setFont(m_charset, 0, n);
-}
-
-void KHTMLSettings::setFixedFontName(const QString &n)
-{
- setFont(m_charset, 1, n);
-}
-
-void KHTMLSettings::setDefaultCharset( QFont::CharSet c, bool enforce )
-{
- m_defaultCharset = c;
- enforceCharset = enforce;
- if(enforce)
- internalSetCharset(c);
-}
-
-void KHTMLSettings::resetCharset()
-{
- internalSetCharset(m_defaultCharset);
- setScript( m_defaultCharset );
-}
-
-void KHTMLSettings::setCharset( QFont::CharSet c)
-{
- if (!enforceCharset)
- internalSetCharset(c);
-}
-
-void KHTMLSettings::internalSetCharset( QFont::CharSet c )
-{
- m_charset = c;
- availFamilies = KGlobal::charsets()->availableFamilies( m_charset ).join(",");
- resetFontSizes();
-}
-
-void KHTMLSettings::setScript( QFont::CharSet c )
-{
- //kdDebug(6050) << "KHTMLSettings::setScript to " << c << endl;
- m_script = c;
-}
-
-QString KHTMLSettings::userStyleSheet() const
-{
- return m_userSheet;
-}
diff --git a/WebCore/src/kdelibs/khtml/khtml_settings.h b/WebCore/src/kdelibs/khtml/khtml_settings.h
deleted file mode 100644
index d15e47a..0000000
--- a/WebCore/src/kdelibs/khtml/khtml_settings.h
+++ /dev/null
@@ -1,167 +0,0 @@
-/* This file is part of the KDE project
- Copyright (C) 1999 David Faure <faure at kde.org>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
-*/
-
-#ifndef __konq_htmlsettings_h__
-#define __konq_htmlsettings_h__
-
-class KConfig;
-#include <qcolor.h>
-#include <qstring.h>
-#include <qstringlist.h>
-#include <qfont.h>
-#include <qmap.h>
-
-/**
- * Settings for the HTML view.
- */
-class KHTMLSettings
-{
-public:
-
- /**
- * This enum specifies whether Java/JavaScript execution is allowed.
- */
- enum KJavaScriptAdvice {
- KJavaScriptDunno=0,
- KJavaScriptAccept,
- KJavaScriptReject
- };
-
- /**
- * @internal Constructor
- */
- KHTMLSettings();
-
- /** Called by constructor and reparseConfiguration */
- void init();
-
- /** Read settings from @p config.
- * @param reset if true, settings are always set; if false,
- * settings are only set if the config file has a corresponding key.
- */
- void init( KConfig * config, bool reset = true );
-
- /** Destructor. Don't delete any instance by yourself. */
- virtual ~KHTMLSettings() {};
-
- // Behaviour settings
- bool changeCursor() { return m_bChangeCursor; }
- bool underlineLink() { return m_underlineLink; }
- bool hoverLink() { return m_hoverLink; }
-
- // Font settings
- QString stdFontName() const;
- QString fixedFontName() const;
- QString serifFontName() const;
- QString sansSerifFontName() const;
- QString cursiveFontName() const;
- QString fantasyFontName() const;
-
- // these two can be set. Mainly for historical reasons (the method in KHTMLPart exists...)
- void setStdFontName(const QString &n);
- void setFixedFontName(const QString &n);
-
- const QValueList<int> &fontSizes() const { return m_fontSizes; }
- void setFontSizes(const QValueList<int> &newFontSizes );
- void resetFontSizes();
-
- int minFontSize() const { return m_minFontSize; }
-
- // the charset used to display the current document.
- QFont::CharSet charset() const { return m_charset; }
- void setCharset( QFont::CharSet c );
- QFont::CharSet script() const { return m_script; }
- void setScript( QFont::CharSet c );
- void resetCharset( );
-
- void setDefaultCharset( QFont::CharSet c, bool b );
-
- const QString &encoding() const { return m_encoding; }
-
- // Color settings
- const QColor& textColor() { return m_textColor; }
- const QColor& linkColor() { return m_linkColor; }
- const QColor& vLinkColor() { return m_vLinkColor; }
-
- // Autoload images
- bool autoLoadImages() { return m_bAutoLoadImages; }
-
- // Java and JavaScript
- bool isJavaEnabled( const QString& hostname = QString::null );
- bool isJavaScriptEnabled( const QString& hostname = QString::null );
- bool isPluginsEnabled( const QString& hostname = QString::null );
- bool isCSSEnabled( const QString& hostname = QString::null );
-
- // helpers for parsing domain-specific configuration, used in KControl module as well
- static KJavaScriptAdvice strToAdvice(const QString& _str);
- static void splitDomainAdvice(const QString& configStr, QString &domain,
- KJavaScriptAdvice &javaAdvice, KJavaScriptAdvice& javaScriptAdvice);
- static const char* adviceToStr(KJavaScriptAdvice _advice);
-
- QString settingsToCSS() const;
- QString availableFamilies() const { return availFamilies; }
-
- QString userStyleSheet() const;
-
- // Form completion
- bool isFormCompletionEnabled() const { return m_formCompletionEnabled; }
- int maxFormCompletionItems() const { return m_maxFormCompletionItems; }
-
-private:
- void setFont(const QFont::CharSet &charset, int i, const QString &n);
- QString lookupFont(const QFont::CharSet &charset, int i) const;
-
- void internalSetCharset( QFont::CharSet c );
-
-private:
- bool m_bChangeCursor;
- bool m_underlineLink;
- bool m_hoverLink;
-
- int m_fontSize;
- QValueList<int> m_fontSizes;
- int m_minFontSize;
-
- QFont::CharSet m_charset;
- QFont::CharSet m_script;
- QFont::CharSet m_defaultCharset;
- bool enforceCharset;
- QString m_encoding;
- QString m_userSheet;
-
- QColor m_textColor;
- QColor m_linkColor;
- QColor m_vLinkColor;
-
- bool m_bAutoLoadImages;
- bool m_bEnableJava;
- bool m_bEnableJavaScript;
- bool m_bEnablePlugins;
- bool m_bEnableCSS;
- QMap<QString,KJavaScriptAdvice> javaDomainPolicy;
- QMap<QString,KJavaScriptAdvice> javaScriptDomainPolicy;
- QMap<QFont::CharSet, QStringList> fontsForCharset;
- QStringList defaultFonts;
- QString availFamilies;
-
- bool m_formCompletionEnabled;
- int m_maxFormCompletionItems;
-};
-
-#endif
diff --git a/WebCore/src/kdelibs/khtml/xml/Makefile.in b/WebCore/src/kdelibs/khtml/xml/Makefile.in
index 6845082..a9f363c 100644
--- a/WebCore/src/kdelibs/khtml/xml/Makefile.in
+++ b/WebCore/src/kdelibs/khtml/xml/Makefile.in
@@ -55,9 +55,10 @@ CXXFLAGS = $(BASECXXFLAGS) \
-I$(TOPSRCDIR) \
-I$(TOPSRCDIR)/src/kwq \
-I$(TOPSRCDIR)/src/kwq/kde \
- -I$(TOPSRCDIR)/src/kwq/qt \
-I$(TOPSRCDIR)/src/kwq/kdecore \
-I$(TOPSRCDIR)/src/kwq/kdeui \
+ -I$(TOPSRCDIR)/src/kwq/khtml \
+ -I$(TOPSRCDIR)/src/kwq/qt \
-I../css \
-I../dom \
-I../html \
diff --git a/WebCore/src/kwq/KWQCursor.mm b/WebCore/src/kwq/KWQCursor.mm
index 89a487c..41e9a15 100644
--- a/WebCore/src/kwq/KWQCursor.mm
+++ b/WebCore/src/kwq/KWQCursor.mm
@@ -30,6 +30,11 @@ QCursor::QCursor()
}
+QCursor::QCursor(const QPixmap &pixmap, int hotX, int hotY)
+{
+}
+
+
QCursor::QCursor(const QCursor &)
{
}
diff --git a/WebCore/src/kwq/KWQKProcess.mm b/WebCore/src/kwq/KWQImage.mm
similarity index 70%
copy from WebCore/src/kwq/KWQKProcess.mm
copy to WebCore/src/kwq/KWQImage.mm
index 9505adc..e32168d 100644
--- a/WebCore/src/kwq/KWQKProcess.mm
+++ b/WebCore/src/kwq/KWQImage.mm
@@ -23,51 +23,86 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <kprocess.h>
+#include <qimage.h>
-KProcess::KProcess()
+
+QImage::QImage()
+{
+}
+
+
+QImage::QImage(const QImage &)
+{
+}
+
+
+QImage::~QImage()
+{
+}
+
+
+bool QImage::isNull()
+{
+}
+
+
+QRgb QImage::color(int) const
+{
+}
+
+
+void QImage::setColor(int, QRgb)
{
}
-KProcess::~KProcess()
+int QImage::width() const
{
}
-QStrList *KProcess::args()
+int QImage::height() const
{
}
-bool KProcess::isRunning() const
+int QImage::depth() const
{
}
-bool KProcess::writeStdin(const char *buffer, int buflen)
+int QImage::pixelIndex(int,int) const
{
}
-bool KProcess::start(RunMode runmode, Communication comm)
+bool QImage::create(int,int,int,int numColors=0)
{
}
-bool KProcess::kill(int signo=SIGTERM)
+QImage QImage::createAlphaMask(int conversion_flags=0) const
{
}
-void KProcess::resume()
+bool QImage::hasAlphaBuffer() const
{
}
-KProcess &KProcess::operator<<(const QString& arg)
+uchar **QImage::jumpTable() const
{
}
+uchar *QImage::scanLine(int) const
+{
+}
+
+
+QImage &QImage::operator=(const QImage &)
+{
+}
+
diff --git a/WebCore/kwq/KWQKProcess.mm b/WebCore/src/kwq/KWQKHTMLSettings.mm
similarity index 64%
copy from WebCore/kwq/KWQKProcess.mm
copy to WebCore/src/kwq/KWQKHTMLSettings.mm
index 9505adc..b4d3163 100644
--- a/WebCore/kwq/KWQKProcess.mm
+++ b/WebCore/src/kwq/KWQKHTMLSettings.mm
@@ -23,51 +23,82 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <kprocess.h>
-KProcess::KProcess()
+#include <khtml_settings.h>
+
+QString KHTMLSettings::stdFontName() const
{
}
-KProcess::~KProcess()
+QString KHTMLSettings::fixedFontName() const
{
}
-QStrList *KProcess::args()
+QString KHTMLSettings::serifFontName() const
{
}
-bool KProcess::isRunning() const
+QString KHTMLSettings::sansSerifFontName() const
{
}
-bool KProcess::writeStdin(const char *buffer, int buflen)
+QString KHTMLSettings::cursiveFontName() const
{
}
-bool KProcess::start(RunMode runmode, Communication comm)
+QString KHTMLSettings::fantasyFontName() const
{
}
-bool KProcess::kill(int signo=SIGTERM)
+QString KHTMLSettings::settingsToCSS() const
+{
+}
+
+QFont::CharSet KHTMLSettings::charset() const
{
}
-void KProcess::resume()
+int KHTMLSettings::minFontSize() const
{
}
-KProcess &KProcess::operator<<(const QString& arg)
+QString KHTMLSettings::availableFamilies() const
{
}
+QFont::CharSet KHTMLSettings::script() const
+{
+}
+
+
+const QValueList<int> &KHTMLSettings::fontSizes() const
+{
+}
+
+
+bool KHTMLSettings::changeCursor()
+{
+}
+
+
+bool KHTMLSettings::isFormCompletionEnabled() const
+{
+}
+
+
+int KHTMLSettings::maxFormCompletionItems() const
+{
+}
+
+
+
diff --git a/WebCore/src/kwq/KWQButton.mm b/WebCore/src/kwq/KWQKPrinter.mm
similarity index 85%
copy from WebCore/src/kwq/KWQButton.mm
copy to WebCore/src/kwq/KWQKPrinter.mm
index 465137b..003f79f 100644
--- a/WebCore/src/kwq/KWQButton.mm
+++ b/WebCore/src/kwq/KWQKPrinter.mm
@@ -23,29 +23,35 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <qbutton.h>
+#include <kprinter.h>
-QButton::QButton()
+bool KPrinter::setup(QWidget *parent=0)
{
}
-QButton::QButton(QWidget *parent)
+bool KPrinter::newPage()
{
}
-QButton::~QButton()
+void KPrinter::setDocName(const QString &)
{
}
-void QButton::setText(const QString &)
+void KPrinter::setCreator(const QString &)
{
}
-QString QButton::text() const
+void KPrinter::setFullPage(bool)
{
}
+
+QSize KPrinter::margins() const
+{
+}
+
+
diff --git a/WebCore/kwq/KWQKProcess.mm b/WebCore/src/kwq/KWQMovie.mm
similarity index 60%
copy from WebCore/kwq/KWQKProcess.mm
copy to WebCore/src/kwq/KWQMovie.mm
index 9505adc..8f38b63 100644
--- a/WebCore/kwq/KWQKProcess.mm
+++ b/WebCore/src/kwq/KWQMovie.mm
@@ -23,49 +23,104 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <kprocess.h>
+#include <qmovie.h>
-KProcess::KProcess()
+QMovie::QMovie()
{
}
-KProcess::~KProcess()
+QMovie::QMovie(QDataSource*, int bufsize)
{
}
-QStrList *KProcess::args()
+QMovie::QMovie(const QMovie &)
{
}
-bool KProcess::isRunning() const
+QMovie::~QMovie()
{
}
-bool KProcess::writeStdin(const char *buffer, int buflen)
+void QMovie::unpause()
{
}
-bool KProcess::start(RunMode runmode, Communication comm)
+void QMovie::pause()
{
}
-bool KProcess::kill(int signo=SIGTERM)
+void QMovie::restart()
{
}
-void KProcess::resume()
+bool QMovie::finished()
{
}
-KProcess &KProcess::operator<<(const QString& arg)
+bool QMovie::running()
+{
+}
+
+
+int QMovie::frameNumber() const
+{
+}
+
+
+const QRect& QMovie::getValidRect() const
+{
+}
+
+
+const QPixmap& QMovie::framePixmap() const
+{
+}
+
+
+const QImage& QMovie::frameImage() const
+{
+}
+
+
+void QMovie::connectResize(QObject* receiver, const char *member)
+{
+}
+
+
+void QMovie::connectUpdate(QObject* receiver, const char *member)
+{
+}
+
+
+void QMovie::connectStatus(QObject* receiver, const char *member)
+{
+}
+
+
+void QMovie::disconnectResize(QObject* receiver, const char *member=0)
+{
+}
+
+
+void QMovie::disconnectUpdate(QObject* receiver, const char *member=0)
+{
+}
+
+
+void QMovie::disconnectStatus(QObject* receiver, const char *member=0)
+{
+}
+
+
+QMovie &QMovie::operator=(const QMovie &)
{
}
diff --git a/WebCore/src/kwq/KWQPixmap.mm b/WebCore/src/kwq/KWQPixmap.mm
index 4109c53..03801cd 100644
--- a/WebCore/src/kwq/KWQPixmap.mm
+++ b/WebCore/src/kwq/KWQPixmap.mm
@@ -119,10 +119,16 @@ int QPixmap::height() const
void QPixmap::resize(const QSize &sz)
{
- [nsimage setSize: NSMakeSize ((float)(sz.width()), (float)(sz.height()))];
+ resize (sz.width(), sz.height());
}
+void QPixmap::resize(int w, int h) {
+ [nsimage setSize: NSMakeSize ((float)(w), (float)(h))];
+}
+
+
+
QPixmap QPixmap::xForm(const QWMatrix &xmatrix) const
{
QPixmap xPix = *this;
diff --git a/WebCore/src/kwq/KWQKGlobal.mm b/WebCore/src/kwq/KWQToolTip.mm
similarity index 84%
copy from WebCore/src/kwq/KWQKGlobal.mm
copy to WebCore/src/kwq/KWQToolTip.mm
index e1e3848..a530aaf 100644
--- a/WebCore/src/kwq/KWQKGlobal.mm
+++ b/WebCore/src/kwq/KWQToolTip.mm
@@ -22,38 +22,20 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#include <qtooltip.h>
-#include <kglobal.h>
-
-
-KInstance *KGlobal::instance()
-{
-}
-
-
-KCharsets *KGlobal::charsets()
+QPalette QToolTip::palette()
{
}
-KLocale *KGlobal::locale()
+QToolTip::QToolTip(QWidget *)
{
}
-KStandardDirs *KGlobal::dirs()
-{
-}
-
-
-KConfig KGlobal::*config()
-{
-}
-
-
-
-const QString &KGlobal::staticQString(const QString &)
+void QToolTip::tip(const QRect &, const QString &)
{
}
diff --git a/WebCore/src/kwq/KWQWidget.mm b/WebCore/src/kwq/KWQWidget.mm
index c613da8..da8c62b 100644
--- a/WebCore/src/kwq/KWQWidget.mm
+++ b/WebCore/src/kwq/KWQWidget.mm
@@ -428,6 +428,25 @@ void QWidget::setAcceptDrops(bool)
}
+void QWidget::erase()
+{
+ NSLog (@"WARNING %s:%s:%d (NOT YET IMPLEMENTED)\n", __FILE__, __FUNCTION__, __LINE__);
+}
+
+
+QWidget *QWidget::focusWidget() const
+{
+ NSLog (@"WARNING %s:%s:%d (NOT YET IMPLEMENTED)\n", __FILE__, __FUNCTION__, __LINE__);
+}
+
+
+QPoint QWidget::mapFromGlobal(const QPoint &) const
+{
+ NSLog (@"WARNING %s:%s:%d (NOT YET IMPLEMENTED)\n", __FILE__, __FUNCTION__, __LINE__);
+}
+
+
+
#ifdef _KWQ_
void QWidget::paint (void *)
diff --git a/WebCore/src/kwq/Makefile.in b/WebCore/src/kwq/Makefile.in
index 147a682..677f3f1 100644
--- a/WebCore/src/kwq/Makefile.in
+++ b/WebCore/src/kwq/Makefile.in
@@ -36,6 +36,7 @@ MMOBJECTS = \
KWQFont.o \
KWQFontMetrics.o \
KWQFrame.o \
+ KWQImage.o \
KWQKApplication.o \
KWQKCharsets.o \
KWQKComboBox.o \
@@ -46,11 +47,13 @@ MMOBJECTS = \
KWQKGlobal.o \
KWQKGlobalSettings.o \
KWQKHTMLPart.o \
+ KWQKHTMLSettings.o \
KWQKIconLoader.o \
KWQKInstance.o \
KWQKLineEdit.o \
KWQKListBox.o \
KWQKMessageBox.o \
+ KWQKPrinter.o \
KWQKProcess.o \
KWQKSimpleConfig.o \
KWQKStringHandler.o \
@@ -58,6 +61,7 @@ MMOBJECTS = \
KWQKWinModule.o \
KWQListBox.o \
KWQLineEdit.o \
+ KWQMovie.o \
KWQObject.o \
KWQPainter.o \
KWQPaintDevice.o \
@@ -71,6 +75,7 @@ MMOBJECTS = \
KWQRadioButton.o \
KWQScrollView.o \
KWQTextEdit.o \
+ KWQToolTip.o \
KWQView.o \
KWQWMatrix.o \
KWQWidget.o \
@@ -104,6 +109,8 @@ CMMFLAGS = $(BASECMMFLAGS) \
-I$(TOPSRCDIR)/src/kwq/kde \
-I$(TOPSRCDIR)/src/kwq/kdecore \
-I$(TOPSRCDIR)/src/kwq/kdeui \
+ -I$(TOPSRCDIR)/src/kwq/khtml \
+ -I$(TOPSRCDIR)/src/kwq/kio \
-I$(TOPSRCDIR)/src/kwq/kparts \
-I. \
$(NULL)
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list