diff options
Diffstat (limited to 'kontact/plugins/kmail')
-rw-r--r-- | kontact/plugins/kmail/kcmkmailsummary.cpp | 18 | ||||
-rw-r--r-- | kontact/plugins/kmail/kcmkmailsummary.h | 7 | ||||
-rw-r--r-- | kontact/plugins/kmail/kmail_plugin.cpp | 10 | ||||
-rw-r--r-- | kontact/plugins/kmail/kmail_plugin.h | 7 | ||||
-rw-r--r-- | kontact/plugins/kmail/summarywidget.cpp | 10 | ||||
-rw-r--r-- | kontact/plugins/kmail/summarywidget.h | 7 |
6 files changed, 31 insertions, 28 deletions
diff --git a/kontact/plugins/kmail/kcmkmailsummary.cpp b/kontact/plugins/kmail/kcmkmailsummary.cpp index e27254e33..ae7765553 100644 --- a/kontact/plugins/kmail/kcmkmailsummary.cpp +++ b/kontact/plugins/kmail/kcmkmailsummary.cpp @@ -17,8 +17,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 <tqcheckbox.h> @@ -41,14 +41,14 @@ extern "C" { - KDE_EXPORT KCModule *create_kmailsummary( TQWidget *parent, const char * ) + KDE_EXPORT KCModule *create_kmailsummary( TQWidget *tqparent, const char * ) { - return new KCMKMailSummary( parent, "kcmkmailsummary" ); + return new KCMKMailSummary( tqparent, "kcmkmailsummary" ); } } -KCMKMailSummary::KCMKMailSummary( TQWidget *parent, const char *name ) - : KCModule( parent, name ) +KCMKMailSummary::KCMKMailSummary( TQWidget *tqparent, const char *name ) + : KCModule( tqparent, name ) { initGUI(); @@ -109,14 +109,14 @@ void KCMKMailSummary::initFolders() folderRef.call( "displayName()" ).get( displayName ); } if ( (*it).tqcontains( '/' ) == 1 ) { - if ( mFolderMap.find( *it ) == mFolderMap.end() ) + if ( mFolderMap.tqfind( *it ) == mFolderMap.end() ) mFolderMap.insert( *it, new TQListViewItem( mFolderView, displayName ) ); } else { const int pos = (*it).findRev( '/' ); - const TQString parentFolder = (*it).left( pos ); + const TQString tqparentFolder = (*it).left( pos ); mFolderMap.insert( *it, - new TQCheckListItem( mFolderMap[ parentFolder ], + new TQCheckListItem( mFolderMap[ tqparentFolder ], displayName, TQCheckListItem::CheckBox ) ); } diff --git a/kontact/plugins/kmail/kcmkmailsummary.h b/kontact/plugins/kmail/kcmkmailsummary.h index 4ef16a96d..068fa4a8d 100644 --- a/kontact/plugins/kmail/kcmkmailsummary.h +++ b/kontact/plugins/kmail/kcmkmailsummary.h @@ -17,8 +17,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 KCMKMAILSUMMARY_H @@ -36,9 +36,10 @@ class TQCheckListItem; class KCMKMailSummary : public KCModule { Q_OBJECT + TQ_OBJECT public: - KCMKMailSummary( TQWidget *parent = 0, const char *name = 0 ); + KCMKMailSummary( TQWidget *tqparent = 0, const char *name = 0 ); virtual void load(); virtual void save(); diff --git a/kontact/plugins/kmail/kmail_plugin.cpp b/kontact/plugins/kmail/kmail_plugin.cpp index c2aff819d..55a192e3e 100644 --- a/kontact/plugins/kmail/kmail_plugin.cpp +++ b/kontact/plugins/kmail/kmail_plugin.cpp @@ -17,8 +17,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 <tqwidget.h> @@ -125,7 +125,7 @@ void KMailPlugin::openComposer( const TQString& to ) void KMailPlugin::slotNewMail() { - openComposer( TQString::null ); + openComposer( TQString() ); } void KMailPlugin::slotSyncFolders() @@ -174,9 +174,9 @@ bool KMailPlugin::isRunningStandalone() return mUniqueAppWatcher->isRunningStandalone(); } -Kontact::Summary *KMailPlugin::createSummaryWidget( TQWidget *parent ) +Kontact::Summary *KMailPlugin::createSummaryWidget( TQWidget *tqparent ) { - return new SummaryWidget( this, parent ); + return new SummaryWidget( this, tqparent ); } //// diff --git a/kontact/plugins/kmail/kmail_plugin.h b/kontact/plugins/kmail/kmail_plugin.h index 0077182bf..46998d802 100644 --- a/kontact/plugins/kmail/kmail_plugin.h +++ b/kontact/plugins/kmail/kmail_plugin.h @@ -17,8 +17,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 KMAIL_PLUGIN_H @@ -46,6 +46,7 @@ public: class KMailPlugin : public Kontact::Plugin { Q_OBJECT + TQ_OBJECT public: KMailPlugin( Kontact::Core *core, const char *name, const TQStringList& ); @@ -53,7 +54,7 @@ class KMailPlugin : public Kontact::Plugin virtual bool isRunningStandalone(); virtual bool createDCOPInterface( const TQString& serviceType ); - virtual Kontact::Summary *createSummaryWidget( TQWidget *parent ); + virtual Kontact::Summary *createSummaryWidget( TQWidget *tqparent ); virtual TQString tipFile() const; int weight() const { return 200; } diff --git a/kontact/plugins/kmail/summarywidget.cpp b/kontact/plugins/kmail/summarywidget.cpp index 92023570c..b72283421 100644 --- a/kontact/plugins/kmail/summarywidget.cpp +++ b/kontact/plugins/kmail/summarywidget.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 <tqlabel.h> @@ -41,8 +41,8 @@ #include <time.h> -SummaryWidget::SummaryWidget( Kontact::Plugin *plugin, TQWidget *parent, const char *name ) - : Kontact::Summary( parent, name ), +SummaryWidget::SummaryWidget( Kontact::Plugin *plugin, TQWidget *tqparent, const char *name ) + : Kontact::Summary( tqparent, name ), DCOPObject( TQCString("MailSummary") ), mPlugin( plugin ) { @@ -168,7 +168,7 @@ bool SummaryWidget::eventFilter( TQObject *obj, TQEvent* e ) if ( e->type() == TQEvent::Enter ) emit message( i18n( "Open Folder: \"%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/kmail/summarywidget.h b/kontact/plugins/kmail/summarywidget.h index bd875565b..575aceae6 100644 --- a/kontact/plugins/kmail/summarywidget.h +++ b/kontact/plugins/kmail/summarywidget.h @@ -17,8 +17,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 SUMMARYWIDGET_H @@ -41,10 +41,11 @@ class TQString; class SummaryWidget : public Kontact::Summary, public DCOPObject { Q_OBJECT +// TQ_OBJECT K_DCOP public: - SummaryWidget( Kontact::Plugin *plugin, TQWidget *parent, const char *name = 0 ); + SummaryWidget( Kontact::Plugin *plugin, TQWidget *tqparent, const char *name = 0 ); int summaryHeight() const { return 1; } TQStringList configModules() const; |