summaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
Diffstat (limited to 'plugins')
-rw-r--r--plugins/kmail/bodypartformatter/attendeeselector.cpp6
-rw-r--r--plugins/kmail/bodypartformatter/text_calendar.cpp40
-rw-r--r--plugins/kmail/bodypartformatter/text_vcard.cpp4
-rw-r--r--plugins/kmail/bodypartformatter/text_xdiff.cpp8
-rw-r--r--plugins/kmail/bodypartformatter/ui_attendeeselector.ui4
5 files changed, 31 insertions, 31 deletions
diff --git a/plugins/kmail/bodypartformatter/attendeeselector.cpp b/plugins/kmail/bodypartformatter/attendeeselector.cpp
index 5311858f0..ca733e7ea 100644
--- a/plugins/kmail/bodypartformatter/attendeeselector.cpp
+++ b/plugins/kmail/bodypartformatter/attendeeselector.cpp
@@ -26,7 +26,7 @@
#include <klocale.h>
#include <kpushbutton.h>
-#include <tqlayout.h>
+#include <layout.h>
AttendeeSelector::AttendeeSelector(TQWidget * parent)
: KDialogBase( parent, 0, true, i18n("Select Attendees"), Ok|Cancel, NoDefault, true )
@@ -34,8 +34,8 @@ AttendeeSelector::AttendeeSelector(TQWidget * parent)
ui = new AttendeeSelectorWidget( this );
setMainWidget( ui );
- TQGridLayout *tqlayout = static_cast<TQGridLayout*>( ui->tqlayout() );
- tqlayout->setMargin( 0 );
+ TQGridLayout *layout = static_cast<TQGridLayout*>( ui->layout() );
+ layout->setMargin( 0 );
ui->addButton->setGuiItem( KStdGuiItem::add() );
connect( ui->addButton, TQT_SIGNAL(clicked()), TQT_SLOT(addClicked()) );
diff --git a/plugins/kmail/bodypartformatter/text_calendar.cpp b/plugins/kmail/bodypartformatter/text_calendar.cpp
index 6a8e01996..ec585dcc1 100644
--- a/plugins/kmail/bodypartformatter/text_calendar.cpp
+++ b/plugins/kmail/bodypartformatter/text_calendar.cpp
@@ -78,7 +78,7 @@
#include <tqurl.h>
#include <tqdir.h>
-#include <tqtextstream.h>
+#include <textstream.h>
#include <tdepimmacros.h>
@@ -190,7 +190,7 @@ class Formatter : public KMail::Interface::BodyPartFormatter
}
};
-static TQString directoryFortqStatus( Attendee::PartStat status )
+static TQString directoryForStatus( Attendee::PartStat status )
{
TQString dir;
switch ( status ) {
@@ -344,16 +344,16 @@ class UrlHandler : public KMail::Interface::BodyPartURLHandler
TQString subject;
switch ( type ) {
case Answer:
- subject = i18n( "Answer: %1" ).tqarg( summary );
+ subject = i18n( "Answer: %1" ).arg( summary );
break;
case Delegation:
- subject = i18n( "Delegated: %1" ).tqarg( summary );
+ subject = i18n( "Delegated: %1" ).arg( summary );
break;
case Forward:
- subject = i18n( "Forwarded: %1" ).tqarg( summary );
+ subject = i18n( "Forwarded: %1" ).arg( summary );
break;
case DeclineCounter:
- subject = i18n( "Declined Counter Proposal: %1" ).tqarg( summary );
+ subject = i18n( "Declined Counter Proposal: %1" ).arg( summary );
break;
}
@@ -367,7 +367,7 @@ class UrlHandler : public KMail::Interface::BodyPartURLHandler
TQString recv = to;
if ( recv.isEmpty() )
recv = incidence->organizer().fullName();
- TQString statusString = directoryFortqStatus( status ); //it happens to return the right strings
+ TQString statusString = directoryForStatus( status ); //it happens to return the right strings
return callback.mailICal( recv, msg, subject, statusString, type != Forward );
}
@@ -426,7 +426,7 @@ class UrlHandler : public KMail::Interface::BodyPartURLHandler
bool cancelPastInvites( Incidence *incidence, const TQString &path ) const
{
TQString warnStr;
- TQDateTime now = TQDateTime::tqcurrentDateTime();
+ TQDateTime now = TQDateTime::currentDateTime();
TQDate today = now.date();
Event * const event = dynamic_cast<Event *>( incidence );
Todo * const todo = dynamic_cast<Todo *>( incidence );
@@ -434,13 +434,13 @@ class UrlHandler : public KMail::Interface::BodyPartURLHandler
Q_ASSERT( event );
if ( !event->doesFloat() ) {
if ( event->dtEnd() < now ) {
- warnStr = i18n( "\"%1\" occurred already." ).tqarg( event->summary() );
+ warnStr = i18n( "\"%1\" occurred already." ).arg( event->summary() );
} else if ( event->dtStart() <= now && now <= event->dtEnd() ) {
- warnStr = i18n( "\"%1\" is currently in-progress." ).tqarg( event->summary() );
+ warnStr = i18n( "\"%1\" is currently in-progress." ).arg( event->summary() );
}
} else {
if ( event->dtEnd().date() < today ) {
- warnStr = i18n( "\"%1\" occurred already." ).tqarg( event->summary() );
+ warnStr = i18n( "\"%1\" occurred already." ).arg( event->summary() );
} else if ( event->dtStart().date() <= today && today <= event->dtEnd().date() ) {
warnStr = i18n( "\"%1\", happening all day today, is currently in-progress." ).
arg( event->summary() );
@@ -451,19 +451,19 @@ class UrlHandler : public KMail::Interface::BodyPartURLHandler
if ( !todo->doesFloat() ) {
if ( todo->hasDueDate() ) {
if ( todo->dtDue() < now ) {
- warnStr = i18n( "\"%1\" is past due." ).tqarg( todo->summary() );
+ warnStr = i18n( "\"%1\" is past due." ).arg( todo->summary() );
} else if ( todo->hasStartDate() && todo->dtStart() <= now && now <= todo->dtDue() ) {
- warnStr = i18n( "\"%1\" is currently in-progress." ).tqarg( todo->summary() );
+ warnStr = i18n( "\"%1\" is currently in-progress." ).arg( todo->summary() );
}
} else if ( todo->hasStartDate() ) {
if ( todo->dtStart() < now ) {
- warnStr = i18n( "\"%1\" has already started." ).tqarg( todo->summary() );
+ warnStr = i18n( "\"%1\" has already started." ).arg( todo->summary() );
}
}
} else {
if ( todo->hasDueDate() ) {
if ( todo->dtDue().date() < today) {
- warnStr = i18n( "\"%1\" is past due." ).tqarg( todo->summary() );
+ warnStr = i18n( "\"%1\" is past due." ).arg( todo->summary() );
} else if ( todo->hasStartDate() &&
todo->dtStart().date() <= today && today <= todo->dtDue().date() ) {
warnStr = i18n( "\"%1\", happening all-day today, is currently in-progress." ).
@@ -526,12 +526,12 @@ class UrlHandler : public KMail::Interface::BodyPartURLHandler
} else if ( path.startsWith( "ATTACH:" ) ) {
return false;
} else {
- queryStr = i18n( "%1?" ).tqarg( path );
+ queryStr = i18n( "%1?" ).arg( path );
}
if ( KMessageBox::warningYesNo(
0,
- i18n( "%1\n%2" ).tqarg( warnStr ).tqarg( queryStr ) ) == KMessageBox::No ) {
+ i18n( "%1\n%2" ).arg( warnStr ).arg( queryStr ) ) == KMessageBox::No ) {
return true;
}
}
@@ -567,7 +567,7 @@ class UrlHandler : public KMail::Interface::BodyPartURLHandler
}
// First, save it for KOrganizer to handle
- TQString dir = directoryFortqStatus( status );
+ TQString dir = directoryForStatus( status );
if ( dir.isEmpty() )
return true; // unknown status
if ( status != Attendee::Delegated ) // we do that below for delegated incidences
@@ -649,7 +649,7 @@ class UrlHandler : public KMail::Interface::BodyPartURLHandler
if ( status == Attendee::Delegated ) {
incidence = icalToString( iCal );
myself = findMyself( incidence, receiver );
- myself->setqStatus( status );
+ myself->seStatus( status );
myself->setDelegate( delegateString );
TQString name, email;
KPIM::getNameAndMail( delegateString, name, email );
@@ -820,7 +820,7 @@ class UrlHandler : public KMail::Interface::BodyPartURLHandler
case KMessageBox::No: // means "send email"
summary = incidence->summary();
if ( !summary.isEmpty() ) {
- summary = i18n( "Re: %1" ).tqarg( summary );
+ summary = i18n( "Re: %1" ).arg( summary );
}
KApplication::kApplication()->invokeMailer( incidence->organizer().email(), summary );
diff --git a/plugins/kmail/bodypartformatter/text_vcard.cpp b/plugins/kmail/bodypartformatter/text_vcard.cpp
index c99fd1c08..ec3a3bfe5 100644
--- a/plugins/kmail/bodypartformatter/text_vcard.cpp
+++ b/plugins/kmail/bodypartformatter/text_vcard.cpp
@@ -104,7 +104,7 @@ namespace {
writer->queue( contact );
TQString addToLinkText = i18n( "[Add this contact to the addressbook]" );
- TQString op = TQString::tqfromLatin1( "addToAddressBook:%1" ).tqarg( count );
+ TQString op = TQString::fromLatin1( "addToAddressBook:%1" ).arg( count );
writer->queue(
"<div align=\"center\"><a href=\"" +
bodyPart->makeLink( op ) +
@@ -195,7 +195,7 @@ namespace {
if ( a.realName().isEmpty() ) {
return i18n( "Add this contact to the address book." );
} else {
- return i18n( "Add \"%1\" to the address book." ).tqarg( a.realName() );
+ return i18n( "Add \"%1\" to the address book." ).arg( a.realName() );
}
}
diff --git a/plugins/kmail/bodypartformatter/text_xdiff.cpp b/plugins/kmail/bodypartformatter/text_xdiff.cpp
index df89306f6..7fd053472 100644
--- a/plugins/kmail/bodypartformatter/text_xdiff.cpp
+++ b/plugins/kmail/bodypartformatter/text_xdiff.cpp
@@ -50,7 +50,7 @@
#include <tqurl.h>
#include <tqfile.h>
#include <tqdir.h>
-#include <tqstylesheet.h>
+#include <stylesheet.h>
namespace {
@@ -71,19 +71,19 @@ namespace {
- TQString addedLineStyle = TQString::tqfromLatin1(
+ TQString addedLineStyle = TQString::fromLatin1(
"style=\""
"color: green;\"");
TQString fileAddStyle( "style=\"font-weight: bold; "
"color: green; \"" );
- TQString removedLineStyle = TQString::tqfromLatin1(
+ TQString removedLineStyle = TQString::fromLatin1(
"style=\""
"color: red;\"");
TQString fileRemoveStyle( "style=\"font-weight: bold; "
"color: red ;\"" );
- TQString tableStyle = TQString::tqfromLatin1(
+ TQString tableStyle = TQString::fromLatin1(
"style=\""
"text-align: -khtml-auto; "
"border: solid black 1px; "
diff --git a/plugins/kmail/bodypartformatter/ui_attendeeselector.ui b/plugins/kmail/bodypartformatter/ui_attendeeselector.ui
index 7ccbcc742..e74f4dce0 100644
--- a/plugins/kmail/bodypartformatter/ui_attendeeselector.ui
+++ b/plugins/kmail/bodypartformatter/ui_attendeeselector.ui
@@ -48,7 +48,7 @@
<property name="name">
<cstring>attendeeEdit</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>250</width>
<height>0</height>
@@ -65,7 +65,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>140</height>
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-09 06:45:03 +0000