summaryrefslogtreecommitdiffstats
path: root/korganizer/printing
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-04-14 20:16:30 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-04-14 20:16:30 +0000
commit1c93fca14d9ce37499bcfdf994c660186a0b6f17 (patch)
treef2defe163a805a9e34a2142dfde4cdb5e49241e7 /korganizer/printing
parent67e29a054cfcb1b0d2fe6b0a316cf6b3eec087b7 (diff)
downloadtdepim-1c93fca14d9ce37499bcfdf994c660186a0b6f17.tar.gz
tdepim-1c93fca14d9ce37499bcfdf994c660186a0b6f17.zip
Enable kdepim compilation under Qt4
This will likely break Qt3 compilation temporarily, which is an unintended side effect. A third and final kdepim commit will repair Qt3 compilation shortly. git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1227946 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'korganizer/printing')
-rw-r--r--korganizer/printing/calprintdefaultplugins.cpp36
-rw-r--r--korganizer/printing/calprinter.cpp2
-rw-r--r--korganizer/printing/calprintpluginbase.cpp36
3 files changed, 37 insertions, 37 deletions
diff --git a/korganizer/printing/calprintdefaultplugins.cpp b/korganizer/printing/calprintdefaultplugins.cpp
index c5f69dd09..6fe3a5e39 100644
--- a/korganizer/printing/calprintdefaultplugins.cpp
+++ b/korganizer/printing/calprintdefaultplugins.cpp
@@ -346,13 +346,13 @@ void CalPrintIncidence::print( TQPainter &p, int width, int height )
if ( offset % (24*60) == 0 && offset>0 ) { // divides evenly into days?
useoffset = offset / (24*60);
- offsetstr = offsetstr.arg( i18n("1 day", "%n days", useoffset ) );
+ offsetstr = offsetstr.tqarg( i18n("1 day", "%n days", useoffset ) );
} else if (offset % 60 == 0 && offset>0 ) { // divides evenly into hours?
useoffset = offset / 60;
- offsetstr = offsetstr.arg( i18n("1 hour", "%n hours", useoffset ) );
+ offsetstr = offsetstr.tqarg( i18n("1 hour", "%n hours", useoffset ) );
} else {
useoffset = offset;
- offsetstr = offsetstr.arg( i18n("1 minute", "%n minutes", useoffset ) );
+ offsetstr = offsetstr.tqarg( i18n("1 minute", "%n minutes", useoffset ) );
}
alarmStrings << offsetstr;
}
@@ -481,24 +481,24 @@ void CalPrintIncidence::print( TQPainter &p, int width, int height )
datesString = "";
if ( (*rit)->dtStart().isValid() ) {
datesString += i18n(
- "Start Date: %1\n").arg(
+ "Start Date: %1\n").tqarg(
KGlobal::locale()->formatDate( (*rit)->dtStart().date(),
true ) );
if ( !(*rit)->doesFloat() ) {
datesString += i18n(
- "Start Time: %1\n").arg(
+ "Start Time: %1\n").tqarg(
KGlobal::locale()->formatTime((*rit)->dtStart().time(),
false, false) );
}
}
if ( (*rit)->dtEnd().isValid() ) {
subitemString += i18n(
- "Due Date: %1\n").arg(
+ "Due Date: %1\n").tqarg(
KGlobal::locale()->formatDate( (*rit)->dtEnd().date(),
true ) );
if ( !(*rit)->doesFloat() ) {
subitemString += i18n(
- "subitem due time", "Due Time: %1\n").arg(
+ "subitem due time", "Due Time: %1\n").tqarg(
KGlobal::locale()->formatTime((*rit)->dtEnd().time(),
false, false) );
}
@@ -511,12 +511,12 @@ void CalPrintIncidence::print( TQPainter &p, int width, int height )
subitemString += "\n";
}
subitemString += i18n( "subitem tqStatus: statusString",
- "tqStatus: %1\n").arg( statusString );
+ "tqStatus: %1\n").tqarg( statusString );
subitemString += IncidenceFormatter::recurrenceString((*rit)) + "\n";
subitemString += i18n( "subitem Priority: N",
- "Priority: %1\n").arg( (*rit)->priority() );
+ "Priority: %1\n").tqarg( (*rit)->priority() );
subitemString += i18n( "subitem Secrecy: secrecyString",
- "Secrecy: %1\n").arg( (*rit)->secrecyStr() );
+ "Secrecy: %1\n").tqarg( (*rit)->secrecyStr() );
subitemString += "\n";
}
drawBoxWithCaption( p, notesBox, i18n("Subitems:"),
@@ -562,8 +562,8 @@ void CalPrintIncidence::print( TQPainter &p, int width, int height )
"'Name (Role): tqStatus', e.g. 'Reinhold Kainhofer "
"<reinhold@kainhofer.com> (Participant): Awaiting Response'",
"%1 (%2): %3")
- .arg( (*ait)->fullName() )
- .arg( (*ait)->roleStr() ).arg( (*ait)->statusStr() );
+ .tqarg( (*ait)->fullName() )
+ .tqarg( (*ait)->roleStr() ).tqarg( (*ait)->statusStr() );
}
drawBoxWithCaption( p, attendeesBox, i18n("Attendees:"), attendeeString,
/*sameLine=*/false, /*expand=*/false, captionFont, textFont );
@@ -572,11 +572,11 @@ void CalPrintIncidence::print( TQPainter &p, int width, int height )
if ( mShowOptions ) {
TQString optionsString;
if ( !(*it)->statusStr().isEmpty() ) {
- optionsString += i18n("tqStatus: %1").arg( (*it)->statusStr() );
+ optionsString += i18n("tqStatus: %1").tqarg( (*it)->statusStr() );
optionsString += "\n";
}
if ( !(*it)->secrecyStr().isEmpty() ) {
- optionsString += i18n("Secrecy: %1").arg( (*it)->secrecyStr() );
+ optionsString += i18n("Secrecy: %1").tqarg( (*it)->secrecyStr() );
optionsString += "\n";
}
if ( (*it)->type() == "Event" ) {
@@ -936,7 +936,7 @@ void CalPrintWeek::print( TQPainter &p, int width, int height )
} else {
title = i18n("date from-\nto", "%1 -\n%2");;
}
- title = title.arg( line1 ).arg( line2 );
+ title = title.tqarg( line1 ).tqarg( line2 );
drawHeader( p, title, curWeek.addDays( -6 ), TQDate(), headerBox );
drawWeek( p, curWeek, weekBox );
@@ -959,7 +959,7 @@ void CalPrintWeek::print( TQPainter &p, int width, int height )
} else {
title = i18n("date from -\nto (week number)", "%1 -\n%2 (Week %3)");
}
- title = title.arg( line1 ).arg( line2 ).arg( curWeek.weekNumber() );
+ title = title.tqarg( line1 ).tqarg( line2 ).tqarg( curWeek.weekNumber() );
drawHeader( p, title, curWeek, TQDate(), headerBox );
TQRect weekBox( headerBox );
@@ -1121,8 +1121,8 @@ void CalPrintMonth::print( TQPainter &p, int width, int height )
do {
TQString title( i18n("monthname year", "%1 %2") );
- title = title.arg( calSys->monthName( curMonth ) )
- .arg( curMonth.year() );
+ title = title.tqarg( calSys->monthName( curMonth ) )
+ .tqarg( curMonth.year() );
TQDate tmp( fromMonth );
int weekdayCol = weekdayColumn( tmp.dayOfWeek() );
tmp = tmp.addDays( -weekdayCol );
diff --git a/korganizer/printing/calprinter.cpp b/korganizer/printing/calprinter.cpp
index 0b2c098cf..54aacd18c 100644
--- a/korganizer/printing/calprinter.cpp
+++ b/korganizer/printing/calprinter.cpp
@@ -174,7 +174,7 @@ CalPrintDialog::CalPrintDialog( KOrg::PrintPlugin::List plugins,
TQVBox *page = makeVBoxMainWidget();
TQSplitter *splitter = new TQSplitter( page );
- splitter->setOrientation( TQSplitter::Horizontal );
+ splitter->setOrientation( Qt::Horizontal );
mTypeGroup = new TQVButtonGroup( i18n("Print Style"), splitter, "buttonGroup" );
// use the minimal width possible = max width of the radio buttons, not extensible
diff --git a/korganizer/printing/calprintpluginbase.cpp b/korganizer/printing/calprintpluginbase.cpp
index 3d330efe0..3df996528 100644
--- a/korganizer/printing/calprintpluginbase.cpp
+++ b/korganizer/printing/calprintpluginbase.cpp
@@ -560,7 +560,7 @@ int CalPrintPluginBase::drawFooter( TQPainter &p, TQRect &footbox )
TQFontMetrics fm( p.font() );
TQString dateStr = KGlobal::locale()->formatDateTime( TQDateTime::tqcurrentDateTime(), false );
p.drawText( footbox, TQt::AlignCenter | TQt::AlignVCenter | TQt::SingleLine,
- i18n( "print date: formatted-datetime", "printed: %1" ).arg( dateStr ) );
+ i18n( "print date: formatted-datetime", "printed: %1" ).tqarg( dateStr ) );
p.setFont( oldfont );
return footbox.bottom();
@@ -933,9 +933,9 @@ void CalPrintPluginBase::drawDayBox( TQPainter &p, const TQDate &qd,
if ( fullDate && mCalSys ) {
dayNumStr = i18n("weekday month date", "%1 %2 %3")
- .arg( mCalSys->weekDayName( qd ) )
- .arg( mCalSys->monthName( qd ) )
- .arg( qd.day() );
+ .tqarg( mCalSys->weekDayName( qd ) )
+ .tqarg( mCalSys->monthName( qd ) )
+ .tqarg( qd.day() );
// dayNumStr = local->formatDate(qd);
} else {
dayNumStr = TQString::number( qd.day() );
@@ -984,7 +984,7 @@ void CalPrintPluginBase::drawDayBox( TQPainter &p, const TQDate &qd,
TQString str;
if ( !currEvent->location().isEmpty() ) {
str = i18n( "summary, location", "%1, %2" ).
- arg( currEvent->summary() ).arg( currEvent->location() );
+ tqarg( currEvent->summary() ).tqarg( currEvent->location() );
} else {
str = currEvent->summary();
}
@@ -1008,7 +1008,7 @@ void CalPrintPluginBase::drawDayBox( TQPainter &p, const TQDate &qd,
TQString summaryStr;
if ( !todo->location().isEmpty() ) {
summaryStr = i18n( "summary, location", "%1, %2" ).
- arg( todo->summary() ).arg( todo->location() );
+ tqarg( todo->summary() ).tqarg( todo->location() );
} else {
summaryStr = todo->summary();
}
@@ -1026,7 +1026,7 @@ void CalPrintPluginBase::drawDayBox( TQPainter &p, const TQDate &qd,
} else {
str = summaryStr;
}
- drawIncidence( p, box, timeText, i18n("To-do: %1").arg( str ), textY );
+ drawIncidence( p, box, timeText, i18n("To-do: %1").tqarg( str ), textY );
}
}
@@ -1572,7 +1572,7 @@ void CalPrintPluginBase::drawTodo( int &count, Todo *todo, TQPainter &p,
}
//now, write the percentage
- outStr = i18n( "%1%" ).arg( todo->percentComplete() );
+ outStr = i18n( "%1%" ).tqarg( todo->percentComplete() );
rect = p.boundingRect( posPercentComplete+lwidth+3, y, x + width, -1,
TQt::AlignTop | TQt::AlignLeft, outStr );
p.drawText( rect, TQt::AlignTop | TQt::AlignLeft, outStr );
@@ -1648,7 +1648,7 @@ void CalPrintPluginBase::drawJournalField( TQPainter &p, TQString field, TQStrin
{
if ( text.isEmpty() ) return;
- TQString entry( field.arg( text ) );
+ TQString entry( field.tqarg( text ) );
TQRect rect( p.boundingRect( x, y, width, -1, TQt::WordBreak, entry) );
if ( rect.bottom() > pageHeight) {
@@ -1677,8 +1677,8 @@ void CalPrintPluginBase::drawJournal( Journal * journal, TQPainter &p, int x, in
headerText = dateText;
} else {
headerText = i18n("Description - date", "%1 - %2")
- .arg( journal->summary() )
- .arg( dateText );
+ .tqarg( journal->summary() )
+ .tqarg( dateText );
}
TQRect rect( p.boundingRect( x, y, width, -1, TQt::WordBreak, headerText) );
@@ -1717,15 +1717,15 @@ void CalPrintPluginBase::drawSplitHeaderRight( TQPainter &p, const TQDate &fd,
if ( mCalSys ) {
if ( fd.month() == td.month() ) {
title = i18n("Date range: Month dayStart - dayEnd", "%1 %2 - %3")
- .arg( mCalSys->monthName( fd.month(), false ) )
- .arg( mCalSys->dayString( fd, false ) )
- .arg( mCalSys->dayString( td, false ) );
+ .tqarg( mCalSys->monthName( fd.month(), false ) )
+ .tqarg( mCalSys->dayString( fd, false ) )
+ .tqarg( mCalSys->dayString( td, false ) );
} else {
title = i18n("Date range: monthStart dayStart - monthEnd dayEnd", "%1 %2 - %3 %4")
- .arg( mCalSys->monthName( fd.month(), false ) )
- .arg( mCalSys->dayString( fd, false ) )
- .arg( mCalSys->monthName( td.month(), false ) )
- .arg( mCalSys->dayString( td, false ) );
+ .tqarg( mCalSys->monthName( fd.month(), false ) )
+ .tqarg( mCalSys->dayString( fd, false ) )
+ .tqarg( mCalSys->monthName( td.month(), false ) )
+ .tqarg( mCalSys->dayString( td, false ) );
}
}