1 files changed, 23 insertions, 23 deletions

diff --git a/kshutdownlockout/lockout.cpp b/kshutdownlockout/lockout.cpp
index af336ea..201ecd7 100644
--- a/kshutdownlockout/lockout.cpp
+++ b/kshutdownlockout/lockout.cpp
@@ -38,13 +38,13 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <ntqtooltip.h>
 
 #include <dcopclient.h>
-#include <kaction.h>
-#include <kapplication.h>
-#include <kglobal.h>
+#include <tdeaction.h>
+#include <tdeapplication.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
-#include <klocale.h>
-#include <kmessagebox.h>
-#include <kpopupmenu.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
+#include <tdepopupmenu.h>
 #include <kprocess.h>
 #include <krun.h>
 
@@ -60,7 +60,7 @@ extern "C"
 	KDE_EXPORT KPanelApplet *init(TQWidget *parent, const TQString& configFile)
 	{
 		// share i18n with KShutDown
-		KGlobal::locale()->insertCatalogue("kshutdown");
+		TDEGlobal::locale()->insertCatalogue("kshutdown");
 
 		return new Lockout(configFile, parent);
 	}
@@ -82,7 +82,7 @@ Lockout::Lockout(const TQString& configFile, TQWidget *parent)
 
 	initActions();
 
-	KPopupMenu *pm_actions = new KPopupMenu(this);
+	TDEPopupMenu *pm_actions = new TDEPopupMenu(this);
 	pm_actions->insertTitle(SmallIcon("messagebox_warning"), i18n("No Delay"));
 	_shutDownAction->plug(pm_actions);
 	_rebootAction->plug(pm_actions);
@@ -105,7 +105,7 @@ Lockout::Lockout(const TQString& configFile, TQWidget *parent)
 	layout->addWidget(button);
 
 /*	// read configuration
-	KConfig *config = this->config();
+	TDEConfig *config = this->config();
 	config->setGroup("kshutdownlockout");
 	_transparent = config->readBoolEntry("Transparent", true);
 */
@@ -124,7 +124,7 @@ Lockout::Lockout(const TQString& configFile, TQWidget *parent)
 
 Lockout::~Lockout()
 {
-	KGlobal::locale()->removeCatalogue("kshutdown");
+	TDEGlobal::locale()->removeCatalogue("kshutdown");
 }
 
 int Lockout::heightForWidth(int/* width*/) const
@@ -143,7 +143,7 @@ void Lockout::callKShutDown(const TQCString &function) {
 	DCOPClient *client = kapp->dcopClient();
 	if (!client->isApplicationRegistered("kshutdown")) {
 		// run KShutDown
-		KProcess *p = new KProcess();
+		TDEProcess *p = new TDEProcess();
 		if (!p) {
 			KMessageBox::error(0, i18n("Could not run KShutDown!"));
 
@@ -151,7 +151,7 @@ void Lockout::callKShutDown(const TQCString &function) {
 		}
 		*p << "kshutdown";
 		*p << "--init";
-		if (!p->start(KProcess::Block))
+		if (!p->start(TDEProcess::Block))
 			KMessageBox::error(0, i18n("Could not run KShutDown!"));
 		delete p;
 	}
@@ -159,36 +159,36 @@ void Lockout::callKShutDown(const TQCString &function) {
 }
 
 void Lockout::initActions() {
-	KActionCollection *ac_shutDown = new KActionCollection(this, this);
+	TDEActionCollection *ac_shutDown = new TDEActionCollection(this, this);
 
-	_lockScreenAction = new KAction(
-		i18n("Lock Screen"), "lock", KShortcut(),
+	_lockScreenAction = new TDEAction(
+		i18n("Lock Screen"), "lock", TDEShortcut(),
 		this, SLOT(slotLockScreen()),
 		ac_shutDown, "kshutdown_lockscreen"
 	);
 
-	_logoutAction = new KAction(
-		i18n("End Current Session"), "undo", KShortcut(),
+	_logoutAction = new TDEAction(
+		i18n("End Current Session"), "undo", TDEShortcut(),
 		this, SLOT(slotLogout()),
 		ac_shutDown, "kshutdown_logout"
 	);
 
-	_rebootAction = new KAction(
-		i18n("Restart Computer"), "reload", KShortcut(),
+	_rebootAction = new TDEAction(
+		i18n("Restart Computer"), "reload", TDEShortcut(),
 		this, SLOT(slotReboot()),
 		ac_shutDown, "kshutdown_reboot"
 	);
 
-	_shutDownAction = new KAction(
-		i18n("Turn Off Computer"), "exit", KShortcut(),
+	_shutDownAction = new TDEAction(
+		i18n("Turn Off Computer"), "exit", TDEShortcut(),
 		this, SLOT(slotShutDown()),
 		ac_shutDown, "kshutdown_shutdown"
 	);
 
 	// standard actions
 
-	_configureKShutDownAction = new KAction(
-		i18n("&Configure KShutDown..."), "configure", KShortcut(),
+	_configureKShutDownAction = new TDEAction(
+		i18n("&Configure KShutDown..."), "configure", TDEShortcut(),
 		this, SLOT(slotConfigureKShutDown()),
 		ac_shutDown, "options_configure"
 	);