summaryrefslogtreecommitdiffstats
path: root/korganizer/kowhatsnextview.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'korganizer/kowhatsnextview.cpp')
-rw-r--r--korganizer/kowhatsnextview.cpp28
1 files changed, 14 insertions, 14 deletions
diff --git a/korganizer/kowhatsnextview.cpp b/korganizer/kowhatsnextview.cpp
index c98c6c31d..722ba2681 100644
--- a/korganizer/kowhatsnextview.cpp
+++ b/korganizer/kowhatsnextview.cpp
@@ -22,9 +22,9 @@
without including the source code for TQt in the source distribution.
*/
-#include <tqlayout.h>
-#include <tqtextbrowser.h>
-#include <tqtextcodec.h>
+#include <layout.h>
+#include <textbrowser.h>
+#include <textcodec.h>
#include <tqfileinfo.h>
#include <tqlabel.h>
@@ -65,9 +65,9 @@ KOWhatsNextView::KOWhatsNextView(Calendar *calendar, TQWidget *parent,
: KOrg::BaseView(calendar, parent, name)
{
// TQLabel *dateLabel =
-// new TQLabel(KGlobal::locale()->formatDate(TQDate::tqcurrentDate()),this);
+// new TQLabel(KGlobal::locale()->formatDate(TQDate::currentDate()),this);
// dateLabel->setMargin(2);
-// dateLabel->tqsetAlignment(AlignCenter);
+// dateLabel->setAlignment(AlignCenter);
mView = new WhatsNextTextBrowser(this);
connect(mView,TQT_SIGNAL(showIncidence(const TQString &)),TQT_SLOT(showIncidence(const TQString &)));
@@ -81,7 +81,7 @@ KOWhatsNextView::~KOWhatsNextView()
{
}
-int KOWhatsNextView::tqcurrentDateCount()
+int KOWhatsNextView::currentDateCount()
{
return mStartDate.daysTo( mEndDate );
}
@@ -106,8 +106,8 @@ void KOWhatsNextView::updateView()
mText += KGlobal::locale()->formatDate( mStartDate );
} else {
mText += i18n("Date from - to", "%1 - %2")
- .tqarg( KGlobal::locale()->formatDate( mStartDate ) )
- .tqarg( KGlobal::locale()->formatDate( mEndDate ) );
+ .arg( KGlobal::locale()->formatDate( mStartDate ) )
+ .arg( KGlobal::locale()->formatDate( mEndDate ) );
}
mText+="</h2>\n";
@@ -183,7 +183,7 @@ void KOWhatsNextView::updateView()
TQStringList myEmails( KOPrefs::instance()->allEmails() );
int replies = 0;
- events = calendar()->events( TQDate::tqcurrentDate(), TQDate(2975,12,6) );
+ events = calendar()->events( TQDate::currentDate(), TQDate(2975,12,6) );
Event::List::ConstIterator it2;
for( it2 = events.begin(); it2 != events.end(); ++it2 ) {
Event *ev = *it2;
@@ -281,14 +281,14 @@ void KOWhatsNextView::appendEvent( Incidence *ev, const TQDateTime &start,
if ( starttime.date().daysTo( endtime.date() ) >= 1 ) {
mText += i18n("date from - to", "%1 - %2")
- .tqarg( KGlobal::locale()->formatDateTime( starttime ) )
- .tqarg( KGlobal::locale()->formatDateTime( endtime ) );
+ .arg( KGlobal::locale()->formatDateTime( starttime ) )
+ .arg( KGlobal::locale()->formatDateTime( endtime ) );
} else {
/*if (reply) */
mText += i18n("date, from - to", "%1, %2 - %3")
- .tqarg( KGlobal::locale()->formatDate( starttime.date(), true ) )
- .tqarg( KGlobal::locale()->formatTime( starttime.time() ) )
- .tqarg( KGlobal::locale()->formatTime( endtime.time() ) );
+ .arg( KGlobal::locale()->formatDate( starttime.date(), true ) )
+ .arg( KGlobal::locale()->formatTime( starttime.time() ) )
+ .arg( KGlobal::locale()->formatTime( endtime.time() ) );
}
}
// }