diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:49:30 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:49:30 -0600 |
commit | a9bde819f2b421dcc44741156e75eca4bb5fb4f4 (patch) | |
tree | d087071b1e8fcf79698938efec19f8e48bab0799 /korganizer/printing | |
parent | 5c4a80ead2b1fe57dc6a8c29d0368792344cd61e (diff) | |
download | tdepim-a9bde819f2b421dcc44741156e75eca4bb5fb4f4.tar.gz tdepim-a9bde819f2b421dcc44741156e75eca4bb5fb4f4.zip |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'korganizer/printing')
-rw-r--r-- | korganizer/printing/calprintdefaultplugins.cpp | 14 | ||||
-rw-r--r-- | korganizer/printing/calprintpluginbase.cpp | 28 |
2 files changed, 21 insertions, 21 deletions
diff --git a/korganizer/printing/calprintdefaultplugins.cpp b/korganizer/printing/calprintdefaultplugins.cpp index caa2e69ef..e67015545 100644 --- a/korganizer/printing/calprintdefaultplugins.cpp +++ b/korganizer/printing/calprintdefaultplugins.cpp @@ -298,7 +298,7 @@ void CalPrintIncidence::print( TQPainter &p, int width, int height ) exceptString = i18n("except for listed dates", " except"); for ( uint i = 0; i < recurs->exDates().size(); i++ ) { exceptString.append(" "); - exceptString.append( KGlobal::locale()->formatDate(recurs->exDates()[i], + exceptString.append( TDEGlobal::locale()->formatDate(recurs->exDates()[i], true) ); } } @@ -482,24 +482,24 @@ void CalPrintIncidence::print( TQPainter &p, int width, int height ) if ( (*rit)->dtStart().isValid() ) { datesString += i18n( "Start Date: %1\n").arg( - KGlobal::locale()->formatDate( (*rit)->dtStart().date(), + TDEGlobal::locale()->formatDate( (*rit)->dtStart().date(), true ) ); if ( !(*rit)->doesFloat() ) { datesString += i18n( "Start Time: %1\n").arg( - KGlobal::locale()->formatTime((*rit)->dtStart().time(), + TDEGlobal::locale()->formatTime((*rit)->dtStart().time(), false, false) ); } } if ( (*rit)->dtEnd().isValid() ) { subitemString += i18n( "Due Date: %1\n").arg( - KGlobal::locale()->formatDate( (*rit)->dtEnd().date(), + TDEGlobal::locale()->formatDate( (*rit)->dtEnd().date(), true ) ); if ( !(*rit)->doesFloat() ) { subitemString += i18n( "subitem due time", "Due Time: %1\n").arg( - KGlobal::locale()->formatTime((*rit)->dtEnd().time(), + TDEGlobal::locale()->formatTime((*rit)->dtEnd().time(), false, false) ); } } @@ -705,7 +705,7 @@ void CalPrintDay::print( TQPainter &p, int width, int height ) TQRect footerBox( 0, height - footerHeight(), width, footerHeight() ); height -= footerHeight(); - KLocale *local = KGlobal::locale(); + KLocale *local = TDEGlobal::locale(); do { TQTime curStartTime( mStartTime ); @@ -915,7 +915,7 @@ void CalPrintWeek::print( TQPainter &p, int width, int height ) toWeek = mToDate.addDays( 6 - weekdayCol ); curWeek = fromWeek.addDays( 6 ); - KLocale *local = KGlobal::locale(); + KLocale *local = TDEGlobal::locale(); TQString line1, line2, title; TQRect headerBox( 0, 0, width, headerHeight() ); diff --git a/korganizer/printing/calprintpluginbase.cpp b/korganizer/printing/calprintpluginbase.cpp index 99d57395e..50436228b 100644 --- a/korganizer/printing/calprintpluginbase.cpp +++ b/korganizer/printing/calprintpluginbase.cpp @@ -558,7 +558,7 @@ int CalPrintPluginBase::drawFooter( TQPainter &p, TQRect &footbox ) TQFont oldfont( p.font() ); p.setFont( TQFont( "sans-serif", 6 ) ); TQFontMetrics fm( p.font() ); - TQString dateStr = KGlobal::locale()->formatDateTime( TQDateTime::currentDateTime(), false ); + TQString dateStr = TDEGlobal::locale()->formatDateTime( TQDateTime::currentDateTime(), false ); p.drawText( footbox, TQt::AlignCenter | TQt::AlignVCenter | TQt::SingleLine, i18n( "print date: formatted-datetime", "printed: %1" ).arg( dateStr ) ); p.setFont( oldfont ); @@ -690,7 +690,7 @@ void CalPrintPluginBase::drawTimeLine( TQPainter &p, const TQTime &fromTime, if ( newY < box.bottom() ) { TQFont oldFont( p.font() ); // draw the time: - if ( !KGlobal::locale()->use12Clock() ) { + if ( !TDEGlobal::locale()->use12Clock() ) { p.drawLine( xcenter, (int)newY, box.right(), (int)newY ); numStr.setNum( curTime.hour() ); if ( cellHeight > 30 ) { @@ -706,7 +706,7 @@ void CalPrintPluginBase::drawTimeLine( TQPainter &p, const TQTime &fromTime, } else { p.drawLine( box.left(), (int)newY, box.right(), (int)newY ); TQTime time( curTime.hour(), 0 ); - numStr = KGlobal::locale()->formatTime( time ); + numStr = TDEGlobal::locale()->formatTime( time ); if ( box.width() < 60 ) { p.setFont( TQFont( "sans-serif", 7, TQFont::Bold ) ); // for weekprint } else { @@ -906,14 +906,14 @@ void CalPrintPluginBase::drawAgendaItem( PrintCellItem *item, TQPainter &p, if ( event->location().isEmpty() ) { str = i18n( "starttime - endtime summary", "%1-%2 %3" ). - arg( KGlobal::locale()->formatTime( startTime.time() ) ). - arg( KGlobal::locale()->formatTime( endTime.time() ) ). + arg( TDEGlobal::locale()->formatTime( startTime.time() ) ). + arg( TDEGlobal::locale()->formatTime( endTime.time() ) ). arg( cleanStr( event->summary() ) ); } else { str = i18n( "starttime - endtime summary, location", "%1-%2 %3, %4" ). - arg( KGlobal::locale()->formatTime( startTime.time() ) ). - arg( KGlobal::locale()->formatTime( endTime.time() ) ). + arg( TDEGlobal::locale()->formatTime( startTime.time() ) ). + arg( TDEGlobal::locale()->formatTime( endTime.time() ) ). arg( cleanStr( event->summary() ) ). arg( cleanStr( event->location() ) ); } @@ -927,7 +927,7 @@ void CalPrintPluginBase::drawDayBox( TQPainter &p, const TQDate &qd, bool fullDate, bool printRecurDaily, bool printRecurWeekly ) { TQString dayNumStr; - const KLocale*local = KGlobal::locale(); + const KLocale*local = TDEGlobal::locale(); // This has to be localized if ( fullDate && mCalSys ) { @@ -1001,7 +1001,7 @@ void CalPrintPluginBase::drawDayBox( TQPainter &p, const TQDate &qd, continue; } if ( todo->hasStartDate() && !todo->doesFloat() ) { - timeText = KGlobal::locale()->formatTime( todo->dtStart().time() ) + " "; + timeText = TDEGlobal::locale()->formatTime( todo->dtStart().time() ) + " "; } else { timeText = ""; } @@ -1017,11 +1017,11 @@ void CalPrintPluginBase::drawDayBox( TQPainter &p, const TQDate &qd, if ( !todo->doesFloat() ) { str = i18n( "%1 (Due: %2)" ). arg( summaryStr ). - arg( KGlobal::locale()->formatDateTime( todo->dtDue() ) ); + arg( TDEGlobal::locale()->formatDateTime( todo->dtDue() ) ); } else { str = i18n( "%1 (Due: %2)" ). arg( summaryStr ). - arg( KGlobal::locale()->formatDate( todo->dtDue().date(), true ) ); + arg( TDEGlobal::locale()->formatDate( todo->dtDue().date(), true ) ); } } else { str = summaryStr; @@ -1423,7 +1423,7 @@ void CalPrintPluginBase::drawTodo( int &count, Todo *todo, TQPainter &p, TodoParentStart *r ) { TQString outStr; - const KLocale *local = KGlobal::locale(); + const KLocale *local = TDEGlobal::locale(); TQRect rect; TodoParentStart startpt; @@ -1640,7 +1640,7 @@ void CalPrintPluginBase::drawTodo( int &count, Todo *todo, TQPainter &p, int CalPrintPluginBase::weekdayColumn( int weekday ) { - return ( weekday + 7 - KGlobal::locale()->weekStartDay() ) % 7; + return ( weekday + 7 - TDEGlobal::locale()->weekStartDay() ) % 7; } void CalPrintPluginBase::drawJournalField( TQPainter &p, TQString field, TQString text, @@ -1670,7 +1670,7 @@ void CalPrintPluginBase::drawJournal( Journal * journal, TQPainter &p, int x, in TQFont oldFont( p.font() ); p.setFont( TQFont( "sans-serif", 15 ) ); TQString headerText; - TQString dateText( KGlobal::locale()-> + TQString dateText( TDEGlobal::locale()-> formatDate( journal->dtStart().date(), false ) ); if ( journal->summary().isEmpty() ) { |