summaryrefslogtreecommitdiffstats
path: root/konsolekalendar
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:49:30 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:49:30 -0600
commita9bde819f2b421dcc44741156e75eca4bb5fb4f4 (patch)
treed087071b1e8fcf79698938efec19f8e48bab0799 /konsolekalendar
parent5c4a80ead2b1fe57dc6a8c29d0368792344cd61e (diff)
downloadtdepim-a9bde819f2b421dcc44741156e75eca4bb5fb4f4.tar.gz
tdepim-a9bde819f2b421dcc44741156e75eca4bb5fb4f4.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'konsolekalendar')
-rw-r--r--konsolekalendar/konsolekalendarexports.cpp24
1 files changed, 12 insertions, 12 deletions
diff --git a/konsolekalendar/konsolekalendarexports.cpp b/konsolekalendar/konsolekalendarexports.cpp
index af371d07..9894ac96 100644
--- a/konsolekalendar/konsolekalendarexports.cpp
+++ b/konsolekalendar/konsolekalendarexports.cpp
@@ -79,15 +79,15 @@ bool KonsoleKalendarExports::exportAsTxt( TQTextStream *ts,
// Print Event Date (in user's prefered format)
*ts << i18n( "Date:" )
<< "\t"
- << KGlobal::locale()->formatDate( date )
+ << TDEGlobal::locale()->formatDate( date )
<< endl;
// Print Event Starttime - Endtime, for Non-Floating Events Only
if ( !event->doesFloat() ) {
*ts << "\t"
- << KGlobal::locale()->formatTime( event->dtStart().time() )
+ << TDEGlobal::locale()->formatTime( event->dtStart().time() )
<< " - "
- << KGlobal::locale()->formatTime( event->dtEnd().time() );
+ << TDEGlobal::locale()->formatTime( event->dtEnd().time() );
}
*ts << endl;
@@ -159,15 +159,15 @@ bool KonsoleKalendarExports::exportAsTxtShort( TQTextStream *ts,
if ( !sameday ) {
// If a new date, then Print the Event Date (in user's prefered format)
- *ts << KGlobal::locale()->formatDate( date ) << ":"
+ *ts << TDEGlobal::locale()->formatDate( date ) << ":"
<< endl;
}
// Print Event Starttime - Endtime
if ( !event->doesFloat() ) {
- *ts << KGlobal::locale()->formatTime( event->dtStart().time() )
+ *ts << TDEGlobal::locale()->formatTime( event->dtStart().time() )
<< " - "
- << KGlobal::locale()->formatTime( event->dtEnd().time() );
+ << TDEGlobal::locale()->formatTime( event->dtEnd().time() );
} else {
*ts << i18n( "[all day]\t" );
}
@@ -222,14 +222,14 @@ bool KonsoleKalendarExports::exportAsCSV( TQTextStream *ts,
TQString dquote = i18n( "\"" ); // character to use to quote CSV fields
if ( !event->doesFloat() ) {
- *ts << pF( KGlobal::locale()->formatDate( date ) )
- << delim << pF( KGlobal::locale()->formatTime( event->dtStart().time() ) )
- << delim << pF( KGlobal::locale()->formatDate( date ) )
- << delim << pF( KGlobal::locale()->formatTime( event->dtEnd().time() ) );
+ *ts << pF( TDEGlobal::locale()->formatDate( date ) )
+ << delim << pF( TDEGlobal::locale()->formatTime( event->dtStart().time() ) )
+ << delim << pF( TDEGlobal::locale()->formatDate( date ) )
+ << delim << pF( TDEGlobal::locale()->formatTime( event->dtEnd().time() ) );
} else {
- *ts << pF( KGlobal::locale()->formatDate( date ) )
+ *ts << pF( TDEGlobal::locale()->formatDate( date ) )
<< delim << pF( "" )
- << delim << pF( KGlobal::locale()->formatDate( date ) )
+ << delim << pF( TDEGlobal::locale()->formatDate( date ) )
<< delim << pF( "" );
}