summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-04 14:13:36 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-04 14:13:36 -0600
commit6c0599e58e1d9126a66e7f8aaf22cdbe10a3fa9d (patch)
treea333ba247308a1c012d13576a2bcbee5e3325182
parent09470cb1bf92cbed1abf0f7096af9ed87a262624 (diff)
downloadtdeadmin-6c0599e58e1d9126a66e7f8aaf22cdbe10a3fa9d.tar.gz
tdeadmin-6c0599e58e1d9126a66e7f8aaf22cdbe10a3fa9d.zip
Rename KIcon to enhance compatibility with KDE4
-rw-r--r--kdat/ImageCache.cpp32
-rw-r--r--ksysv/trash.cpp4
-rw-r--r--ksysv/trash.h4
3 files changed, 20 insertions, 20 deletions
diff --git a/kdat/ImageCache.cpp b/kdat/ImageCache.cpp
index a2d489a..b155392 100644
--- a/kdat/ImageCache.cpp
+++ b/kdat/ImageCache.cpp
@@ -24,26 +24,26 @@
ImageCache::ImageCache()
{
- KIconLoader *l = TDEGlobal::iconLoader();
+ TDEIconLoader *l = TDEGlobal::iconLoader();
/* 2002-01-24 FP */
- // _archive = new TQPixmap(l->iconPath("package", KIcon::Toolbar));
- _archive = new TQPixmap(l->iconPath("tar", KIcon::Small));
+ // _archive = new TQPixmap(l->iconPath("package", TDEIcon::Toolbar));
+ _archive = new TQPixmap(l->iconPath("tar", TDEIcon::Small));
/* 2002-01-24 FP */
- _backup = new TQPixmap(l->iconPath("kdat_backup", KIcon::Toolbar));
- _file = new TQPixmap(l->iconPath("mime_empty", KIcon::Small));
- _folderClosed = new TQPixmap(l->iconPath("folder_blue", KIcon::Small));
- _folderOpen = new TQPixmap(l->iconPath("folder_blue_open", KIcon::Small));
- _restore = new TQPixmap(l->iconPath("kdat_restore", KIcon::Toolbar));
- _selectAll = new TQPixmap(l->iconPath("kdat_select_all", KIcon::Toolbar));
- _selectNone = new TQPixmap(l->iconPath("kdat_select_none", KIcon::Toolbar));
- _selectSome = new TQPixmap(l->iconPath("kdat_select_some", KIcon::Toolbar));
+ _backup = new TQPixmap(l->iconPath("kdat_backup", TDEIcon::Toolbar));
+ _file = new TQPixmap(l->iconPath("mime_empty", TDEIcon::Small));
+ _folderClosed = new TQPixmap(l->iconPath("folder_blue", TDEIcon::Small));
+ _folderOpen = new TQPixmap(l->iconPath("folder_blue_open", TDEIcon::Small));
+ _restore = new TQPixmap(l->iconPath("kdat_restore", TDEIcon::Toolbar));
+ _selectAll = new TQPixmap(l->iconPath("kdat_select_all", TDEIcon::Toolbar));
+ _selectNone = new TQPixmap(l->iconPath("kdat_select_none", TDEIcon::Toolbar));
+ _selectSome = new TQPixmap(l->iconPath("kdat_select_some", TDEIcon::Toolbar));
// 2002-01-28 FP
- // _tape = new TQPixmap(l->iconPath("kdat_archive", KIcon::Toolbar));
- _tape = new TQPixmap(l->iconPath("kdat", KIcon::Small));
+ // _tape = new TQPixmap(l->iconPath("kdat_archive", TDEIcon::Toolbar));
+ _tape = new TQPixmap(l->iconPath("kdat", TDEIcon::Small));
// 2002-01-28 FP
- _tapeMounted = new TQPixmap(l->iconPath("kdat_mounted", KIcon::Toolbar));
- _tapeUnmounted = new TQPixmap(l->iconPath("kdat_unmounted", KIcon::Toolbar));
- _verify = new TQPixmap(l->iconPath("kdat_verify", KIcon::Toolbar));
+ _tapeMounted = new TQPixmap(l->iconPath("kdat_mounted", TDEIcon::Toolbar));
+ _tapeUnmounted = new TQPixmap(l->iconPath("kdat_unmounted", TDEIcon::Toolbar));
+ _verify = new TQPixmap(l->iconPath("kdat_verify", TDEIcon::Toolbar));
}
ImageCache::~ImageCache()
diff --git a/ksysv/trash.cpp b/ksysv/trash.cpp
index a397bfb..887bb58 100644
--- a/ksysv/trash.cpp
+++ b/ksysv/trash.cpp
@@ -40,7 +40,7 @@ KSVTrash::KSVTrash (TQWidget* parent, const char* name)
setFrameStyle (TQFrame::StyledPanel | TQFrame::Sunken);
- mLabel->setPixmap(mKIL->loadIcon("trashcan_empty", KIcon::Desktop));
+ mLabel->setPixmap(mKIL->loadIcon("trashcan_empty", TDEIcon::Desktop));
mPixmapWidth = mLabel->pixmap()->width();
mLabel->setGeometry(5, 7, mPixmapWidth, mPixmapWidth);
@@ -88,7 +88,7 @@ void KSVTrash::dragMoveEvent ( TQDragMoveEvent* e )
TQPainter p;
p.begin(mLabel);
- p.drawPixmap( 0, 0, mKIL->loadIcon("trashcan_full", KIcon::Desktop) );
+ p.drawPixmap( 0, 0, mKIL->loadIcon("trashcan_full", TDEIcon::Desktop) );
p.end();
mOpen = true;
diff --git a/ksysv/trash.h b/ksysv/trash.h
index 89215ba..d848790 100644
--- a/ksysv/trash.h
+++ b/ksysv/trash.h
@@ -21,7 +21,7 @@
// forward declarations
class TQLabel;
-class KIconLoader;
+class TDEIconLoader;
class KSVItem;
class KSVAction;
@@ -55,7 +55,7 @@ protected:
virtual bool eventFilter ( TQObject*, TQEvent* );
private:
- KIconLoader* mKIL;
+ TDEIconLoader* mKIL;
TQLabel* mLabel;
bool mOpen;
int mPixmapWidth;