3 files changed, 7 insertions, 6 deletions
diff --git a/libkdepim/komposer/plugins/default/defaulteditor.cpp b/libkdepim/komposer/plugins/default/defaulteditor.cpp
index 56f97d22..6f7dcb7d 100644
--- a/libkdepim/komposer/plugins/default/defaulteditor.cpp
+++ b/libkdepim/komposer/plugins/default/defaulteditor.cpp
@@ -36,7 +36,7 @@
 #include <kprinter.h>
 #include <kfinddialog.h>
 #include <kfind.h>
-#include <ktqreplacedialog.h>
+#include <kreplacedialog.h>
 #include <ktqreplace.h>
 
 #include <tqtextedit.h>
@@ -46,8 +46,8 @@ typedef KGenericFactory<DefaultEditor> DefaultEditorFactory;
 K_EXPORT_COMPONENT_FACTORY( libkomposer_defaulteditor,
                             DefaultEditorFactory( "komposer_defaulteditor" ) )
 
-DefaultEditor::DefaultEditor( TQObject *parent, const char *name, const TQStringList &args )
-  : Editor( parent, name, args ), m_textEdit( 0 )
+DefaultEditor::DefaultEditor( TQObject *tqparent, const char *name, const TQStringList &args )
+  : Editor( tqparent, name, args ), m_textEdit( 0 )
 {
   setInstance( DefaultEditorFactory::instance() );
 
@@ -69,7 +69,7 @@ DefaultEditor::widget()
     return m_textEdit;
 }
 
-QString
+TQString
 DefaultEditor::text() const
 {
   return m_textEdit->text();
diff --git a/libkdepim/komposer/plugins/default/defaulteditor.h b/libkdepim/komposer/plugins/default/defaulteditor.h
index a877b762..7c33bb33 100644
--- a/libkdepim/komposer/plugins/default/defaulteditor.h
+++ b/libkdepim/komposer/plugins/default/defaulteditor.h
@@ -34,8 +34,9 @@ class KActionCollection;
 class DefaultEditor : public Komposer::Editor
 {
   Q_OBJECT
+  TQ_OBJECT
 public:
-  DefaultEditor( TQObject *parent, const char *name, const TQStringList &args );
+  DefaultEditor( TQObject *tqparent, const char *name, const TQStringList &args );
   ~DefaultEditor();
 
   virtual TQWidget *widget();
diff --git a/libkdepim/komposer/plugins/default/defaulteditorui.rc b/libkdepim/komposer/plugins/default/defaulteditorui.rc
index 479fa8b0..de8c2e6d 100644
--- a/libkdepim/komposer/plugins/default/defaulteditorui.rc
+++ b/libkdepim/komposer/plugins/default/defaulteditorui.rc
@@ -24,7 +24,7 @@
     <Action name="format_color"/>
     <DefineGroup name="format_chars_group" />
     <Separator/>
-    <Menu name="alignment"><text>&amp;Alignment</text>
+    <Menu name="tqalignment"><text>&amp;Alignment</text>
        <Action name="format_align_left"/>
        <Action name="format_align_center"/>
        <Action name="format_align_right"/>