Rename KIcon to enhance compatibility with KDE4

4 files changed, 24 insertions, 24 deletions

diff --git a/kexi/widget/tableview/kexiblobtableedit.cpp b/kexi/widget/tableview/kexiblobtableedit.cpp
index 91523cb7..4982fffa 100644
--- a/kexi/widget/tableview/kexiblobtableedit.cpp
+++ b/kexi/widget/tableview/kexiblobtableedit.cpp
@@ -474,10 +474,10 @@ bool KexiBlobTableEdit::eventFilter( TQObject *o, TQEvent *e )
 KEXI_CELLEDITOR_FACTORY_ITEM_IMPL(KexiBlobEditorFactoryItem, KexiBlobTableEdit)
 
 //=======================
-// KexiKIconTableEdit class is temporarily here:
+// KexiTDEIconTableEdit class is temporarily here:
 
 //! @internal
-class KexiKIconTableEdit::Private
+class KexiTDEIconTableEdit::Private
 {
 public:
 	Private()
@@ -490,61 +490,61 @@ public:
 	TQCache<TQPixmap> pixmapCache;
 };
 
-KexiKIconTableEdit::KexiKIconTableEdit(KexiTableViewColumn &column, TQWidget *parent)
+KexiTDEIconTableEdit::KexiTDEIconTableEdit(KexiTableViewColumn &column, TQWidget *parent)
  : KexiTableEdit(column, parent)
  , d( new Private() )
 {
-	setName("KexiKIconTableEdit");
+	setName("KexiTDEIconTableEdit");
 	init();
 }
 
-KexiKIconTableEdit::~KexiKIconTableEdit()
+KexiTDEIconTableEdit::~KexiTDEIconTableEdit()
 {
 	delete d;
 }
 
-void KexiKIconTableEdit::init()
+void KexiTDEIconTableEdit::init()
 {
 	m_hasFocusableWidget = false;
 	d->pixmapCache.setAutoDelete(true);
 }
 	
-void KexiKIconTableEdit::setValueInternal(const TQVariant& /*add*/, bool /*removeOld*/)
+void KexiTDEIconTableEdit::setValueInternal(const TQVariant& /*add*/, bool /*removeOld*/)
 {
 	d->currentValue = m_origValue;
 }
 
-bool KexiKIconTableEdit::valueIsNull()
+bool KexiTDEIconTableEdit::valueIsNull()
 {
 	return d->currentValue.isNull();
 }
 
-bool KexiKIconTableEdit::valueIsEmpty()
+bool KexiTDEIconTableEdit::valueIsEmpty()
 {
 	return d->currentValue.isNull();
 }
 
-TQVariant KexiKIconTableEdit::value()
+TQVariant KexiTDEIconTableEdit::value()
 {
 	return d->currentValue;
 }
 
-void KexiKIconTableEdit::clear()
+void KexiTDEIconTableEdit::clear()
 {
 	d->currentValue = TQVariant();
 }
 
-bool KexiKIconTableEdit::cursorAtStart()
+bool KexiTDEIconTableEdit::cursorAtStart()
 {
 	return true;
 }
 
-bool KexiKIconTableEdit::cursorAtEnd()
+bool KexiTDEIconTableEdit::cursorAtEnd()
 {
 	return true;
 }
 
-void KexiKIconTableEdit::setupContents( TQPainter *p, bool /*focused*/, const TQVariant& val, 
+void KexiTDEIconTableEdit::setupContents( TQPainter *p, bool /*focused*/, const TQVariant& val, 
 	TQString &/*txt*/, int &/*align*/, int &/*x*/, int &y_offset, int &w, int &h  )
 {
 	Q_UNUSED( y_offset );
@@ -571,8 +571,8 @@ void KexiKIconTableEdit::setupContents( TQPainter *p, bool /*focused*/, const TQ
 	TQPixmap *pix = 0;
 	if (!key.isEmpty() && !(pix = d->pixmapCache[ key ])) {
 		//cache pixmap
-		TQPixmap pm = TDEGlobal::iconLoader()->loadIcon( key, KIcon::Small, 
-			0, KIcon::DefaultState, 0L, true/*canReturnNull*/ );
+		TQPixmap pm = TDEGlobal::iconLoader()->loadIcon( key, TDEIcon::Small, 
+			0, TDEIcon::DefaultState, 0L, true/*canReturnNull*/ );
 		if (!pm.isNull()) {
 			pix = new TQPixmap(pm);
 			d->pixmapCache.insert(key, pix);
@@ -584,12 +584,12 @@ void KexiKIconTableEdit::setupContents( TQPainter *p, bool /*focused*/, const TQ
 	}
 }
 
-void KexiKIconTableEdit::handleCopyAction(const TQVariant& value, const TQVariant& visibleValue)
+void KexiTDEIconTableEdit::handleCopyAction(const TQVariant& value, const TQVariant& visibleValue)
 {
 	Q_UNUSED(value);
 	Q_UNUSED(visibleValue);
 }
 
-KEXI_CELLEDITOR_FACTORY_ITEM_IMPL(KexiKIconTableEditorFactoryItem, KexiKIconTableEdit)
+KEXI_CELLEDITOR_FACTORY_ITEM_IMPL(KexiTDEIconTableEditorFactoryItem, KexiTDEIconTableEdit)
 
 #include "kexiblobtableedit.moc"
diff --git a/kexi/widget/tableview/kexiblobtableedit.h b/kexi/widget/tableview/kexiblobtableedit.h
index 4d17b3b9..fb7f6049 100644
--- a/kexi/widget/tableview/kexiblobtableedit.h
+++ b/kexi/widget/tableview/kexiblobtableedit.h
@@ -126,12 +126,12 @@ KEXI_DECLARE_CELLEDITOR_FACTORY_ITEM(KexiBlobEditorFactoryItem)
 /*! @short Cell editor for displaying kde icon (using icon name provided as string).
  Read only.
 */
-class KexiKIconTableEdit : public KexiTableEdit
+class KexiTDEIconTableEdit : public KexiTableEdit
 {
 	public:
-		KexiKIconTableEdit(KexiTableViewColumn &column, TQWidget *parent=0);
+		KexiTDEIconTableEdit(KexiTableViewColumn &column, TQWidget *parent=0);
 
-		virtual ~KexiKIconTableEdit();
+		virtual ~KexiTDEIconTableEdit();
 
 		//! \return true if editor's value is null (not empty)
 		virtual bool valueIsNull();
@@ -166,6 +166,6 @@ class KexiKIconTableEdit : public KexiTableEdit
 		Private *d;
 };
 
-KEXI_DECLARE_CELLEDITOR_FACTORY_ITEM(KexiKIconTableEditorFactoryItem)
+KEXI_DECLARE_CELLEDITOR_FACTORY_ITEM(KexiTDEIconTableEditorFactoryItem)
 
 #endif
diff --git a/kexi/widget/tableview/kexicelleditorfactory.cpp b/kexi/widget/tableview/kexicelleditorfactory.cpp
index 9cfcfe27..11664e54 100644
--- a/kexi/widget/tableview/kexicelleditorfactory.cpp
+++ b/kexi/widget/tableview/kexicelleditorfactory.cpp
@@ -119,7 +119,7 @@ void KexiCellEditorFactory::init()
 	KexiCellEditorFactory_static->registerItem( *new KexiDateTimeEditorFactoryItem(), KexiDB::Field::DateTime );
 	KexiCellEditorFactory_static->registerItem( *new KexiComboBoxEditorFactoryItem(), KexiDB::Field::Enum );
 	KexiCellEditorFactory_static->registerItem( *new KexiBoolEditorFactoryItem(), KexiDB::Field::Boolean );
-	KexiCellEditorFactory_static->registerItem( *new KexiKIconTableEditorFactoryItem(), KexiDB::Field::Text, "KIcon" );
+	KexiCellEditorFactory_static->registerItem( *new KexiTDEIconTableEditorFactoryItem(), KexiDB::Field::Text, "TDEIcon" );
 	//default type
 	KexiCellEditorFactory_static->registerItem( *new KexiInputEditorFactoryItem(), KexiDB::Field::InvalidType );
 }
diff --git a/kexi/widget/tableview/kexitableview.cpp b/kexi/widget/tableview/kexitableview.cpp
index b975fcdf..8fdac680 100644
--- a/kexi/widget/tableview/kexitableview.cpp
+++ b/kexi/widget/tableview/kexitableview.cpp
@@ -221,7 +221,7 @@ KexiTableView::KexiTableView(KexiTableViewData* data, TQWidget* parent, const ch
 #if 0 //moved to mainwindow's actions
 	d->menu_id_addRecord = m_popupMenu->insertItem(i18n("Add Record"), this, TQT_SLOT(addRecord()), TQt::CTRL+TQt::Key_Insert);
 	d->menu_id_removeRecord = m_popupMenu->insertItem(
-		kapp->iconLoader()->loadIcon("button_cancel", KIcon::Small),
+		kapp->iconLoader()->loadIcon("button_cancel", TDEIcon::Small),
 		i18n("Remove Record"), this, TQT_SLOT(removeRecord()), TQt::CTRL+TQt::Key_Delete);
 #endif