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/xfaceconfigurator.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'kmail/xfaceconfigurator.cpp') diff --git a/kmail/xfaceconfigurator.cpp b/kmail/xfaceconfigurator.cpp index fee9b269..1110641d 100644 --- a/kmail/xfaceconfigurator.cpp +++ b/kmail/xfaceconfigurator.cpp @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -70,8 +70,8 @@ using namespace KPIM; namespace KMail { - XFaceConfigurator::XFaceConfigurator( TQWidget * parent, const char * name ) - : TQWidget( parent, name ) + XFaceConfigurator::XFaceConfigurator( TQWidget * tqparent, const char * name ) + : TQWidget( tqparent, name ) { // tmp. vars: TQLabel * label; @@ -93,7 +93,7 @@ namespace KMail { i18n( "Check this box if you want KMail to add a so-called X-Face header to messages " "written with this identity. An X-Face is a small (48x48 pixels) black and " "white image that some mail clients are able to display." ) ); - hlay->addWidget( mEnableCheck, Qt::AlignLeft | Qt::AlignVCenter ); + hlay->addWidget( mEnableCheck, TQt::AlignLeft | TQt::AlignVCenter ); mXFaceLabel = new TQLabel( this ); TQWhatsThis::add(mXFaceLabel, @@ -180,7 +180,7 @@ namespace KMail { TQWhatsThis::add( mTextEdit, i18n( "Use this field to enter an arbitrary X-Face string." ) ); mTextEdit->setFont( KGlobalSettings::fixedFont() ); mTextEdit->setWrapPolicy( TQTextEdit::Anywhere ); - mTextEdit->setTextFormat( Qt::PlainText ); + mTextEdit->setTextFormat( TQt::PlainText ); label2 = new KActiveLabel( i18n("Examples are available at http://www.xs4all.nl/~ace/X-Faces/."), page ); page_vlay->addWidget( label2 ); @@ -225,7 +225,7 @@ namespace KMail { { TQStringList mimeTypes = KImageIO::mimeTypes (KImageIO::Reading); TQString filter = mimeTypes.join (" "); - KURL url = KFileDialog::getOpenURL( TQString::null, filter, this, TQString::null ); + KURL url = KFileDialog::getOpenURL( TQString(), filter, this, TQString() ); if ( !url.isEmpty() ) setXfaceFromFile( url ); } -- cgit v1.2.3