Rename a number of classes to enhance compatibility with KDE4

4 files changed, 40 insertions, 40 deletions

diff --git a/libtdepim/komposer/core/core.cpp b/libtdepim/komposer/core/core.cpp
index a2f5fd00..87da5c00 100644
--- a/libtdepim/komposer/core/core.cpp
+++ b/libtdepim/komposer/core/core.cpp
@@ -55,7 +55,7 @@ using namespace Komposer;
 
 Core::Core( TQWidget *parent, const char *name )
   : KomposerIface( "KomposerIface" ),
-    KMainWindow( parent, name ), m_currentEditor( 0 )
+    TDEMainWindow( parent, name ), m_currentEditor( 0 )
 {
   initWidgets();
   initCore();
@@ -248,29 +248,29 @@ Core::createActions()
 {
   KStdAction::close( this, TQT_SLOT(slotClose()), actionCollection() );
 
-  (void) new KAction( i18n( "&Send" ), "mail_send", CTRL+Key_Return,
+  (void) new TDEAction( i18n( "&Send" ), "mail_send", CTRL+Key_Return,
                       this, TQT_SLOT(slotSendNow()), actionCollection(),
                       "send_default" );
 
-  (void) new KAction( i18n( "&Queue" ), "queue", 0,
+  (void) new TDEAction( i18n( "&Queue" ), "queue", 0,
                       this, TQT_SLOT(slotSendLater()),
                       actionCollection(), "send_alternative" );
 
-  (void) new KAction( i18n( "Save in &Drafts Folder" ), "filesave", 0,
+  (void) new TDEAction( i18n( "Save in &Drafts Folder" ), "filesave", 0,
                       this, TQT_SLOT(slotSaveDraft()),
                       actionCollection(), "save_in_drafts" );
-  (void) new KAction( i18n( "&Insert File..." ), "fileopen", 0,
+  (void) new TDEAction( i18n( "&Insert File..." ), "fileopen", 0,
                       this,  TQT_SLOT(slotInsertFile()),
                       actionCollection(), "insert_file" );
-  (void) new KAction( i18n( "&Address Book" ), "contents",0,
+  (void) new TDEAction( i18n( "&Address Book" ), "contents",0,
                       this, TQT_SLOT(slotAddrBook()),
                       actionCollection(), "addressbook" );
-  (void) new KAction( i18n( "&New Composer" ), "mail_new",
-                      KStdAccel::shortcut( KStdAccel::New ),
+  (void) new TDEAction( i18n( "&New Composer" ), "mail_new",
+                      TDEStdAccel::shortcut( TDEStdAccel::New ),
                       this, TQT_SLOT(slotNewComposer()),
                       actionCollection(), "new_composer" );
 
-  (void) new KAction( i18n( "&Attach File..." ), "attach",
+  (void) new TDEAction( i18n( "&Attach File..." ), "attach",
                       0, this, TQT_SLOT(slotAttachFile()),
                       actionCollection(), "attach_file" );
 }
diff --git a/libtdepim/komposer/core/core.h b/libtdepim/komposer/core/core.h
index 98fee42a..5259710a 100644
--- a/libtdepim/komposer/core/core.h
+++ b/libtdepim/komposer/core/core.h
@@ -42,7 +42,7 @@ namespace Komposer
   /**
    * This class provides the interface to the Komposer core for the editor.
    */
-  class Core : public KMainWindow, virtual public KomposerIface
+  class Core : public TDEMainWindow, virtual public KomposerIface
   {
     Q_OBJECT
   
diff --git a/libtdepim/komposer/plugins/default/defaulteditor.cpp b/libtdepim/komposer/plugins/default/defaulteditor.cpp
index 426e4c01..88c4fb1e 100644
--- a/libtdepim/komposer/plugins/default/defaulteditor.cpp
+++ b/libtdepim/komposer/plugins/default/defaulteditor.cpp
@@ -93,7 +93,7 @@ DefaultEditor::changeSignature( const TQString &sig )
 }
 
 void
-DefaultEditor::createActions( KActionCollection *ac )
+DefaultEditor::createActions( TDEActionCollection *ac )
 {
   //
   // File Actions
@@ -106,22 +106,22 @@ DefaultEditor::createActions( KActionCollection *ac )
   //
   // Edit Actions
   //
-  KAction *actionUndo = KStdAction::undo( m_textEdit, TQT_SLOT(undo()), ac );
+  TDEAction *actionUndo = KStdAction::undo( m_textEdit, TQT_SLOT(undo()), ac );
   actionUndo->setEnabled( false );
   connect( m_textEdit, TQT_SIGNAL(undoAvailable(bool)),
            actionUndo, TQT_SLOT(setEnabled(bool)) );
 
-  KAction *actionRedo = KStdAction::redo( m_textEdit, TQT_SLOT(redo()), ac );
+  TDEAction *actionRedo = KStdAction::redo( m_textEdit, TQT_SLOT(redo()), ac );
   actionRedo->setEnabled( false );
   connect( m_textEdit, TQT_SIGNAL(redoAvailable(bool)),
            actionRedo, TQT_SLOT(setEnabled(bool)) );
 
-  KAction *action_cut = KStdAction::cut( m_textEdit, TQT_SLOT(cut()), ac );
+  TDEAction *action_cut = KStdAction::cut( m_textEdit, TQT_SLOT(cut()), ac );
   action_cut->setEnabled( false );
   connect( m_textEdit, TQT_SIGNAL(copyAvailable(bool)),
            action_cut, TQT_SLOT(setEnabled(bool)) );
 
-  KAction *action_copy = KStdAction::copy( m_textEdit, TQT_SLOT(copy()), ac );
+  TDEAction *action_copy = KStdAction::copy( m_textEdit, TQT_SLOT(copy()), ac );
   action_copy->setEnabled( false );
   connect( m_textEdit, TQT_SIGNAL(copyAvailable(bool)),
            action_copy, TQT_SLOT(setEnabled(bool)) );
@@ -129,7 +129,7 @@ DefaultEditor::createActions( KActionCollection *ac )
   (void) KStdAction::print( this, TQT_SLOT(print()), ac );
 
   (void) KStdAction::paste( m_textEdit, TQT_SLOT(paste()), ac );
-  (void) new KAction( i18n( "C&lear" ), 0,
+  (void) new TDEAction( i18n( "C&lear" ), 0,
                       m_textEdit, TQT_SLOT(removeSelectedText()),
                       ac, "edit_clear" );
 
@@ -144,37 +144,37 @@ DefaultEditor::createActions( KActionCollection *ac )
   //
   // Character Formatting
   //
-  m_actionBold = new KToggleAction( i18n("&Bold"), "text_bold", CTRL+Key_B,
+  m_actionBold = new TDEToggleAction( i18n("&Bold"), "text_bold", CTRL+Key_B,
                                     ac, "format_bold" );
   connect( m_actionBold, TQT_SIGNAL(toggled(bool)),
            m_textEdit, TQT_SLOT(setBold(bool)) );
 
-  m_actionItalic = new KToggleAction( i18n("&Italic"), "text_italic", CTRL+Key_I,
+  m_actionItalic = new TDEToggleAction( i18n("&Italic"), "text_italic", CTRL+Key_I,
                                       ac, "format_italic" );
 
   connect( m_actionItalic, TQT_SIGNAL(toggled(bool)),
            m_textEdit, TQT_SLOT(setItalic(bool) ));
 
-  m_actionUnderline = new KToggleAction( i18n("&Underline"), "text_under", CTRL+Key_U,
+  m_actionUnderline = new TDEToggleAction( i18n("&Underline"), "text_under", CTRL+Key_U,
                                          ac, "format_underline" );
 
   connect( m_actionUnderline, TQT_SIGNAL(toggled(bool)),
            m_textEdit, TQT_SLOT(setUnderline(bool)) );
 
-  (void) new KAction( i18n("Text &Color..."), "colorpicker", 0,
+  (void) new TDEAction( i18n("Text &Color..."), "colorpicker", 0,
                       this, TQT_SLOT(formatColor()),
                       ac, "format_color" );
 
   //
   // Font
   //
-  m_actionFont = new KFontAction( i18n("&Font"), 0,
+  m_actionFont = new TDEFontAction( i18n("&Font"), 0,
                                  ac, "format_font" );
   connect( m_actionFont, TQT_SIGNAL(activated(const TQString &)),
            m_textEdit, TQT_SLOT(setFamily(const TQString &)) );
 
 
-  m_actionFontSize = new KFontSizeAction( i18n("Font &Size"), 0,
+  m_actionFontSize = new TDEFontSizeAction( i18n("Font &Size"), 0,
                                           ac, "format_font_size" );
   connect( m_actionFontSize, TQT_SIGNAL(fontSizeChanged(int)),
            m_textEdit, TQT_SLOT(setPointSize(int)) );
@@ -182,22 +182,22 @@ DefaultEditor::createActions( KActionCollection *ac )
   //
   // Alignment
   //
-  m_actionAlignLeft = new KToggleAction( i18n("Align &Left"), "text_left", 0,
+  m_actionAlignLeft = new TDEToggleAction( i18n("Align &Left"), "text_left", 0,
                                          ac, "format_align_left" );
   connect( m_actionAlignLeft, TQT_SIGNAL(toggled(bool)),
            this, TQT_SLOT(setAlignLeft(bool)) );
 
-  m_actionAlignCenter = new KToggleAction( i18n("Align &Center"), "text_center", 0,
+  m_actionAlignCenter = new TDEToggleAction( i18n("Align &Center"), "text_center", 0,
                                            ac, "format_align_center" );
   connect( m_actionAlignCenter, TQT_SIGNAL(toggled(bool)),
            this, TQT_SLOT(setAlignCenter(bool)) );
 
-  m_actionAlignRight = new KToggleAction( i18n("Align &Right"), "text_right", 0,
+  m_actionAlignRight = new TDEToggleAction( i18n("Align &Right"), "text_right", 0,
                                           ac, "format_align_right" );
   connect( m_actionAlignRight, TQT_SIGNAL(toggled(bool)),
            this, TQT_SLOT(setAlignRight(bool)) );
 
-  m_actionAlignJustify = new KToggleAction( i18n("&Justify"), "text_block", 0,
+  m_actionAlignJustify = new TDEToggleAction( i18n("&Justify"), "text_block", 0,
                                             ac, "format_align_justify" );
   connect( m_actionAlignJustify, TQT_SIGNAL(toggled(bool)),
            this, TQT_SLOT(setAlignJustify(bool)) );
diff --git a/libtdepim/komposer/plugins/default/defaulteditor.h b/libtdepim/komposer/plugins/default/defaulteditor.h
index d73953a6..5763b554 100644
--- a/libtdepim/komposer/plugins/default/defaulteditor.h
+++ b/libtdepim/komposer/plugins/default/defaulteditor.h
@@ -25,10 +25,10 @@
 #include "editor.h"
 
 class TQTextEdit;
-class KFontAction;
-class KFontSizeAction;
-class KToggleAction;
-class KActionCollection;
+class TDEFontAction;
+class TDEFontSizeAction;
+class TDEToggleAction;
+class TDEActionCollection;
 
 
 class DefaultEditor : public Komposer::Editor
@@ -91,7 +91,7 @@ protected slots:
   /**
    * Creates the part's actions in the part's action collection.
    */
-  void createActions( KActionCollection *ac );
+  void createActions( TDEActionCollection *ac );
 
   void updateActions();
 
@@ -102,17 +102,17 @@ protected slots:
 private:
   TQTextEdit *m_textEdit;
 
-  KToggleAction *m_actionBold;
-  KToggleAction *m_actionItalic;
-  KToggleAction *m_actionUnderline;
+  TDEToggleAction *m_actionBold;
+  TDEToggleAction *m_actionItalic;
+  TDEToggleAction *m_actionUnderline;
 
-  KFontAction *m_actionFont;
-  KFontSizeAction *m_actionFontSize;
+  TDEFontAction *m_actionFont;
+  TDEFontSizeAction *m_actionFontSize;
 
-  KToggleAction *m_actionAlignLeft;
-  KToggleAction *m_actionAlignRight;
-  KToggleAction *m_actionAlignCenter;
-  KToggleAction *m_actionAlignJustify;
+  TDEToggleAction *m_actionAlignLeft;
+  TDEToggleAction *m_actionAlignRight;
+  TDEToggleAction *m_actionAlignCenter;
+  TDEToggleAction *m_actionAlignJustify;
 };
 
 #endif