From 1c93fca14d9ce37499bcfdf994c660186a0b6f17 Mon Sep 17 00:00:00 2001 From: tpearson Date: Thu, 14 Apr 2011 20:16:30 +0000 Subject: 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 --- konsolekalendar/konsolekalendar.cpp | 37 +++++++------- konsolekalendar/konsolekalendaradd.cpp | 20 ++++---- konsolekalendar/konsolekalendarchange.cpp | 36 ++++++------- konsolekalendar/konsolekalendardelete.cpp | 18 +++---- konsolekalendar/konsolekalendarepoch.cpp | 6 +-- konsolekalendar/main.cpp | 84 +++++++++++++++---------------- 6 files changed, 101 insertions(+), 100 deletions(-) (limited to 'konsolekalendar') diff --git a/konsolekalendar/konsolekalendar.cpp b/konsolekalendar/konsolekalendar.cpp index f8c5fa998..3fbb5aed2 100644 --- a/konsolekalendar/konsolekalendar.cpp +++ b/konsolekalendar/konsolekalendar.cpp @@ -3,7 +3,8 @@ * * * KonsoleKalendar is a command line interface to KDE calendars * * Copyright (C) 2002-2004 Tuukka Pasanen * - * Copyright (C) 2003-2005 Allen Winter + * Copyright (C) 2003-2005 Allen Winter * + * Copyright (C) 2010-2011 Timothy Pearson * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * @@ -20,8 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * * * As a special exception, permission is given to link this program * - * with any edition of TQt, and distribute the resulting executable, * - * without including the source code for TQt in the source distribution. * + * with any edition of TQt, and distribute the resulting executable, * + * without including the source code for TQt in the source distribution. * * * ******************************************************************************/ /** @@ -83,17 +84,17 @@ bool KonsoleKalendar::createCalendar() if ( m_variables->isDryRun() ) { cout << i18n( "Create Calendar : %1" ). - arg( m_variables->getCalendarFile() ).local8Bit() + tqarg( m_variables->getCalendarFile() ).local8Bit().data() << endl; } else { kdDebug() << "konsolekalendar.cpp::createCalendar() | " << "Creating calendar file: " - << m_variables->getCalendarFile().local8Bit() + << m_variables->getCalendarFile().local8Bit().data() << endl; if ( m_variables->isVerbose() ) { cout << i18n( "Create Calendar : %1" ). - arg( m_variables->getCalendarFile() ).local8Bit() + tqarg( m_variables->getCalendarFile() ).local8Bit().data() << endl; } @@ -113,7 +114,7 @@ bool KonsoleKalendar::showInstance() Event *event; if ( m_variables->isDryRun() ) { - cout << i18n( "View Events :" ).local8Bit() + cout << i18n( "View Events :" ).local8Bit().data() << endl; printSpecs(); } else { @@ -141,7 +142,7 @@ bool KonsoleKalendar::showInstance() << endl; if ( m_variables->isVerbose() ) { - cout << i18n( "View Event :" ).local8Bit() + cout << i18n( "View Event :" ).local8Bit().data() << endl; printSpecs(); } @@ -244,7 +245,7 @@ bool KonsoleKalendar::showInstance() kdDebug() << "konsolekalendar.cpp::showInstance() | " << "HTML view events by uid list" << endl; cout << i18n("Sorry, export to HTML by UID is not supported yet") - .local8Bit() << endl; + .local8Bit().data() << endl; return( false ); } else { kdDebug() << "konsolekalendar.cpp::showInstance() | " @@ -271,11 +272,11 @@ bool KonsoleKalendar::showInstance() } else { if ( firstdate == lastdate ) { title = i18n( "Events: %1" ) - .arg( firstdate.toString( TQt::TextDate ) ); + .tqarg( firstdate.toString( Qt::TextDate ) ); } else { title = i18n( "Events: %1 - %2" ) - .arg( firstdate.toString( TQt::TextDate ) ) - .arg( lastdate.toString( TQt::TextDate ) ); + .tqarg( firstdate.toString( Qt::TextDate ) ) + .tqarg( lastdate.toString( Qt::TextDate ) ); } htmlSettings.setEventView( true ); } @@ -434,27 +435,27 @@ bool KonsoleKalendar::isEvent( TQDateTime startdate, void KonsoleKalendar::printSpecs() { cout << i18n( " What: %1" ). - arg( m_variables->getSummary() ).local8Bit() + tqarg( m_variables->getSummary() ).local8Bit().data() << endl; cout << i18n( " Begin: %1" ). - arg( m_variables->getStartDateTime().toString( TQt::TextDate ) ).local8Bit() + tqarg( m_variables->getStartDateTime().toString( Qt::TextDate ) ).local8Bit().data() << endl; cout << i18n( " End: %1" ). - arg( m_variables->getEndDateTime().toString( TQt::TextDate ) ).local8Bit() + tqarg( m_variables->getEndDateTime().toString( Qt::TextDate ) ).local8Bit().data() << endl; if ( m_variables->getFloating() == true ) { - cout << i18n( " No Time Associated with Event" ).local8Bit() + cout << i18n( " No Time Associated with Event" ).local8Bit().data() << endl; } cout << i18n( " Desc: %1" ). - arg( m_variables->getDescription() ).local8Bit() + tqarg( m_variables->getDescription() ).local8Bit().data() << endl; cout << i18n( " Location: %1" ). - arg( m_variables->getLocation() ).local8Bit() + tqarg( m_variables->getLocation() ).local8Bit().data() << endl; } diff --git a/konsolekalendar/konsolekalendaradd.cpp b/konsolekalendar/konsolekalendaradd.cpp index bd1980733..6b18ba20f 100644 --- a/konsolekalendar/konsolekalendaradd.cpp +++ b/konsolekalendar/konsolekalendaradd.cpp @@ -70,12 +70,12 @@ bool KonsoleKalendarAdd::addEvent() kdDebug() << "konsolekalendaradd.cpp::addEvent()" << endl; if ( m_variables->isDryRun() ) { - cout << i18n( "Insert Event :" ).local8Bit() + cout << i18n( "Insert Event :" ).local8Bit().data() << endl; printSpecs(); } else { if ( m_variables->isVerbose() ) { - cout << i18n( "Insert Event :" ).local8Bit() + cout << i18n( "Insert Event :" ).local8Bit().data() << endl; printSpecs(); } @@ -91,14 +91,14 @@ bool KonsoleKalendarAdd::addEvent() if ( m_variables->getCalendar()->addEvent( event ) ) { cout << i18n( "Success: \"%1\" inserted" ). - arg( m_variables->getSummary() ).local8Bit() + tqarg( m_variables->getSummary() ).local8Bit().data() << endl; m_variables->getCalendar()->save(); } else { cout << i18n( "Failure: \"%1\" not inserted" ). - arg( m_variables->getSummary() ).local8Bit() + tqarg( m_variables->getSummary() ).local8Bit().data() << endl; status = false; } @@ -142,27 +142,27 @@ bool KonsoleKalendarAdd::addImportedCalendar() void KonsoleKalendarAdd::printSpecs() { cout << i18n( " What: %1" ). - arg( m_variables->getSummary() ).local8Bit() + tqarg( m_variables->getSummary() ).local8Bit().data() << endl; cout << i18n( " Begin: %1" ). - arg( m_variables->getStartDateTime().toString( TQt::TextDate ) ).local8Bit() + tqarg( m_variables->getStartDateTime().toString( Qt::TextDate ) ).local8Bit().data() << endl; cout << i18n( " End: %1" ). - arg( m_variables->getEndDateTime().toString( TQt::TextDate ) ).local8Bit() + tqarg( m_variables->getEndDateTime().toString( Qt::TextDate ) ).local8Bit().data() << endl; if ( m_variables->getFloating() == true ) { - cout << i18n( " No Time Associated with Event" ).local8Bit() + cout << i18n( " No Time Associated with Event" ).local8Bit().data() << endl; } cout << i18n( " Desc: %1" ). - arg( m_variables->getDescription() ).local8Bit() + tqarg( m_variables->getDescription() ).local8Bit().data() << endl; cout << i18n( " Location: %1" ). - arg( m_variables->getLocation() ).local8Bit() + tqarg( m_variables->getLocation() ).local8Bit().data() << endl; } diff --git a/konsolekalendar/konsolekalendarchange.cpp b/konsolekalendar/konsolekalendarchange.cpp index 067c05e21..5ba9d2769 100644 --- a/konsolekalendar/konsolekalendarchange.cpp +++ b/konsolekalendar/konsolekalendarchange.cpp @@ -62,11 +62,11 @@ bool KonsoleKalendarChange::changeEvent() Event *event = m_variables->getCalendar()->event( m_variables->getUID() ); if ( event ) { if ( m_variables->isDryRun() ) { - cout << i18n( "Change Event :" ).local8Bit() + cout << i18n( "Change Event :" ).local8Bit().data() << endl; printSpecs( event ); - cout << i18n( "To Event :" ).local8Bit() + cout << i18n( "To Event :" ).local8Bit().data() << endl; printSpecs(); } else { @@ -75,11 +75,11 @@ bool KonsoleKalendarChange::changeEvent() << endl; if ( m_variables->isVerbose() ) { - cout << i18n( "Change Event :" ).local8Bit() + cout << i18n( "Change Event :" ).local8Bit().data() << endl; printSpecs( event ); - cout << i18n( "To Event :" ).local8Bit() + cout << i18n( "To Event :" ).local8Bit().data() << endl; printSpecs(); } @@ -108,14 +108,14 @@ bool KonsoleKalendarChange::changeEvent() if ( m_variables->getCalendar()->addEvent( event ) ) { cout << i18n( "Success: \"%1\" changed" ) - .arg( event->summary() ).local8Bit() + .tqarg( event->summary() ).local8Bit().data() << endl; m_variables->getCalendar()->save(); status = true; } else { cout << i18n( "Failure: \"%1\" not changed" ) - .arg( event->summary() ).local8Bit() + .tqarg( event->summary() ).local8Bit().data() << endl; } } @@ -128,53 +128,53 @@ bool KonsoleKalendarChange::changeEvent() void KonsoleKalendarChange::printSpecs( Event *event ) { cout << i18n( " UID: %1" ). - arg( event->uid() ).local8Bit() + tqarg( event->uid() ).local8Bit().data() << endl; cout << i18n( " What: %1" ). - arg( event->summary() ).local8Bit() + tqarg( event->summary() ).local8Bit().data() << endl; cout << i18n( " Begin: %1" ). - arg( event->dtStart().toString( TQt::TextDate ) ).local8Bit() + tqarg( event->dtStart().toString( Qt::TextDate ) ).local8Bit().data() << endl; cout << i18n( " End: %1" ). - arg( event->dtEnd().toString( TQt::TextDate ) ).local8Bit() + tqarg( event->dtEnd().toString( Qt::TextDate ) ).local8Bit().data() << endl; cout << i18n( " Desc: %1" ). - arg( event->description() ).local8Bit() + tqarg( event->description() ).local8Bit().data() << endl; cout << i18n( " Location: %1" ). - arg( event->location() ).local8Bit() + tqarg( event->location() ).local8Bit().data() << endl; } void KonsoleKalendarChange::printSpecs() { cout << i18n( " UID: %1" ). - arg( m_variables->getUID() ).local8Bit() + tqarg( m_variables->getUID() ).local8Bit().data() << endl; cout << i18n( " What: %1" ). - arg( m_variables->getSummary() ).local8Bit() + tqarg( m_variables->getSummary() ).local8Bit().data() << endl; cout << i18n( " Begin: %1" ). - arg( m_variables->getStartDateTime().toString( TQt::TextDate ) ).local8Bit() + tqarg( m_variables->getStartDateTime().toString( Qt::TextDate ) ).local8Bit().data() << endl; cout << i18n( " End: %1" ). - arg( m_variables->getEndDateTime().toString( TQt::TextDate ) ).local8Bit() + tqarg( m_variables->getEndDateTime().toString( Qt::TextDate ) ).local8Bit().data() << endl; cout << i18n( " Desc: %1" ). - arg( m_variables->getDescription() ).local8Bit() + tqarg( m_variables->getDescription() ).local8Bit().data() << endl; cout << i18n( " Location: %1" ). - arg( m_variables->getLocation() ).local8Bit() + tqarg( m_variables->getLocation() ).local8Bit().data() << endl; } diff --git a/konsolekalendar/konsolekalendardelete.cpp b/konsolekalendar/konsolekalendardelete.cpp index b3f27650e..160e87e1a 100644 --- a/konsolekalendar/konsolekalendardelete.cpp +++ b/konsolekalendar/konsolekalendardelete.cpp @@ -62,7 +62,7 @@ bool KonsoleKalendarDelete::deleteEvent() Event *event = m_variables->getCalendar()->event( m_variables->getUID() ); if ( event ) { if ( m_variables->isDryRun() ) { - cout << i18n( "Delete Event :" ).local8Bit() + cout << i18n( "Delete Event :" ).local8Bit().data() << endl; printSpecs( event ); } else { @@ -71,14 +71,14 @@ bool KonsoleKalendarDelete::deleteEvent() << endl; if ( m_variables->isVerbose() ) { - cout << i18n( "Delete Event :" ).local8Bit() + cout << i18n( "Delete Event :" ).local8Bit().data() << endl; printSpecs( event ); } m_variables->getCalendar()->deleteEvent( event ); cout << i18n( "Success: \"%1\" deleted" ) - .arg( event->summary() ).local8Bit() + .tqarg( 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" ). - arg( m_variables->getUID() ).local8Bit() + tqarg( m_variables->getUID() ).local8Bit().data() << endl; cout << i18n( " What: %1" ). - arg( event->summary() ).local8Bit() + tqarg( event->summary() ).local8Bit().data() << endl; cout << i18n( " Begin: %1" ). - arg( event->dtStart().toString( TQt::TextDate ) ).local8Bit() + tqarg( event->dtStart().toString( Qt::TextDate ) ).local8Bit().data() << endl; cout << i18n( " End: %1" ). - arg( event->dtEnd().toString( TQt::TextDate ) ).local8Bit() + tqarg( event->dtEnd().toString( Qt::TextDate ) ).local8Bit().data() << endl; cout << i18n( " Desc: %1" ). - arg( event->description() ).local8Bit() + tqarg( event->description() ).local8Bit().data() << endl; cout << i18n( " Location: %1" ). - arg( event->location() ).local8Bit() + tqarg( event->location() ).local8Bit().data() << endl; } diff --git a/konsolekalendar/konsolekalendarepoch.cpp b/konsolekalendar/konsolekalendarepoch.cpp index e314bde7c..ec59d7a3f 100644 --- a/konsolekalendar/konsolekalendarepoch.cpp +++ b/konsolekalendar/konsolekalendarepoch.cpp @@ -53,7 +53,7 @@ KonsoleKalendarEpoch::~KonsoleKalendarEpoch() TQDateTime KonsoleKalendarEpoch::epoch2TQDateTime( uint epoch ) { TQDateTime dt; - dt.setTime_t( epoch, TQt::UTC ); + dt.setTime_t( epoch, Qt::UTC ); return( dt ); } @@ -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( TQt::UTC ).toTime_t() - - TQDateTime::tqcurrentDateTime( TQt::LocalTime ).toTime_t(); + int offset = TQDateTime::tqcurrentDateTime( Qt::UTC ).toTime_t() + - TQDateTime::tqcurrentDateTime( Qt::LocalTime ).toTime_t(); return( dt.toTime_t() - offset ); } diff --git a/konsolekalendar/main.cpp b/konsolekalendar/main.cpp index 14b892052..0fc5bf72c 100644 --- a/konsolekalendar/main.cpp +++ b/konsolekalendar/main.cpp @@ -241,22 +241,22 @@ int main( int argc, char *argv[] ) if ( args->isSet( "export-list" ) ) { cout << endl; cout << i18n( "%1 supports these export formats:" ). - arg( progDisplay ).local8Bit() + tqarg( progDisplay ).local8Bit().data() << endl; cout << i18n( " %1 [Default]" ). - arg( "Text" ).local8Bit() + tqarg( "Text" ).local8Bit().data() << endl; cout << i18n( " %1 (like %2, but more compact)" ). - arg( "Short", "Text" ).local8Bit() + tqarg( "Short", "Text" ).local8Bit().data() << endl; cout << i18n( " %1" ). - arg( "HTML" ).local8Bit() + tqarg( "HTML" ).local8Bit().data() << endl; cout << i18n( " %1 (like %2, but in a month view)" ). - arg( "HTMLmonth", "HTML" ).local8Bit() + tqarg( "HTMLmonth", "HTML" ).local8Bit().data() << endl; cout << i18n( " %1 (Comma-Separated Values)" ). - arg( "CSV" ).local8Bit() + tqarg( "CSV" ).local8Bit().data() << endl; cout << endl; return 0; @@ -272,14 +272,14 @@ int main( int argc, char *argv[] ) if ( args->isSet( "todo" ) ) { variables.setUseTodos( true ); kdDebug() << "main | parse options | use To-dos" << endl; - cout << i18n( "Sorry, To-dos are not working yet." ).local8Bit() + cout << i18n( "Sorry, To-dos are not working yet." ).local8Bit().data() << endl; return 1; } if ( args->isSet( "journal" ) ) { variables.setUseJournals( true ); kdDebug() << "main | parse options | use Journals" << endl; - cout << i18n( "Sorry, Journals are not working yet." ).local8Bit() + cout << i18n( "Sorry, Journals are not working yet." ).local8Bit().data() << endl; return 1; } @@ -315,7 +315,7 @@ int main( int argc, char *argv[] ) variables.setExportType( ExportTypeTextShort ); } else { cout << i18n( "Invalid Export Type Specified: %1" ). - arg( option ).local8Bit() + tqarg( option ).local8Bit().data() << endl; return 1; } @@ -472,16 +472,16 @@ int main( int argc, char *argv[] ) << "(" << option << ")" << endl; - startdate = TQDate::fromString( option, TQt::ISODate ); + startdate = TQDate::fromString( option, Qt::ISODate ); if ( !startdate.isValid() ) { cout << i18n( "Invalid Start Date Specified: %1" ). - arg( option ).local8Bit() + tqarg( option ).local8Bit().data() << endl; return 1; } kdDebug() << "main | parse options | " << "Start date after conversion: " - << "(" << startdate.toString() << ")" + << "(" << TQString(startdate.toString()) << ")" << endl; } @@ -497,16 +497,16 @@ int main( int argc, char *argv[] ) << endl; if ( option.upper() != "FLOAT" ) { - starttime = TQTime::fromString( option, TQt::ISODate ); + starttime = TQTime::fromString( option, Qt::ISODate ); if ( !starttime.isValid() ) { cout << i18n( "Invalid Start Time Specified: %1" ). - arg( option ).local8Bit() + tqarg( option ).local8Bit().data() << endl; return 1; } kdDebug() << "main | parse options | " << "Start time after conversion: " - << "(" << starttime.toString() << ")" + << "(" << TQString(starttime.toString()) << ")" << endl; } else { variables.setFloating( true ); @@ -527,16 +527,16 @@ int main( int argc, char *argv[] ) << "(" << option << ")" << endl; - enddate = TQDate::fromString( option, TQt::ISODate ); + enddate = TQDate::fromString( option, Qt::ISODate ); if ( !enddate.isValid() ) { cout << i18n( "Invalid End Date Specified: %1" ). - arg( option ).local8Bit() + tqarg( option ).local8Bit().data() << endl; return 1; } kdDebug() << "main | parse options | " << "End date after conversion: " - << "(" << enddate.toString() << ")" + << "(" << TQString(enddate.toString()) << ")" << endl; } @@ -554,7 +554,7 @@ int main( int argc, char *argv[] ) if ( !ok ) { cout << i18n( "Invalid Date Count Specified: %1" ). - arg( option ).local8Bit() + tqarg( option ).local8Bit().data() << endl; return 1; } @@ -563,7 +563,7 @@ int main( int argc, char *argv[] ) enddate = enddate.addDays( variables.getDaysCount() ); kdDebug() << "main | parse options | " << "End date after conversion: " - << "(" << enddate.toString() << ")" + << "(" << TQString(enddate.toString()) << ")" << endl; } @@ -579,17 +579,17 @@ int main( int argc, char *argv[] ) << endl; if ( option.upper() != "FLOAT" ) { - endtime = TQTime::fromString( option, TQt::ISODate ); + endtime = TQTime::fromString( option, Qt::ISODate ); if ( !endtime.isValid() ) { cout << i18n( "Invalid End Time Specified: %1" ). - arg( option ).local8Bit() + tqarg( option ).local8Bit().data() << endl; return 1; } kdDebug() << "main | parse options | " << "End time after conversion: " - << "(" << endtime.toString() << ")" + << "(" << TQString(endtime.toString()) << ")" << endl; } else { variables.setFloating( true ); @@ -682,12 +682,12 @@ int main( int argc, char *argv[] ) if ( remote ) { cout << i18n( "Attempting to create a remote file %1" ). - arg( variables.getCalendarFile() ).local8Bit() << endl; + tqarg( variables.getCalendarFile() ).local8Bit().data() << endl; return 1; } else { if ( exists ) { cout << i18n( "Calendar %1 already exists" ). - arg( variables.getCalendarFile() ).local8Bit() + tqarg( 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" ). - arg( variables.getCalendarFile() ).local8Bit() + tqarg( variables.getCalendarFile() ).local8Bit().data() << endl; return 0; } else { cout << i18n( "Unable to create calendar: %1" ). - arg( variables.getCalendarFile() ).local8Bit() + tqarg( variables.getCalendarFile() ).local8Bit().data() << endl; return 1; } @@ -708,9 +708,9 @@ int main( int argc, char *argv[] ) if ( !exists ) { cout << i18n( "Calendar file not found %1" ). - arg( variables.getCalendarFile() ).local8Bit() + tqarg( variables.getCalendarFile() ).local8Bit().data() << endl; - cout << i18n( "Try --create to create new calendar file" ).local8Bit() + cout << i18n( "Try --create to create new calendar file" ).local8Bit().data() << endl; return 1; } @@ -854,10 +854,10 @@ int main( int argc, char *argv[] ) // Some more debug prints kdDebug() << "main | datetimestamp | StartDate=" - << startdatetime.toString( TQt::TextDate ) + << startdatetime.toString( Qt::TextDate ) << endl; kdDebug() << "main | datetimestamp | EndDate=" - << enddatetime.toString( TQt::TextDate ) + << enddatetime.toString( Qt::TextDate ) << endl; /*************************************************************************** @@ -870,7 +870,7 @@ int main( int argc, char *argv[] ) "Only 1 operation mode " "(view, add, change, delete, create) " "permitted at any one time" - ).local8Bit() << endl; + ).local8Bit().data() << endl; return 1; } @@ -878,7 +878,7 @@ int main( int argc, char *argv[] ) if ( startdatetime > enddatetime ) { cout << i18n( "Ending Date/Time occurs before the Starting Date/Time" - ).local8Bit() << endl; + ).local8Bit().data() << endl; return 1; } @@ -894,17 +894,17 @@ int main( int argc, char *argv[] ) */ TQString prodId = "-//K Desktop Environment//NONSGML %1 %2//EN"; CalFormat::setApplication( progDisplay, - prodId.arg( progDisplay ).arg( progVersion ) ); + prodId.tqarg( progDisplay ).tqarg( progVersion ) ); if ( importFile ) { if ( konsolekalendar->importCalendar() ) { cout << i18n( "Calendar %1 successfully imported" ). - arg( variables.getImportFile() ).local8Bit() + tqarg( variables.getImportFile() ).local8Bit().data() << endl; return 0; } else { cout << i18n( "Unable to import calendar: %1" ). - arg( variables.getImportFile() ).local8Bit() + tqarg( variables.getImportFile() ).local8Bit().data() << endl; return 1; } @@ -920,7 +920,7 @@ int main( int argc, char *argv[] ) } else { cout << i18n( "Attempting to insert an event that already exists" - ).local8Bit() << endl; + ).local8Bit().data() << endl; return 1; } } @@ -931,12 +931,12 @@ int main( int argc, char *argv[] ) << endl; if ( !variables.isUID() ) { cout << i18n( "Missing event UID: " - "use --uid command line option" ).local8Bit() + "use --uid command line option" ).local8Bit().data() << endl; return 1; } if ( konsolekalendar->changeEvent() != true ) { - cout << i18n( "No such event UID: change event failed" ).local8Bit() + cout << i18n( "No such event UID: change event failed" ).local8Bit().data() << endl; return 1; } @@ -951,12 +951,12 @@ int main( int argc, char *argv[] ) << endl; if ( !variables.isUID() ) { cout << i18n( "Missing event UID: " - "use --uid command line option" ).local8Bit() + "use --uid command line option" ).local8Bit().data() << endl; return 1; } if ( konsolekalendar->deleteEvent() != true ) { - cout << i18n( "No such event UID: delete event failed").local8Bit() + cout << i18n( "No such event UID: delete event failed").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" ). - arg( variables.getExportFile() ).local8Bit() + tqarg( variables.getExportFile() ).local8Bit().data() << endl; return 1; } -- cgit v1.2.1