summaryrefslogtreecommitdiffstats
path: root/kalarm/dcophandler.cpp
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-04-14 20:16:30 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-04-14 20:16:30 +0000
commit1c93fca14d9ce37499bcfdf994c660186a0b6f17 (patch)
treef2defe163a805a9e34a2142dfde4cdb5e49241e7 /kalarm/dcophandler.cpp
parent67e29a054cfcb1b0d2fe6b0a316cf6b3eec087b7 (diff)
downloadtdepim-1c93fca14d9ce37499bcfdf994c660186a0b6f17.tar.gz
tdepim-1c93fca14d9ce37499bcfdf994c660186a0b6f17.zip
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
Diffstat (limited to 'kalarm/dcophandler.cpp')
-rw-r--r--kalarm/dcophandler.cpp11
1 files changed, 6 insertions, 5 deletions
diff --git a/kalarm/dcophandler.cpp b/kalarm/dcophandler.cpp
index 5f6e85074..c76f2a7fb 100644
--- a/kalarm/dcophandler.cpp
+++ b/kalarm/dcophandler.cpp
@@ -32,6 +32,7 @@
#include "karecurrence.h"
#include "mainwindow.h"
#include "preferences.h"
+#include "dcophandler.h"
#include "dcophandler.moc"
static const char* DCOP_OBJECT_NAME = "request"; // DCOP name of KAlarm's request interface
@@ -325,7 +326,7 @@ DateTime DcopHandler::convertStartDateTime(const TQString& startDateTime)
if (startDateTime.length() > 10)
{
// Both a date and a time are specified
- start = TQDateTime::fromString(startDateTime, TQt::ISODate);
+ start = TQDateTime::fromString(startDateTime, Qt::ISODate);
}
else
{
@@ -339,12 +340,12 @@ DateTime DcopHandler::convertStartDateTime(const TQString& startDateTime)
if (t.isEmpty())
{
// It's a date
- start = TQDate::fromString(startDateTime, TQt::ISODate);
+ start = TQDate::fromString(startDateTime, Qt::ISODate);
}
else
{
// It's a time, so use today as the date
- start.set(TQDate::tqcurrentDate(), TQTime::fromString(t, TQt::ISODate));
+ start.set(TQDate::tqcurrentDate(), TQTime::fromString(t, Qt::ISODate));
}
}
if (!start.isValid())
@@ -426,7 +427,7 @@ bool DcopHandler::convertRecurrence(DateTime& start, KARecurrence& recurrence, c
kdError(5950) << "DCOP call: alarm is date-only, but recurrence end is date/time" << endl;
return false;
}
- end.setDate(TQDate::fromString(endDateTime, TQt::ISODate));
+ end.setDate(TQDate::fromString(endDateTime, Qt::ISODate));
}
else
{
@@ -435,7 +436,7 @@ bool DcopHandler::convertRecurrence(DateTime& start, KARecurrence& recurrence, c
kdError(5950) << "DCOP call: alarm is timed, but recurrence end is date-only" << endl;
return false;
}
- end = TQDateTime::fromString(endDateTime, TQt::ISODate);
+ end = TQDateTime::fromString(endDateTime, Qt::ISODate);
}
if (!end.isValid())
{