1 files changed, 15 insertions, 15 deletions

diff --git a/clients/tde/src/app/remotemdi.cpp b/clients/tde/src/app/remotemdi.cpp
index 32043c2..7630c66 100644
--- a/clients/tde/src/app/remotemdi.cpp
+++ b/clients/tde/src/app/remotemdi.cpp
@@ -11,7 +11,7 @@ using namespace std;
 #include <kapplication.h>
 #include <klocale.h>
 #include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kmessagebox.h>
 
 #include <tqlabel.h>
@@ -20,9 +20,9 @@ using namespace std;
 #include <kiconloader.h>
 #include <kstdaction.h>
 #include <kstatusbar.h>
-#include <kmdichildview.h>
-#include <klistbox.h>
-#include <kactionclasses.h>
+#include <tdemdichildview.h>
+#include <tdelistbox.h>
+#include <tdeactionclasses.h>
 #include <kedittoolbar.h>
 #include <kkeydialog.h>
 
@@ -44,13 +44,13 @@ RemoteMDI::RemoteMDI()
 	KStdAction::close(this, SLOT(closeCurrent()), actionCollection());
 	KStdAction::quit(this, SLOT(close()), actionCollection());
 
-	KActionCollection *const ac = actionCollection();
+	TDEActionCollection *const ac = actionCollection();
 	setStandardToolBarMenuEnabled(true);
 	KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), ac);
 	KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(configToolbars()), ac);
 	KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(configKeys()), ac);
-	connect_action = new KAction(i18n("Connect to Server"), "connect_creating", KShortcut(), TQT_TQOBJECT(this), TQT_SLOT(connectToServer()), ac, "connect_server");
-	disconnect_action = new KAction(i18n("Disconnect from Server"), "connect_no", KShortcut(), TQT_TQOBJECT(this), TQT_SLOT(disconnectFromServer()), ac, "disconnect_server");
+	connect_action = new TDEAction(i18n("Connect to Server"), "connect_creating", TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(connectToServer()), ac, "connect_server");
+	disconnect_action = new TDEAction(i18n("Disconnect from Server"), "connect_no", TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(disconnectFromServer()), ac, "disconnect_server");
 
 	setMenuForSDIModeSysButtons(menuBar());
 
@@ -140,13 +140,13 @@ void RemoteMDI::resizeEvent(TQResizeEvent *e) {
 
 void RemoteMDI::processActions() {
 	// Add dynamic actions
-	KActionCollection *const ac = actionCollection();
+	TDEActionCollection *const ac = actionCollection();
 
-	KAction* action;
+	TDEAction* action;
 	ServiceType st;
 	for (ServiceList::Iterator it(m_activeStation.services.begin()); it != m_activeStation.services.end(); ++it) {
 		st = *it;
-		action = new KAction(i18n("Launch")+" "+st.name, st.clientLibrary, KShortcut(), TQT_TQOBJECT(this), TQT_SLOT(startModule()), ac, st.clientLibrary.ascii());
+		action = new TDEAction(i18n("Launch")+" "+st.name, st.clientLibrary, TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(startModule()), ac, st.clientLibrary.ascii());
 		m_instrumentActionList.append(action);
 	}
 	plugActionList("instrumentMenu_actionlist", m_instrumentActionList);
@@ -154,7 +154,7 @@ void RemoteMDI::processActions() {
 }
 
 void RemoteMDI::startModule() {
-	const KAction* sendingAction = dynamic_cast<const KAction*>(sender());
+	const TDEAction* sendingAction = dynamic_cast<const TDEAction*>(sender());
 	if (sendingAction) {
 		bool serviceFound = false;
 		ServiceType st;
@@ -175,7 +175,7 @@ void RemoteMDI::startModule() {
 		view->setName(st.clientLibrary.ascii());
 		connect(view, SIGNAL(statusMessageSet(const TQString&)), this, SLOT(updateStatusBarWindowMessage(const TQString&)));
 		if (st.singleInstance) {
-			const_cast<KAction*>(sendingAction)->setEnabled(false);
+			const_cast<TDEAction*>(sendingAction)->setEnabled(false);
 		}
 		openNewWindow(view);
 		showViewTaskBar();
@@ -467,7 +467,7 @@ void RemoteMDI::processLockouts() {
 	connect_action->setEnabled(!connected);
 	disconnect_action->setEnabled(connected);
 
-	for (TQPtrList<KAction>::Iterator it(m_instrumentActionList.begin()); it != m_instrumentActionList.end(); ++it) {
+	for (TQPtrList<TDEAction>::Iterator it(m_instrumentActionList.begin()); it != m_instrumentActionList.end(); ++it) {
 		(*it)->setEnabled(connected);
 	}
 
@@ -588,7 +588,7 @@ void RemoteMDI::childClosed(KMdiChildView * w) {
 	RemoteLab::InstrumentView* view = dynamic_cast<RemoteLab::InstrumentView*>(w);
 	if (view) {
 		TQString libraryName = view->name();
-		for (TQPtrList<KAction>::Iterator it(m_instrumentActionList.begin()); it != m_instrumentActionList.end(); ++it) {
+		for (TQPtrList<TDEAction>::Iterator it(m_instrumentActionList.begin()); it != m_instrumentActionList.end(); ++it) {
 			if ((*it)->name() == libraryName) {
 				(*it)->setEnabled(true);
 			}
@@ -619,7 +619,7 @@ bool RemoteMDI::queryClose() {
 
 	// Save current MDI settings (window positions, etc.)
 	// FIXME
-	KConfig *c = kapp->config();
+	TDEConfig *c = kapp->config();
 
 	c->sync();