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 /libkcal | |
parent | 5c4a80ead2b1fe57dc6a8c29d0368792344cd61e (diff) | |
download | tdepim-a9bde819f2b421dcc44741156e75eca4bb5fb4f4.tar.gz tdepim-a9bde819f2b421dcc44741156e75eca4bb5fb4f4.zip |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'libkcal')
-rw-r--r-- | libkcal/event.cpp | 6 | ||||
-rw-r--r-- | libkcal/htmlexport.cpp | 8 | ||||
-rw-r--r-- | libkcal/incidencebase.cpp | 6 | ||||
-rw-r--r-- | libkcal/incidenceformatter.cpp | 72 | ||||
-rw-r--r-- | libkcal/resourcecached.cpp | 4 | ||||
-rw-r--r-- | libkcal/todo.cpp | 14 |
6 files changed, 55 insertions, 55 deletions
diff --git a/libkcal/event.cpp b/libkcal/event.cpp index 5bd3a8188..b040d1823 100644 --- a/libkcal/event.cpp +++ b/libkcal/event.cpp @@ -100,17 +100,17 @@ TQDate Event::dateEnd() const TQString Event::dtEndTimeStr() const { - return KGlobal::locale()->formatTime(dtEnd().time()); + return TDEGlobal::locale()->formatTime(dtEnd().time()); } TQString Event::dtEndDateStr(bool shortfmt) const { - return KGlobal::locale()->formatDate(dtEnd().date(),shortfmt); + return TDEGlobal::locale()->formatDate(dtEnd().date(),shortfmt); } TQString Event::dtEndStr() const { - return KGlobal::locale()->formatDateTime(dtEnd()); + return TDEGlobal::locale()->formatDateTime(dtEnd()); } void Event::setHasEndDate(bool b) diff --git a/libkcal/htmlexport.cpp b/libkcal/htmlexport.cpp index de436e0d3..7938c7512 100644 --- a/libkcal/htmlexport.cpp +++ b/libkcal/htmlexport.cpp @@ -147,9 +147,9 @@ void HtmlExport::createMonthView(TQTextStream *ts) while ( start < toDate() ) { // Write header - *ts << "<h2>" << (i18n("month_year","%1 %2").arg(KGlobal::locale()->calendar()->monthName(start)) + *ts << "<h2>" << (i18n("month_year","%1 %2").arg(TDEGlobal::locale()->calendar()->monthName(start)) .arg(start.year())) << "</h2>\n"; - if ( KGlobal::locale()->weekStartDay() == 1 ) { + if ( TDEGlobal::locale()->weekStartDay() == 1 ) { start = start.addDays(1 - start.dayOfWeek()); } else { if (start.dayOfWeek() != 7) { @@ -161,7 +161,7 @@ void HtmlExport::createMonthView(TQTextStream *ts) // Write table header *ts << " <tr>"; for(int i=0; i<7; ++i) { - *ts << "<th>" << KGlobal::locale()->calendar()->weekDayName( start.addDays(i) ) << "</th>"; + *ts << "<th>" << TDEGlobal::locale()->calendar()->weekDayName( start.addDays(i) ) << "</th>"; } *ts << "</tr>\n"; @@ -256,7 +256,7 @@ void HtmlExport::createEventList (TQTextStream *ts) if ( first ) { *ts << " <tr><td colspan=\"" << TQString::number(columns) << "\" class=\"datehead\"><i>" - << KGlobal::locale()->formatDate(dt) + << TDEGlobal::locale()->formatDate(dt) << "</i></td></tr>\n"; first = false; } diff --git a/libkcal/incidencebase.cpp b/libkcal/incidencebase.cpp index a8a6bdb05..74c896f57 100644 --- a/libkcal/incidencebase.cpp +++ b/libkcal/incidencebase.cpp @@ -205,17 +205,17 @@ TQDateTime IncidenceBase::dtStart() const TQString IncidenceBase::dtStartTimeStr() const { - return KGlobal::locale()->formatTime(dtStart().time()); + return TDEGlobal::locale()->formatTime(dtStart().time()); } TQString IncidenceBase::dtStartDateStr(bool shortfmt) const { - return KGlobal::locale()->formatDate(dtStart().date(),shortfmt); + return TDEGlobal::locale()->formatDate(dtStart().date(),shortfmt); } TQString IncidenceBase::dtStartStr() const { - return KGlobal::locale()->formatDateTime(dtStart()); + return TDEGlobal::locale()->formatDateTime(dtStart()); } diff --git a/libkcal/incidenceformatter.cpp b/libkcal/incidenceformatter.cpp index 063ccf072..7632b17ee 100644 --- a/libkcal/incidenceformatter.cpp +++ b/libkcal/incidenceformatter.cpp @@ -221,7 +221,7 @@ static TQString displayViewLinkPerson( const TQString& email, TQString name, TQS mailto.setProtocol( "mailto" ); mailto.setPath( email ); const TQString iconPath = - KGlobal::iconLoader()->iconPath( "mail_new", KIcon::Small ); + TDEGlobal::iconLoader()->iconPath( "mail_new", KIcon::Small ); tmpString += " " + htmlAddLink( mailto.url(), "<img valign=\"top\" src=\"" + iconPath + "\">" ); @@ -401,38 +401,38 @@ static TQString displayViewFormatHeader( Incidence *incidence ) if ( incidence->customProperty( "KABC", "BIRTHDAY" ) == "YES" ) { if ( incidence->customProperty( "KABC", "ANNIVERSARY" ) == "YES" ) { iconPath = - KGlobal::iconLoader()->iconPath( "calendaranniversary", KIcon::Small ); + TDEGlobal::iconLoader()->iconPath( "calendaranniversary", KIcon::Small ); } else { - iconPath = KGlobal::iconLoader()->iconPath( "calendarbirthday", KIcon::Small ); + iconPath = TDEGlobal::iconLoader()->iconPath( "calendarbirthday", KIcon::Small ); } } else { - iconPath = KGlobal::iconLoader()->iconPath( "appointment", KIcon::Small ); + iconPath = TDEGlobal::iconLoader()->iconPath( "appointment", KIcon::Small ); } tmpStr += "<img valign=\"top\" src=\"" + iconPath + "\">"; } if ( incidence->type() == "Todo" ) { tmpStr += "<img valign=\"top\" src=\"" + - KGlobal::iconLoader()->iconPath( "todo", KIcon::Small ) + + TDEGlobal::iconLoader()->iconPath( "todo", KIcon::Small ) + "\">"; } if ( incidence->type() == "Journal" ) { tmpStr += "<img valign=\"top\" src=\"" + - KGlobal::iconLoader()->iconPath( "journal", KIcon::Small ) + + TDEGlobal::iconLoader()->iconPath( "journal", KIcon::Small ) + "\">"; } if ( incidence->isAlarmEnabled() ) { tmpStr += "<img valign=\"top\" src=\"" + - KGlobal::iconLoader()->iconPath( "bell", KIcon::Small ) + + TDEGlobal::iconLoader()->iconPath( "bell", KIcon::Small ) + "\">"; } if ( incidence->doesRecur() ) { tmpStr += "<img valign=\"top\" src=\"" + - KGlobal::iconLoader()->iconPath( "recur", KIcon::Small ) + + TDEGlobal::iconLoader()->iconPath( "recur", KIcon::Small ) + "\">"; } if ( incidence->isReadOnly() ) { tmpStr += "<img valign=\"top\" src=\"" + - KGlobal::iconLoader()->iconPath( "readonlyevent", KIcon::Small ) + + TDEGlobal::iconLoader()->iconPath( "readonlyevent", KIcon::Small ) + "\">"; } @@ -1174,7 +1174,7 @@ static TQString invitationPerson( const TQString& email, TQString name, TQString mailto.setProtocol( "mailto" ); mailto.setPath( person.fullName() ); const TQString iconPath = - KGlobal::iconLoader()->iconPath( "mail_new", KIcon::Small ); + TDEGlobal::iconLoader()->iconPath( "mail_new", KIcon::Small ); tmpString += " " + htmlAddLink( mailto.url(), "<img src=\"" + iconPath + "\">" ) ; @@ -1365,10 +1365,10 @@ static TQString invitationDetailsEvent( Event* event, bool noHtmlMode ) for ( ex_iter = exceptions.begin(); ex_iter != exceptions.end(); ++ex_iter ) { if (isFirstExRow == true) { isFirstExRow = false; - html += invitationRow( i18n("Cancelled on:"), KGlobal::locale()->formatDate(* ex_iter ) ); + html += invitationRow( i18n("Cancelled on:"), TDEGlobal::locale()->formatDate(* ex_iter ) ); } else { - html += invitationRow(" ", KGlobal::locale()->formatDate(* ex_iter ) ); + html += invitationRow(" ", TDEGlobal::locale()->formatDate(* ex_iter ) ); } } } @@ -1487,7 +1487,7 @@ static TQString invitationDetailsFreeBusy( FreeBusy *fb, bool /*noHtmlMode*/ ) html += invitationRow( i18n("Start date:"), IncidenceFormatter::dateToString( fb->dtStart(), true ) ); html += invitationRow( i18n("End date:"), - KGlobal::locale()->formatDate( fb->dtEnd().date(), true ) ); + TDEGlobal::locale()->formatDate( fb->dtEnd().date(), true ) ); html += "<tr><td colspan=2><hr></td></tr>\n"; html += "<tr><td colspan=2>Busy periods given in this free/busy object:</td></tr>\n"; @@ -1511,19 +1511,19 @@ static TQString invitationDetailsFreeBusy( FreeBusy *fb, bool /*noHtmlMode*/ ) cont += i18n("1 second", "%n seconds", dur); } html += invitationRow( TQString(), i18n("startDate for duration", "%1 for %2") - .arg( KGlobal::locale()->formatDateTime( per.start(), false ) ) + .arg( TDEGlobal::locale()->formatDateTime( per.start(), false ) ) .arg(cont) ); } else { TQString cont; if ( per.start().date() == per.end().date() ) { cont = i18n("date, fromTime - toTime ", "%1, %2 - %3") - .arg( KGlobal::locale()->formatDate( per.start().date() ) ) - .arg( KGlobal::locale()->formatTime( per.start().time() ) ) - .arg( KGlobal::locale()->formatTime( per.end().time() ) ); + .arg( TDEGlobal::locale()->formatDate( per.start().date() ) ) + .arg( TDEGlobal::locale()->formatTime( per.start().time() ) ) + .arg( TDEGlobal::locale()->formatTime( per.end().time() ) ); } else { cont = i18n("fromDateTime - toDateTime", "%1 - %2") - .arg( KGlobal::locale()->formatDateTime( per.start(), false ) ) - .arg( KGlobal::locale()->formatDateTime( per.end(), false ) ); + .arg( TDEGlobal::locale()->formatDateTime( per.start(), false ) ) + .arg( TDEGlobal::locale()->formatDateTime( per.end(), false ) ); } html += invitationRow( TQString(), cont ); @@ -2005,7 +2005,7 @@ static TQString invitationAttachments( InvitationFormatterHelper *helper, Incide // Attachment icon KMimeType::Ptr mimeType = KMimeType::mimeType( a->mimeType() ); const TQString iconStr = mimeType ? mimeType->icon( a->uri(), false ) : TQString( "application-octet-stream" ); - const TQString iconPath = KGlobal::iconLoader()->iconPath( iconStr, KIcon::Small ); + const TQString iconPath = TDEGlobal::iconLoader()->iconPath( iconStr, KIcon::Small ); if ( !iconPath.isEmpty() ) { tmpStr += "<img valign=\"top\" src=\"" + iconPath + "\">"; } @@ -3320,9 +3320,9 @@ TQString IncidenceFormatter::ToolTipVisitor::dateRangeText( Journal*journal ) TQString IncidenceFormatter::ToolTipVisitor::dateRangeText( FreeBusy *fb ) { TQString tmp( "<br>" + i18n("<i>Period start:</i> %1") ); - TQString ret = tmp.arg( KGlobal::locale()->formatDateTime( fb->dtStart() ) ); + TQString ret = tmp.arg( TDEGlobal::locale()->formatDateTime( fb->dtStart() ) ); tmp = "<br>" + i18n("<i>Period start:</i> %1"); - ret += tmp.arg( KGlobal::locale()->formatDateTime( fb->dtEnd() ) ); + ret += tmp.arg( TDEGlobal::locale()->formatDateTime( fb->dtEnd() ) ); return ret; } @@ -3637,9 +3637,9 @@ bool IncidenceFormatter::MailBodyVisitor::visit( Event *event ) // TODO_Recurrence: What to do with floating TQString endstr; if ( event->doesFloat() ) { - endstr = KGlobal::locale()->formatDate( recur->endDate() ); + endstr = TDEGlobal::locale()->formatDate( recur->endDate() ); } else { - endstr = KGlobal::locale()->formatDateTime( recur->endDateTime() ); + endstr = TDEGlobal::locale()->formatDateTime( recur->endDateTime() ); } mResult += i18n("Repeat until: %1\n").arg( endstr ); } else { @@ -3652,7 +3652,7 @@ bool IncidenceFormatter::MailBodyVisitor::visit( Event *event ) mResult += i18n("This recurring meeting has been cancelled on the following days:\n"); DateList::ConstIterator ex_iter; for ( ex_iter = exceptions.begin(); ex_iter != exceptions.end(); ++ex_iter ) { - mResult += i18n(" %1\n").arg( KGlobal::locale()->formatDate(* ex_iter ) ); + mResult += i18n(" %1\n").arg( TDEGlobal::locale()->formatDate(* ex_iter ) ); } } } @@ -3722,9 +3722,9 @@ static TQString recurEnd( Incidence *incidence ) { TQString endstr; if ( incidence->doesFloat() ) { - endstr = KGlobal::locale()->formatDate( incidence->recurrence()->endDate() ); + endstr = TDEGlobal::locale()->formatDate( incidence->recurrence()->endDate() ); } else { - endstr = KGlobal::locale()->formatDateTime( incidence->recurrence()->endDateTime() ); + endstr = TDEGlobal::locale()->formatDateTime( incidence->recurrence()->endDateTime() ); } return endstr; } @@ -3801,10 +3801,10 @@ TQString IncidenceFormatter::recurrenceString( Incidence *incidence ) dayList.append( i18n( "29th" ) ); dayList.append( i18n( "30th" ) ); dayList.append( i18n( "31st" ) ); - int weekStart = KGlobal::locale()->weekStartDay(); + int weekStart = TDEGlobal::locale()->weekStartDay(); TQString dayNames; TQString recurStr, txt; - const KCalendarSystem *calSys = KGlobal::locale()->calendar(); + const KCalendarSystem *calSys = TDEGlobal::locale()->calendar(); Recurrence *recur = incidence->recurrence(); switch ( recur->recurrenceType() ) { case Recurrence::rNone: @@ -4017,13 +4017,13 @@ TQString IncidenceFormatter::recurrenceString( Incidence *incidence ) TQString IncidenceFormatter::timeToString( const TQDateTime &date, bool shortfmt ) { - return KGlobal::locale()->formatTime( date.time(), !shortfmt ); + return TDEGlobal::locale()->formatTime( date.time(), !shortfmt ); } TQString IncidenceFormatter::dateToString( const TQDateTime &date, bool shortfmt ) { return - KGlobal::locale()->formatDate( date.date(), shortfmt ); + TDEGlobal::locale()->formatDate( date.date(), shortfmt ); } TQString IncidenceFormatter::dateTimeToString( const TQDateTime &date, @@ -4033,7 +4033,7 @@ TQString IncidenceFormatter::dateTimeToString( const TQDateTime &date, return dateToString( date, shortfmt ); } - return KGlobal::locale()->formatDateTime( date, shortfmt ); + return TDEGlobal::locale()->formatDateTime( date, shortfmt ); } TQString IncidenceFormatter::resourceString( Calendar *calendar, Incidence *incidence ) @@ -4133,7 +4133,7 @@ TQStringList IncidenceFormatter::reminderStringList( Incidence *incidence, bool if ( alarm->hasTime() ) { offset = 0; if ( alarm->time().isValid() ) { - atStr = KGlobal::locale()->formatDateTime( alarm->time() ); + atStr = TDEGlobal::locale()->formatDateTime( alarm->time() ); } } else if ( alarm->hasStartOffset() ) { offset = alarm->startOffset().asSeconds(); @@ -4146,7 +4146,7 @@ TQStringList IncidenceFormatter::reminderStringList( Incidence *incidence, bool "%1 after the start" ); } else { //offset is 0 if ( incidence->dtStart().isValid() ) { - atStr = KGlobal::locale()->formatDateTime( incidence->dtStart() ); + atStr = TDEGlobal::locale()->formatDateTime( incidence->dtStart() ); } } } else if ( alarm->hasEndOffset() ) { @@ -4172,12 +4172,12 @@ TQStringList IncidenceFormatter::reminderStringList( Incidence *incidence, bool if ( incidence->type() == "Todo" ) { Todo *t = static_cast<Todo *>( incidence ); if ( t->dtDue().isValid() ) { - atStr = KGlobal::locale()->formatDateTime( t->dtDue() ); + atStr = TDEGlobal::locale()->formatDateTime( t->dtDue() ); } } else { Event *e = static_cast<Event *>( incidence ); if ( e->dtEnd().isValid() ) { - atStr = KGlobal::locale()->formatDateTime( e->dtEnd() ); + atStr = TDEGlobal::locale()->formatDateTime( e->dtEnd() ); } } } diff --git a/libkcal/resourcecached.cpp b/libkcal/resourcecached.cpp index dacab7e9d..d32fad054 100644 --- a/libkcal/resourcecached.cpp +++ b/libkcal/resourcecached.cpp @@ -689,12 +689,12 @@ void ResourceCached::addInfoText( TQString &txt ) const if ( mLastLoad.isValid() ) { txt += "<br>"; txt += i18n("Last loaded: %1") - .arg( KGlobal::locale()->formatDateTime( mLastLoad ) ); + .arg( TDEGlobal::locale()->formatDateTime( mLastLoad ) ); } if ( mLastSave.isValid() ) { txt += "<br>"; txt += i18n("Last saved: %1") - .arg( KGlobal::locale()->formatDateTime( mLastSave ) ); + .arg( TDEGlobal::locale()->formatDateTime( mLastSave ) ); } } diff --git a/libkcal/todo.cpp b/libkcal/todo.cpp index b3fe65d9c..7c4a4df33 100644 --- a/libkcal/todo.cpp +++ b/libkcal/todo.cpp @@ -127,18 +127,18 @@ TQDateTime Todo::dtDue( bool first ) const TQString Todo::dtDueTimeStr() const { - return KGlobal::locale()->formatTime( dtDue(!doesRecur()).time() ); + return TDEGlobal::locale()->formatTime( dtDue(!doesRecur()).time() ); } TQString Todo::dtDueDateStr(bool shortfmt) const { - return KGlobal::locale()->formatDate(dtDue( !doesRecur() ).date(),shortfmt); + return TDEGlobal::locale()->formatDate(dtDue( !doesRecur() ).date(),shortfmt); } // TODO: Add shortfmt param!!! TQString Todo::dtDueStr() const { - return KGlobal::locale()->formatDateTime( dtDue( !doesRecur() ) ); + return TDEGlobal::locale()->formatDateTime( dtDue( !doesRecur() ) ); } bool Todo::hasDueDate() const @@ -201,17 +201,17 @@ void Todo::setDtStart( const TQDateTime &dtStart ) TQString Todo::dtStartTimeStr( bool first ) const { - return KGlobal::locale()->formatTime(dtStart(first).time()); + return TDEGlobal::locale()->formatTime(dtStart(first).time()); } TQString Todo::dtStartDateStr(bool shortfmt, bool first) const { - return KGlobal::locale()->formatDate(dtStart(first).date(),shortfmt); + return TDEGlobal::locale()->formatDate(dtStart(first).date(),shortfmt); } TQString Todo::dtStartStr(bool first) const { - return KGlobal::locale()->formatDateTime(dtStart(first)); + return TDEGlobal::locale()->formatDateTime(dtStart(first)); } bool Todo::isCompleted() const @@ -242,7 +242,7 @@ TQDateTime Todo::completed() const TQString Todo::completedStr() const { - return KGlobal::locale()->formatDateTime(mCompleted); + return TDEGlobal::locale()->formatDateTime(mCompleted); } void Todo::setCompleted(const TQDateTime &completed) |