summaryrefslogtreecommitdiffstats
path: root/tdecore
diff options
context:
space:
mode:
Diffstat (limited to 'tdecore')
-rw-r--r--tdecore/kcalendarsystemgregorian.cpp8
-rw-r--r--tdecore/kcalendarsystemhebrew.cpp4
-rw-r--r--tdecore/kcalendarsystemhijri.cpp2
-rw-r--r--tdecore/kcalendarsystemjalali.cpp2
-rw-r--r--tdecore/ktimezones.cpp4
-rw-r--r--tdecore/tdeapplication.cpp4
-rw-r--r--tdecore/tdeconfigbase.cpp6
-rw-r--r--tdecore/tdelocale.cpp4
8 files changed, 17 insertions, 17 deletions
diff --git a/tdecore/kcalendarsystemgregorian.cpp b/tdecore/kcalendarsystemgregorian.cpp
index 9d4d14661..d4f53fc39 100644
--- a/tdecore/kcalendarsystemgregorian.cpp
+++ b/tdecore/kcalendarsystemgregorian.cpp
@@ -58,7 +58,7 @@ int KCalendarSystemGregorian::weeksInYear(int year) const
// If the last day of the year is in the first week, we have to check the
// week before
if ( temp.weekNumber() == 1 )
- temp = TQT_TQDATE_OBJECT(temp.addDays(-7));
+ temp = temp.addDays(-7);
return temp.weekNumber();
}
@@ -221,17 +221,17 @@ bool KCalendarSystemGregorian::setYMD(TQDate & date, int y, int m, int d) const
TQDate KCalendarSystemGregorian::addYears(const TQDate & date, int nyears) const
{
- return TQT_TQDATE_OBJECT(date.addYears(nyears));
+ return date.addYears(nyears);
}
TQDate KCalendarSystemGregorian::addMonths(const TQDate & date, int nmonths) const
{
- return TQT_TQDATE_OBJECT(date.addMonths(nmonths));
+ return date.addMonths(nmonths);
}
TQDate KCalendarSystemGregorian::addDays(const TQDate & date, int ndays) const
{
- return TQT_TQDATE_OBJECT(date.addDays(ndays));
+ return date.addDays(ndays);
}
TQString KCalendarSystemGregorian::weekDayName(int col, bool shortName) const
diff --git a/tdecore/kcalendarsystemhebrew.cpp b/tdecore/kcalendarsystemhebrew.cpp
index 2f0aa111a..e0737c5b3 100644
--- a/tdecore/kcalendarsystemhebrew.cpp
+++ b/tdecore/kcalendarsystemhebrew.cpp
@@ -306,7 +306,7 @@ int KCalendarSystemHebrew::weeksInYear(int year) const
int nWeekNumber = weekNumber(temp);
if(nWeekNumber == 1) // last week belongs to next year
{
- temp = TQT_TQDATE_OBJECT(temp.addDays(-7));
+ temp = temp.addDays(-7);
nWeekNumber = weekNumber(temp);
}
@@ -574,7 +574,7 @@ int KCalendarSystemHebrew::weekDayOfPray() const
// Ok
TQDate KCalendarSystemHebrew::addDays( const TQDate & date, int ndays ) const
{
- return TQT_TQDATE_OBJECT(date.addDays( ndays ));
+ return date.addDays( ndays );
}
// Ok
diff --git a/tdecore/kcalendarsystemhijri.cpp b/tdecore/kcalendarsystemhijri.cpp
index cc66805e0..ef94b590f 100644
--- a/tdecore/kcalendarsystemhijri.cpp
+++ b/tdecore/kcalendarsystemhijri.cpp
@@ -539,7 +539,7 @@ int KCalendarSystemHijri::weekDayOfPray() const
TQDate KCalendarSystemHijri::addDays( const TQDate & date, int ndays ) const
{
- return TQT_TQDATE_OBJECT(date.addDays( ndays ));
+ return date.addDays( ndays );
}
TQDate KCalendarSystemHijri::addMonths( const TQDate & date, int nmonths ) const
diff --git a/tdecore/kcalendarsystemjalali.cpp b/tdecore/kcalendarsystemjalali.cpp
index 631693e45..3c71ca442 100644
--- a/tdecore/kcalendarsystemjalali.cpp
+++ b/tdecore/kcalendarsystemjalali.cpp
@@ -304,7 +304,7 @@ TQDate KCalendarSystemJalali::addMonths( const TQDate & date, int nmonths ) cons
TQDate KCalendarSystemJalali::addDays( const TQDate & date, int ndays ) const
{
- return TQT_TQDATE_OBJECT(date.addDays( ndays ));
+ return date.addDays( ndays );
}
int KCalendarSystemJalali::monthsInYear( const TQDate & date ) const
diff --git a/tdecore/ktimezones.cpp b/tdecore/ktimezones.cpp
index 3436cdabb..2dd248cfe 100644
--- a/tdecore/ktimezones.cpp
+++ b/tdecore/ktimezones.cpp
@@ -507,7 +507,7 @@ const KTimezone *KTimezones::local()
// Compute the MD5 sum of /etc/localtime.
KMD5 context("");
context.reset();
- context.update(TQT_TQIODEVICE_OBJECT(f));
+ context.update(f);
TQIODevice::Offset referenceSize = f.size();
TQString referenceMd5Sum = context.hexDigest();
f.close();
@@ -526,7 +526,7 @@ const KTimezone *KTimezones::local()
{
// Only do the heavy lifting for file sizes which match.
context.reset();
- context.update(TQT_TQIODEVICE_OBJECT(f));
+ context.update(f);
candidateMd5Sum = context.hexDigest();
}
f.close();
diff --git a/tdecore/tdeapplication.cpp b/tdecore/tdeapplication.cpp
index ec05a6cd2..99254a679 100644
--- a/tdecore/tdeapplication.cpp
+++ b/tdecore/tdeapplication.cpp
@@ -1389,7 +1389,7 @@ void TDEApplication::propagateSessionManager()
bool check = smEnv.isEmpty();
if ( !check && smModificationTime ) {
TQFileInfo info( fName );
- TQTime current = TQT_TQTIME_OBJECT(info.lastModified().time());
+ TQTime current = info.lastModified().time();
check = current > *smModificationTime;
}
if ( check ) {
@@ -1398,7 +1398,7 @@ void TDEApplication::propagateSessionManager()
if ( !f.open( IO_ReadOnly ) )
return;
TQFileInfo info ( f );
- smModificationTime = new TQTime( TQT_TQTIME_OBJECT(info.lastModified().time()) );
+ smModificationTime = new TQTime( info.lastModified().time() );
TQTextStream t(&f);
t.setEncoding( TQTextStream::Latin1 );
TQString s = t.readLine();
diff --git a/tdecore/tdeconfigbase.cpp b/tdecore/tdeconfigbase.cpp
index 417999df6..f716d7bff 100644
--- a/tdecore/tdeconfigbase.cpp
+++ b/tdecore/tdeconfigbase.cpp
@@ -435,7 +435,7 @@ TQVariant TDEConfigBase::readPropertyEntry( const char *pKey,
case TQVariant::DateTime:
return TQVariant( readDateTimeEntry( pKey, &tmp.asDateTime() ) );
case TQVariant::Date:
- return TQVariant(TQT_TQDATE_OBJECT(readDateTimeEntry( pKey, &tmp.asDateTime() ).date()));
+ return TQVariant(readDateTimeEntry( pKey, &tmp.asDateTime() ).date());
case TQVariant::Pixmap:
case TQVariant::Image:
@@ -1757,8 +1757,8 @@ void TDEConfigBase::writeEntry( const char *pKey, const TQDateTime& rDateTime,
TQStrList list;
TQCString tempstr;
- TQTime time = TQT_TQTIME_OBJECT(rDateTime.time());
- TQDate date = TQT_TQDATE_OBJECT(rDateTime.date());
+ TQTime time = rDateTime.time();
+ TQDate date = rDateTime.date();
list.insert( 0, tempstr.setNum( date.year() ) );
list.insert( 1, tempstr.setNum( date.month() ) );
diff --git a/tdecore/tdelocale.cpp b/tdecore/tdelocale.cpp
index 91e0865bf..254d5f054 100644
--- a/tdecore/tdelocale.cpp
+++ b/tdecore/tdelocale.cpp
@@ -1969,8 +1969,8 @@ TQString TDELocale::formatDateTime(const TQDateTime &pDateTime,
bool includeSeconds) const
{
return translate("concatenation of dates and time", "%1 %2")
- .arg( formatDate( TQT_TQDATE_OBJECT(pDateTime.date()), shortFormat ) )
- .arg( formatTime( TQT_TQTIME_OBJECT(pDateTime.time()), includeSeconds ) );
+ .arg( formatDate( pDateTime.date(), shortFormat ) )
+ .arg( formatTime( pDateTime.time(), includeSeconds ) );
}
TQString i18n(const char* text)