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 --- kontact/plugins/specialdates/kcmsdsummary.cpp | 12 ++++++------ kontact/plugins/specialdates/kcmsdsummary.h | 7 ++++--- kontact/plugins/specialdates/sdsummarywidget.cpp | 20 ++++++++++---------- kontact/plugins/specialdates/sdsummarywidget.h | 7 ++++--- kontact/plugins/specialdates/specialdates_plugin.cpp | 4 ++-- kontact/plugins/specialdates/specialdates_plugin.h | 4 ++-- 6 files changed, 28 insertions(+), 26 deletions(-) (limited to 'kontact/plugins/specialdates') diff --git a/kontact/plugins/specialdates/kcmsdsummary.cpp b/kontact/plugins/specialdates/kcmsdsummary.cpp index 183a2e12..b3a67127 100644 --- a/kontact/plugins/specialdates/kcmsdsummary.cpp +++ b/kontact/plugins/specialdates/kcmsdsummary.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include @@ -43,14 +43,14 @@ extern "C" { - KDE_EXPORT KCModule *create_sdsummary( TQWidget *parent, const char * ) + KDE_EXPORT KCModule *create_sdsummary( TQWidget *tqparent, const char * ) { - return new KCMSDSummary( parent, "kcmsdsummary" ); + return new KCMSDSummary( tqparent, "kcmsdsummary" ); } } -KCMSDSummary::KCMSDSummary( TQWidget *parent, const char *name ) - : KCModule( parent, name ) +KCMSDSummary::KCMSDSummary( TQWidget *tqparent, const char *name ) + : KCModule( tqparent, name ) { initGUI(); diff --git a/kontact/plugins/specialdates/kcmsdsummary.h b/kontact/plugins/specialdates/kcmsdsummary.h index 6fbb8aee..4369797f 100644 --- a/kontact/plugins/specialdates/kcmsdsummary.h +++ b/kontact/plugins/specialdates/kcmsdsummary.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef KCMSDSUMMARY_H @@ -36,9 +36,10 @@ class KAboutData; class KCMSDSummary : public KCModule { Q_OBJECT + TQ_OBJECT public: - KCMSDSummary( TQWidget *parent = 0, const char *name = 0 ); + KCMSDSummary( TQWidget *tqparent = 0, const char *name = 0 ); virtual void load(); virtual void save(); diff --git a/kontact/plugins/specialdates/sdsummarywidget.cpp b/kontact/plugins/specialdates/sdsummarywidget.cpp index bd1fa73b..cd4e40d7 100644 --- a/kontact/plugins/specialdates/sdsummarywidget.cpp +++ b/kontact/plugins/specialdates/sdsummarywidget.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include @@ -77,9 +77,9 @@ class SDEntry } }; -SDSummaryWidget::SDSummaryWidget( Kontact::Plugin *plugin, TQWidget *parent, +SDSummaryWidget::SDSummaryWidget( Kontact::Plugin *plugin, TQWidget *tqparent, const char *name ) - : Kontact::Summary( parent, name ), mPlugin( plugin ), mCalendar( 0 ), mHolidays( 0 ) + : Kontact::Summary( tqparent, name ), mPlugin( plugin ), mCalendar( 0 ), mHolidays( 0 ) { // Create the Summary Layout TQVBoxLayout *mainLayout = new TQVBoxLayout( this, 3, 3 ); @@ -250,7 +250,7 @@ void SDSummaryWidget::updateView() TQString anniversaryAsString = (*it).custom( "KADDRESSBOOK" , "X-Anniversary" ); if ( !anniversaryAsString.isEmpty() ) { - TQDate anniversary = TQDate::fromString( anniversaryAsString, Qt::ISODate ); + TQDate anniversary = TQDate::fromString( anniversaryAsString, TQt::ISODate ); if ( anniversary.isValid() && mShowAnniversariesFromKAB ) { SDEntry entry; entry.type = IncidenceTypeContact; @@ -502,7 +502,7 @@ void SDSummaryWidget::updateView() urlLabel->installEventFilter( this ); urlLabel->setURL( (*addrIt).addressee.uid() ); urlLabel->setText( (*addrIt).addressee.realName() ); - urlLabel->setTextFormat( Qt::RichText ); + urlLabel->setTextFormat( TQt::RichText ); mLayout->addWidget( urlLabel, counter, 4 ); mLabels.append( urlLabel ); @@ -513,7 +513,7 @@ void SDSummaryWidget::updateView() } else { label = new TQLabel( this ); label->setText( (*addrIt).summary ); - label->setTextFormat( Qt::RichText ); + label->setTextFormat( TQt::RichText ); mLayout->addWidget( label, counter, 4 ); mLabels.append( label ); if ( !(*addrIt).desc.isEmpty() ) { @@ -556,9 +556,9 @@ void SDSummaryWidget::updateView() void SDSummaryWidget::mailContact( const TQString &uid ) { KABC::StdAddressBook *ab = KABC::StdAddressBook::self( true ); - TQString email = ab->tqfindByUid( uid ).fullEmail(); + TQString email = ab->findByUid( uid ).fullEmail(); - kapp->invokeMailer( email, TQString::null ); + kapp->invokeMailer( email, TQString() ); } void SDSummaryWidget::viewContact( const TQString &uid ) @@ -597,7 +597,7 @@ bool SDSummaryWidget::eventFilter( TQObject *obj, TQEvent* e ) if ( e->type() == TQEvent::Enter ) emit message( i18n( "Mail to:\"%1\"" ).arg( label->text() ) ); if ( e->type() == TQEvent::Leave ) - emit message( TQString::null ); + emit message( TQString() ); } return Kontact::Summary::eventFilter( obj, e ); diff --git a/kontact/plugins/specialdates/sdsummarywidget.h b/kontact/plugins/specialdates/sdsummarywidget.h index 5c52c77c..939ca5bb 100644 --- a/kontact/plugins/specialdates/sdsummarywidget.h +++ b/kontact/plugins/specialdates/sdsummarywidget.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef SDSUMMARYWIDGET_H @@ -43,9 +43,10 @@ class TQLabel; class SDSummaryWidget : public Kontact::Summary { Q_OBJECT + TQ_OBJECT public: - SDSummaryWidget( Kontact::Plugin *plugin, TQWidget *parent, + SDSummaryWidget( Kontact::Plugin *plugin, TQWidget *tqparent, const char *name = 0 ); TQStringList configModules() const; diff --git a/kontact/plugins/specialdates/specialdates_plugin.cpp b/kontact/plugins/specialdates/specialdates_plugin.cpp index 70cfa521..9d0b60cf 100644 --- a/kontact/plugins/specialdates/specialdates_plugin.cpp +++ b/kontact/plugins/specialdates/specialdates_plugin.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include diff --git a/kontact/plugins/specialdates/specialdates_plugin.h b/kontact/plugins/specialdates/specialdates_plugin.h index eb3a514f..fc359802 100644 --- a/kontact/plugins/specialdates/specialdates_plugin.h +++ b/kontact/plugins/specialdates/specialdates_plugin.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef SPECIALDATES_PLUGIN_H -- cgit v1.2.3