Rename a number of classes to enhance compatibility with KDE4

7 files changed, 26 insertions, 26 deletions

diff --git a/kcalc/ChangeLog b/kcalc/ChangeLog
index 4e96f0c..89d8e23 100644
--- a/kcalc/ChangeLog
+++ b/kcalc/ChangeLog
@@ -239,7 +239,7 @@
 	* Caption is set via signal/slots
 	* Fixed "%"-mode to make it again more conformant with documentation.
 	  "x^y%" does still not work. Did it ever?
-	* Number-keys are now handled by KAccel instead of keyPressEvent
+	* Number-keys are now handled by TDEAccel instead of keyPressEvent
 	* ConfigDialog is modal
 
 2003-08-27 Klaus Niederkrüger <kniederk@math.uni-koeln.de>
diff --git a/kcalc/dlabel.cpp b/kcalc/dlabel.cpp
index 157a387..f2e476c 100644
--- a/kcalc/dlabel.cpp
+++ b/kcalc/dlabel.cpp
@@ -35,7 +35,7 @@
 
 
 DispLogic::DispLogic(TQWidget *parent, const char *name,
-		     KActionCollection *coll)
+		     TDEActionCollection *coll)
   :KCalcDisplay(parent,name), _history_index(0)
 {
 	KNumber::setDefaultFloatOutput(true);
diff --git a/kcalc/dlabel.h b/kcalc/dlabel.h
index 9656dc5..fe226b5 100644
--- a/kcalc/dlabel.h
+++ b/kcalc/dlabel.h
@@ -32,8 +32,8 @@
 #include "kcalcdisplay.h"
 
 class CalcEngine;
-class KAction;
-class KActionCollection;
+class TDEAction;
+class TDEActionCollection;
 
 class DispLogic : public KCalcDisplay
 {
@@ -42,7 +42,7 @@ Q_OBJECT
 
 public:
 	DispLogic(TQWidget *parent, const char *name,
-		  KActionCollection *coll);
+		  TDEActionCollection *coll);
 	~DispLogic();
 
 	void changeSettings();
@@ -58,8 +58,8 @@ private:
 	TQValueVector<KNumber> _history_list;
 	int _history_index;
 
-	KAction *_forward;
-	KAction *_back;
+	TDEAction *_forward;
+	TDEAction *_back;
 };
 
 #endif
diff --git a/kcalc/kcalc.cpp b/kcalc/kcalc.cpp
index 7d84ecb..b18882d 100644
--- a/kcalc/kcalc.cpp
+++ b/kcalc/kcalc.cpp
@@ -79,14 +79,14 @@ static const char version[] = KCALCVERSION;
 
 
 KCalculator::KCalculator(TQWidget *parent, const char *name)
-	: KMainWindow(parent, name), inverse(false),
+	: TDEMainWindow(parent, name), inverse(false),
 	  hyp_mode(false), memory_num(0.0), calc_display(NULL),
 	  mInternalSpacing(4), core()
 {
 	/* central widget to contain all the elements */
 	TQWidget *central = new TQWidget(this);
 	setCentralWidget(central);
-	KAcceleratorManager::setNoAccel( central );
+	TDEAcceleratorManager::setNoAccel( central );
 
 	// Detect color change
 	connect(kapp,TQT_SIGNAL(kdisplayPaletteChanged()), TQT_SLOT(set_colors()));
@@ -132,7 +132,7 @@ KCalculator::KCalculator(TQWidget *parent, const char *name)
 	TQToolTip::add(pbAngleChoose, i18n("Choose the unit for the angle measure"));
 	pbAngleChoose->setAutoDefault(false);
 
-	KPopupMenu *angle_menu = new KPopupMenu(pbAngleChoose, "AngleMode-Selection-Menu");
+	TDEPopupMenu *angle_menu = new TDEPopupMenu(pbAngleChoose, "AngleMode-Selection-Menu");
 	angle_menu->insertItem(i18n("Degrees"), 0);
 	angle_menu->insertItem(i18n("Radians"), 1);
 	angle_menu->insertItem(i18n("Gradians"), 2);
@@ -417,35 +417,35 @@ void KCalculator::setupMainActions(void)
 	KStdAction::paste(TQT_TQOBJECT(calc_display), TQT_SLOT(slotPaste()), actionCollection());
 
 	// settings menu
-	actionStatshow =  new KToggleAction(i18n("&Statistic Buttons"), 0,
+	actionStatshow =  new TDEToggleAction(i18n("&Statistic Buttons"), 0,
 					    actionCollection(), "show_stat");
 	actionStatshow->setChecked(true);
 	connect(actionStatshow, TQT_SIGNAL(toggled(bool)),
 		TQT_SLOT(slotStatshow(bool)));
 
-	actionScientificshow = new KToggleAction(i18n("Science/&Engineering Buttons"),
+	actionScientificshow = new TDEToggleAction(i18n("Science/&Engineering Buttons"),
 						 0, actionCollection(), "show_science");
 	actionScientificshow->setChecked(true);
 	connect(actionScientificshow, TQT_SIGNAL(toggled(bool)),
 		TQT_SLOT(slotScientificshow(bool)));
 
-	actionLogicshow = new KToggleAction(i18n("&Logic Buttons"), 0,
+	actionLogicshow = new TDEToggleAction(i18n("&Logic Buttons"), 0,
 					    actionCollection(), "show_logic");
 	actionLogicshow->setChecked(true);
 	connect(actionLogicshow, TQT_SIGNAL(toggled(bool)),
 		TQT_SLOT(slotLogicshow(bool)));
 
-	actionConstantsShow = new KToggleAction(i18n("&Constants Buttons"), 0,
+	actionConstantsShow = new TDEToggleAction(i18n("&Constants Buttons"), 0,
 						actionCollection(), "show_constants");
 	actionConstantsShow->setChecked(true);
 	connect(actionConstantsShow, TQT_SIGNAL(toggled(bool)),
 		TQT_SLOT(slotConstantsShow(bool)));
 
 
-	(void) new KAction(i18n("&Show All"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotShowAll()),
+	(void) new TDEAction(i18n("&Show All"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotShowAll()),
 			   actionCollection(), "show_all");
 
-	(void) new KAction(i18n("&Hide All"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotHideAll()),
+	(void) new TDEAction(i18n("&Hide All"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotHideAll()),
 			   actionCollection(), "hide_all");
 
 	KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(showSettings()), actionCollection());
@@ -1825,8 +1825,8 @@ void KCalculator::showSettings()
 
 	TQWidget *fontWidget = new TQWidget(0,"Font");
 	TQVBoxLayout *fontLayout = new TQVBoxLayout(fontWidget);
-	KFontChooser *mFontChooser =
-		new KFontChooser(fontWidget, "kcfg_Font", false, TQStringList(), false, 6);
+	TDEFontChooser *mFontChooser =
+		new TDEFontChooser(fontWidget, "kcfg_Font", false, TQStringList(), false, 6);
 
 	fontLayout->addWidget(mFontChooser);
 	dialog->addPage(fontWidget, i18n("Font"), "fonts", i18n("Select Display Font"));
@@ -2253,7 +2253,7 @@ bool KCalculator::eventFilter(TQObject *o, TQEvent *e)
 	}
 	else
 	{
-		return KMainWindow::eventFilter(o, e);
+		return TDEMainWindow::eventFilter(o, e);
 	}
 }
 
diff --git a/kcalc/kcalc.h b/kcalc/kcalc.h
index ab0acec..d19e141 100644
--- a/kcalc/kcalc.h
+++ b/kcalc/kcalc.h
@@ -58,7 +58,7 @@ class Constants;
 #include "kcalc_button.h"
 #include "kcalc_const_button.h"
 
-class KCalculator : public KMainWindow
+class KCalculator : public TDEMainWindow
 {
     Q_OBJECT
   
@@ -222,10 +222,10 @@ private:
     // ConstButtonGroup C1-C6
     TQButtonGroup*	ConstButtonGroup;
 
-    KToggleAction *actionStatshow;
-    KToggleAction *actionScientificshow;
-    KToggleAction *actionLogicshow;
-    KToggleAction *actionConstantsShow;
+    TDEToggleAction *actionStatshow;
+    TDEToggleAction *actionScientificshow;
+    TDEToggleAction *actionLogicshow;
+    TDEToggleAction *actionConstantsShow;
 
     TQPtrList<KCalcButton> mFunctionButtonList;
     TQPtrList<KCalcButton> mStatButtonList;
diff --git a/kcalc/kcalc_const_button.cpp b/kcalc/kcalc_const_button.cpp
index 071bb71..8294526 100644
--- a/kcalc/kcalc_const_button.cpp
+++ b/kcalc/kcalc_const_button.cpp
@@ -70,7 +70,7 @@ void KCalcConstButton::initPopupMenu(void)
 {
   KCalcConstMenu *tmp_menu = new KCalcConstMenu(this);
   
-  _popup = new KPopupMenu(this, "set const-cutton");
+  _popup = new TDEPopupMenu(this, "set const-cutton");
   _popup->insertItem(i18n("Set Name"), 0);
   _popup->insertItem(i18n("Choose From List"), tmp_menu, 1);
   
diff --git a/kcalc/kcalc_const_button.h b/kcalc/kcalc_const_button.h
index f557c61..a30b657 100644
--- a/kcalc/kcalc_const_button.h
+++ b/kcalc/kcalc_const_button.h
@@ -51,7 +51,7 @@ Q_OBJECT
   private:
   void initPopupMenu(void);
   
-  KPopupMenu* _popup;
+  TDEPopupMenu* _popup;
   int _button_num;
 };