diff options
Diffstat (limited to 'tdehtml')
-rw-r--r-- | tdehtml/ecma/kjs_debugwin.cpp | 8 | ||||
-rw-r--r-- | tdehtml/misc/loader.cpp | 2 | ||||
-rw-r--r-- | tdehtml/tdehtml_part.cpp | 14 | ||||
-rw-r--r-- | tdehtml/tdehtmlview.cpp | 10 |
4 files changed, 17 insertions, 17 deletions
diff --git a/tdehtml/ecma/kjs_debugwin.cpp b/tdehtml/ecma/kjs_debugwin.cpp index c57b26c7b..069720c0b 100644 --- a/tdehtml/ecma/kjs_debugwin.cpp +++ b/tdehtml/ecma/kjs_debugwin.cpp @@ -81,7 +81,7 @@ SourceDisplay::SourceDisplay(KJSDebugWin *debugWin, TQWidget *parent, const char { verticalScrollBar()->setLineStep(TQFontMetrics(m_font).height()); viewport()->setBackgroundMode(TQt::NoBackground); - m_breakpointIcon = TDEGlobal::iconLoader()->loadIcon("stop",KIcon::Small); + m_breakpointIcon = TDEGlobal::iconLoader()->loadIcon("stop",TDEIcon::Small); } SourceDisplay::~SourceDisplay() @@ -297,8 +297,8 @@ KJSErrorDialog::KJSErrorDialog(TQWidget *parent, const TQString& errorMessage, b TQLabel *iconLabel = new TQLabel("",page); iconLabel->setPixmap(TDEGlobal::iconLoader()->loadIcon("messagebox_critical", - KIcon::NoGroup,KIcon::SizeMedium, - KIcon::DefaultState,0,true)); + TDEIcon::NoGroup,TDEIcon::SizeMedium, + TDEIcon::DefaultState,0,true)); TQWidget *contents = new TQWidget(page); TQLabel *label = new TQLabel(errorMessage,contents); @@ -361,7 +361,7 @@ KJSDebugWin::KJSDebugWin(TQWidget *parent, const char *name) m_execsAlloc = 0; m_steppingDepth = 0; - m_stopIcon = TDEGlobal::iconLoader()->loadIcon("stop",KIcon::Small); + m_stopIcon = TDEGlobal::iconLoader()->loadIcon("stop",TDEIcon::Small); m_emptyIcon = TQPixmap(m_stopIcon.width(),m_stopIcon.height()); TQBitmap emptyMask(m_stopIcon.width(),m_stopIcon.height(),true); m_emptyIcon.setMask(emptyMask); diff --git a/tdehtml/misc/loader.cpp b/tdehtml/misc/loader.cpp index 6f19d01aa..6fccfced8 100644 --- a/tdehtml/misc/loader.cpp +++ b/tdehtml/misc/loader.cpp @@ -1356,7 +1356,7 @@ void Cache::init() nullPixmap = new TQPixmap; if ( !brokenPixmap ) - brokenPixmap = new TQPixmap(TDEHTMLFactory::instance()->iconLoader()->loadIcon("file_broken", KIcon::Desktop, 16, KIcon::DisabledState)); + brokenPixmap = new TQPixmap(TDEHTMLFactory::instance()->iconLoader()->loadIcon("file_broken", TDEIcon::Desktop, 16, TDEIcon::DisabledState)); if ( !blockedPixmap ) { blockedPixmap = new TQPixmap(); diff --git a/tdehtml/tdehtml_part.cpp b/tdehtml/tdehtml_part.cpp index 9f771268e..b6fdde210 100644 --- a/tdehtml/tdehtml_part.cpp +++ b/tdehtml/tdehtml_part.cpp @@ -607,7 +607,7 @@ bool TDEHTMLPart::openURL( const KURL &url ) if (userAgent != KProtocolManager::userAgentForHost(TQString())) { if (!d->m_statusBarUALabel) { d->m_statusBarUALabel = new KURLLabel(d->m_statusBarExtension->statusBar()); - d->m_statusBarUALabel->setFixedHeight(instance()->iconLoader()->currentSize(KIcon::Small)); + d->m_statusBarUALabel->setFixedHeight(instance()->iconLoader()->currentSize(TDEIcon::Small)); d->m_statusBarUALabel->setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed)); d->m_statusBarUALabel->setUseCursor(false); d->m_statusBarExtension->addStatusBarItem(d->m_statusBarUALabel, 0, false); @@ -1074,7 +1074,7 @@ KJSErrorDlg *TDEHTMLPart::jsErrorExtension() { if (!d->m_statusBarJSErrorLabel) { d->m_statusBarJSErrorLabel = new KURLLabel(d->m_statusBarExtension->statusBar()); - d->m_statusBarJSErrorLabel->setFixedHeight(instance()->iconLoader()->currentSize(KIcon::Small)); + d->m_statusBarJSErrorLabel->setFixedHeight(instance()->iconLoader()->currentSize(TDEIcon::Small)); d->m_statusBarJSErrorLabel->setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed)); d->m_statusBarJSErrorLabel->setUseCursor(false); d->m_statusBarExtension->addStatusBarItem(d->m_statusBarJSErrorLabel, 0, false); @@ -1524,7 +1524,7 @@ void TDEHTMLPart::setPageSecurity( PageSecurity sec ) emit d->m_extension->setPageSecurity( sec ); if ( sec != NotCrypted && !d->m_statusBarIconLabel && !parentPart() ) { d->m_statusBarIconLabel = new KURLLabel( d->m_statusBarExtension->statusBar() ); - d->m_statusBarIconLabel->setFixedHeight( instance()->iconLoader()->currentSize(KIcon::Small) ); + d->m_statusBarIconLabel->setFixedHeight( instance()->iconLoader()->currentSize(TDEIcon::Small) ); d->m_statusBarIconLabel->setSizePolicy(TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed )); d->m_statusBarIconLabel->setUseCursor( false ); d->m_statusBarExtension->addStatusBarItem( d->m_statusBarIconLabel, 0, false ); @@ -6406,13 +6406,13 @@ void TDEHTMLPart::tdehtmlMouseMoveEvent( tdehtml::MouseMoveEvent *event ) { img = static_cast<HTMLImageElementImpl *>(innerNode.handle()); u = KURL( completeURL( tdehtml::parseURL(img->getAttribute(ATTR_SRC)).string() ) ); - pix = KMimeType::mimeType("image/png")->pixmap(KIcon::Desktop); + pix = KMimeType::mimeType("image/png")->pixmap(TDEIcon::Desktop); } else { // Text or image link... u = completeURL( d->m_strSelectedURL ); - pix = KMimeType::pixmapForURL(u, 0, KIcon::Desktop, KIcon::SizeMedium); + pix = KMimeType::pixmapForURL(u, 0, TDEIcon::Desktop, TDEIcon::SizeMedium); } u.setPass(TQString()); @@ -7248,7 +7248,7 @@ void TDEHTMLPart::walletOpened(KWallet::Wallet *wallet) { if (!d->m_statusBarWalletLabel) { d->m_statusBarWalletLabel = new KURLLabel(d->m_statusBarExtension->statusBar()); - d->m_statusBarWalletLabel->setFixedHeight(instance()->iconLoader()->currentSize(KIcon::Small)); + d->m_statusBarWalletLabel->setFixedHeight(instance()->iconLoader()->currentSize(TDEIcon::Small)); d->m_statusBarWalletLabel->setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed)); d->m_statusBarWalletLabel->setUseCursor(false); d->m_statusBarExtension->addStatusBarItem(d->m_statusBarWalletLabel, 0, false); @@ -7385,7 +7385,7 @@ void TDEHTMLPart::setSuppressedPopupIndicator( bool enable, TDEHTMLPart *originP if ( enable && !d->m_statusBarPopupLabel ) { d->m_statusBarPopupLabel = new KURLLabel( d->m_statusBarExtension->statusBar() ); - d->m_statusBarPopupLabel->setFixedHeight( instance()->iconLoader()->currentSize( KIcon::Small) ); + d->m_statusBarPopupLabel->setFixedHeight( instance()->iconLoader()->currentSize( TDEIcon::Small) ); d->m_statusBarPopupLabel->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed )); d->m_statusBarPopupLabel->setUseCursor( false ); d->m_statusBarExtension->addStatusBarItem( d->m_statusBarPopupLabel, 0, false ); diff --git a/tdehtml/tdehtmlview.cpp b/tdehtml/tdehtmlview.cpp index 19850a1d4..48ead5cf2 100644 --- a/tdehtml/tdehtmlview.cpp +++ b/tdehtml/tdehtmlview.cpp @@ -975,13 +975,13 @@ void TDEHTMLView::viewportMousePressEvent( TQMouseEvent *_mouse ) pixmap.fill( TQColor( tqRgba( 127, 127, 127, 127 ) ) ); TQPainter p( &pixmap ); - icon = TDEGlobal::iconLoader()->loadIcon( "1uparrow", KIcon::Small ); + icon = TDEGlobal::iconLoader()->loadIcon( "1uparrow", TDEIcon::Small ); p.drawPixmap( 16, 0, icon ); - icon = TDEGlobal::iconLoader()->loadIcon( "1leftarrow", KIcon::Small ); + icon = TDEGlobal::iconLoader()->loadIcon( "1leftarrow", TDEIcon::Small ); p.drawPixmap( 0, 16, icon ); - icon = TDEGlobal::iconLoader()->loadIcon( "1downarrow", KIcon::Small ); + icon = TDEGlobal::iconLoader()->loadIcon( "1downarrow", TDEIcon::Small ); p.drawPixmap( 16, 32,icon ); - icon = TDEGlobal::iconLoader()->loadIcon( "1rightarrow", KIcon::Small ); + icon = TDEGlobal::iconLoader()->loadIcon( "1rightarrow", TDEIcon::Small ); p.drawPixmap( 32, 16, icon ); p.drawEllipse( 23, 23, 2, 2 ); @@ -1269,7 +1269,7 @@ void TDEHTMLView::viewportMouseMoveEvent( TQMouseEvent * _mouse ) if ( ( mailtoCursor || newWindowCursor ) && isVisible() && hasFocus() ) { #ifdef Q_WS_X11 - TQPixmap icon_pixmap = TDEGlobal::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", TDEIcon::Small, 0, TDEIcon::DefaultState, 0, true ); if (d->cursor_icon_widget) { const TQPixmap *pm = d->cursor_icon_widget->backgroundPixmap(); |