diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:23:24 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:23:24 -0600 |
| commit | 5b8ab149469c8e186ee8b05d90c0103ae722dd85 (patch) | |
| tree | fb31321c80b12ee8e2237bdcf8c228fe44e67772 /koshell | |
| parent | fe33d391dd7c9da0f83e779344a17e2e445b70a8 (diff) | |
| download | koffice-5b8ab149469c8e186ee8b05d90c0103ae722dd85.tar.gz koffice-5b8ab149469c8e186ee8b05d90c0103ae722dd85.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'koshell')
| -rw-r--r-- | koshell/iconsidepane.cpp | 2 | ||||
| -rw-r--r-- | koshell/koshell_shell.cc | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/koshell/iconsidepane.cpp b/koshell/iconsidepane.cpp index 7f3371e4..3c88f8b6 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 = KGlobal::iconLoader()->loadIcon( mPixmapName, KIcon::Desktop, size ); + mPixmap = TDEGlobal::iconLoader()->loadIcon( mPixmapName, KIcon::Desktop, size ); else mPixmap = TQPixmap(); } diff --git a/koshell/koshell_shell.cc b/koshell/koshell_shell.cc index 27bec9d6..44d95fe3 100644 --- a/koshell/koshell_shell.cc +++ b/koshell/koshell_shell.cc @@ -58,7 +58,7 @@ #include <kiconloader.h> KoShellWindow::KoShellWindow() - : KoMainWindow( KGlobal::instance() ) + : KoMainWindow( TDEGlobal::instance() ) { m_activePage = m_lstPages.end(); @@ -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, KGlobal::iconLoader()->loadIcon( m_documentEntry.service()->icon(), KIcon::Small ), i18n("Untitled") ); + m_pFrame->addTab( v, TDEGlobal::iconLoader()->loadIcon( m_documentEntry.service()->icon(), KIcon::Small ), i18n("Untitled") ); // Create a new page for this doc Page page; |