Rename a number of classes to enhance compatibility with KDE4

4 files changed, 11 insertions, 11 deletions

diff --git a/kteatime/ChangeLog b/kteatime/ChangeLog
index 6baec9f..e47bf9c 100644
--- a/kteatime/ChangeLog
+++ b/kteatime/ChangeLog
@@ -46,7 +46,7 @@
 	- don't display ticks in left-click menu
 
 2003-02-15  Martin Willers <willers@xm-arts.de>
-	- using KActions for start, stop, and configure entries
+	- using TDEActions for start, stop, and configure entries
 	- display list of configured teas on left-click,
 	  making one-click starting of a new tea possible
 	- some cleanups
diff --git a/kteatime/TODO b/kteatime/TODO
index b53dea2..b1b096d 100644
--- a/kteatime/TODO
+++ b/kteatime/TODO
@@ -18,7 +18,7 @@
 - KNotifyClient: passive popup cannot(?) have no timeout
   (--> hence no replacement for my own "Popup" action)
 - when steeping, display "stop <teaname>" on left-click, not just "stop"
-  (not easy when using KAction in a simple way?)
+  (not easy when using TDEAction in a simple way?)
 - use QMovie for tea-is-finished-icon instead of two alternating pixmaps?
 
 
@@ -31,7 +31,7 @@ internals:
   (or at least: x-maximize QListView's titles)
 - somehow make double-click with left button start 'current' tea
   without displaying start_menu?
-- figure out how to use KAction for "quit"-entry of menu
+- figure out how to use TDEAction for "quit"-entry of menu
   (somehow doesn't work as expected..)
 - some more tidying of configure-dialog
   (eg. initial position!, initial size)
diff --git a/kteatime/toplevel.cpp b/kteatime/toplevel.cpp
index 0619994..f73209f 100644
--- a/kteatime/toplevel.cpp
+++ b/kteatime/toplevel.cpp
@@ -117,15 +117,15 @@ TopLevel::TopLevel() : KSystemTray()
 	listempty = (teas.count() == 0);
 
 
-	startAct = new KAction(i18n("&Start"), "1rightarrow", 0,
+	startAct = new TDEAction(i18n("&Start"), "1rightarrow", 0,
 	                       TQT_TQOBJECT(this), TQT_SLOT(start()), actionCollection(), "start");
-	stopAct = new KAction(i18n("Sto&p"), "cancel", 0,
+	stopAct = new TDEAction(i18n("Sto&p"), "cancel", 0,
 	                      TQT_TQOBJECT(this), TQT_SLOT(stop()), actionCollection(), "stop");
-	confAct = new KAction(i18n("&Configure..."), "configure", 0,
+	confAct = new TDEAction(i18n("&Configure..."), "configure", 0,
 	                      TQT_TQOBJECT(this), TQT_SLOT(config()), actionCollection(), "configure");
-	anonAct = new KAction(i18n("&Anonymous..."), 0, 0,
+	anonAct = new TDEAction(i18n("&Anonymous..."), 0, 0,
 	                      TQT_TQOBJECT(this), TQT_SLOT(anonymous()), actionCollection(), "anonymous");
-//	KAction *quitAct = actionCollection()->action("file_quit");
+//	TDEAction *quitAct = actionCollection()->action("file_quit");
 
 	// create app menu (displayed on right-click)
 	menu = new TQPopupMenu();
@@ -140,7 +140,7 @@ TopLevel::TopLevel() : KSystemTray()
 	rebuildTeaMenus();      // populate tops of menus with tea-entries from config
 
 	KHelpMenu* help = new KHelpMenu(this, TDEGlobal::instance()->aboutData(), false);
-	KPopupMenu* helpMnu = help->menu();
+	TDEPopupMenu* helpMnu = help->menu();
 
 	start_menu->insertSeparator();
 	anonAct->plug(start_menu);
diff --git a/kteatime/toplevel.h b/kteatime/toplevel.h
index 1daaecb..a67c51d 100644
--- a/kteatime/toplevel.h
+++ b/kteatime/toplevel.h
@@ -35,7 +35,7 @@
 #include <ksystemtray.h>
 #include <tqpixmap.h>
 
-class KAction;
+class TDEAction;
 class KDialogBase;
 class TQCheckBox;
 class TimeEdit;
@@ -109,7 +109,7 @@ private:
 
 	TQPixmap mugPixmap, teaNotReadyPixmap, teaAnim1Pixmap, teaAnim2Pixmap;
 
-	KAction *startAct, *stopAct, *confAct, *anonAct;
+	TDEAction *startAct, *stopAct, *confAct, *anonAct;
 	TQPopupMenu *menu, *steeping_menu, *start_menu;
 	TQListView *listbox;
 	TQLineEdit *nameEdit, *actionEdit;