diff options
author | Timothy Pearson <[email protected]> | 2013-01-24 13:45:52 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2013-01-24 13:45:52 -0600 |
commit | 6adb71382c3d5277c3dcbc4ec24c5ff36b4c07ef (patch) | |
tree | 44659d1cc0c37eb995e572bc1b979e75a74210fb /kooka/scanpackager.cpp | |
parent | e2385b701b464dc2259fcd5f3819c98f2c8c4438 (diff) | |
download | tdegraphics-6adb71382c3d5277c3dcbc4ec24c5ff36b4c07ef.tar.gz tdegraphics-6adb71382c3d5277c3dcbc4ec24c5ff36b4c07ef.zip |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kooka/scanpackager.cpp')
-rw-r--r-- | kooka/scanpackager.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kooka/scanpackager.cpp b/kooka/scanpackager.cpp index a54fde7c..71b97246 100644 --- a/kooka/scanpackager.cpp +++ b/kooka/scanpackager.cpp @@ -117,7 +117,7 @@ ScanPackager::ScanPackager( TQWidget *parent ) : KFileTreeView( parent ) m_currImportDir = m_currCopyDir; /* Preload frequently used icons */ - KIconLoader *loader = KGlobal::iconLoader(); + KIconLoader *loader = TDEGlobal::iconLoader(); m_floppyPixmap = loader->loadIcon( "3floppy_unmount", KIcon::Small ); m_grayPixmap = loader->loadIcon( "palette_gray", KIcon::Small ); m_bwPixmap = loader->loadIcon( "palette_lineart", KIcon::Small ); @@ -145,7 +145,7 @@ void ScanPackager::openRoots() KFileTreeBranch* ScanPackager::openRoot( const KURL& root, bool ) { - KIconLoader *loader = KGlobal::iconLoader(); + KIconLoader *loader = TDEGlobal::iconLoader(); /* working on the global branch. FIXME */ m_defaultBranch = addBranch( root, i18n("Kooka Gallery"), @@ -581,7 +581,7 @@ void ScanPackager::loadImageForItem( KFileTreeViewItem *item ) kdDebug(28000) << "subImage-count: " << img->subImagesCount() << endl; if( img->subImagesCount() > 1 ) { - KIconLoader *loader = KGlobal::iconLoader(); + KIconLoader *loader = TDEGlobal::iconLoader(); kdDebug(28000) << "SubImages existing!" << endl; /* Start at the image with index 1, that makes one less than are actually in the |