diff options
Diffstat (limited to 'konsolekalendar')
-rw-r--r-- | konsolekalendar/konsolekalendar.cpp | 22 | ||||
-rw-r--r-- | konsolekalendar/konsolekalendaradd.cpp | 14 | ||||
-rw-r--r-- | konsolekalendar/konsolekalendarchange.cpp | 28 | ||||
-rw-r--r-- | konsolekalendar/konsolekalendardelete.cpp | 14 | ||||
-rw-r--r-- | konsolekalendar/konsolekalendarepoch.cpp | 4 | ||||
-rw-r--r-- | konsolekalendar/konsolekalendarexports.h | 2 | ||||
-rw-r--r-- | konsolekalendar/main.cpp | 46 |
7 files changed, 65 insertions, 65 deletions
diff --git a/konsolekalendar/konsolekalendar.cpp b/konsolekalendar/konsolekalendar.cpp index ca68b82ca..8cfd060cb 100644 --- a/konsolekalendar/konsolekalendar.cpp +++ b/konsolekalendar/konsolekalendar.cpp @@ -37,7 +37,7 @@ #include <tqdatetime.h> #include <tqfile.h> -#include <tqtextstream.h> +#include <textstream.h> #include <kdebug.h> #include <klocale.h> @@ -84,7 +84,7 @@ bool KonsoleKalendar::createCalendar() if ( m_variables->isDryRun() ) { cout << i18n( "Create Calendar <Dry Run>: %1" ). - tqarg( m_variables->getCalendarFile() ).local8Bit().data() + arg( m_variables->getCalendarFile() ).local8Bit().data() << endl; } else { kdDebug() << "konsolekalendar.cpp::createCalendar() | " @@ -94,7 +94,7 @@ bool KonsoleKalendar::createCalendar() if ( m_variables->isVerbose() ) { cout << i18n( "Create Calendar <Verbose>: %1" ). - tqarg( m_variables->getCalendarFile() ).local8Bit().data() + arg( m_variables->getCalendarFile() ).local8Bit().data() << endl; } @@ -272,11 +272,11 @@ bool KonsoleKalendar::showInstance() } else { if ( firstdate == lastdate ) { title = i18n( "Events: %1" ) - .tqarg( firstdate.toString( Qt::TextDate ) ); + .arg( firstdate.toString( Qt::TextDate ) ); } else { title = i18n( "Events: %1 - %2" ) - .tqarg( firstdate.toString( Qt::TextDate ) ) - .tqarg( lastdate.toString( Qt::TextDate ) ); + .arg( firstdate.toString( Qt::TextDate ) ) + .arg( lastdate.toString( Qt::TextDate ) ); } htmlSettings.setEventView( true ); } @@ -435,15 +435,15 @@ bool KonsoleKalendar::isEvent( TQDateTime startdate, void KonsoleKalendar::printSpecs() { cout << i18n( " What: %1" ). - tqarg( m_variables->getSummary() ).local8Bit().data() + arg( m_variables->getSummary() ).local8Bit().data() << endl; cout << i18n( " Begin: %1" ). - tqarg( m_variables->getStartDateTime().toString( Qt::TextDate ) ).local8Bit().data() + arg( m_variables->getStartDateTime().toString( Qt::TextDate ) ).local8Bit().data() << endl; cout << i18n( " End: %1" ). - tqarg( m_variables->getEndDateTime().toString( Qt::TextDate ) ).local8Bit().data() + arg( m_variables->getEndDateTime().toString( Qt::TextDate ) ).local8Bit().data() << endl; if ( m_variables->getFloating() == true ) { @@ -452,10 +452,10 @@ void KonsoleKalendar::printSpecs() } cout << i18n( " Desc: %1" ). - tqarg( m_variables->getDescription() ).local8Bit().data() + arg( m_variables->getDescription() ).local8Bit().data() << endl; cout << i18n( " Location: %1" ). - tqarg( m_variables->getLocation() ).local8Bit().data() + arg( m_variables->getLocation() ).local8Bit().data() << endl; } diff --git a/konsolekalendar/konsolekalendaradd.cpp b/konsolekalendar/konsolekalendaradd.cpp index 8ef25f6db..36e23629c 100644 --- a/konsolekalendar/konsolekalendaradd.cpp +++ b/konsolekalendar/konsolekalendaradd.cpp @@ -91,14 +91,14 @@ bool KonsoleKalendarAdd::addEvent() if ( m_variables->getCalendar()->addEvent( event ) ) { cout << i18n( "Success: \"%1\" inserted" ). - tqarg( m_variables->getSummary() ).local8Bit().data() + arg( m_variables->getSummary() ).local8Bit().data() << endl; m_variables->getCalendar()->save(); } else { cout << i18n( "Failure: \"%1\" not inserted" ). - tqarg( m_variables->getSummary() ).local8Bit().data() + arg( m_variables->getSummary() ).local8Bit().data() << endl; status = false; } @@ -142,15 +142,15 @@ bool KonsoleKalendarAdd::addImportedCalendar() void KonsoleKalendarAdd::printSpecs() { cout << i18n( " What: %1" ). - tqarg( m_variables->getSummary() ).local8Bit().data() + arg( m_variables->getSummary() ).local8Bit().data() << endl; cout << i18n( " Begin: %1" ). - tqarg( m_variables->getStartDateTime().toString( Qt::TextDate ) ).local8Bit().data() + arg( m_variables->getStartDateTime().toString( Qt::TextDate ) ).local8Bit().data() << endl; cout << i18n( " End: %1" ). - tqarg( m_variables->getEndDateTime().toString( Qt::TextDate ) ).local8Bit().data() + arg( m_variables->getEndDateTime().toString( Qt::TextDate ) ).local8Bit().data() << endl; if ( m_variables->getFloating() == true ) { @@ -159,10 +159,10 @@ void KonsoleKalendarAdd::printSpecs() } cout << i18n( " Desc: %1" ). - tqarg( m_variables->getDescription() ).local8Bit().data() + arg( m_variables->getDescription() ).local8Bit().data() << endl; cout << i18n( " Location: %1" ). - tqarg( m_variables->getLocation() ).local8Bit().data() + arg( m_variables->getLocation() ).local8Bit().data() << endl; } diff --git a/konsolekalendar/konsolekalendarchange.cpp b/konsolekalendar/konsolekalendarchange.cpp index 5ba9d2769..338ed1e54 100644 --- a/konsolekalendar/konsolekalendarchange.cpp +++ b/konsolekalendar/konsolekalendarchange.cpp @@ -108,14 +108,14 @@ bool KonsoleKalendarChange::changeEvent() if ( m_variables->getCalendar()->addEvent( event ) ) { cout << i18n( "Success: \"%1\" changed" ) - .tqarg( event->summary() ).local8Bit().data() + .arg( event->summary() ).local8Bit().data() << endl; m_variables->getCalendar()->save(); status = true; } else { cout << i18n( "Failure: \"%1\" not changed" ) - .tqarg( event->summary() ).local8Bit().data() + .arg( event->summary() ).local8Bit().data() << endl; } } @@ -128,53 +128,53 @@ bool KonsoleKalendarChange::changeEvent() void KonsoleKalendarChange::printSpecs( Event *event ) { cout << i18n( " UID: %1" ). - tqarg( event->uid() ).local8Bit().data() + arg( event->uid() ).local8Bit().data() << endl; cout << i18n( " What: %1" ). - tqarg( event->summary() ).local8Bit().data() + arg( event->summary() ).local8Bit().data() << endl; cout << i18n( " Begin: %1" ). - tqarg( event->dtStart().toString( Qt::TextDate ) ).local8Bit().data() + arg( event->dtStart().toString( Qt::TextDate ) ).local8Bit().data() << endl; cout << i18n( " End: %1" ). - tqarg( event->dtEnd().toString( Qt::TextDate ) ).local8Bit().data() + arg( event->dtEnd().toString( Qt::TextDate ) ).local8Bit().data() << endl; cout << i18n( " Desc: %1" ). - tqarg( event->description() ).local8Bit().data() + arg( event->description() ).local8Bit().data() << endl; cout << i18n( " Location: %1" ). - tqarg( event->location() ).local8Bit().data() + arg( event->location() ).local8Bit().data() << endl; } void KonsoleKalendarChange::printSpecs() { cout << i18n( " UID: %1" ). - tqarg( m_variables->getUID() ).local8Bit().data() + arg( m_variables->getUID() ).local8Bit().data() << endl; cout << i18n( " What: %1" ). - tqarg( m_variables->getSummary() ).local8Bit().data() + arg( m_variables->getSummary() ).local8Bit().data() << endl; cout << i18n( " Begin: %1" ). - tqarg( m_variables->getStartDateTime().toString( Qt::TextDate ) ).local8Bit().data() + arg( m_variables->getStartDateTime().toString( Qt::TextDate ) ).local8Bit().data() << endl; cout << i18n( " End: %1" ). - tqarg( m_variables->getEndDateTime().toString( Qt::TextDate ) ).local8Bit().data() + arg( m_variables->getEndDateTime().toString( Qt::TextDate ) ).local8Bit().data() << endl; cout << i18n( " Desc: %1" ). - tqarg( m_variables->getDescription() ).local8Bit().data() + arg( m_variables->getDescription() ).local8Bit().data() << endl; cout << i18n( " Location: %1" ). - tqarg( m_variables->getLocation() ).local8Bit().data() + arg( m_variables->getLocation() ).local8Bit().data() << endl; } diff --git a/konsolekalendar/konsolekalendardelete.cpp b/konsolekalendar/konsolekalendardelete.cpp index 160e87e1a..65b8d4254 100644 --- a/konsolekalendar/konsolekalendardelete.cpp +++ b/konsolekalendar/konsolekalendardelete.cpp @@ -78,7 +78,7 @@ bool KonsoleKalendarDelete::deleteEvent() m_variables->getCalendar()->deleteEvent( event ); cout << i18n( "Success: \"%1\" deleted" ) - .tqarg( event->summary() ).local8Bit().data() + .arg( event->summary() ).local8Bit().data() << endl; m_variables->getCalendar()->save(); @@ -93,26 +93,26 @@ bool KonsoleKalendarDelete::deleteEvent() void KonsoleKalendarDelete::printSpecs( Event *event ) { cout << i18n( " UID: %1" ). - tqarg( m_variables->getUID() ).local8Bit().data() + arg( m_variables->getUID() ).local8Bit().data() << endl; cout << i18n( " What: %1" ). - tqarg( event->summary() ).local8Bit().data() + arg( event->summary() ).local8Bit().data() << endl; cout << i18n( " Begin: %1" ). - tqarg( event->dtStart().toString( Qt::TextDate ) ).local8Bit().data() + arg( event->dtStart().toString( Qt::TextDate ) ).local8Bit().data() << endl; cout << i18n( " End: %1" ). - tqarg( event->dtEnd().toString( Qt::TextDate ) ).local8Bit().data() + arg( event->dtEnd().toString( Qt::TextDate ) ).local8Bit().data() << endl; cout << i18n( " Desc: %1" ). - tqarg( event->description() ).local8Bit().data() + arg( event->description() ).local8Bit().data() << endl; cout << i18n( " Location: %1" ). - tqarg( event->location() ).local8Bit().data() + arg( event->location() ).local8Bit().data() << endl; } diff --git a/konsolekalendar/konsolekalendarepoch.cpp b/konsolekalendar/konsolekalendarepoch.cpp index ec59d7a3f..6aebd9a94 100644 --- a/konsolekalendar/konsolekalendarepoch.cpp +++ b/konsolekalendar/konsolekalendarepoch.cpp @@ -64,8 +64,8 @@ uint KonsoleKalendarEpoch::TQDateTime2epoch( TQDateTime dt ) // SORRY QT DOESN'T HANDLE DAYLIGHT SAVINGS TIME. // Compute #seconds to subtract for local timezone difference from UTC. - int offset = TQDateTime::tqcurrentDateTime( Qt::UTC ).toTime_t() - - TQDateTime::tqcurrentDateTime( Qt::LocalTime ).toTime_t(); + int offset = TQDateTime::currentDateTime( Qt::UTC ).toTime_t() + - TQDateTime::currentDateTime( Qt::LocalTime ).toTime_t(); return( dt.toTime_t() - offset ); } diff --git a/konsolekalendar/konsolekalendarexports.h b/konsolekalendar/konsolekalendarexports.h index 930426d48..84c67a3e9 100644 --- a/konsolekalendar/konsolekalendarexports.h +++ b/konsolekalendar/konsolekalendarexports.h @@ -28,7 +28,7 @@ #ifndef _KONSOLEKALENDAREXPORTS_H_ #define _KONSOLEKALENDAREXPORTS_H_ -#include <tqtextstream.h> +#include <textstream.h> #include "konsolekalendarvariables.h" diff --git a/konsolekalendar/main.cpp b/konsolekalendar/main.cpp index 0fc5bf72c..02aa5b6e2 100644 --- a/konsolekalendar/main.cpp +++ b/konsolekalendar/main.cpp @@ -204,11 +204,11 @@ int main( int argc, char *argv[] ) KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); // Default values for start date/time (today at 07:00) - TQDate startdate = TQDate::tqcurrentDate(); + TQDate startdate = TQDate::currentDate(); TQTime starttime( 7, 0 ); // Default values for end date/time (today at 17:00) - TQDate enddate = TQDate::tqcurrentDate(); + TQDate enddate = TQDate::currentDate(); TQTime endtime( 17, 0 ); // Default values for switches @@ -241,22 +241,22 @@ int main( int argc, char *argv[] ) if ( args->isSet( "export-list" ) ) { cout << endl; cout << i18n( "%1 supports these export formats:" ). - tqarg( progDisplay ).local8Bit().data() + arg( progDisplay ).local8Bit().data() << endl; cout << i18n( " %1 [Default]" ). - tqarg( "Text" ).local8Bit().data() + arg( "Text" ).local8Bit().data() << endl; cout << i18n( " %1 (like %2, but more compact)" ). - tqarg( "Short", "Text" ).local8Bit().data() + arg( "Short", "Text" ).local8Bit().data() << endl; cout << i18n( " %1" ). - tqarg( "HTML" ).local8Bit().data() + arg( "HTML" ).local8Bit().data() << endl; cout << i18n( " %1 (like %2, but in a month view)" ). - tqarg( "HTMLmonth", "HTML" ).local8Bit().data() + arg( "HTMLmonth", "HTML" ).local8Bit().data() << endl; cout << i18n( " %1 (Comma-Separated Values)" ). - tqarg( "CSV" ).local8Bit().data() + arg( "CSV" ).local8Bit().data() << endl; cout << endl; return 0; @@ -315,7 +315,7 @@ int main( int argc, char *argv[] ) variables.setExportType( ExportTypeTextShort ); } else { cout << i18n( "Invalid Export Type Specified: %1" ). - tqarg( option ).local8Bit().data() + arg( option ).local8Bit().data() << endl; return 1; } @@ -475,7 +475,7 @@ int main( int argc, char *argv[] ) startdate = TQDate::fromString( option, Qt::ISODate ); if ( !startdate.isValid() ) { cout << i18n( "Invalid Start Date Specified: %1" ). - tqarg( option ).local8Bit().data() + arg( option ).local8Bit().data() << endl; return 1; } @@ -500,7 +500,7 @@ int main( int argc, char *argv[] ) starttime = TQTime::fromString( option, Qt::ISODate ); if ( !starttime.isValid() ) { cout << i18n( "Invalid Start Time Specified: %1" ). - tqarg( option ).local8Bit().data() + arg( option ).local8Bit().data() << endl; return 1; } @@ -530,7 +530,7 @@ int main( int argc, char *argv[] ) enddate = TQDate::fromString( option, Qt::ISODate ); if ( !enddate.isValid() ) { cout << i18n( "Invalid End Date Specified: %1" ). - tqarg( option ).local8Bit().data() + arg( option ).local8Bit().data() << endl; return 1; } @@ -554,7 +554,7 @@ int main( int argc, char *argv[] ) if ( !ok ) { cout << i18n( "Invalid Date Count Specified: %1" ). - tqarg( option ).local8Bit().data() + arg( option ).local8Bit().data() << endl; return 1; } @@ -582,7 +582,7 @@ int main( int argc, char *argv[] ) endtime = TQTime::fromString( option, Qt::ISODate ); if ( !endtime.isValid() ) { cout << i18n( "Invalid End Time Specified: %1" ). - tqarg( option ).local8Bit().data() + arg( option ).local8Bit().data() << endl; return 1; } @@ -682,12 +682,12 @@ int main( int argc, char *argv[] ) if ( remote ) { cout << i18n( "Attempting to create a remote file %1" ). - tqarg( variables.getCalendarFile() ).local8Bit().data() << endl; + arg( variables.getCalendarFile() ).local8Bit().data() << endl; return 1; } else { if ( exists ) { cout << i18n( "Calendar %1 already exists" ). - tqarg( variables.getCalendarFile() ).local8Bit().data() + arg( variables.getCalendarFile() ).local8Bit().data() << endl; return 1; } @@ -695,12 +695,12 @@ int main( int argc, char *argv[] ) if ( konsolekalendar->createCalendar() ) { cout << i18n( "Calendar %1 successfully created" ). - tqarg( variables.getCalendarFile() ).local8Bit().data() + arg( variables.getCalendarFile() ).local8Bit().data() << endl; return 0; } else { cout << i18n( "Unable to create calendar: %1" ). - tqarg( variables.getCalendarFile() ).local8Bit().data() + arg( variables.getCalendarFile() ).local8Bit().data() << endl; return 1; } @@ -708,7 +708,7 @@ int main( int argc, char *argv[] ) if ( !exists ) { cout << i18n( "Calendar file not found %1" ). - tqarg( variables.getCalendarFile() ).local8Bit().data() + arg( variables.getCalendarFile() ).local8Bit().data() << endl; cout << i18n( "Try --create to create new calendar file" ).local8Bit().data() << endl; @@ -894,17 +894,17 @@ int main( int argc, char *argv[] ) */ TQString prodId = "-//K Desktop Environment//NONSGML %1 %2//EN"; CalFormat::setApplication( progDisplay, - prodId.tqarg( progDisplay ).tqarg( progVersion ) ); + prodId.arg( progDisplay ).arg( progVersion ) ); if ( importFile ) { if ( konsolekalendar->importCalendar() ) { cout << i18n( "Calendar %1 successfully imported" ). - tqarg( variables.getImportFile() ).local8Bit().data() + arg( variables.getImportFile() ).local8Bit().data() << endl; return 0; } else { cout << i18n( "Unable to import calendar: %1" ). - tqarg( variables.getImportFile() ).local8Bit().data() + arg( variables.getImportFile() ).local8Bit().data() << endl; return 1; } @@ -971,7 +971,7 @@ int main( int argc, char *argv[] ) << endl; if ( !konsolekalendar->showInstance() ) { cout << i18n( "Cannot open specified export file: %1" ). - tqarg( variables.getExportFile() ).local8Bit().data() + arg( variables.getExportFile() ).local8Bit().data() << endl; return 1; } |