Rename a number of classes to enhance compatibility with KDE4

5 files changed, 8 insertions, 8 deletions

diff --git a/kexi/plugins/macros/kexipart/keximacroerror.cpp b/kexi/plugins/macros/kexipart/keximacroerror.cpp
index 6c35e8d7..a512994d 100644
--- a/kexi/plugins/macros/kexipart/keximacroerror.cpp
+++ b/kexi/plugins/macros/kexipart/keximacroerror.cpp
@@ -59,7 +59,7 @@ KexiMacroError::KexiMacroError(KexiMainWindow* mainwin, TDESharedPtr<KoMacro::Co
 	KoMacro::MacroItem::List items = context->macro()->items();
 	for (KoMacro::MacroItem::List::ConstIterator mit = items.begin(); mit != items.end(); mit++)
 	{
-		KListViewItem* listviewitem = new KListViewItem(errorlist);
+		TDEListViewItem* listviewitem = new TDEListViewItem(errorlist);
 		listviewitem->setText(0,TQString("%1").arg(i++));
 		listviewitem->setText(1,i18n("Action"));
 		TDESharedPtr<KoMacro::MacroItem> macroitem = *mit;
@@ -80,7 +80,7 @@ KexiMacroError::KexiMacroError(KexiMainWindow* mainwin, TDESharedPtr<KoMacro::Co
 		KoMacro::Variable::Map variables = macroitem->variables();
 		KoMacro::Variable::Map::ConstIterator vit;
 		for ( vit = variables.begin(); vit != variables.end(); ++vit ) {
-			KListViewItem* child = new KListViewItem(listviewitem);
+			TDEListViewItem* child = new TDEListViewItem(listviewitem);
 			child->setText(1,vit.key());
 			child->setText(2,vit.data()->toString());
 		}
diff --git a/kexi/plugins/macros/kexipart/keximacroerrorbase.ui b/kexi/plugins/macros/kexipart/keximacroerrorbase.ui
index 05d7ba72..707b2cb3 100644
--- a/kexi/plugins/macros/kexipart/keximacroerrorbase.ui
+++ b/kexi/plugins/macros/kexipart/keximacroerrorbase.ui
@@ -93,7 +93,7 @@
                         </widget>
                     </hbox>
                 </widget>
-                <widget class="KListView">
+                <widget class="TDEListView">
                     <column>
                         <property name="text">
                             <string>No</string>
diff --git a/kexi/plugins/macros/kexipart/keximacropart.h b/kexi/plugins/macros/kexipart/keximacropart.h
index f8109364..197676e9 100644
--- a/kexi/plugins/macros/kexipart/keximacropart.h
+++ b/kexi/plugins/macros/kexipart/keximacropart.h
@@ -50,7 +50,7 @@ class KexiMacroPart : public KexiPart::Part
 
 		/**
 		* Implementation of the KexiPart::Part::action method used to
-		* provide scripts as KAction's to the outside world.
+		* provide scripts as TDEAction's to the outside world.
 		*/
 		virtual bool execute(KexiPart::Item* item, TQObject* sender = 0);
 
diff --git a/kexi/plugins/macros/lib/action.h b/kexi/plugins/macros/lib/action.h
index c779f21a..0b19ef46 100644
--- a/kexi/plugins/macros/lib/action.h
+++ b/kexi/plugins/macros/lib/action.h
@@ -32,8 +32,8 @@
 namespace KoMacro {
 
 	/**
-	 * The Action class extendes KAction to implement some additional
-	 * functionality KAction doesn't provide.
+	 * The Action class extendes TDEAction to implement some additional
+	 * functionality TDEAction doesn't provide.
 	 */
 	class KOMACRO_EXPORT Action
 		: public TQObject // TQt functionality like signals and slots
diff --git a/kexi/plugins/macros/lib/manager.h b/kexi/plugins/macros/lib/manager.h
index 5e3ce084..5abddeae 100644
--- a/kexi/plugins/macros/lib/manager.h
+++ b/kexi/plugins/macros/lib/manager.h
@@ -48,8 +48,8 @@ namespace KoMacro {
 	* // got published.
 	* class PublishedObject : public TQObject {};
 	*
-	* // Somewhere we have our KMainWindow.
-	* KMainWindow* mainwindow = new KMainWindow();
+	* // Somewhere we have our TDEMainWindow.
+	* TDEMainWindow* mainwindow = new TDEMainWindow();
 	*
 	* // Create a new KoMacro::Manager instance to access the
 	* // Macro-framework.