Rename a number of classes to enhance compatibility with KDE4

1 files changed, 88 insertions, 88 deletions

diff --git a/lib/kformula/kformuladocument.h b/lib/kformula/kformuladocument.h
index d541a4c5..8a3dd77d 100644
--- a/lib/kformula/kformuladocument.h
+++ b/lib/kformula/kformuladocument.h
@@ -296,7 +296,7 @@ class KOFORMULA_EXPORT DocumentWrapper : public TQObject {
 public:
 
     DocumentWrapper( TDEConfig* config,
-                     KActionCollection* collection,
+                     TDEActionCollection* collection,
                      KoCommandHistory* history = 0 );
     ~DocumentWrapper();
 
@@ -319,53 +319,53 @@ public:
      */
     void document( Document* document, bool init = true );
 
-    KAction* getAddNegThinSpaceAction()  { return m_addNegThinSpaceAction; }
-    KAction* getAddThinSpaceAction()     { return m_addThinSpaceAction; }
-    KAction* getAddMediumSpaceAction()   { return m_addMediumSpaceAction; }
-    KAction* getAddThickSpaceAction()    { return m_addThickSpaceAction; }
-    KAction* getAddQuadSpaceAction()     { return m_addQuadSpaceAction; }
-    KAction* getAddBracketAction()       { return m_addBracketAction; }
-    KAction* getAddSBracketAction()      { return m_addSBracketAction;}
-    KAction* getAddCBracketAction()      { return m_addCBracketAction;}
-    KAction* getAddAbsAction()           { return m_addAbsAction;}
-    KAction* getAddFractionAction()      { return m_addFractionAction; }
-    KAction* getAddRootAction()          { return m_addRootAction; }
-    KAction* getAddSumAction()           { return m_addSumAction; }
-    KAction* getAddProductAction()       { return m_addProductAction; }
-    KAction* getAddIntegralAction()      { return m_addIntegralAction; }
-    KAction* getAddMatrixAction()        { return m_addMatrixAction; }
-    KAction* getAddOneByTwoMatrixAction(){ return m_addOneByTwoMatrixAction; }
-    KAction* getAddUpperLeftAction()     { return m_addUpperLeftAction; }
-    KAction* getAddLowerLeftAction()     { return m_addLowerLeftAction; }
-    KAction* getAddUpperRightAction()    { return m_addUpperRightAction; }
-    KAction* getAddLowerRightAction()    { return m_addLowerRightAction; }
-    KAction* getAddGenericUpperAction()  { return m_addGenericUpperAction; }
-    KAction* getAddGenericLowerAction()  { return m_addGenericLowerAction; }
-    KAction* getAddOverlineAction()      { return m_addOverlineAction; }
-    KAction* getAddUnderlineAction()     { return m_addUnderlineAction; }
-    KAction* getAddMultilineAction()     { return m_addMultilineAction; }
-    KAction* getRemoveEnclosingAction()  { return m_removeEnclosingAction; }
-    KAction* getMakeGreekAction()        { return m_makeGreekAction; }
-    KAction* getInsertSymbolAction()     { return m_insertSymbolAction; }
-
-    KAction* getAppendColumnAction()     { return m_appendColumnAction; }
-    KAction* getInsertColumnAction()     { return m_insertColumnAction; }
-    KAction* getRemoveColumnAction()     { return m_removeColumnAction; }
-    KAction* getAppendRowAction()        { return m_appendRowAction; }
-    KAction* getInsertRowAction()        { return m_insertRowAction; }
-    KAction* getRemoveRowAction()        { return m_removeRowAction; }
+    TDEAction* getAddNegThinSpaceAction()  { return m_addNegThinSpaceAction; }
+    TDEAction* getAddThinSpaceAction()     { return m_addThinSpaceAction; }
+    TDEAction* getAddMediumSpaceAction()   { return m_addMediumSpaceAction; }
+    TDEAction* getAddThickSpaceAction()    { return m_addThickSpaceAction; }
+    TDEAction* getAddQuadSpaceAction()     { return m_addQuadSpaceAction; }
+    TDEAction* getAddBracketAction()       { return m_addBracketAction; }
+    TDEAction* getAddSBracketAction()      { return m_addSBracketAction;}
+    TDEAction* getAddCBracketAction()      { return m_addCBracketAction;}
+    TDEAction* getAddAbsAction()           { return m_addAbsAction;}
+    TDEAction* getAddFractionAction()      { return m_addFractionAction; }
+    TDEAction* getAddRootAction()          { return m_addRootAction; }
+    TDEAction* getAddSumAction()           { return m_addSumAction; }
+    TDEAction* getAddProductAction()       { return m_addProductAction; }
+    TDEAction* getAddIntegralAction()      { return m_addIntegralAction; }
+    TDEAction* getAddMatrixAction()        { return m_addMatrixAction; }
+    TDEAction* getAddOneByTwoMatrixAction(){ return m_addOneByTwoMatrixAction; }
+    TDEAction* getAddUpperLeftAction()     { return m_addUpperLeftAction; }
+    TDEAction* getAddLowerLeftAction()     { return m_addLowerLeftAction; }
+    TDEAction* getAddUpperRightAction()    { return m_addUpperRightAction; }
+    TDEAction* getAddLowerRightAction()    { return m_addLowerRightAction; }
+    TDEAction* getAddGenericUpperAction()  { return m_addGenericUpperAction; }
+    TDEAction* getAddGenericLowerAction()  { return m_addGenericLowerAction; }
+    TDEAction* getAddOverlineAction()      { return m_addOverlineAction; }
+    TDEAction* getAddUnderlineAction()     { return m_addUnderlineAction; }
+    TDEAction* getAddMultilineAction()     { return m_addMultilineAction; }
+    TDEAction* getRemoveEnclosingAction()  { return m_removeEnclosingAction; }
+    TDEAction* getMakeGreekAction()        { return m_makeGreekAction; }
+    TDEAction* getInsertSymbolAction()     { return m_insertSymbolAction; }
+
+    TDEAction* getAppendColumnAction()     { return m_appendColumnAction; }
+    TDEAction* getInsertColumnAction()     { return m_insertColumnAction; }
+    TDEAction* getRemoveColumnAction()     { return m_removeColumnAction; }
+    TDEAction* getAppendRowAction()        { return m_appendRowAction; }
+    TDEAction* getInsertRowAction()        { return m_insertRowAction; }
+    TDEAction* getRemoveRowAction()        { return m_removeRowAction; }
 
     void enableMatrixActions(bool);
-    KSelectAction* getLeftBracketAction()  { return m_leftBracket; }
-    KSelectAction* getRightBracketAction() { return m_rightBracket; }
+    TDESelectAction* getLeftBracketAction()  { return m_leftBracket; }
+    TDESelectAction* getRightBracketAction() { return m_rightBracket; }
     SymbolAction* getSymbolNamesAction()  { return m_symbolNamesAction; }
-    KToggleAction* getSyntaxHighlightingAction()
+    TDEToggleAction* getSyntaxHighlightingAction()
         { return m_syntaxHighlightingAction; }
-    KToggleAction* getFormatBoldAction()   { return m_formatBoldAction; }
-    KToggleAction* getFormatItalicAction() { return m_formatItalicAction; }
+    TDEToggleAction* getFormatBoldAction()   { return m_formatBoldAction; }
+    TDEToggleAction* getFormatItalicAction() { return m_formatItalicAction; }
 
-    KSelectAction* getFontFamilyAction() { return m_fontFamily; }
-    KSelectAction* getTokenElementAction() { return m_tokenElement; }
+    TDESelectAction* getFontFamilyAction() { return m_fontFamily; }
+    TDESelectAction* getTokenElementAction() { return m_tokenElement; }
 
     SymbolType leftBracketChar() const  { return m_leftBracketChar; }
     SymbolType rightBracketChar() const { return m_rightBracketChar; }
@@ -435,7 +435,7 @@ public slots:
 
 private:
 
-    void createActions( KActionCollection* collection );
+    void createActions( TDEActionCollection* collection );
     void initSymbolNamesAction();
     void setCommandStack( KoCommandHistory* history );
 
@@ -444,52 +444,52 @@ private:
 
     Document* m_document;
 
-    KAction* m_addNegThinSpaceAction;
-    KAction* m_addThinSpaceAction;
-    KAction* m_addMediumSpaceAction;
-    KAction* m_addThickSpaceAction;
-    KAction* m_addQuadSpaceAction;
-    KAction* m_addBracketAction;
-    KAction* m_addSBracketAction;
-    KAction* m_addCBracketAction;
-    KAction* m_addAbsAction;
-    KAction* m_addFractionAction;
-    KAction* m_addRootAction;
-    KAction* m_addSumAction;
-    KAction* m_addProductAction;
-    KAction* m_addIntegralAction;
-    KAction* m_addMatrixAction;
-    KAction* m_addOneByTwoMatrixAction;
-    KAction* m_addUpperLeftAction;
-    KAction* m_addLowerLeftAction;
-    KAction* m_addUpperRightAction;
-    KAction* m_addLowerRightAction;
-    KAction* m_addGenericUpperAction;
-    KAction* m_addGenericLowerAction;
-    KAction* m_addOverlineAction;
-    KAction* m_addUnderlineAction;
-    KAction* m_addMultilineAction;
-    KAction* m_removeEnclosingAction;
-    KAction* m_makeGreekAction;
-    KAction* m_insertSymbolAction;
-
-    KAction* m_appendColumnAction;
-    KAction* m_insertColumnAction;
-    KAction* m_removeColumnAction;
-    KAction* m_appendRowAction;
-    KAction* m_insertRowAction;
-    KAction* m_removeRowAction;
-
-    KToggleAction* m_syntaxHighlightingAction;
-    KToggleAction* m_formatBoldAction;
-    KToggleAction* m_formatItalicAction;
-
-    KSelectAction* m_leftBracket;
-    KSelectAction* m_rightBracket;
+    TDEAction* m_addNegThinSpaceAction;
+    TDEAction* m_addThinSpaceAction;
+    TDEAction* m_addMediumSpaceAction;
+    TDEAction* m_addThickSpaceAction;
+    TDEAction* m_addQuadSpaceAction;
+    TDEAction* m_addBracketAction;
+    TDEAction* m_addSBracketAction;
+    TDEAction* m_addCBracketAction;
+    TDEAction* m_addAbsAction;
+    TDEAction* m_addFractionAction;
+    TDEAction* m_addRootAction;
+    TDEAction* m_addSumAction;
+    TDEAction* m_addProductAction;
+    TDEAction* m_addIntegralAction;
+    TDEAction* m_addMatrixAction;
+    TDEAction* m_addOneByTwoMatrixAction;
+    TDEAction* m_addUpperLeftAction;
+    TDEAction* m_addLowerLeftAction;
+    TDEAction* m_addUpperRightAction;
+    TDEAction* m_addLowerRightAction;
+    TDEAction* m_addGenericUpperAction;
+    TDEAction* m_addGenericLowerAction;
+    TDEAction* m_addOverlineAction;
+    TDEAction* m_addUnderlineAction;
+    TDEAction* m_addMultilineAction;
+    TDEAction* m_removeEnclosingAction;
+    TDEAction* m_makeGreekAction;
+    TDEAction* m_insertSymbolAction;
+
+    TDEAction* m_appendColumnAction;
+    TDEAction* m_insertColumnAction;
+    TDEAction* m_removeColumnAction;
+    TDEAction* m_appendRowAction;
+    TDEAction* m_insertRowAction;
+    TDEAction* m_removeRowAction;
+
+    TDEToggleAction* m_syntaxHighlightingAction;
+    TDEToggleAction* m_formatBoldAction;
+    TDEToggleAction* m_formatItalicAction;
+
+    TDESelectAction* m_leftBracket;
+    TDESelectAction* m_rightBracket;
     SymbolAction* m_symbolNamesAction;
 
-    KSelectAction* m_fontFamily;
-    KSelectAction* m_tokenElement;
+    TDESelectAction* m_fontFamily;
+    TDESelectAction* m_tokenElement;
 
     SymbolType m_leftBracketChar;
     SymbolType m_rightBracketChar;