diff options
Diffstat (limited to 'plugins/kmail')
6 files changed, 22 insertions, 22 deletions
diff --git a/plugins/kmail/bodypartformatter/attendeeselector.cpp b/plugins/kmail/bodypartformatter/attendeeselector.cpp index 08bf9c00..c0c89307 100644 --- a/plugins/kmail/bodypartformatter/attendeeselector.cpp +++ b/plugins/kmail/bodypartformatter/attendeeselector.cpp @@ -38,15 +38,15 @@ AttendeeSelector::AttendeeSelector(TQWidget * parent) layout->setMargin( 0 ); ui->addButton->setGuiItem( KStdGuiItem::add() ); - connect( ui->addButton, TQT_SIGNAL(clicked()), TQT_SLOT(addClicked()) ); + connect( ui->addButton, TQ_SIGNAL(clicked()), TQ_SLOT(addClicked()) ); ui->removeButton->setGuiItem( KStdGuiItem::remove() ); - connect( ui->removeButton, TQT_SIGNAL(clicked()), TQT_SLOT(removeClicked()) ); + connect( ui->removeButton, TQ_SIGNAL(clicked()), TQ_SLOT(removeClicked()) ); ui->attendeeEdit->setClickMessage( i18n("Click to add a new attendee") ); - connect( ui->attendeeEdit, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(textChanged(const TQString&)) ); - connect( ui->attendeeEdit, TQT_SIGNAL(returnPressed(const TQString&)), TQT_SLOT(addClicked()) ); + connect( ui->attendeeEdit, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(textChanged(const TQString&)) ); + connect( ui->attendeeEdit, TQ_SIGNAL(returnPressed(const TQString&)), TQ_SLOT(addClicked()) ); - connect( ui->attendeeList, TQT_SIGNAL(selectionChanged()), TQT_SLOT(selectionChanged()) ); + connect( ui->attendeeList, TQ_SIGNAL(selectionChanged()), TQ_SLOT(selectionChanged()) ); } TQStringList AttendeeSelector::attendees() const diff --git a/plugins/kmail/bodypartformatter/attendeeselector.h b/plugins/kmail/bodypartformatter/attendeeselector.h index f111ac53..05c73d5f 100644 --- a/plugins/kmail/bodypartformatter/attendeeselector.h +++ b/plugins/kmail/bodypartformatter/attendeeselector.h @@ -29,7 +29,7 @@ class AttendeeSelectorWidget; */ class AttendeeSelector : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: AttendeeSelector( TQWidget *parent = 0 ); diff --git a/plugins/kmail/bodypartformatter/delegateselector.h b/plugins/kmail/bodypartformatter/delegateselector.h index 9f34e3c5..775c8858 100644 --- a/plugins/kmail/bodypartformatter/delegateselector.h +++ b/plugins/kmail/bodypartformatter/delegateselector.h @@ -33,7 +33,7 @@ class TQCheckBox; */ class DelegateSelector : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/plugins/kmail/bodypartformatter/text_calendar.cpp b/plugins/kmail/bodypartformatter/text_calendar.cpp index bfe78c61..a6ea8bc5 100644 --- a/plugins/kmail/bodypartformatter/text_calendar.cpp +++ b/plugins/kmail/bodypartformatter/text_calendar.cpp @@ -67,7 +67,7 @@ #include <kdebug.h> #include <kdcopservicestarter.h> #include <tdemessagebox.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeapplication.h> #include <tdetempfile.h> #include <kmdcodec.h> @@ -80,7 +80,7 @@ #include <tqdir.h> #include <tqtextstream.h> -#include <tdepimmacros.h> +#include <tdemacros.h> #include <dcopclient.h> #include <dcopref.h> @@ -381,8 +381,8 @@ class UrlHandler : public KMail::Interface::BodyPartURLHandler // [that's not the case when kontact was already running, but korganizer not loaded into it...] static const char* const dcopObjectId = "KOrganizerIface"; TQCString dummy; - if ( !kapp->dcopClient()->findObject( dcopService, dcopObjectId, "", TQByteArray(), dummy, dummy ) ) { - DCOPRef ref( dcopService, dcopService ); // talk to the KUniqueApplication or its kontact wrapper + if ( !tdeApp->dcopClient()->findObject( dcopService, dcopObjectId, "", TQByteArray(), dummy, dummy ) ) { + DCOPRef ref( dcopService, dcopService ); // talk to the TDEUniqueApplication or its kontact wrapper if ( switchTo ) { ref.call( "newInstance()" ); // activate korganizer window } @@ -390,7 +390,7 @@ class UrlHandler : public KMail::Interface::BodyPartURLHandler DCOPReply reply = ref.call( "load()" ); if ( reply.isValid() && (bool)reply ) { kdDebug() << "Loaded " << dcopService << " successfully" << endl; - Q_ASSERT( kapp->dcopClient()->findObject( dcopService, dcopObjectId, "", TQByteArray(), dummy, dummy ) ); + Q_ASSERT( tdeApp->dcopClient()->findObject( dcopService, dcopObjectId, "", TQByteArray(), dummy, dummy ) ); } else kdWarning() << "Error loading " << dcopService << endl; } @@ -671,13 +671,13 @@ class UrlHandler : public KMail::Interface::BodyPartURLHandler { ensureKorganizerRunning( true ); // raise korganizer part in kontact or the korganizer app - kapp->dcopClient()->send( "korganizer", "korganizer", "newInstance()", TQByteArray() ); + tdeApp->dcopClient()->send( "korganizer", "korganizer", "newInstance()", TQByteArray() ); TQByteArray arg; TQDataStream s( arg, IO_WriteOnly ); s << TQString( "kontact_korganizerplugin" ); - kapp->dcopClient()->send( "kontact", "KontactIface", "selectPlugin(TQString)", arg ); + tdeApp->dcopClient()->send( "kontact", "KontactIface", "selectPlugin(TQString)", arg ); - KCalendarIface_stub *iface = new KCalendarIface_stub( kapp->dcopClient(), "korganizer", "CalendarIface" ); + KCalendarIface_stub *iface = new KCalendarIface_stub( tdeApp->dcopClient(), "korganizer", "CalendarIface" ); iface->showEventView(); iface->showDate( date ); delete iface; @@ -823,7 +823,7 @@ class UrlHandler : public KMail::Interface::BodyPartURLHandler summary = i18n( "Re: %1" ).arg( summary ); } - TDEApplication::kApplication()->invokeMailer( incidence->organizer().email(), summary ); + tdeApp->invokeMailer( incidence->organizer().email(), summary ); //fall through case KMessageBox::Yes: // means "do not send" if ( saveFile( "Receiver Not Searched", iCal, TQString( "reply" ) ) ) { @@ -968,7 +968,7 @@ class Plugin : public KMail::Interface::BodyPartFormatterPlugin } extern "C" -KDE_EXPORT KMail::Interface::BodyPartFormatterPlugin * +TDE_EXPORT KMail::Interface::BodyPartFormatterPlugin * libkmail_bodypartformatter_text_calendar_create_bodypart_formatter_plugin() { TDEGlobal::locale()->insertCatalogue( "kmail_text_calendar_plugin" ); diff --git a/plugins/kmail/bodypartformatter/text_vcard.cpp b/plugins/kmail/bodypartformatter/text_vcard.cpp index 3f0f9014..215c83c8 100644 --- a/plugins/kmail/bodypartformatter/text_vcard.cpp +++ b/plugins/kmail/bodypartformatter/text_vcard.cpp @@ -1,4 +1,4 @@ -/* -*- mode: C++; c-file-style: "gnu" -*- +/* text_vcard.cpp This file is part of KMail, the KDE mail client. @@ -63,7 +63,7 @@ using TDEABC::Addressee; #include "addresseeview.h" using KPIM::AddresseeView; -#include <tdepimmacros.h> +#include <tdemacros.h> namespace { @@ -71,7 +71,7 @@ namespace { public: Formatter() { // disabled pending resolution of how to share static objects when dlopening libraries - //mKIMProxy = ::KIMProxy::instance( kapp->dcopClient() ); + //mKIMProxy = ::KIMProxy::instance( tdeApp->dcopClient() ); } Result format( BodyPart *bodyPart, KMail::HtmlWriter *writer, KMail::Callback & ) const { @@ -268,7 +268,7 @@ namespace { } extern "C" -KDE_EXPORT KMail::Interface::BodyPartFormatterPlugin * +TDE_EXPORT KMail::Interface::BodyPartFormatterPlugin * libkmail_bodypartformatter_text_vcard_create_bodypart_formatter_plugin() { TDEGlobal::locale()->insertCatalogue( "kmail_text_vcard_plugin" ); return new Plugin(); diff --git a/plugins/kmail/bodypartformatter/text_xdiff.cpp b/plugins/kmail/bodypartformatter/text_xdiff.cpp index 8d4937c7..7a229f03 100644 --- a/plugins/kmail/bodypartformatter/text_xdiff.cpp +++ b/plugins/kmail/bodypartformatter/text_xdiff.cpp @@ -44,7 +44,7 @@ #include <kiconloader.h> #include <kdebug.h> #include <tdemessagebox.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeapplication.h> #include <tqurl.h> |