diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-04-13 00:46:47 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-04-13 00:46:47 +0000 |
commit | 67e29a054cfcb1b0d2fe6b0a316cf6b3eec087b7 (patch) | |
tree | 5f52a9eada2e9f3654fc327d7c14dfef570a6ecb /libkdepim/komposer/plugins/default | |
parent | 2ee4bf4fd5eff93b2fbef0ff8e8063edffc5da5c (diff) | |
download | tdepim-67e29a054cfcb1b0d2fe6b0a316cf6b3eec087b7.tar.gz tdepim-67e29a054cfcb1b0d2fe6b0a316cf6b3eec087b7.zip |
Initial conversion of kdepim to TQt
This will probably require some tweaking before it will build under Qt4,
however Qt3 builds are OK. Any alterations this commit makes to kdepim
behaviour under Qt3 are unintentional and should be fixed.
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1227832 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'libkdepim/komposer/plugins/default')
-rw-r--r-- | libkdepim/komposer/plugins/default/defaulteditor.cpp | 8 | ||||
-rw-r--r-- | libkdepim/komposer/plugins/default/defaulteditor.h | 3 | ||||
-rw-r--r-- | libkdepim/komposer/plugins/default/defaulteditorui.rc | 2 |
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>&Alignment</text> + <Menu name="tqalignment"><text>&Alignment</text> <Action name="format_align_left"/> <Action name="format_align_center"/> <Action name="format_align_right"/> |