From 7be55ffa061c026e35e2d6a0effe1161ddb0d41f Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 31 Jul 2010 19:53:50 +0000 Subject: Trinity Qt initial conversion git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1157655 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- konsolekalendar/konsolekalendar.cpp | 36 ++++++++--------- konsolekalendar/konsolekalendar.h | 10 ++--- konsolekalendar/konsolekalendaradd.cpp | 6 +-- konsolekalendar/konsolekalendarepoch.cpp | 26 ++++++------- konsolekalendar/konsolekalendarepoch.h | 10 ++--- konsolekalendar/konsolekalendarexports.cpp | 36 ++++++++--------- konsolekalendar/konsolekalendarexports.h | 24 ++++++------ konsolekalendar/konsolekalendarvariables.cpp | 42 ++++++++++---------- konsolekalendar/konsolekalendarvariables.h | 58 ++++++++++++++-------------- konsolekalendar/main.cpp | 46 +++++++++++----------- konsolekalendar/stdcalendar.cpp | 8 ++-- konsolekalendar/stdcalendar.h | 4 +- 12 files changed, 153 insertions(+), 153 deletions(-) (limited to 'konsolekalendar') diff --git a/konsolekalendar/konsolekalendar.cpp b/konsolekalendar/konsolekalendar.cpp index 793c65d40..564adf530 100644 --- a/konsolekalendar/konsolekalendar.cpp +++ b/konsolekalendar/konsolekalendar.cpp @@ -34,9 +34,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include #include @@ -108,8 +108,8 @@ bool KonsoleKalendar::createCalendar() bool KonsoleKalendar::showInstance() { bool status = true; - QFile f; - QString title; + TQFile f; + TQString title; Event *event; if ( m_variables->isDryRun() ) { @@ -146,7 +146,7 @@ bool KonsoleKalendar::showInstance() printSpecs(); } - QTextStream ts( &f ); + TQTextStream ts( &f ); if ( m_variables->getExportType() != ExportTypeHTML && m_variables->getExportType() != ExportTypeMonthHTML ) { @@ -160,7 +160,7 @@ bool KonsoleKalendar::showInstance() m_variables->getCalendar()->events( EventSortStartDate ); if( sortedList.count() > 0 ) { - QDate dt, firstdate, lastdate; + TQDate dt, firstdate, lastdate; firstdate = sortedList.first()->dtStart().date(); lastdate = sortedList.last()->dtStart().date(); for ( dt = firstdate; @@ -189,10 +189,10 @@ bool KonsoleKalendar::showInstance() << "Show next activity in calendar" << endl; - QDateTime datetime = m_variables->getStartDateTime(); + TQDateTime datetime = m_variables->getStartDateTime(); datetime = datetime.addDays( 720 ); - QDate dt; + TQDate dt; for ( dt = m_variables->getStartDateTime().date(); dt <= datetime.date(); dt = dt.addDays(1) ) { @@ -214,7 +214,7 @@ bool KonsoleKalendar::showInstance() << "view raw events within date range list" << endl; - QDate dt; + TQDate dt; for ( dt = m_variables->getStartDateTime().date(); dt <= m_variables->getEndDateTime().date() && status != false; dt = dt.addDays(1) ) { @@ -226,7 +226,7 @@ bool KonsoleKalendar::showInstance() } } } else { - QDate firstdate, lastdate; + TQDate firstdate, lastdate; if ( m_variables->getAll() ) { kdDebug() << "konsolekalendar.cpp::showInstance() | " << "HTML view all events sorted list" @@ -292,8 +292,8 @@ bool KonsoleKalendar::showInstance() // htmlSettings.setTaskAttendees( false ); // htmlSettings.setTaskDueDate( true ); - htmlSettings.setDateStart( QDateTime( firstdate ) ); - htmlSettings.setDateEnd( QDateTime( lastdate ) ) ; + htmlSettings.setDateStart( TQDateTime( firstdate ) ); + htmlSettings.setDateEnd( TQDateTime( lastdate ) ) ; KCal::HtmlExport *Export; Export = new HtmlExport( m_variables->getCalendar(), &htmlSettings ); @@ -306,8 +306,8 @@ bool KonsoleKalendar::showInstance() return status; } -bool KonsoleKalendar::printEventList( QTextStream *ts, - Event::List *eventList, QDate date ) +bool KonsoleKalendar::printEventList( TQTextStream *ts, + Event::List *eventList, TQDate date ) { bool status = true; @@ -327,7 +327,7 @@ bool KonsoleKalendar::printEventList( QTextStream *ts, return( status ); } -bool KonsoleKalendar::printEvent( QTextStream *ts, Event *event, QDate dt ) +bool KonsoleKalendar::printEvent( TQTextStream *ts, Event *event, TQDate dt ) { bool status = false; bool sameDay = true; @@ -407,8 +407,8 @@ bool KonsoleKalendar::deleteEvent() return( del.deleteEvent() ); } -bool KonsoleKalendar::isEvent( QDateTime startdate, - QDateTime enddate, QString summary ) +bool KonsoleKalendar::isEvent( TQDateTime startdate, + TQDateTime enddate, TQString summary ) { // Search for an event with specified start and end datetime stamp and summary diff --git a/konsolekalendar/konsolekalendar.h b/konsolekalendar/konsolekalendar.h index f41ed4ccb..71ded4f61 100644 --- a/konsolekalendar/konsolekalendar.h +++ b/konsolekalendar/konsolekalendar.h @@ -28,7 +28,7 @@ #ifndef _KONSOLEKALENDAR_H #define _KONSOLEKALENDAR_H -#include +#include #include @@ -93,7 +93,7 @@ namespace KCal * @param enddate Ending date * @param summary Which summary event should have have */ - bool isEvent( QDateTime startdate, QDateTime enddate, QString summary ); + bool isEvent( TQDateTime startdate, TQDateTime enddate, TQString summary ); /** * Creates calendar file (If it doesn't exists) @@ -113,7 +113,7 @@ namespace KCal * @param eventlist which event we should print * @param dt is the date to use when printing the event for recurring events */ - bool printEventList( QTextStream *ts, Event::List *eventList, QDate dt ); + bool printEventList( TQTextStream *ts, Event::List *eventList, TQDate dt ); /** * Prints a single event in many formats @@ -121,7 +121,7 @@ namespace KCal * @param event which we should print * @param dt is the date to use when printing the event for recurring events */ - bool printEvent( QTextStream *ts, Event *event, QDate dt ); + bool printEvent( TQTextStream *ts, Event *event, TQDate dt ); /** * Variables that changes stuff in programm @@ -136,7 +136,7 @@ namespace KCal /** * This is usefull if we like to have same day events to same system */ - QDate m_saveDate; + TQDate m_saveDate; }; diff --git a/konsolekalendar/konsolekalendaradd.cpp b/konsolekalendar/konsolekalendaradd.cpp index 2f48d1b84..e1c80498f 100644 --- a/konsolekalendar/konsolekalendaradd.cpp +++ b/konsolekalendar/konsolekalendaradd.cpp @@ -33,8 +33,8 @@ #include #include -#include -#include +#include +#include #include #include @@ -114,7 +114,7 @@ bool KonsoleKalendarAdd::addImportedCalendar() // If --file specified, then import into that file // else, import into the standard calendar - QString fileName; + TQString fileName; if ( m_variables->getCalendarFile().isEmpty() ) fileName = locateLocal( "data", "korganizer/std.ics" ); else diff --git a/konsolekalendar/konsolekalendarepoch.cpp b/konsolekalendar/konsolekalendarepoch.cpp index c070d2532..e469a42c2 100644 --- a/konsolekalendar/konsolekalendarepoch.cpp +++ b/konsolekalendar/konsolekalendarepoch.cpp @@ -33,7 +33,7 @@ #include #include -#include +#include #include "konsolekalendarepoch.h" using namespace KCal; @@ -50,22 +50,22 @@ KonsoleKalendarEpoch::~KonsoleKalendarEpoch() // By "epoch" we mean the number of seconds since 00:00:00 UTC on January 1 1970 // Function to convert an epoch value into a QDateTime -QDateTime KonsoleKalendarEpoch::epoch2QDateTime( uint epoch ) +TQDateTime KonsoleKalendarEpoch::epoch2TQDateTime( uint epoch ) { - QDateTime dt; + TQDateTime dt; dt.setTime_t( epoch, Qt::UTC ); return( dt ); } -// Function to convert a QDateTime value into an epoch -uint KonsoleKalendarEpoch::QDateTime2epoch( QDateTime dt ) +// Function to convert a TQDateTime value into an epoch +uint KonsoleKalendarEpoch::QDateTime2epoch( TQDateTime dt ) { // THIS FUNCTION CAN BE OFF BY 1 HOUR DUE TO DAYLIGHT SAVINGS TIME. // SORRY QT DOESN'T HANDLE DAYLIGHT SAVINGS TIME. // Compute #seconds to subtract for local timezone difference from UTC. - int offset = QDateTime::currentDateTime( Qt::UTC ).toTime_t() - - QDateTime::currentDateTime( Qt::LocalTime ).toTime_t(); + int offset = TQDateTime::currentDateTime( Qt::UTC ).toTime_t() + - TQDateTime::currentDateTime( Qt::LocalTime ).toTime_t(); return( dt.toTime_t() - offset ); } @@ -76,7 +76,7 @@ uint KonsoleKalendarEpoch::QDateTime2epoch( QDateTime dt ) main() { uint epoch; - QDateTime dt; + TQDateTime dt; cout << endl; cout << "NOTE: Some tests may be off by 1 hour (3600 secs) " @@ -85,7 +85,7 @@ main() // Test1 epoch = 0; - dt = KonsoleKalendarEpoch::epoch2QDateTime( epoch ); + dt = KonsoleKalendarEpoch::epoch2TQDateTime( epoch ); cout << "TEST 1:" << endl; cout << "epoch=" << epoch @@ -103,7 +103,7 @@ main() // Test2 epoch = 100000; - dt = KonsoleKalendarEpoch::epoch2QDateTime( epoch ); + dt = KonsoleKalendarEpoch::epoch2TQDateTime( epoch ); cout << "TEST 2:" << endl; cout << "epoch=" << epoch @@ -121,7 +121,7 @@ main() // Test3 epoch = 10000000; - dt = KonsoleKalendarEpoch::epoch2QDateTime( epoch ); + dt = KonsoleKalendarEpoch::epoch2TQDateTime( epoch ); cout << "TEST 3:" << endl; cout << "epoch=" << epoch @@ -139,7 +139,7 @@ main() // Test4 epoch = 1000000000; - dt = KonsoleKalendarEpoch::epoch2QDateTime( epoch ); + dt = KonsoleKalendarEpoch::epoch2TQDateTime( epoch ); cout << "TEST 4:" << endl; cout << "epoch=" << epoch @@ -157,7 +157,7 @@ main() // Test5 epoch = 10000000000; - dt = KonsoleKalendarEpoch::epoch2QDateTime( epoch ); + dt = KonsoleKalendarEpoch::epoch2TQDateTime( epoch ); cout << "TEST 5:" << endl; cout << "epoch=" << epoch diff --git a/konsolekalendar/konsolekalendarepoch.h b/konsolekalendar/konsolekalendarepoch.h index e6db6d77e..fedd392c3 100644 --- a/konsolekalendar/konsolekalendarepoch.h +++ b/konsolekalendar/konsolekalendarepoch.h @@ -28,7 +28,7 @@ #ifndef _KONSOLEKALENDAREPOCH_H_ #define _KONSOLEKALENDAREPOCH_H_ -#include +#include /** * @file konsolekalendarepoch.h @@ -54,16 +54,16 @@ namespace KCal ~KonsoleKalendarEpoch(); /** - * Converts epoch time to QDateTime format. + * Converts epoch time to TQDateTime format. * @param epoch epoch time. */ - static QDateTime epoch2QDateTime( uint epoch ); + static TQDateTime epoch2TQDateTime( uint epoch ); /** * Converts QT DateTime to epoch format. - * @param dt is a QDateTime to convert to an epoch. + * @param dt is a TQDateTime to convert to an epoch. */ - static uint QDateTime2epoch( QDateTime dt ); + static uint QDateTime2epoch( TQDateTime dt ); }; diff --git a/konsolekalendar/konsolekalendarexports.cpp b/konsolekalendar/konsolekalendarexports.cpp index cad79964a..f1d93b0ab 100644 --- a/konsolekalendar/konsolekalendarexports.cpp +++ b/konsolekalendar/konsolekalendarexports.cpp @@ -33,7 +33,7 @@ #include #include -#include +#include #include #include @@ -58,8 +58,8 @@ KonsoleKalendarExports::~KonsoleKalendarExports() { } -bool KonsoleKalendarExports::exportAsTxt( QTextStream *ts, - Event *event, QDate date ) +bool KonsoleKalendarExports::exportAsTxt( TQTextStream *ts, + Event *event, TQDate date ) { // Export "Text" Format: @@ -144,8 +144,8 @@ bool KonsoleKalendarExports::exportAsTxt( QTextStream *ts, return true; } -bool KonsoleKalendarExports::exportAsTxtShort( QTextStream *ts, - Event *event, QDate date, +bool KonsoleKalendarExports::exportAsTxtShort( TQTextStream *ts, + Event *event, TQDate date, bool sameday ) { @@ -174,21 +174,21 @@ bool KonsoleKalendarExports::exportAsTxtShort( QTextStream *ts, *ts << "\t"; // Print Event Summary - *ts << event->summary().replace( QChar( '\n' ), QChar( ' ' ) ); + *ts << event->summary().replace( TQChar( '\n' ), TQChar( ' ' ) ); // Print Event Location if ( !event->location().isEmpty() ) { if ( !event->summary().isEmpty() ) { *ts << ", "; } - *ts << event->location().replace( QChar( '\n' ), QChar( ' ' ) ); + *ts << event->location().replace( TQChar( '\n' ), TQChar( ' ' ) ); } *ts << endl; // Print Event Description if ( !event->description().isEmpty() ) { *ts << "\t\t\t" - << event->description().replace( QChar( '\n' ), QChar( ' ' ) ) + << event->description().replace( TQChar( '\n' ), TQChar( ' ' ) ) << endl; } @@ -197,29 +197,29 @@ bool KonsoleKalendarExports::exportAsTxtShort( QTextStream *ts, return true; } -QString KonsoleKalendarExports::processField( QString field, QString dquote ) +TQString KonsoleKalendarExports::processField( TQString field, TQString dquote ) { // little function that processes a field for CSV compliance: // 1. Replaces double quotes by a pair of consecutive double quotes // 2. Surrounds field with double quotes - QString double_dquote = dquote + dquote; - QString retField = dquote + field.replace( dquote, double_dquote ) + dquote; + TQString double_dquote = dquote + dquote; + TQString retField = dquote + field.replace( dquote, double_dquote ) + dquote; return retField; } #define pF( x ) processField( ( x ), dquote ) -bool KonsoleKalendarExports::exportAsCSV( QTextStream *ts, - Event *event, QDate date ) +bool KonsoleKalendarExports::exportAsCSV( TQTextStream *ts, + Event *event, TQDate date ) { // Export "CSV" Format: // // startdate,starttime,enddate,endtime,summary,location,description,UID - QString delim = i18n( "," ); // character to use as CSV field delimiter - QString dquote = i18n( "\"" ); // character to use to quote CSV fields + TQString delim = i18n( "," ); // character to use as CSV field delimiter + TQString dquote = i18n( "\"" ); // character to use to quote CSV fields if ( !event->doesFloat() ) { *ts << pF( KGlobal::locale()->formatDate( date ) ) @@ -233,9 +233,9 @@ bool KonsoleKalendarExports::exportAsCSV( QTextStream *ts, << delim << pF( "" ); } - *ts << delim << pF( event->summary().replace( QChar('\n'), QChar(' ') ) ) - << delim << pF( event->location().replace( QChar('\n'), QChar(' ') ) ) - << delim << pF( event->description().replace( QChar('\n'), QChar(' ') ) ) + *ts << delim << pF( event->summary().replace( TQChar('\n'), TQChar(' ') ) ) + << delim << pF( event->location().replace( TQChar('\n'), TQChar(' ') ) ) + << delim << pF( event->description().replace( TQChar('\n'), TQChar(' ') ) ) << delim << pF( event->uid() ) << endl; diff --git a/konsolekalendar/konsolekalendarexports.h b/konsolekalendar/konsolekalendarexports.h index dc2f44eca..8db27c97f 100644 --- a/konsolekalendar/konsolekalendarexports.h +++ b/konsolekalendar/konsolekalendarexports.h @@ -28,7 +28,7 @@ #ifndef _KONSOLEKALENDAREXPORTS_H_ #define _KONSOLEKALENDAREXPORTS_H_ -#include +#include #include "konsolekalendarvariables.h" @@ -60,28 +60,28 @@ namespace KCal /** * Export the Event in Text Mode. - * @param ts pointer to the output QTextStream. + * @param ts pointer to the output TQTextStream. * @param event pointer to the Event to export. - * @param date is the QDate to be exported for. + * @param date is the TQDate to be exported for. */ - bool exportAsTxt( QTextStream *ts, Event *event, QDate date ); + bool exportAsTxt( TQTextStream *ts, Event *event, TQDate date ); /** * Export the Event in Short Text Mode. - * @param ts pointer to the output QTextStream. + * @param ts pointer to the output TQTextStream. * @param event pointer to the Event to export. - * @param date is the QDate to be exported for. + * @param date is the TQDate to be exported for. * @param sameday flags that this Event is on the same date as the * previously exported Event. */ - bool exportAsTxtShort( QTextStream *ts, Event *event, QDate date, + bool exportAsTxtShort( TQTextStream *ts, Event *event, TQDate date, bool sameday ); /** * Export the Event in Comma-Separated Values (CSV) Mode. - * @param ts pointer to the output QTextStream. + * @param ts pointer to the output TQTextStream. * @param event pointer to the Event to export. - * @param date is the QDate to be exported for. + * @param date is the TQDate to be exported for. */ - bool exportAsCSV( QTextStream *ts, Event *event, QDate date ); + bool exportAsCSV( TQTextStream *ts, Event *event, TQDate date ); private: KonsoleKalendarVariables *m_variables; @@ -91,9 +91,9 @@ namespace KCal * 1. Replaces double quotes by a pair of consecutive double quotes * 2. Surrounds field with double quotes * @param field is the field value to be processed. - * @param dquote is a QString containing the double quote character. + * @param dquote is a TQString containing the double quote character. */ - QString processField( QString field, QString dquote ); + TQString processField( TQString field, TQString dquote ); }; diff --git a/konsolekalendar/konsolekalendarvariables.cpp b/konsolekalendar/konsolekalendarvariables.cpp index bba7864bd..a93279239 100644 --- a/konsolekalendar/konsolekalendarvariables.cpp +++ b/konsolekalendar/konsolekalendarvariables.cpp @@ -36,9 +36,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include #include @@ -79,13 +79,13 @@ KonsoleKalendarVariables::~KonsoleKalendarVariables() // delete m_resource; } -void KonsoleKalendarVariables::setUID( QString uid ) +void KonsoleKalendarVariables::setUID( TQString uid ) { m_bIsUID = true; m_UID = uid; } -QString KonsoleKalendarVariables::getUID() +TQString KonsoleKalendarVariables::getUID() { return m_UID; } @@ -95,13 +95,13 @@ bool KonsoleKalendarVariables::isUID() return m_bIsUID; } -void KonsoleKalendarVariables::setStartDateTime( QDateTime start ) +void KonsoleKalendarVariables::setStartDateTime( TQDateTime start ) { m_bIsStartDateTime = true; m_startDateTime = start; } -QDateTime KonsoleKalendarVariables::getStartDateTime() +TQDateTime KonsoleKalendarVariables::getStartDateTime() { return m_startDateTime; } @@ -111,13 +111,13 @@ bool KonsoleKalendarVariables::isStartDateTime() return m_bIsStartDateTime; } -void KonsoleKalendarVariables::setEndDateTime( QDateTime end ) +void KonsoleKalendarVariables::setEndDateTime( TQDateTime end ) { m_bIsEndDateTime = true; m_endDateTime = end; } -QDateTime KonsoleKalendarVariables::getEndDateTime() +TQDateTime KonsoleKalendarVariables::getEndDateTime() { return m_endDateTime; } @@ -187,22 +187,22 @@ bool KonsoleKalendarVariables::getUseJournals() return( m_bUseJournals ); } -void KonsoleKalendarVariables::setCalendarFile( QString calendar ) +void KonsoleKalendarVariables::setCalendarFile( TQString calendar ) { m_calendar = calendar; } -QString KonsoleKalendarVariables::getCalendarFile() +TQString KonsoleKalendarVariables::getCalendarFile() { return m_calendar; } -void KonsoleKalendarVariables::setImportFile( QString calendar ) +void KonsoleKalendarVariables::setImportFile( TQString calendar ) { m_import = calendar; } -QString KonsoleKalendarVariables::getImportFile() +TQString KonsoleKalendarVariables::getImportFile() { return m_import; } @@ -227,7 +227,7 @@ ExportType KonsoleKalendarVariables::getExportType() return m_exportType; } -void KonsoleKalendarVariables::setExportFile( QString export_file ) +void KonsoleKalendarVariables::setExportFile( TQString export_file ) { m_exportFile = export_file; m_bIsExportFile = true; @@ -238,7 +238,7 @@ bool KonsoleKalendarVariables::isExportFile() return m_bIsExportFile; } -QString KonsoleKalendarVariables::getExportFile() +TQString KonsoleKalendarVariables::getExportFile() { return m_exportFile; } @@ -258,13 +258,13 @@ bool KonsoleKalendarVariables::getAll() return m_bAll; } -void KonsoleKalendarVariables::setDescription( QString description ) +void KonsoleKalendarVariables::setDescription( TQString description ) { m_bDescription = true; m_description = description; } -QString KonsoleKalendarVariables::getDescription() +TQString KonsoleKalendarVariables::getDescription() { return m_description; } @@ -274,13 +274,13 @@ bool KonsoleKalendarVariables::isDescription() return m_bDescription; } -void KonsoleKalendarVariables::setLocation( QString location ) +void KonsoleKalendarVariables::setLocation( TQString location ) { m_bLocation = true; m_location = location; } -QString KonsoleKalendarVariables::getLocation() +TQString KonsoleKalendarVariables::getLocation() { return m_location; } @@ -290,13 +290,13 @@ bool KonsoleKalendarVariables::isLocation() return m_bLocation; } -void KonsoleKalendarVariables::setSummary( QString summary ) +void KonsoleKalendarVariables::setSummary( TQString summary ) { m_bSummary = true; m_summary = summary; } -QString KonsoleKalendarVariables::getSummary() +TQString KonsoleKalendarVariables::getSummary() { return m_summary; } diff --git a/konsolekalendar/konsolekalendarvariables.h b/konsolekalendar/konsolekalendarvariables.h index ccba49348..9b0c82d32 100644 --- a/konsolekalendar/konsolekalendarvariables.h +++ b/konsolekalendar/konsolekalendarvariables.h @@ -34,8 +34,8 @@ #include #include -#include -#include +#include +#include /** * @file konsolekalendarvariables.h @@ -123,13 +123,13 @@ namespace KCal * Sets start date. * @param start is the start date. */ - void setStartDateTime( QDateTime start ); + void setStartDateTime( TQDateTime start ); /** * Get start date. * @return start date. */ - QDateTime getStartDateTime(); + TQDateTime getStartDateTime(); /** * Is there start date? @@ -141,13 +141,13 @@ namespace KCal * Sets end date. * @param end is the enddate. */ - void setEndDateTime( QDateTime end ); + void setEndDateTime( TQDateTime end ); /** * Get end date. * @return end date. */ - QDateTime getEndDateTime(); + TQDateTime getEndDateTime(); /** * Is there end date? @@ -159,13 +159,13 @@ namespace KCal * Sets the UID, the unique tag for VCard entry. * @param uid unique tag for VCard entry. */ - void setUID( QString uid ); + void setUID( TQString uid ); /** * Get UID, the unique tag for VCard entry. * @return UID number. */ - QString getUID(); + TQString getUID(); /** * Is there UID set? @@ -211,37 +211,37 @@ namespace KCal * Set calendar file * @param calendar Calendar files full path. */ - void setCalendarFile( QString calendar ); + void setCalendarFile( TQString calendar ); /** * Returns fullpath to calendar file. * @return calendar file. */ - QString getCalendarFile(); + TQString getCalendarFile(); /** * Set file to import active calendar. * @param calendar Calendar file to import. */ - void setImportFile( QString calendar ); + void setImportFile( TQString calendar ); /** * Return import filename. * @return File that should be imported. */ - QString getImportFile(); + TQString getImportFile(); /** * Add description. * @param description to event. */ - void setDescription( QString description ); + void setDescription( TQString description ); /** * Return description. * @return description of event. */ - QString getDescription(); + TQString getDescription(); /** * Is there an event description? @@ -253,13 +253,13 @@ namespace KCal * Add location information. * @param location location where the event occurs. */ - void setLocation( QString location ); + void setLocation( TQString location ); /** * Return location information. * @return location where event is occurring. */ - QString getLocation(); + TQString getLocation(); /** * Is there event location information available? @@ -271,13 +271,13 @@ namespace KCal * Add summary. * @param summary event summary. */ - void setSummary( QString summary ); + void setSummary( TQString summary ); /** * Get summary. * @return summary. */ - QString getSummary(); + TQString getSummary(); /** * Is there an event summary? @@ -324,12 +324,12 @@ namespace KCal /** * Set output file. */ - void setExportFile( QString export_file ); + void setExportFile( TQString export_file ); /** * To what file we'll output. */ - QString getExportFile(); + TQString getExportFile(); /** * Has an Export File been set? @@ -365,29 +365,29 @@ namespace KCal private: bool m_bIsUID; - QString m_UID; + TQString m_UID; bool m_bIsStartDateTime; - QDateTime m_startDateTime; + TQDateTime m_startDateTime; bool m_bIsEndDateTime; - QDateTime m_endDateTime; + TQDateTime m_endDateTime; bool m_bNext; bool m_bVerbose; bool m_bDryRun; bool m_bUseEvents; bool m_bUseTodos; bool m_bUseJournals; - QString m_calendar; - QString m_import; + TQString m_calendar; + TQString m_import; ExportType m_exportType; bool m_bIsExportFile; - QString m_exportFile; + TQString m_exportFile; bool m_bAll; bool m_bDescription; - QString m_description; + TQString m_description; bool m_bLocation; - QString m_location; + TQString m_location; bool m_bSummary; - QString m_summary; + TQString m_summary; bool m_bFloating; bool m_bDaysCount; int m_daysCount; diff --git a/konsolekalendar/main.cpp b/konsolekalendar/main.cpp index 3792d083e..6343144e2 100644 --- a/konsolekalendar/main.cpp +++ b/konsolekalendar/main.cpp @@ -57,9 +57,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include #include @@ -204,12 +204,12 @@ int main( int argc, char *argv[] ) KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); // Default values for start date/time (today at 07:00) - QDate startdate = QDate::currentDate(); - QTime starttime( 7, 0 ); + TQDate startdate = TQDate::currentDate(); + TQTime starttime( 7, 0 ); // Default values for end date/time (today at 17:00) - QDate enddate = QDate::currentDate(); - QTime endtime( 17, 0 ); + TQDate enddate = TQDate::currentDate(); + TQTime endtime( 17, 0 ); // Default values for switches bool view = true; @@ -220,7 +220,7 @@ int main( int argc, char *argv[] ) bool calendarFile = false; bool importFile = false; - QString option; + TQString option; KonsoleKalendarVariables variables; KonsoleKalendarEpoch epochs; @@ -472,7 +472,7 @@ int main( int argc, char *argv[] ) << "(" << option << ")" << endl; - startdate = QDate::fromString( option, Qt::ISODate ); + startdate = TQDate::fromString( option, Qt::ISODate ); if ( !startdate.isValid() ) { cout << i18n( "Invalid Start Date Specified: %1" ). arg( option ).local8Bit() @@ -497,7 +497,7 @@ int main( int argc, char *argv[] ) << endl; if ( option.upper() != "FLOAT" ) { - starttime = QTime::fromString( option, Qt::ISODate ); + starttime = TQTime::fromString( option, Qt::ISODate ); if ( !starttime.isValid() ) { cout << i18n( "Invalid Start Time Specified: %1" ). arg( option ).local8Bit() @@ -527,7 +527,7 @@ int main( int argc, char *argv[] ) << "(" << option << ")" << endl; - enddate = QDate::fromString( option, Qt::ISODate ); + enddate = TQDate::fromString( option, Qt::ISODate ); if ( !enddate.isValid() ) { cout << i18n( "Invalid End Date Specified: %1" ). arg( option ).local8Bit() @@ -579,7 +579,7 @@ int main( int argc, char *argv[] ) << endl; if ( option.upper() != "FLOAT" ) { - endtime = QTime::fromString( option, Qt::ISODate ); + endtime = TQTime::fromString( option, Qt::ISODate ); if ( !endtime.isValid() ) { cout << i18n( "Invalid End Time Specified: %1" ). arg( option ).local8Bit() @@ -662,12 +662,12 @@ int main( int argc, char *argv[] ) KURL url = KURL::fromPathOrURL( variables.getCalendarFile() ); if ( url.isLocalFile() ) { variables.setCalendarFile( url.path() ); - exists = QFile::exists( variables.getCalendarFile() ); + exists = TQFile::exists( variables.getCalendarFile() ); remote = false; } else if ( url.protocol().isEmpty() ) { - QFileInfo info( variables.getCalendarFile() ); + TQFileInfo info( variables.getCalendarFile() ); variables.setCalendarFile( info.absFilePath() ); - exists = QFile::exists( variables.getCalendarFile() ); + exists = TQFile::exists( variables.getCalendarFile() ); remote = false; } else { exists = true; // really have no idea if the remote file exists @@ -740,7 +740,7 @@ int main( int argc, char *argv[] ) /*************************************************************************** * Glorious date/time checking and setting code * ***************************************************************************/ - QDateTime startdatetime, enddatetime; + TQDateTime startdatetime, enddatetime; // Handle case with either date or end-date unspecified if ( !args->isSet( "end-date" ) && !args->isSet( "show-next" ) && @@ -768,7 +768,7 @@ int main( int argc, char *argv[] ) << "setting endtime 1 hour after starttime" << endl; } else if ( args->isSet( "epoch-start" ) ) { - startdatetime = epochs.epoch2QDateTime( epochstart ); + startdatetime = epochs.epoch2TQDateTime( epochstart ); enddatetime = startdatetime.addSecs( 60 * 60 ); kdDebug() << "main | datetimestamp | " << "setting endtime 1 hour after epochstart" @@ -786,7 +786,7 @@ int main( int argc, char *argv[] ) << "setting starttime 1 hour before endtime" << endl; } else if ( args->isSet( "epoch-end" ) ) { - enddatetime = epochs.epoch2QDateTime( epochend ); + enddatetime = epochs.epoch2TQDateTime( epochend ); startdatetime = enddatetime.addSecs( -60 * 60 ); kdDebug() << "main | datetimestamp | " << "setting starttime 1 before after epochend" @@ -799,13 +799,13 @@ int main( int argc, char *argv[] ) if ( !args->isSet( "time" ) && !args->isSet( "epoch-start" ) && !args->isSet( "end-time" ) && !args->isSet( "epoch-end" ) ) { // set default start date/time - startdatetime = QDateTime::QDateTime( startdate, starttime ); + startdatetime = TQDateTime::TQDateTime( startdate, starttime ); kdDebug() << "main | datetimestamp | " << "setting startdatetime from " << "default startdate (today) and starttime" << endl; // set default end date/time - enddatetime = QDateTime::QDateTime( enddate, endtime ); + enddatetime = TQDateTime::TQDateTime( enddate, endtime ); kdDebug() << "main | datetimestamp | " << "setting enddatetime from " << "default enddate (today) and endtime" @@ -814,13 +814,13 @@ int main( int argc, char *argv[] ) // Set startdatetime, enddatetime if still necessary if ( startdatetime.isNull() ) { - startdatetime = QDateTime::QDateTime( startdate, starttime ); + startdatetime = TQDateTime::TQDateTime( startdate, starttime ); kdDebug() << "main | datetimestamp | " << "setting startdatetime from startdate and starttime" << endl; } if ( enddatetime.isNull() ) { - enddatetime = QDateTime::QDateTime( enddate, endtime ); + enddatetime = TQDateTime::TQDateTime( enddate, endtime ); kdDebug() << "main | datetimestamp | " << "setting enddatetime from enddate and endtime" << endl; @@ -892,7 +892,7 @@ int main( int argc, char *argv[] ) * Set our application name for use in unique IDs and error messages, * and product ID for incidence PRODID property */ - QString prodId = "-//K Desktop Environment//NONSGML %1 %2//EN"; + TQString prodId = "-//K Desktop Environment//NONSGML %1 %2//EN"; CalFormat::setApplication( progDisplay, prodId.arg( progDisplay ).arg( progVersion ) ); diff --git a/konsolekalendar/stdcalendar.cpp b/konsolekalendar/stdcalendar.cpp index 6263172c1..6026d7720 100644 --- a/konsolekalendar/stdcalendar.cpp +++ b/konsolekalendar/stdcalendar.cpp @@ -33,7 +33,7 @@ using namespace KCal; -StdCalendar::StdCalendar( const QString &fileName, const QString &resName ) +StdCalendar::StdCalendar( const TQString &fileName, const TQString &resName ) : CalendarResources( KPimPrefs::timezone() ) { mManager = resourceManager(); @@ -56,7 +56,7 @@ StdCalendar::StdCalendar() if ( mManager->isEmpty() ) { KConfig config( "korganizerrc" ); config.setGroup( "General" ); - QString fileName = config.readPathEntry( "Active Calendar" ); + TQString fileName = config.readPathEntry( "Active Calendar" ); if ( !fileName.isEmpty() ) { addFileResource( fileName, i18n( "Active Calendar" ) ); @@ -69,8 +69,8 @@ StdCalendar::StdCalendar() } } -void StdCalendar::addFileResource( const QString &fileName, - const QString &resName ) +void StdCalendar::addFileResource( const TQString &fileName, + const TQString &resName ) { KCal::ResourceCalendar *resource = 0; diff --git a/konsolekalendar/stdcalendar.h b/konsolekalendar/stdcalendar.h index e217786f5..b1f434729 100644 --- a/konsolekalendar/stdcalendar.h +++ b/konsolekalendar/stdcalendar.h @@ -31,10 +31,10 @@ class KDE_EXPORT StdCalendar : public KCal::CalendarResources { public: StdCalendar(); - StdCalendar( const QString &fileName, const QString &resName ); + StdCalendar( const TQString &fileName, const TQString &resName ); ~StdCalendar(); - void addFileResource( const QString &fileName, const QString &resName ); + void addFileResource( const TQString &fileName, const TQString &resName ); private: KCal::CalendarResourceManager *mManager; -- cgit v1.2.1