diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-04 14:05:40 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-04 14:05:40 -0600 |
| commit | 1d4158dd755a445fd42f2db7db5abab8084175cd (patch) | |
| tree | 71ca5f966ca25d2a47b66ae27f7bb06c34d190bf /koshell | |
| parent | 391e0b69f256bab8971430050c65f0e6e7eea9be (diff) | |
| download | koffice-1d4158dd755a445fd42f2db7db5abab8084175cd.tar.gz koffice-1d4158dd755a445fd42f2db7db5abab8084175cd.zip | |
Rename KIcon to enhance compatibility with KDE4
Diffstat (limited to 'koshell')
| -rw-r--r-- | koshell/iconsidepane.cpp | 2 | ||||
| -rw-r--r-- | koshell/koshell_shell.cc | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/koshell/iconsidepane.cpp b/koshell/iconsidepane.cpp index 003762c28..61b890be5 100644 --- a/koshell/iconsidepane.cpp +++ b/koshell/iconsidepane.cpp @@ -69,7 +69,7 @@ void EntryItem::reloadPixmap() { int size = (int)navigator()->viewMode(); if ( size != 0 ) - mPixmap = TDEGlobal::iconLoader()->loadIcon( mPixmapName, KIcon::Desktop, size ); + mPixmap = TDEGlobal::iconLoader()->loadIcon( mPixmapName, TDEIcon::Desktop, size ); else mPixmap = TQPixmap(); } diff --git a/koshell/koshell_shell.cc b/koshell/koshell_shell.cc index 991a2a09f..772b8f376 100644 --- a/koshell/koshell_shell.cc +++ b/koshell/koshell_shell.cc @@ -345,7 +345,7 @@ void KoShellWindow::setRootDocument( KoDocument * doc ) v->setGeometry( 0, 0, m_pFrame->width(), m_pFrame->height() ); v->setPartManager( partManager() ); - m_pFrame->addTab( v, TDEGlobal::iconLoader()->loadIcon( m_documentEntry.service()->icon(), KIcon::Small ), i18n("Untitled") ); + m_pFrame->addTab( v, TDEGlobal::iconLoader()->loadIcon( m_documentEntry.service()->icon(), TDEIcon::Small ), i18n("Untitled") ); // Create a new page for this doc Page page; @@ -670,9 +670,9 @@ TQString KoShellWindow::configFile() const void KoShellWindow::tab_contextMenu(TQWidget * w,const TQPoint &p) { TDEPopupMenu menu; - KIconLoader il; - int const mnuSave = menu.insertItem( il.loadIconSet( "filesave", KIcon::Small ), i18n("Save") ); - int const mnuClose = menu.insertItem( il.loadIcon( "fileclose", KIcon::Small ), i18n("Close") ); + TDEIconLoader il; + int const mnuSave = menu.insertItem( il.loadIconSet( "filesave", TDEIcon::Small ), i18n("Save") ); + int const mnuClose = menu.insertItem( il.loadIcon( "fileclose", TDEIcon::Small ), i18n("Close") ); int tabnr = m_pFrame->indexOf( w ); Page page = m_lstPages[tabnr]; |