diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-09-01 00:37:02 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-09-01 00:37:02 +0000 |
commit | cc29364f06178f8f6b457384f2ec37a042bd9d43 (patch) | |
tree | 7c77a3184c698bbf9d98cef09fb1ba8124daceba /konsolekalendar | |
parent | 4f6c584bacc8c3c694228f36ada3de77a76614a6 (diff) | |
download | tdepim-cc29364f06178f8f6b457384f2ec37a042bd9d43.tar.gz tdepim-cc29364f06178f8f6b457384f2ec37a042bd9d43.zip |
* Massive set of changes to bring in all fixes and enhancements from the Enterprise PIM branch
* Ensured that the Trinity changes were applied on top of those enhancements, and any redundancy removed
* Added journal read support to the CalDAV resource
* Fixed CalDAV resource to use events URL for tasks and journals when separate URL checkbox unchecked
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1170461 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'konsolekalendar')
-rw-r--r-- | konsolekalendar/main.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/konsolekalendar/main.cpp b/konsolekalendar/main.cpp index 6343144e2..59b9a2f86 100644 --- a/konsolekalendar/main.cpp +++ b/konsolekalendar/main.cpp @@ -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 = TQDateTime::TQDateTime( startdate, starttime ); + startdatetime = TQDateTime( startdate, starttime ); kdDebug() << "main | datetimestamp | " << "setting startdatetime from " << "default startdate (today) and starttime" << endl; // set default end date/time - enddatetime = TQDateTime::TQDateTime( enddate, endtime ); + enddatetime = 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 = TQDateTime::TQDateTime( startdate, starttime ); + startdatetime = TQDateTime( startdate, starttime ); kdDebug() << "main | datetimestamp | " << "setting startdatetime from startdate and starttime" << endl; } if ( enddatetime.isNull() ) { - enddatetime = TQDateTime::TQDateTime( enddate, endtime ); + enddatetime = TQDateTime( enddate, endtime ); kdDebug() << "main | datetimestamp | " << "setting enddatetime from enddate and endtime" << endl; |