Rename a number of classes to enhance compatibility with KDE4

4 files changed, 10 insertions, 10 deletions

diff --git a/katapult/common/imagedisplaysettings.ui b/katapult/common/imagedisplaysettings.ui
index 3e77f36..30e5ef6 100644
--- a/katapult/common/imagedisplaysettings.ui
+++ b/katapult/common/imagedisplaysettings.ui
@@ -97,7 +97,7 @@
                                 </size>
                             </property>
                         </spacer>
-                        <widget class="KFontCombo">
+                        <widget class="TDEFontCombo">
                             <property name="name">
                                 <cstring>displayFont</cstring>
                             </property>
diff --git a/katapult/katapult/confcatalogs.ui b/katapult/katapult/confcatalogs.ui
index ba80655..92253a2 100644
--- a/katapult/katapult/confcatalogs.ui
+++ b/katapult/katapult/confcatalogs.ui
@@ -19,7 +19,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="KActionSelector">
+        <widget class="TDEActionSelector">
             <property name="name">
                 <cstring>catalogs</cstring>
             </property>
diff --git a/katapult/katapult/katapult.cpp b/katapult/katapult/katapult.cpp
index 1f5ae44..1d9bfc2 100644
--- a/katapult/katapult/katapult.cpp
+++ b/katapult/katapult/katapult.cpp
@@ -121,18 +121,18 @@ void Katapult::initAccel(TQWidget *parent)
 	globalAccel->readSettings();
 	globalAccel->updateConnections();
 	
-	actions = new KActionCollection(parent);
+	actions = new TDEActionCollection(parent);
 	actionCollection()->clear();
 	
 	contextMenu()->clear();
 	
-	new KAction(i18n("Execute"), "exec", Key_Return, TQT_TQOBJECT(this), TQT_SLOT(execute()), actions, "execute");
-	new KAction(i18n("Clear"), "editclear", Key_Left, TQT_TQOBJECT(this), TQT_SLOT(clearQuery()), actions, "clear");
-	new KAction(i18n("Close"), "fileclose", Key_Escape, TQT_TQOBJECT(this), TQT_SLOT(hideLauncher()), actions, "close");
-	new KAction(i18n("Complete Query"), "next", Key_Right, TQT_TQOBJECT(this), TQT_SLOT(completeQuery()), actions, "complete_query");
-	new KAction(i18n("Show Context Menu"), "menu", CTRL+Key_C, TQT_TQOBJECT(this), TQT_SLOT(showContextMenu()), actions, "show_menu");
+	new TDEAction(i18n("Execute"), "exec", Key_Return, TQT_TQOBJECT(this), TQT_SLOT(execute()), actions, "execute");
+	new TDEAction(i18n("Clear"), "editclear", Key_Left, TQT_TQOBJECT(this), TQT_SLOT(clearQuery()), actions, "clear");
+	new TDEAction(i18n("Close"), "fileclose", Key_Escape, TQT_TQOBJECT(this), TQT_SLOT(hideLauncher()), actions, "close");
+	new TDEAction(i18n("Complete Query"), "next", Key_Right, TQT_TQOBJECT(this), TQT_SLOT(completeQuery()), actions, "complete_query");
+	new TDEAction(i18n("Show Context Menu"), "menu", CTRL+Key_C, TQT_TQOBJECT(this), TQT_SLOT(showContextMenu()), actions, "show_menu");
 	
-	KAction *actGlobAccel = KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(showGlobalShortcutsDialog()), actions);
+	TDEAction *actGlobAccel = KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(showGlobalShortcutsDialog()), actions);
 	actGlobAccel->setText(i18n("Configure &Global Shortcuts..."));
 	actGlobAccel->plug((TQWidget *) contextMenu());
 	
diff --git a/katapult/katapult/katapult.h b/katapult/katapult/katapult.h
index fd39057..be4318b 100644
--- a/katapult/katapult/katapult.h
+++ b/katapult/katapult/katapult.h
@@ -82,7 +82,7 @@ private:
 	int allStatus;
 	KatapultDisplay *display;
 	TDEGlobalAccel *globalAccel;
-	KActionCollection *actions;
+	TDEActionCollection *actions;
 	KatapultSettings *settings;
 	Match bestMatch;
 	const KatapultAction *action;