Rename a number of classes to enhance compatibility with KDE4

src/toplevel.cpp

@@ -66,18 +66,18 @@ TopLevel::TopLevel() : KSystemTray(), ticketWatch(0), m_refreshTimer(0), notifyE
 	TDEConfig *config = kapp->config();
 	config->setGroup("Kerberos");
 
-	getNewTGTAct = new KAction(i18n("&Obtain New Ticket Granting Ticket"), "add_user", 0, TQT_TQOBJECT(this), TQT_SLOT(getNewTGT()), actionCollection(), "getnewtgt");
-	getNewSTAct = new KAction(i18n("&Obtain New Primary Service Ticket"), "add_user", 0, TQT_TQOBJECT(this), TQT_SLOT(getNewServiceTicket()), actionCollection(), "getnewserviceticket");
-	getNewStandardSTAct = new KAction(i18n("&Obtain Authenticated Service Ticket"), "add_user", 0, TQT_TQOBJECT(this), TQT_SLOT(getNewServiceTicketWithExistingCreds()), actionCollection(), "getstandardserviceticket");
-	destroyAllAct = new KAction(i18n("&Destroy All Tickets"), "delete_user", 0, TQT_TQOBJECT(this), TQT_SLOT(destroyAllTickets()), actionCollection(), "destroyall");
-	confAct = new KAction(i18n("&Configure..."), "configure", 0, TQT_TQOBJECT(this), TQT_SLOT(config()), actionCollection(), "configure");
+	getNewTGTAct = new TDEAction(i18n("&Obtain New Ticket Granting Ticket"), "add_user", 0, TQT_TQOBJECT(this), TQT_SLOT(getNewTGT()), actionCollection(), "getnewtgt");
+	getNewSTAct = new TDEAction(i18n("&Obtain New Primary Service Ticket"), "add_user", 0, TQT_TQOBJECT(this), TQT_SLOT(getNewServiceTicket()), actionCollection(), "getnewserviceticket");
+	getNewStandardSTAct = new TDEAction(i18n("&Obtain Authenticated Service Ticket"), "add_user", 0, TQT_TQOBJECT(this), TQT_SLOT(getNewServiceTicketWithExistingCreds()), actionCollection(), "getstandardserviceticket");
+	destroyAllAct = new TDEAction(i18n("&Destroy All Tickets"), "delete_user", 0, TQT_TQOBJECT(this), TQT_SLOT(destroyAllTickets()), actionCollection(), "destroyall");
+	confAct = new TDEAction(i18n("&Configure..."), "configure", 0, TQT_TQOBJECT(this), TQT_SLOT(config()), actionCollection(), "configure");
 
 	// create app menu (displayed on right-click)
 	menu = new TQPopupMenu();
 	connect(menu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(menuAction(int)));
 
 	KHelpMenu* help = new KHelpMenu(this, TDEGlobal::instance()->aboutData(), false);
-	KPopupMenu* helpMnu = help->menu();
+	TDEPopupMenu* helpMnu = help->menu();
 
 	menu->insertSeparator();
 	getNewTGTAct->plug(menu);

src/toplevel.h

@@ -36,7 +36,7 @@
 
 #include <libtdeldap.h>
 
-class KAction;
+class TDEAction;
 class KDialogBase;
 class TQCheckBox;
 class TimeEdit;
@@ -81,11 +81,11 @@ private:
 	TQPixmap partiallyExpiredTicketsPixmap;
 	TQPixmap timerOverlayPixmap;
 	TQPixmap warningOverlayPixmap;
-	KAction *confAct;
-	KAction *getNewTGTAct;
-	KAction *getNewSTAct;
-	KAction *getNewStandardSTAct;
-	KAction *destroyAllAct;
+	TDEAction *confAct;
+	TDEAction *getNewTGTAct;
+	TDEAction *getNewSTAct;
+	TDEAction *getNewStandardSTAct;
+	TDEAction *destroyAllAct;
 	TQPopupMenu *menu;
 	TQString lastTip;
 	KerberosTicketInfoList m_ticketList;