From 34ec7cf1e70300eb43f3822ce3261893f9f8ace6 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Mon, 4 Feb 2013 14:19:04 -0600
Subject: Rename KIcon to enhance compatibility with KDE4

---
 tdewallet/allyourbase.cpp      | 16 ++++++++--------
 tdewallet/allyourbase.h        |  4 ++--
 tdewallet/tdewalleteditor.cpp  |  2 +-
 tdewallet/tdewalletmanager.cpp |  2 +-
 4 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'tdewallet')

diff --git a/tdewallet/allyourbase.cpp b/tdewallet/allyourbase.cpp
index 1939f5a..3da85ee 100644
--- a/tdewallet/allyourbase.cpp
+++ b/tdewallet/allyourbase.cpp
@@ -45,21 +45,21 @@ KWalletFolderItem::KWalletFolderItem(KWallet::Wallet *w, TQListView* parent, con
 	setDragEnabled(true);
 	setDropEnabled(true);
 
-	TQPixmap pix = getFolderIcon(KIcon::Small);
+	TQPixmap pix = getFolderIcon(TDEIcon::Small);
 	
 	setPixmap(0,pix);
 }
 
-TQPixmap KWalletFolderItem::getFolderIcon(KIcon::Group group){
-	KIconLoader *loader = TDEGlobal::instance()->iconLoader();
+TQPixmap KWalletFolderItem::getFolderIcon(TDEIcon::Group group){
+	TDEIconLoader *loader = TDEGlobal::instance()->iconLoader();
 	TQPixmap pix = loader->loadIcon( _name, group, 0,
-			KIcon::DefaultState, 0, true );
+			TDEIcon::DefaultState, 0, true );
 	if (pix.isNull())
 		pix = loader->loadIcon( _name.lower(), group, 0,
-			KIcon::DefaultState, 0, true);
+			TDEIcon::DefaultState, 0, true);
 	if (pix.isNull())
 		pix = loader->loadIcon( "folder_red", group, 0,
-			KIcon::DefaultState, 0, true);
+			TDEIcon::DefaultState, 0, true);
 	return pix;
 }
 
@@ -619,7 +619,7 @@ class KWalletIconDrag : public TQIconDrag {
 *  *  KWalletIconView - An iconview to store wallets
 *   */
 KWalletIconView::KWalletIconView(TQWidget *parent, const char *name)
-: KIconView(parent, name) {
+: TDEIconView(parent, name) {
 	TDEGlobal::dirs()->addResourceType("tdewallet", "share/apps/tdewallet");
 	connect(this, TQT_SIGNAL(dropped(TQDropEvent*, const TQValueList<TQIconDragItem>&)), TQT_SLOT(slotDropped(TQDropEvent*, const TQValueList<TQIconDragItem>&)));
 }
@@ -671,7 +671,7 @@ void KWalletIconView::contentsMousePressEvent(TQMouseEvent *e) {
 	if (!findItem(_mousePos)) {
 		clearSelection();
 	}
-	KIconView::contentsMousePressEvent( e );
+	TDEIconView::contentsMousePressEvent( e );
 }
 
 TQDragObject *KWalletIconView::dragObject() {
diff --git a/tdewallet/allyourbase.h b/tdewallet/allyourbase.h
index b6b0770..3479189 100644
--- a/tdewallet/allyourbase.h
+++ b/tdewallet/allyourbase.h
@@ -83,7 +83,7 @@ class KWalletFolderItem : public TDEListViewItem {
 		TQString name() const;
 		void refresh();
 		KWalletContainerItem* getContainer(KWallet::Wallet::EntryType type);
-		TQPixmap getFolderIcon(KIcon::Group group);
+		TQPixmap getFolderIcon(TDEIcon::Group group);
 		bool contains(const TQString& itemKey);
 		TQListViewItem* getItem(const TQString& itemKey);
 
@@ -132,7 +132,7 @@ class KWalletItem : public TQIconViewItem {
 };
 
 
-class KWalletIconView : public KIconView {
+class KWalletIconView : public TDEIconView {
 	Q_OBJECT
   
 	public:
diff --git a/tdewallet/tdewalleteditor.cpp b/tdewallet/tdewalleteditor.cpp
index 054824b..6755d60 100644
--- a/tdewallet/tdewalleteditor.cpp
+++ b/tdewallet/tdewalleteditor.cpp
@@ -455,7 +455,7 @@ void KWalletEditor::entrySelectionChanged(TQListViewItem *item) {
 	if (fi) {
 		_currentFolder = fi->name();
 		_ww->_entryTitle->setText(TQString("<font size=\"+1\">%1</font>").arg(fi->text(0)));
-		_ww->_iconTitle->setPixmap(fi->getFolderIcon(KIcon::Toolbar));
+		_ww->_iconTitle->setPixmap(fi->getFolderIcon(TDEIcon::Toolbar));
 	}
 }
 
diff --git a/tdewallet/tdewalletmanager.cpp b/tdewallet/tdewalletmanager.cpp
index 296e2e5..aafbdfa 100644
--- a/tdewallet/tdewalletmanager.cpp
+++ b/tdewallet/tdewalletmanager.cpp
@@ -415,7 +415,7 @@ TQPixmap KWalletManager::loadSystemTrayIcon(const TQString &icon) {
 	TDEConfig *appCfg = kapp->config();
 	TDEConfigGroupSaver configSaver(appCfg, "System Tray");
 	int iconWidth = appCfg->readNumEntry("systrayIconWidth", 22);
-	return kapp->iconLoader()->loadIcon( icon, KIcon::Panel, iconWidth );
+	return kapp->iconLoader()->loadIcon( icon, TDEIcon::Panel, iconWidth );
 #endif
 }
 
-- 
cgit v1.2.1