diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:43:14 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:43:14 -0600 |
commit | 79b21d47bce1ee428affc97534cd8b257232a871 (patch) | |
tree | 0df1fa0109d9f2bcef932eda8b5c25b2e06669ed /konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp | |
parent | 9a898d493f493adbc404f7223043c85f3817472b (diff) | |
download | tdebase-79b21d47bce1ee428affc97534cd8b257232a871.tar.gz tdebase-79b21d47bce1ee428affc97534cd8b257232a871.zip |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp')
-rw-r--r-- | konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp b/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp index c8707970c..7d8f7b1fd 100644 --- a/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp +++ b/konqueror/sidebar/trees/dirtree_module/dirtree_module.cpp @@ -325,7 +325,7 @@ void KonqSidebarDirTreeModule::openSubFolder( KonqSidebarTreeItem *item ) if ( !item->isTopLevelItem() && static_cast<KonqSidebarDirTreeItem *>(item)->hasStandardIcon() ) { - int size = KGlobal::iconLoader()->currentSize( KIcon::Small ); + int size = TDEGlobal::iconLoader()->currentSize( KIcon::Small ); TQPixmap pix = DesktopIcon( "folder_open", size ); m_pTree->startAnimation( item, "kde", 6, &pix ); } @@ -358,7 +358,7 @@ void KonqSidebarDirTreeModule::listDirectory( KonqSidebarTreeItem *item ) { // We have this directory listed already, just copy the entries as we // can't use the dirlister, it would invalidate the old entries - int size = KGlobal::iconLoader()->currentSize( KIcon::Small ); + int size = TDEGlobal::iconLoader()->currentSize( KIcon::Small ); KonqSidebarTreeItem * parentItem = item; KonqSidebarDirTreeItem *oldItem = static_cast<KonqSidebarDirTreeItem *> (openItem->firstChild()); while(oldItem) @@ -424,7 +424,7 @@ void KonqSidebarDirTreeModule::slotNewItems( const KFileItemList& entries ) } kdDebug()<<"number of additional parent items:"<< (parentItemList?parentItemList->count():0)<<endl; - int size = KGlobal::iconLoader()->currentSize( KIcon::Small ); + int size = TDEGlobal::iconLoader()->currentSize( KIcon::Small ); do { kdDebug()<<"Parent Item URL:"<<parentItem->externalURL()<<endl; @@ -456,7 +456,7 @@ void KonqSidebarDirTreeModule::slotNewItems( const KFileItemList& entries ) void KonqSidebarDirTreeModule::slotRefreshItems( const KFileItemList &entries ) { - int size = KGlobal::iconLoader()->currentSize( KIcon::Small ); + int size = TDEGlobal::iconLoader()->currentSize( KIcon::Small ); TQPtrListIterator<KFileItem> kit ( entries ); kdDebug(1201) << "KonqSidebarDirTreeModule::slotRefreshItems " << entries.count() << " entries. First: " << kit.current()->url().url() << endl; |