Rename a number of classes to enhance compatibility with KDE4

3 files changed, 29 insertions, 29 deletions

diff --git a/kformula/DESIGN b/kformula/DESIGN
index eec70869..f9e3d55d 100644
--- a/kformula/DESIGN
+++ b/kformula/DESIGN
@@ -241,7 +241,7 @@ Your only need to choose one of them to get a reasonable good look.
 Interface templates 
 ###################
 
-Decide what KAction have to be toolbars,
+Decide what TDEAction have to be toolbars,
 what element templates must be loaded, what toolbar display....
 There will be predefined (sorry for the spelling error) templates for 
 -General...
diff --git a/kformula/kformula_view.cc b/kformula/kformula_view.cc
index 7dbabc00..4433ddd7 100644
--- a/kformula/kformula_view.cc
+++ b/kformula/kformula_view.cc
@@ -107,37 +107,37 @@ KFormulaPartView::KFormulaPartView(KFormulaDoc* _doc, TQWidget* _parent, const c
     KStdAction::preferences( TQT_TQOBJECT(this), TQT_SLOT(configure()), actionCollection(), "configure" );
 
     // font stuff
-//     KFontAction* actionElement_Text_Font = new KFontAction(i18n( "Font Family" ),0,
+//     TDEFontAction* actionElement_Text_Font = new TDEFontAction(i18n( "Font Family" ),0,
 //                                               actionCollection(),"textfont");
 //     connect( actionElement_Text_Font, TQT_SIGNAL( activated( const TQString& ) ), TQT_TQOBJECT(this), TQT_SLOT( fontSelected( const TQString& ) ) );
 
-    KFontSizeAction* actionTextSize = new KFontSizeAction(i18n( "Size" ),0,
+    TDEFontSizeAction* actionTextSize = new TDEFontSizeAction(i18n( "Size" ),0,
                                                           actionCollection(),"formula_textsize");
     actionTextSize->setFontSize( m_pDoc->getFormula()->fontSize() );
 
     connect( actionTextSize, TQT_SIGNAL( fontSizeChanged( int ) ), TQT_TQOBJECT(this), TQT_SLOT( sizeSelected( int ) ) );
     connect( formula, TQT_SIGNAL( baseSizeChanged( int ) ), actionTextSize, TQT_SLOT( setFontSize( int ) ) );
 
-//     KToggleAction* actionElement_Text_Bold = new KToggleAction(i18n( "Bold" ),
+//     TDEToggleAction* actionElement_Text_Bold = new TDEToggleAction(i18n( "Bold" ),
 //                                                   "bold",
 //                                                   0,
 //                                                   actionCollection(),"textbold");
 //     connect( actionElement_Text_Bold, TQT_SIGNAL( toggled( bool ) ), TQT_TQOBJECT(this), TQT_SLOT( bold( bool ) ) );
 
-//     KToggleAction* actionElement_Text_Italic = new KToggleAction(i18n( "Italic" ),
+//     TDEToggleAction* actionElement_Text_Italic = new TDEToggleAction(i18n( "Italic" ),
 //                                                    "italic",
 //                                                    0,
 //                                                    actionCollection(),"textitalic");
 //     connect( actionElement_Text_Italic, TQT_SIGNAL( toggled( bool ) ), TQT_TQOBJECT(this), TQT_SLOT( italic( bool ) ) );
 
-//     KToggleAction* actionElement_Text_Under = new KToggleAction(i18n( "Underlined" ),
+//     TDEToggleAction* actionElement_Text_Under = new TDEToggleAction(i18n( "Underlined" ),
 //                                                   "underl",
 //                                                   0,
 //                                                   actionCollection(),"textunder");
 //     connect(actionElement_Text_Under, TQT_SIGNAL( toggled( bool ) ), TQT_TQOBJECT(this), TQT_SLOT( underline( bool ) ) );
 
 
-    formulaStringAction = new KAction( i18n( "Edit Formula String..." ),
+    formulaStringAction = new TDEAction( i18n( "Edit Formula String..." ),
                                        0,
                                        TQT_TQOBJECT(this), TQT_SLOT( formulaString() ),
                                        actionCollection(), "formula_formulastring" );
diff --git a/kformula/kformula_view.h b/kformula/kformula_view.h
index ff564ac0..a1e60861 100644
--- a/kformula/kformula_view.h
+++ b/kformula/kformula_view.h
@@ -21,11 +21,11 @@
 #ifndef __kformula_view_h__
 #define __kformula_view_h__
 
-class KAction;
+class TDEAction;
 class KFormulaDoc;
 class KFormulaPartView;
 class KFormulaWidget;
-class KSelectAction;
+class TDESelectAction;
 class TQPaintEvent;
 class TQScrollView;
 class DCOPObject;
@@ -91,26 +91,26 @@ private:
     KFormulaWidget* formulaWidget;
     TQScrollView* scrollview;
 
-    KAction* cutAction;
-    KAction* copyAction;
-    KAction* pasteAction;
-
-    KAction* addBracketAction;
-    KAction* addFractionAction;
-    KAction* addRootAction;
-    KAction* addSumAction;
-    KAction* addProductAction;
-    KAction* addIntegralAction;
-    KAction* addMatrixAction;
-    KAction* addUpperLeftAction;
-    KAction* addLowerLeftAction;
-    KAction* addUpperRightAction;
-    KAction* addLowerRightAction;
-    KAction* addGenericUpperAction;
-    KAction* addGenericLowerAction;
-    KAction* removeEnclosingAction;
-
-    KAction* formulaStringAction;
+    TDEAction* cutAction;
+    TDEAction* copyAction;
+    TDEAction* pasteAction;
+
+    TDEAction* addBracketAction;
+    TDEAction* addFractionAction;
+    TDEAction* addRootAction;
+    TDEAction* addSumAction;
+    TDEAction* addProductAction;
+    TDEAction* addIntegralAction;
+    TDEAction* addMatrixAction;
+    TDEAction* addUpperLeftAction;
+    TDEAction* addLowerLeftAction;
+    TDEAction* addUpperRightAction;
+    TDEAction* addLowerRightAction;
+    TDEAction* addGenericUpperAction;
+    TDEAction* addGenericLowerAction;
+    TDEAction* removeEnclosingAction;
+
+    TDEAction* formulaStringAction;
 
     static bool first_window;