summaryrefslogtreecommitdiffstats
path: root/khtml
diff options
context:
space:
mode:
Diffstat (limited to 'khtml')
-rw-r--r--khtml/css/cssstyleselector.cpp2
-rw-r--r--khtml/ecma/kjs_debugwin.cpp10
-rw-r--r--khtml/ecma/kjs_navigator.cpp2
-rw-r--r--khtml/ecma/kjs_window.cpp14
-rw-r--r--khtml/html/html_formimpl.cpp10
-rw-r--r--khtml/html/htmltokenizer.cpp4
-rw-r--r--khtml/java/kjavaprocess.cpp20
-rw-r--r--khtml/java/kjavaprocess.h8
-rw-r--r--khtml/khtml_ext.cpp4
-rw-r--r--khtml/khtml_factory.cpp2
-rw-r--r--khtml/khtml_part.cpp22
-rw-r--r--khtml/khtml_settings.cc10
-rw-r--r--khtml/khtmlimage.cpp2
-rw-r--r--khtml/khtmlview.cpp16
-rw-r--r--khtml/misc/decoder.cpp2
-rw-r--r--khtml/misc/loader.cpp6
-rw-r--r--khtml/rendering/render_form.cpp2
-rw-r--r--khtml/rendering/render_replaced.cpp2
-rw-r--r--khtml/test_regression.cpp2
-rw-r--r--khtml/testkhtml.cpp2
-rw-r--r--khtml/xml/dom_docimpl.cpp2
21 files changed, 72 insertions, 72 deletions
diff --git a/khtml/css/cssstyleselector.cpp b/khtml/css/cssstyleselector.cpp
index fc125b5e2..6559a2b9e 100644
--- a/khtml/css/cssstyleselector.cpp
+++ b/khtml/css/cssstyleselector.cpp
@@ -2089,7 +2089,7 @@ static TQColor colorForCSSValue( int css_value )
TQColor c = pal.color( uicol->group, uicol->role );
#ifndef APPLE_CHANGES
if ( uicol->configEntry ) {
- KConfig *globalConfig = KGlobal::config();
+ KConfig *globalConfig = TDEGlobal::config();
globalConfig->setGroup( uicol->configGroup );
c = globalConfig->readColorEntry( uicol->configEntry, &c );
}
diff --git a/khtml/ecma/kjs_debugwin.cpp b/khtml/ecma/kjs_debugwin.cpp
index b8d445900..674a3f3c6 100644
--- a/khtml/ecma/kjs_debugwin.cpp
+++ b/khtml/ecma/kjs_debugwin.cpp
@@ -77,11 +77,11 @@ using namespace khtml;
SourceDisplay::SourceDisplay(KJSDebugWin *debugWin, TQWidget *parent, const char *name)
: TQScrollView(parent,name), m_currentLine(-1), m_sourceFile(0), m_debugWin(debugWin),
- m_font(KGlobalSettings::fixedFont())
+ m_font(TDEGlobalSettings::fixedFont())
{
verticalScrollBar()->setLineStep(TQFontMetrics(m_font).height());
viewport()->setBackgroundMode(TQt::NoBackground);
- m_breakpointIcon = KGlobal::iconLoader()->loadIcon("stop",KIcon::Small);
+ m_breakpointIcon = TDEGlobal::iconLoader()->loadIcon("stop",KIcon::Small);
}
SourceDisplay::~SourceDisplay()
@@ -296,7 +296,7 @@ KJSErrorDialog::KJSErrorDialog(TQWidget *parent, const TQString& errorMessage, b
setMainWidget(page);
TQLabel *iconLabel = new TQLabel("",page);
- iconLabel->setPixmap(KGlobal::iconLoader()->loadIcon("messagebox_critical",
+ iconLabel->setPixmap(TDEGlobal::iconLoader()->loadIcon("messagebox_critical",
KIcon::NoGroup,KIcon::SizeMedium,
KIcon::DefaultState,0,true));
@@ -361,7 +361,7 @@ KJSDebugWin::KJSDebugWin(TQWidget *parent, const char *name)
m_execsAlloc = 0;
m_steppingDepth = 0;
- m_stopIcon = KGlobal::iconLoader()->loadIcon("stop",KIcon::Small);
+ m_stopIcon = TDEGlobal::iconLoader()->loadIcon("stop",KIcon::Small);
m_emptyIcon = TQPixmap(m_stopIcon.width(),m_stopIcon.height());
TQBitmap emptyMask(m_stopIcon.width(),m_stopIcon.height(),true);
m_emptyIcon.setMask(emptyMask);
@@ -376,7 +376,7 @@ KJSDebugWin::KJSDebugWin(TQWidget *parent, const char *name)
// frame list & code
TQSplitter *hsplitter = new TQSplitter(Qt::Vertical,mainWidget);
TQSplitter *vsplitter = new TQSplitter(hsplitter);
- TQFont font(KGlobalSettings::fixedFont());
+ TQFont font(TDEGlobalSettings::fixedFont());
TQWidget *contextContainer = new TQWidget(vsplitter);
diff --git a/khtml/ecma/kjs_navigator.cpp b/khtml/ecma/kjs_navigator.cpp
index ee36ddd1b..426c68343 100644
--- a/khtml/ecma/kjs_navigator.cpp
+++ b/khtml/ecma/kjs_navigator.cpp
@@ -240,7 +240,7 @@ Value Navigator::getValueProperty(ExecState *exec, int token) const
case BrowserLanguage:
case Language:
case UserLanguage:
- return String(KGlobal::locale()->language());
+ return String(TDEGlobal::locale()->language());
case UserAgent:
return String(userAgent);
case Platform:
diff --git a/khtml/ecma/kjs_window.cpp b/khtml/ecma/kjs_window.cpp
index 8d96380ab..e557497e0 100644
--- a/khtml/ecma/kjs_window.cpp
+++ b/khtml/ecma/kjs_window.cpp
@@ -165,7 +165,7 @@ Value Screen::getValueProperty(ExecState *exec, int token) const
KWinModule info(0, KWinModule::INFO_DESKTOP);
#endif
TQWidget *thisWidget = Window::retrieveActive(exec)->part()->widget();
- TQRect sg = KGlobalSettings::desktopGeometry(thisWidget);
+ TQRect sg = TDEGlobalSettings::desktopGeometry(thisWidget);
switch( token ) {
case Height:
@@ -882,14 +882,14 @@ Value Window::get(ExecState *exec, const Identifier &p) const
case ScreenX: {
if (!part->view())
return Undefined();
- TQRect sg = KGlobalSettings::desktopGeometry(part->view());
+ TQRect sg = TDEGlobalSettings::desktopGeometry(part->view());
return Number(part->view()->mapToGlobal(TQPoint(0,0)).x() + sg.x());
}
case ScreenTop:
case ScreenY: {
if (!part->view())
return Undefined();
- TQRect sg = KGlobalSettings::desktopGeometry(part->view());
+ TQRect sg = TDEGlobalSettings::desktopGeometry(part->view());
return Number(part->view()->mapToGlobal(TQPoint(0,0)).y() + sg.y());
}
case ScrollX: {
@@ -1504,7 +1504,7 @@ void KJS::Window::resizeTo(TQWidget* tl, int width, int height)
return;
}
- TQRect sg = KGlobalSettings::desktopGeometry(tl);
+ TQRect sg = TDEGlobalSettings::desktopGeometry(tl);
if ( width > sg.width() || height > sg.height() ) {
kdDebug(6070) << "Window::resizeTo refused, window would be too big ("<<width<<","<<height<<")" << endl;
@@ -1622,7 +1622,7 @@ Value Window::executeOpenWindow(ExecState *exec, const KURL& url, const TQString
if (pos >= 0) {
key = s.left(pos).stripWhiteSpace().lower();
val = s.mid(pos + 1).stripWhiteSpace().lower();
- TQRect screen = KGlobalSettings::desktopGeometry(widget->topLevelWidget());
+ TQRect screen = TDEGlobalSettings::desktopGeometry(widget->topLevelWidget());
if (key == "left" || key == "screenx") {
winargs.x = (int)val.toFloat() + screen.x();
@@ -1951,7 +1951,7 @@ Value WindowFunc::tryCall(ExecState *exec, Object &thisObj, const List &args)
KParts::BrowserExtension *ext = part->browserExtension();
if (ext) {
TQWidget * tl = widget->topLevelWidget();
- TQRect sg = KGlobalSettings::desktopGeometry(tl);
+ TQRect sg = TDEGlobalSettings::desktopGeometry(tl);
TQPoint dest = tl->pos() + TQPoint( args[0].toInt32(exec), args[1].toInt32(exec) );
// Security check (the spec talks about UniversalBrowserWrite to disable this check...)
@@ -1971,7 +1971,7 @@ Value WindowFunc::tryCall(ExecState *exec, Object &thisObj, const List &args)
KParts::BrowserExtension *ext = part->browserExtension();
if (ext) {
TQWidget * tl = widget->topLevelWidget();
- TQRect sg = KGlobalSettings::desktopGeometry(tl);
+ TQRect sg = TDEGlobalSettings::desktopGeometry(tl);
TQPoint dest( args[0].toInt32(exec)+sg.x(), args[1].toInt32(exec)+sg.y() );
// Security check (the spec talks about UniversalBrowserWrite to disable this check...)
diff --git a/khtml/html/html_formimpl.cpp b/khtml/html/html_formimpl.cpp
index b7ae2a8f4..7477679bc 100644
--- a/khtml/html/html_formimpl.cpp
+++ b/khtml/html/html_formimpl.cpp
@@ -238,7 +238,7 @@ TQByteArray HTMLFormElementImpl::formData(bool& ok)
if(view && view->part())
enc = view->part()->encoding();
}
- if((codec = KGlobal::charsets()->codecForName(enc.latin1())))
+ if((codec = TDEGlobal::charsets()->codecForName(enc.latin1())))
break;
}
}
@@ -305,8 +305,8 @@ TQByteArray HTMLFormElementImpl::formData(bool& ok)
TQString val = static_cast<HTMLInputElementImpl*>(current)->value().string().stripWhiteSpace();
if (!val.isEmpty() &&
TQDir::isRelativePath(val) &&
- TQFile::exists(KGlobalSettings::documentPath() + val)) {
- path.setPath(KGlobalSettings::documentPath() + val);
+ TQFile::exists(TDEGlobalSettings::documentPath() + val)) {
+ path.setPath(TDEGlobalSettings::documentPath() + val);
} else {
path = KURL::fromPathOrURL(val);
}
@@ -1609,8 +1609,8 @@ bool HTMLInputElementImpl::encoding(const TQTextCodec* codec, khtml::encodingLis
TQString val = value().string();
if (!val.isEmpty() &&
TQDir::isRelativePath(val) &&
- TQFile::exists(KGlobalSettings::documentPath() + val)) {
- fileurl.setPath(KGlobalSettings::documentPath() + val);
+ TQFile::exists(TDEGlobalSettings::documentPath() + val)) {
+ fileurl.setPath(TDEGlobalSettings::documentPath() + val);
} else {
fileurl = KURL::fromPathOrURL(val);
}
diff --git a/khtml/html/htmltokenizer.cpp b/khtml/html/htmltokenizer.cpp
index 2329e2325..50e3ea69e 100644
--- a/khtml/html/htmltokenizer.cpp
+++ b/khtml/html/htmltokenizer.cpp
@@ -129,7 +129,7 @@ HTMLTokenizer::HTMLTokenizer(DOM::DocumentImpl *_doc, KHTMLView *_view)
buffer = 0;
scriptCode = 0;
scriptCodeSize = scriptCodeMaxSize = scriptCodeResync = 0;
- charsets = KGlobal::charsets();
+ charsets = TDEGlobal::charsets();
parser = new KHTMLParser(_view, _doc);
m_executingScript = 0;
m_autoCloseTimer = 0;
@@ -144,7 +144,7 @@ HTMLTokenizer::HTMLTokenizer(DOM::DocumentImpl *_doc, DOM::DocumentFragmentImpl
buffer = 0;
scriptCode = 0;
scriptCodeSize = scriptCodeMaxSize = scriptCodeResync = 0;
- charsets = KGlobal::charsets();
+ charsets = TDEGlobal::charsets();
parser = new KHTMLParser( i, _doc );
m_executingScript = 0;
m_autoCloseTimer = 0;
diff --git a/khtml/java/kjavaprocess.cpp b/khtml/java/kjavaprocess.cpp
index 48eb7b764..dbe80305e 100644
--- a/khtml/java/kjavaprocess.cpp
+++ b/khtml/java/kjavaprocess.cpp
@@ -46,20 +46,20 @@ private:
bool processKilled;
};
-KJavaProcess::KJavaProcess() : KProcess()
+KJavaProcess::KJavaProcess() : TDEProcess()
{
d = new KJavaProcessPrivate;
d->BufferList.setAutoDelete( true );
d->processKilled = false;
- javaProcess = this; //new KProcess();
+ javaProcess = this; //new TDEProcess();
- connect( javaProcess, TQT_SIGNAL( wroteStdin( KProcess * ) ),
+ connect( javaProcess, TQT_SIGNAL( wroteStdin( TDEProcess * ) ),
this, TQT_SLOT( slotWroteData() ) );
connect( javaProcess, TQT_SIGNAL( receivedStdout( int, int& ) ),
this, TQT_SLOT( slotReceivedData(int, int&) ) );
- connect( javaProcess, TQT_SIGNAL( processExited (KProcess *) ),
- this, TQT_SLOT( slotExited (KProcess *) ) );
+ connect( javaProcess, TQT_SIGNAL( processExited (TDEProcess *) ),
+ this, TQT_SLOT( slotExited (TDEProcess *) ) );
d->jvmPath = "java";
d->mainClass = "-help";
@@ -303,11 +303,11 @@ bool KJavaProcess::invokeJVM()
tqCopy( args.begin(), args.end(), TQTextOStreamIterator<TQCString>( stream, " " ) );
kdDebug(6100) << argStr << endl;
- KProcess::Communication flags = (KProcess::Communication)
- (KProcess::Stdin | KProcess::Stdout |
- KProcess::NoRead);
+ TDEProcess::Communication flags = (TDEProcess::Communication)
+ (TDEProcess::Stdin | TDEProcess::Stdout |
+ TDEProcess::NoRead);
- const bool rval = javaProcess->start( KProcess::NotifyOnExit, flags );
+ const bool rval = javaProcess->start( TDEProcess::NotifyOnExit, flags );
if( rval )
javaProcess->resume(); //start processing stdout on the java process
else
@@ -382,7 +382,7 @@ void KJavaProcess::slotReceivedData( int fd, int& len )
len = num_bytes + num_bytes_msg;
}
-void KJavaProcess::slotExited( KProcess *process )
+void KJavaProcess::slotExited( TDEProcess *process )
{
if (process == javaProcess) {
int status = -1;
diff --git a/khtml/java/kjavaprocess.h b/khtml/java/kjavaprocess.h
index 280701233..4768bc382 100644
--- a/khtml/java/kjavaprocess.h
+++ b/khtml/java/kjavaprocess.h
@@ -39,7 +39,7 @@
*/
class KJavaProcessPrivate;
-class KJavaProcess : public KProcess //QObject
+class KJavaProcess : public TDEProcess //QObject
{
Q_OBJECT
@@ -64,7 +64,7 @@ public:
/**
* Returns the status of the java Process- true if it's ok, false if it has died.
- * It calls KProcess::isRunning()
+ * It calls TDEProcess::isRunning()
*/
bool isRunning();
@@ -139,7 +139,7 @@ protected slots:
/**
* This slot is called when the Java Process exited.
*/
- void slotExited( KProcess *process );
+ void slotExited( TDEProcess *process );
protected:
virtual bool invokeJVM();
@@ -150,7 +150,7 @@ protected:
void sendBuffer( TQByteArray* buff );
void storeSize( TQByteArray* buff );
- KProcess* javaProcess;
+ TDEProcess* javaProcess;
signals:
void received( const TQByteArray& );
diff --git a/khtml/khtml_ext.cpp b/khtml/khtml_ext.cpp
index 3f94dcd17..44c060b61 100644
--- a/khtml/khtml_ext.cpp
+++ b/khtml/khtml_ext.cpp
@@ -897,8 +897,8 @@ void KHTMLPopupGUIClient::saveURL( const KURL &url, const KURL &destURL,
downloadViaKIO = false;
KURL cleanDest = destURL;
cleanDest.setPass( TQString::null ); // don't put password into commandline
- cmd += " " + KProcess::quote(url.url()) + " " +
- KProcess::quote(cleanDest.url());
+ cmd += " " + TDEProcess::quote(url.url()) + " " +
+ TDEProcess::quote(cleanDest.url());
kdDebug(1000) << "Calling command "<<cmd<<endl;
KRun::runCommand(cmd);
}
diff --git a/khtml/khtml_factory.cpp b/khtml/khtml_factory.cpp
index c2eee7d17..6b5662882 100644
--- a/khtml/khtml_factory.cpp
+++ b/khtml/khtml_factory.cpp
@@ -120,7 +120,7 @@ void KHTMLFactory::ref()
// that the factory gets deleted from within a qPostRoutine, called
// from the TQApplication destructor. That however is too late, because
// we want to destruct a TDEInstance object, which involves destructing
- // a KConfig object, which might call KGlobal::dirs() (in sync()) which
+ // a KConfig object, which might call TDEGlobal::dirs() (in sync()) which
// probably is not going to work ;-)
// well, perhaps I'm wrong here, but as I'm unsure I try to stay on the
// safe side ;-) -> let's use a simple reference counting scheme
diff --git a/khtml/khtml_part.cpp b/khtml/khtml_part.cpp
index ffa1e0853..bf4566c86 100644
--- a/khtml/khtml_part.cpp
+++ b/khtml/khtml_part.cpp
@@ -300,13 +300,13 @@ void KHTMLPart::init( KHTMLView *view, GUIProfile prof )
d->m_manualDetection = new KSelectAction( i18n( "short for Manual Detection", "Manual" ), 0, this, TQT_SLOT( slotSetEncoding() ), actionCollection(), "manualDetection" );
- TQStringList encodings = KGlobal::charsets()->descriptiveEncodingNames();
+ TQStringList encodings = TDEGlobal::charsets()->descriptiveEncodingNames();
d->m_manualDetection->setItems( encodings );
d->m_manualDetection->setCurrentItem( -1 );
d->m_paSetEncoding->insert( d->m_manualDetection );
- KConfig *config = KGlobal::config();
+ KConfig *config = TDEGlobal::config();
if ( config->hasGroup( "HTML Settings" ) ) {
config->setGroup( "HTML Settings" );
khtml::Decoder::AutoDetectLanguage language;
@@ -460,16 +460,16 @@ void KHTMLPart::init( KHTMLView *view, GUIProfile prof )
// loadPlugins( partObject(), this, instance() );
// "khtml" catalog does not exist, our translations are in tdelibs.
- // removing this catalog from KGlobal::locale() prevents problems
+ // removing this catalog from TDEGlobal::locale() prevents problems
// with changing the language in applications at runtime -Thomas Reitelbach
- KGlobal::locale()->removeCatalogue("khtml");
+ TDEGlobal::locale()->removeCatalogue("khtml");
}
KHTMLPart::~KHTMLPart()
{
//kdDebug(6050) << "KHTMLPart::~KHTMLPart " << this << endl;
- KConfig *config = KGlobal::config();
+ KConfig *config = TDEGlobal::config();
config->setGroup( "HTML Settings" );
config->writeEntry( "AutomaticDetectionLanguage", d->m_autoDetectLanguage );
@@ -1086,7 +1086,7 @@ KJSErrorDlg *KHTMLPart::jsErrorExtension() {
if (!d->m_jsedlg) {
d->m_jsedlg = new KJSErrorDlg;
d->m_jsedlg->setURL(m_url.prettyURL());
- if (KGlobalSettings::showIconsOnPushButtons()) {
+ if (TDEGlobalSettings::showIconsOnPushButtons()) {
d->m_jsedlg->_clear->setIconSet(SmallIconSet("locationbar_erase"));
d->m_jsedlg->_close->setIconSet(SmallIconSet("fileclose"));
}
@@ -1757,7 +1757,7 @@ void KHTMLPart::htmlError( int errorCode, const TQString& text, const KURL& reqU
TQString url, protocol, datetime;
url = reqUrl.prettyURL();
protocol = reqUrl.protocol();
- datetime = KGlobal::locale()->formatDateTime( TQDateTime::currentDateTime(),
+ datetime = TDEGlobal::locale()->formatDateTime( TQDateTime::currentDateTime(),
false );
TQString doc = TQString::fromLatin1( "<html><head><title>" );
@@ -2500,7 +2500,7 @@ TQString KHTMLPart::defaultEncoding() const
if ( url().protocol().startsWith( "http" ) )
return "iso-8859-1";
else
- return KGlobal::locale()->encoding();
+ return TDEGlobal::locale()->encoding();
}
void KHTMLPart::setUserStyleSheet(const KURL &url)
@@ -3800,7 +3800,7 @@ void KHTMLPart::overURL( const TQString &url, const TQString &target, bool /*shi
else
{
float d = (float) buff.st_size/1024.0;
- text = i18n("%2 (%1 K)").arg(KGlobal::locale()->formatNumber(d, 2)).arg(text2); // was %.2f
+ text = i18n("%2 (%1 K)").arg(TDEGlobal::locale()->formatNumber(d, 2)).arg(text2); // was %.2f
}
text += " ";
text += com;
@@ -4222,7 +4222,7 @@ void KHTMLPart::slotSetEncoding()
d->m_paSetEncoding->popupMenu()->setItemChecked( 0, false );
d->m_paSetEncoding->popupMenu()->setItemChecked( d->m_paSetEncoding->popupMenu()->idAt( 2 ), true );
- TQString enc = KGlobal::charsets()->encodingForName( d->m_manualDetection->currentText() );
+ TQString enc = TDEGlobal::charsets()->encodingForName( d->m_manualDetection->currentText() );
setEncoding( enc, true );
}
@@ -6390,7 +6390,7 @@ void KHTMLPart::khtmlMouseMoveEvent( khtml::MouseMoveEvent *event )
if( d->m_bDnd && d->m_bMousePressed &&
( (!d->m_strSelectedURL.isEmpty() && !isEditable())
|| (!d->m_mousePressNode.isNull() && d->m_mousePressNode.elementId() == ID_IMG) ) ) {
- if ( ( d->m_dragStartPos - _mouse->pos() ).manhattanLength() <= KGlobalSettings::dndEventDelay() )
+ if ( ( d->m_dragStartPos - _mouse->pos() ).manhattanLength() <= TDEGlobalSettings::dndEventDelay() )
return;
TQPixmap pix;
diff --git a/khtml/khtml_settings.cc b/khtml/khtml_settings.cc
index 431aec0ca..5c5db7341 100644
--- a/khtml/khtml_settings.cc
+++ b/khtml/khtml_settings.cc
@@ -292,7 +292,7 @@ void KHTMLSettings::init()
KConfig global( "khtmlrc", true, false );
init( &global, true );
- KConfig *local = KGlobal::config();
+ KConfig *local = TDEGlobal::config();
if ( !local )
return;
@@ -369,8 +369,8 @@ void KHTMLSettings::init( KConfig * config, bool reset )
// Fonts and colors
if( reset ) {
d->defaultFonts = TQStringList();
- d->defaultFonts.append( config->readEntry( "StandardFont", KGlobalSettings::generalFont().family() ) );
- d->defaultFonts.append( config->readEntry( "FixedFont", KGlobalSettings::fixedFont().family() ) );
+ d->defaultFonts.append( config->readEntry( "StandardFont", TDEGlobalSettings::generalFont().family() ) );
+ d->defaultFonts.append( config->readEntry( "FixedFont", TDEGlobalSettings::fixedFont().family() ) );
d->defaultFonts.append( config->readEntry( "SerifFont", HTML_DEFAULT_VIEW_SERIF_FONT ) );
d->defaultFonts.append( config->readEntry( "SansSerifFont", HTML_DEFAULT_VIEW_SANSSERIF_FONT ) );
d->defaultFonts.append( config->readEntry( "CursiveFont", HTML_DEFAULT_VIEW_CURSIVE_FONT ) );
@@ -1027,7 +1027,7 @@ void KHTMLSettings::setJSErrorsEnabled(bool enabled)
{
d->m_jsErrorsEnabled = enabled;
// save it
- KConfig *config = KGlobal::config();
+ KConfig *config = TDEGlobal::config();
config->setGroup("HTML Settings");
config->writeEntry("ReportJSErrors", enabled);
config->sync();
@@ -1052,7 +1052,7 @@ void KHTMLSettings::setJSPopupBlockerPassivePopup(bool enabled)
{
d->m_jsPopupBlockerPassivePopup = enabled;
// save it
- KConfig *config = KGlobal::config();
+ KConfig *config = TDEGlobal::config();
config->setGroup("Java/JavaScript Settings");
config->writeEntry("PopupBlockerPassivePopup", enabled);
config->sync();
diff --git a/khtml/khtmlimage.cpp b/khtml/khtmlimage.cpp
index 7782f1786..4cb4bb3f1 100644
--- a/khtml/khtmlimage.cpp
+++ b/khtml/khtmlimage.cpp
@@ -135,7 +135,7 @@ KHTMLImage::~KHTMLImage()
bool KHTMLImage::openURL( const KURL &url )
{
- static const TQString &html = KGlobal::staticQString( "<html><body><img src=\"%1\"></body></html>" );
+ static const TQString &html = TDEGlobal::staticQString( "<html><body><img src=\"%1\"></body></html>" );
disposeImage();
diff --git a/khtml/khtmlview.cpp b/khtml/khtmlview.cpp
index 14169e651..411d03f2e 100644
--- a/khtml/khtmlview.cpp
+++ b/khtml/khtmlview.cpp
@@ -975,13 +975,13 @@ void KHTMLView::viewportMousePressEvent( TQMouseEvent *_mouse )
pixmap.fill( TQColor( tqRgba( 127, 127, 127, 127 ) ) );
TQPainter p( &pixmap );
- icon = KGlobal::iconLoader()->loadIcon( "1uparrow", KIcon::Small );
+ icon = TDEGlobal::iconLoader()->loadIcon( "1uparrow", KIcon::Small );
p.drawPixmap( 16, 0, icon );
- icon = KGlobal::iconLoader()->loadIcon( "1leftarrow", KIcon::Small );
+ icon = TDEGlobal::iconLoader()->loadIcon( "1leftarrow", KIcon::Small );
p.drawPixmap( 0, 16, icon );
- icon = KGlobal::iconLoader()->loadIcon( "1downarrow", KIcon::Small );
+ icon = TDEGlobal::iconLoader()->loadIcon( "1downarrow", KIcon::Small );
p.drawPixmap( 16, 32,icon );
- icon = KGlobal::iconLoader()->loadIcon( "1rightarrow", KIcon::Small );
+ icon = TDEGlobal::iconLoader()->loadIcon( "1rightarrow", KIcon::Small );
p.drawPixmap( 32, 16, icon );
p.drawEllipse( 23, 23, 2, 2 );
@@ -994,7 +994,7 @@ void KHTMLView::viewportMousePressEvent( TQMouseEvent *_mouse )
bool hasHorBar = visibleWidth() < contentsWidth();
bool hasVerBar = visibleHeight() < contentsHeight();
- KConfig *config = KGlobal::config();
+ KConfig *config = TDEGlobal::config();
KConfigGroupSaver saver( config, "HTML Settings" );
if ( config->readBoolEntry( "ShowMouseScrollIndicator", true ) ) {
d->m_mouseScrollIndicator->show();
@@ -1269,7 +1269,7 @@ void KHTMLView::viewportMouseMoveEvent( TQMouseEvent * _mouse )
if ( ( mailtoCursor || newWindowCursor ) && isVisible() && hasFocus() ) {
#ifdef Q_WS_X11
- TQPixmap icon_pixmap = KGlobal::iconLoader()->loadIcon( mailtoCursor ? "mail_generic" : "window_new", KIcon::Small, 0, KIcon::DefaultState, 0, true );
+ TQPixmap icon_pixmap = TDEGlobal::iconLoader()->loadIcon( mailtoCursor ? "mail_generic" : "window_new", KIcon::Small, 0, KIcon::DefaultState, 0, true );
if (d->cursor_icon_widget) {
const TQPixmap *pm = d->cursor_icon_widget->backgroundPixmap();
@@ -2839,7 +2839,7 @@ void KHTMLView::print(bool quick)
int headerHeight = 0;
TQFont headerFont("Sans Serif", 8);
- TQString headerLeft = KGlobal::locale()->formatDate(TQDate::currentDate(),true);
+ TQString headerLeft = TDEGlobal::locale()->formatDate(TQDate::currentDate(),true);
TQString headerMid = docname;
TQString headerRight;
@@ -4517,7 +4517,7 @@ static const int SCROLL_TICK = 20;
void KHTMLView::scrollBy(int dx, int dy)
{
- KConfigGroup cfg( KGlobal::config(), "KDE" );
+ KConfigGroup cfg( TDEGlobal::config(), "KDE" );
if( !cfg.readBoolEntry( "SmoothScrolling", false )) {
TQScrollView::scrollBy( dx, dy );
return;
diff --git a/khtml/misc/decoder.cpp b/khtml/misc/decoder.cpp
index f227f4014..f75fa411d 100644
--- a/khtml/misc/decoder.cpp
+++ b/khtml/misc/decoder.cpp
@@ -97,7 +97,7 @@ void Decoder::setEncoding(const char *_encoding, EncodingType type)
if(enc == "visual") // hebrew visually ordered
enc = "iso8859-8";
bool b;
- TQTextCodec *codec = KGlobal::charsets()->codecForName(enc, b);
+ TQTextCodec *codec = TDEGlobal::charsets()->codecForName(enc, b);
if (!b)
codec = 0;
diff --git a/khtml/misc/loader.cpp b/khtml/misc/loader.cpp
index 7b085aab9..b9400f229 100644
--- a/khtml/misc/loader.cpp
+++ b/khtml/misc/loader.cpp
@@ -194,7 +194,7 @@ TQTextCodec* CachedObject::codecForBuffer( const TQString& charset, const TQByte
// Link or @charset
if(!charset.isEmpty())
{
- TQTextCodec* c = KGlobal::charsets()->codecForName(charset);
+ TQTextCodec* c = TDEGlobal::charsets()->codecForName(charset);
if(c->mibEnum() == 11) {
// iso8859-8 (visually ordered)
c = TQTextCodec::codecForName("iso8859-8-i");
@@ -256,7 +256,7 @@ void CachedCSSStyleSheet::data( TQBuffer &buffer, bool eof )
// TQString charset = checkCharset( buffer.buffer() );
TQTextCodec* c = 0;
if (!m_charset.isEmpty()) {
- c = KGlobal::charsets()->codecForName(m_charset);
+ c = TDEGlobal::charsets()->codecForName(m_charset);
if(c->mibEnum() == 11) c = TQTextCodec::codecForName("iso8859-8-i");
}
else {
@@ -469,7 +469,7 @@ static TQString buildAcceptHeader()
CachedImage::CachedImage(DocLoader* dl, const DOMString &url, KIO::CacheControl _cachePolicy, const char*)
: TQObject(), CachedObject(url, Image, _cachePolicy, 0)
{
- static const TQString &acceptHeader = KGlobal::staticQString( buildAcceptHeader() );
+ static const TQString &acceptHeader = TDEGlobal::staticQString( buildAcceptHeader() );
m = 0;
p = 0;
diff --git a/khtml/rendering/render_form.cpp b/khtml/rendering/render_form.cpp
index a0ac7b732..81005de85 100644
--- a/khtml/rendering/render_form.cpp
+++ b/khtml/rendering/render_form.cpp
@@ -783,7 +783,7 @@ RenderFileButton::RenderFileButton(HTMLInputElementImpl *element)
KURLRequester* w = new KURLRequester( view()->viewport(), "__khtml" );
w->setMode(KFile::File | KFile::ExistingOnly);
- w->completionObject()->setDir(KGlobalSettings::documentPath());
+ w->completionObject()->setDir(TDEGlobalSettings::documentPath());
connect(w->lineEdit(), TQT_SIGNAL(returnPressed()), this, TQT_SLOT(slotReturnPressed()));
connect(w->lineEdit(), TQT_SIGNAL(textChanged(const TQString &)),this,TQT_SLOT(slotTextChanged(const TQString &)));
diff --git a/khtml/rendering/render_replaced.cpp b/khtml/rendering/render_replaced.cpp
index 6d6823455..319f842e7 100644
--- a/khtml/rendering/render_replaced.cpp
+++ b/khtml/rendering/render_replaced.cpp
@@ -272,7 +272,7 @@ void RenderWidget::updateFromElement()
if ( color.isValid() || backgroundColor.isValid() ) {
TQPalette pal(TQApplication::palette(m_widget));
- int contrast_ = KGlobalSettings::contrast();
+ int contrast_ = TDEGlobalSettings::contrast();
int highlightVal = 100 + (2*contrast_+4)*16/10;
int lowlightVal = 100 + (2*contrast_+4)*10;
diff --git a/khtml/test_regression.cpp b/khtml/test_regression.cpp
index 8db2c590a..62785e204 100644
--- a/khtml/test_regression.cpp
+++ b/khtml/test_regression.cpp
@@ -1131,7 +1131,7 @@ void RegressionTest::doFailureReport( const TQString& test, int failures )
TQString relOutputDir = makeRelativePath(m_baseDir, m_outputDir);
- // are blocking reads possible with KProcess?
+ // are blocking reads possible with TDEProcess?
char pwd[PATH_MAX];
(void) getcwd( pwd, PATH_MAX );
chdir( TQFile::encodeName( m_baseDir ) );
diff --git a/khtml/testkhtml.cpp b/khtml/testkhtml.cpp
index 257b656c2..ba5bf063f 100644
--- a/khtml/testkhtml.cpp
+++ b/khtml/testkhtml.cpp
@@ -138,7 +138,7 @@ int main(int argc, char *argv[])
void Dummy::doBenchmark()
{
- KConfigGroup settings(KGlobal::config(), "bench");
+ KConfigGroup settings(TDEGlobal::config(), "bench");
results.clear();
TQString directory = KFileDialog::getExistingDirectory(settings.readPathEntry("path"), m_part->view(),
diff --git a/khtml/xml/dom_docimpl.cpp b/khtml/xml/dom_docimpl.cpp
index 197ceee13..3a277ecf5 100644
--- a/khtml/xml/dom_docimpl.cpp
+++ b/khtml/xml/dom_docimpl.cpp
@@ -1127,7 +1127,7 @@ void DocumentImpl::recalcStyle( StyleChange change )
// ### make the font stuff _really_ work!!!!
khtml::FontDef fontDef;
- TQFont f = KGlobalSettings::generalFont();
+ TQFont f = TDEGlobalSettings::generalFont();
fontDef.family = f.family();
fontDef.italic = f.italic();
fontDef.weight = f.weight();
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-14 07:49:22 +0000