From 67e29a054cfcb1b0d2fe6b0a316cf6b3eec087b7 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 13 Apr 2011 00:46:47 +0000 Subject: 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 --- kmail/kmcomposewin.h | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'kmail/kmcomposewin.h') diff --git a/kmail/kmcomposewin.h b/kmail/kmcomposewin.h index 30362e85..b76aa911 100644 --- a/kmail/kmcomposewin.h +++ b/kmail/kmcomposewin.h @@ -99,6 +99,7 @@ namespace GpgME { class KMComposeWin : public KMail::Composer, public MailComposerIface { Q_OBJECT + TQ_OBJECT friend class ::KMEdit; friend class ::MessageComposer; @@ -271,7 +272,7 @@ private: // kmedit: } bool subjectTextWasSpellChecked() const { return mSubjectTextWasSpellChecked; } - void paste( QClipboard::Mode mode ); + void paste( TQClipboard::Mode mode ); public: // callback /** Disabled signing and encryption completely for this composer window. */ @@ -469,7 +470,7 @@ private slots: // void slotSpellConfigure(); void slotSpellcheckDone(int result); - void slotSpellcheckDoneClearStatus(); + void slotSpellcheckDoneCleartqStatus(); public slots: // kmkernel void autoSaveMessage(); @@ -552,8 +553,8 @@ private: void rethinkHeaderLine( int aValue, int aMask, int& aRow, TQLabel* aLbl, TQLineEdit* aEdt, TQPushButton* aBtn = 0, - const TQString &toolTip = TQString::null, - const TQString &whatsThis = TQString::null ); + const TQString &toolTip = TQString(), + const TQString &whatsThis = TQString() ); void rethinkHeaderLine( int value, int tqmask, int& row, TQLabel* lbl, TQComboBox* cbx, TQCheckBox *chk ); @@ -671,7 +672,7 @@ private: /** * Decrypt an OpenPGP block or strip off the OpenPGP envelope of a text * block with a clear text signature. This is only done if the given - * string tqcontains exactly one OpenPGP block. + * string contains exactly one OpenPGP block. * This function is for example used to restore the unencrypted/unsigned * message text for editting. */ @@ -715,7 +716,7 @@ private: * @return true if all addresses are valid. * @return false if one or several addresses are invalid. */ - static bool validateAddresses( TQWidget * parent, const TQString & addresses ); + static bool validateAddresses( TQWidget * tqparent, const TQString & addresses ); /** * Sets the transport combobox to @p transport. If @p transport is empty -- cgit v1.2.3