summaryrefslogtreecommitdiffstats
path: root/plugins/kmail
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-02-16 20:17:18 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-02-16 20:17:18 +0000
commitf4fae92b6768541e2952173c3d4b09040f95bf7e (patch)
treed8c5d93232235cd635f3310b4d95490df181ba2d /plugins/kmail
parent125c0a08265b75a133644d3b55f47e37c919f45d (diff)
downloadtdepim-f4fae92b6768541e2952173c3d4b09040f95bf7e.tar.gz
tdepim-f4fae92b6768541e2952173c3d4b09040f95bf7e.zip
Moved kpilot from kdepim to applications, as the core Trinity libraries should not contain hardware-dependent software
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1221127 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'plugins/kmail')
-rw-r--r--plugins/kmail/bodypartformatter/attendeeselector.cpp4
-rw-r--r--plugins/kmail/bodypartformatter/text_calendar.cpp10
-rw-r--r--plugins/kmail/bodypartformatter/text_vcard.cpp2
-rw-r--r--plugins/kmail/bodypartformatter/text_xdiff.cpp6
-rw-r--r--plugins/kmail/bodypartformatter/ui_attendeeselector.ui10
5 files changed, 16 insertions, 16 deletions
diff --git a/plugins/kmail/bodypartformatter/attendeeselector.cpp b/plugins/kmail/bodypartformatter/attendeeselector.cpp
index 8fa677705..57c546420 100644
--- a/plugins/kmail/bodypartformatter/attendeeselector.cpp
+++ b/plugins/kmail/bodypartformatter/attendeeselector.cpp
@@ -34,8 +34,8 @@ AttendeeSelector::AttendeeSelector(TQWidget * parent)
ui = new AttendeeSelectorWidget( this );
setMainWidget( ui );
- TQGridLayout *layout = static_cast<TQGridLayout*>( ui->layout() );
- layout->setMargin( 0 );
+ TQGridLayout *tqlayout = static_cast<TQGridLayout*>( ui->tqlayout() );
+ tqlayout->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 49b60f5ff..66ed33c30 100644
--- a/plugins/kmail/bodypartformatter/text_calendar.cpp
+++ b/plugins/kmail/bodypartformatter/text_calendar.cpp
@@ -118,7 +118,7 @@ CalendarManager::CalendarManager()
const TQStringList subResources = (*it)->subresources();
TQMap<TQString, int> prefixSet; // KDE4: QSet
for ( TQStringList::ConstIterator subIt = subResources.begin(); subIt != subResources.end(); ++subIt ) {
- if ( !(*subIt).contains( "/.INBOX.directory/" ) )
+ if ( !(*subIt).tqcontains( "/.INBOX.directory/" ) )
// we don't care about shared folders
continue;
prefixSet.insert( (*subIt).left( (*subIt).find( "/.INBOX.directory/" ) ), 0 );
@@ -295,7 +295,7 @@ class UrlHandler : public KMail::Interface::BodyPartURLHandler
}
- Attendee* setStatusOnMyself( Incidence* incidence, Attendee* myself,
+ Attendee* seStatusOnMyself( Incidence* incidence, Attendee* myself,
Attendee::PartStat status, const TQString &receiver ) const
{
Attendee* newMyself = 0;
@@ -426,7 +426,7 @@ class UrlHandler : public KMail::Interface::BodyPartURLHandler
bool cancelPastInvites( Incidence *incidence, const TQString &path ) const
{
TQString warnStr;
- TQDateTime now = TQDateTime::currentDateTime();
+ TQDateTime now = TQDateTime::tqcurrentDateTime();
TQDate today = now.date();
Event * const event = dynamic_cast<Event *>( incidence );
Todo * const todo = dynamic_cast<Todo *>( incidence );
@@ -606,7 +606,7 @@ class UrlHandler : public KMail::Interface::BodyPartURLHandler
}
if ( ( myself && myself->RSVP() ) || heuristicalRSVP( incidence ) ) {
- Attendee* newMyself = setStatusOnMyself( incidence, myself, status, receiver );
+ Attendee* newMyself = seStatusOnMyself( incidence, myself, status, receiver );
if ( newMyself && status == Attendee::Delegated ) {
newMyself->setDelegate( delegateString );
newMyself->setRSVP( delegatorRSVP );
@@ -649,7 +649,7 @@ class UrlHandler : public KMail::Interface::BodyPartURLHandler
if ( status == Attendee::Delegated ) {
incidence = icalToString( iCal );
myself = findMyself( incidence, receiver );
- myself->setStatus( status );
+ myself->seStatus( status );
myself->setDelegate( delegateString );
TQString name, email;
KPIM::getNameAndMail( delegateString, name, email );
diff --git a/plugins/kmail/bodypartformatter/text_vcard.cpp b/plugins/kmail/bodypartformatter/text_vcard.cpp
index 39a4ab28d..3fd76b8e5 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::fromLatin1( "addToAddressBook:%1" ).arg( count );
+ TQString op = TQString::tqfromLatin1( "addToAddressBook:%1" ).arg( count );
writer->queue(
"<div align=\"center\"><a href=\"" +
bodyPart->makeLink( op ) +
diff --git a/plugins/kmail/bodypartformatter/text_xdiff.cpp b/plugins/kmail/bodypartformatter/text_xdiff.cpp
index 53bb0016f..26c366ab1 100644
--- a/plugins/kmail/bodypartformatter/text_xdiff.cpp
+++ b/plugins/kmail/bodypartformatter/text_xdiff.cpp
@@ -71,19 +71,19 @@ namespace {
- TQString addedLineStyle = TQString::fromLatin1(
+ TQString addedLineStyle = TQString::tqfromLatin1(
"style=\""
"color: green;\"");
TQString fileAddStyle( "style=\"font-weight: bold; "
"color: green; \"" );
- TQString removedLineStyle = TQString::fromLatin1(
+ TQString removedLineStyle = TQString::tqfromLatin1(
"style=\""
"color: red;\"");
TQString fileRemoveStyle( "style=\"font-weight: bold; "
"color: red ;\"" );
- TQString tableStyle = TQString::fromLatin1(
+ TQString tableStyle = TQString::tqfromLatin1(
"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 06873fe5e..54efee6c0 100644
--- a/plugins/kmail/bodypartformatter/ui_attendeeselector.ui
+++ b/plugins/kmail/bodypartformatter/ui_attendeeselector.ui
@@ -5,7 +5,7 @@
<property name="name">
<cstring>AttendeeSelectorWidget</cstring>
</property>
- <property name="geometry">
+ <property name="tqgeometry">
<rect>
<x>0</x>
<y>0</y>
@@ -48,7 +48,7 @@
<property name="name">
<cstring>attendeeEdit</cstring>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>250</width>
<height>0</height>
@@ -65,7 +65,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>140</height>
@@ -77,8 +77,8 @@
<includes>
<include location="global" impldecl="in declaration">libkdepim/addresseelineedit.h</include>
</includes>
-<layoutdefaults spacing="6" margin="0"/>
-<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<tqlayoutdefaults spacing="6" margin="0"/>
+<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
<includehints>
<includehint>kpushbutton.h</includehint>
<includehint>kpushbutton.h</includehint>