diff options
27 files changed, 59 insertions, 59 deletions
diff --git a/interfaces/tdetexteditor/templateinterface.cpp b/interfaces/tdetexteditor/templateinterface.cpp index 25c103196..f3de57447 100644 --- a/interfaces/tdetexteditor/templateinterface.cpp +++ b/interfaces/tdetexteditor/templateinterface.cpp @@ -75,8 +75,8 @@ bool TemplateInterface::expandMacros( TQMap<TQString, TQString> &map, TQWidget * TDEABC::StdAddressBook *addrBook = 0; TDEABC::Addressee userAddress; TQDateTime datetime = TQDateTime::currentDateTime(); - TQDate date = TQT_TQDATE_OBJECT(datetime.date()); - TQTime time = TQT_TQTIME_OBJECT(datetime.time()); + TQDate date = datetime.date(); + TQTime time = datetime.time(); TQMap<TQString,TQString>::Iterator it; for ( it = map.begin(); it != map.end(); ++it ) diff --git a/kate/part/katedocument.cpp b/kate/part/katedocument.cpp index 56e6e1846..574236589 100644 --- a/kate/part/katedocument.cpp +++ b/kate/part/katedocument.cpp @@ -4964,7 +4964,7 @@ bool KateDocument::createDigest( TQCString &result ) if ( f.open( IO_ReadOnly) ) { KMD5 md5; - ret = md5.update( TQT_TQIODEVICE_OBJECT(f) ); + ret = md5.update( f ); md5.hexDigest( result ); f.close(); ret = true; diff --git a/kate/part/kateprinter.cpp b/kate/part/kateprinter.cpp index a7bf324e8..e5e2969c0 100644 --- a/kate/part/kateprinter.cpp +++ b/kate/part/kateprinter.cpp @@ -192,9 +192,9 @@ bool KatePrinter::print (KateDocument *doc) tags["d"] = TDEGlobal::locale()->formatDateTime(dt, true, false); tags["D"] = TDEGlobal::locale()->formatDateTime(dt, false, false); - tags["h"] = TDEGlobal::locale()->formatTime(TQT_TQTIME_OBJECT(dt.time()), false); - tags["y"] = TDEGlobal::locale()->formatDate(TQT_TQDATE_OBJECT(dt.date()), true); - tags["Y"] = TDEGlobal::locale()->formatDate(TQT_TQDATE_OBJECT(dt.date()), false); + tags["h"] = TDEGlobal::locale()->formatTime(dt.time(), false); + tags["y"] = TDEGlobal::locale()->formatDate(dt.date(), true); + tags["Y"] = TDEGlobal::locale()->formatDate(dt.date(), false); tags["f"] = doc->url().fileName(); tags["U"] = doc->url().prettyURL(); if ( selectionOnly ) diff --git a/tdeabc/ldifconverter.cpp b/tdeabc/ldifconverter.cpp index 1527b4893..7c4a72025 100644 --- a/tdeabc/ldifconverter.cpp +++ b/tdeabc/ldifconverter.cpp @@ -152,7 +152,7 @@ bool LDIFConverter::addresseeToLDIF( const Addressee &addr, TQString &str ) ldif_out( t, "homeurl", addr.url().prettyURL() ); ldif_out( t, "description", addr.note() ); if (addr.revision().isValid()) - ldif_out(t, "modifytimestamp", dateToVCardString( TQT_TQDATETIME_OBJECT(addr.revision())) ); + ldif_out(t, "modifytimestamp", dateToVCardString( addr.revision()) ); t << "objectclass: top\n"; t << "objectclass: person\n"; diff --git a/tdeabc/scripts/field.src.cpp b/tdeabc/scripts/field.src.cpp index f8f126b83..b3d5a4bf9 100644 --- a/tdeabc/scripts/field.src.cpp +++ b/tdeabc/scripts/field.src.cpp @@ -362,7 +362,7 @@ bool Field::setValue( TDEABC::Addressee &a, const TQString &value ) return true; } case FieldImpl::Birthday: - a.setBirthday( TQT_TQDATE_OBJECT(TQDate::fromString( value, Qt::ISODate )) ); + a.setBirthday( TQDate::fromString( value, Qt::ISODate ) ); return true; case FieldImpl::CustomField: a.insertCustom( mImpl->app(), mImpl->key(), value ); @@ -378,7 +378,7 @@ TQString Field::sortKey( const TDEABC::Addressee &a ) --CASEVALUE-- case FieldImpl::Birthday: if ( a.birthday().isValid() ) { - TQDate date = TQT_TQDATE_OBJECT(a.birthday().date()); + TQDate date = a.birthday().date(); TQString key; key.sprintf( "%02d-%02d", date.month(), date.day() ); return key; diff --git a/tdeabc/vcardformatimpl.cpp b/tdeabc/vcardformatimpl.cpp index 3a0883edc..4f2ea6809 100644 --- a/tdeabc/vcardformatimpl.cpp +++ b/tdeabc/vcardformatimpl.cpp @@ -331,8 +331,8 @@ void VCardFormatImpl::saveAddressee( const Addressee &addressee, VCARD::VCard *v addTextValue( v, EntityCategories, addressee.categories().join(",") ); - addDateValue( v, EntityBirthday, TQT_TQDATE_OBJECT(addressee.birthday().date()) ); - addDateTimeValue( v, EntityRevision, TQT_TQDATETIME_OBJECT(addressee.revision()) ); + addDateValue( v, EntityBirthday, addressee.birthday().date() ); + addDateTimeValue( v, EntityRevision, addressee.revision() ); addGeoValue( v, addressee.geo() ); addUTCValue( v, addressee.timeZone() ); diff --git a/tdeabc/vcardtool.cpp b/tdeabc/vcardtool.cpp index c1e793e77..423bfad19 100644 --- a/tdeabc/vcardtool.cpp +++ b/tdeabc/vcardtool.cpp @@ -139,7 +139,7 @@ TQString VCardTool::createVCards( Addressee::List list, VCard::Version version ) card.addLine( createAgent( version, (*addrIt).agent() ) ); // BDAY - card.addLine( VCardLine( "BDAY", createDateTime( TQT_TQDATETIME_OBJECT((*addrIt).birthday()) ) ) ); + card.addLine( VCardLine( "BDAY", createDateTime( (*addrIt).birthday()) ) ) ); // CATEGORIES if ( version == VCard::v3_0 ) { @@ -262,7 +262,7 @@ TQString VCardTool::createVCards( Addressee::List list, VCard::Version version ) card.addLine( VCardLine( "PRODID", TQString((*addrIt).productId()) ) ); // REV - card.addLine( VCardLine( "REV", createDateTime( TQT_TQDATETIME_OBJECT((*addrIt).revision()) ) ) ); + card.addLine( VCardLine( "REV", createDateTime( (*addrIt).revision()) ) ) ); // ROLE VCardLine roleLine( "ROLE", TQString((*addrIt).role()) ); 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) diff --git a/tdehtml/ecma/kjs_window.cpp b/tdehtml/ecma/kjs_window.cpp index b06cb970c..0623d6ef9 100644 --- a/tdehtml/ecma/kjs_window.cpp +++ b/tdehtml/ecma/kjs_window.cpp @@ -2304,16 +2304,16 @@ void WindowQObject::timerEvent(TQTimerEvent *) DateTimeMS DateTimeMS::addMSecs(int s) const { DateTimeMS c = *this; - c.mTime = TQT_TQTIME_OBJECT(mTime.addMSecs(s)); + c.mTime = mTime.addMSecs(s); if (s > 0) { if (c.mTime < mTime) - c.mDate = TQT_TQDATE_OBJECT(mDate.addDays(1)); + c.mDate = mDate.addDays(1); } else { if (c.mTime > mTime) - c.mDate = TQT_TQDATE_OBJECT(mDate.addDays(-1)); + c.mDate = mDate.addDays(-1); } return c; } diff --git a/tdehtml/rendering/render_text.cpp b/tdehtml/rendering/render_text.cpp index 3a349844b..5361027d1 100644 --- a/tdehtml/rendering/render_text.cpp +++ b/tdehtml/rendering/render_text.cpp @@ -334,7 +334,7 @@ void InlineTextBox::paintShadow(TQPainter *pt, const Font *f, int _tx, int _ty, m_reversed ? TQPainter::RTL : TQPainter::LTR); p.end(); - TQImage img = TQT_TQIMAGE_OBJECT(pixmap.convertToImage()).convertDepth(32); + TQImage img = pixmap.convertToImage().convertDepth(32); int md = thickness*thickness; // max-dist^2 diff --git a/tdeio/misc/kssld/kssld.cpp b/tdeio/misc/kssld/kssld.cpp index a376ebfac..f40a9183a 100644 --- a/tdeio/misc/kssld/kssld.cpp +++ b/tdeio/misc/kssld/kssld.cpp @@ -287,7 +287,7 @@ KSSLCNode *node; if ( !node->permanent ) { node->expires = TQDateTime::currentDateTime(); // FIXME: make this configurable - node->expires = TQT_TQDATETIME_OBJECT(node->expires.addSecs(5)); + node->expires = node->expires.addSecs(5); } else { node->expires = node->cert->getQDTNotAfter(); // set to certs expiry date } @@ -310,7 +310,7 @@ KSSLCNode *node; if (!permanent) { n->expires = TQDateTime::currentDateTime(); - n->expires = TQT_TQDATETIME_OBJECT(n->expires.addSecs(5)); + n->expires = n->expires.addSecs(5); } else { if ( !n->expires.isValid() ) n->expires = n->cert->getQDTNotAfter(); // set to certs expiry date diff --git a/tdeioslave/file/file.cpp b/tdeioslave/file/file.cpp index bf18a069b..4c9f3fd0f 100644 --- a/tdeioslave/file/file.cpp +++ b/tdeioslave/file/file.cpp @@ -569,7 +569,7 @@ void FileProtocol::put( const KURL& url, int _mode, bool _overwrite, bool _resum // set modification time const TQString mtimeStr = metaData( "modified" ); if ( !mtimeStr.isEmpty() ) { - TQDateTime dt = TQT_TQDATETIME_OBJECT(TQDateTime::fromString( mtimeStr, Qt::ISODate )); + TQDateTime dt = TQDateTime::fromString( mtimeStr, Qt::ISODate ); if ( dt.isValid() ) { KDE_struct_stat dest_statbuf; if (KDE_stat( _dest_orig.data(), &dest_statbuf ) == 0) { diff --git a/tdenewstuff/downloaddialog.cpp b/tdenewstuff/downloaddialog.cpp index 81450fd68..f81d0b477 100644 --- a/tdenewstuff/downloaddialog.cpp +++ b/tdenewstuff/downloaddialog.cpp @@ -439,7 +439,7 @@ int DownloadDialog::installStatus(Entry *entry) if(datestring.isNull()) installed = 0; else { - date = TQT_TQDATE_OBJECT(TQDate::fromString(datestring, Qt::ISODate)); + date = TQDate::fromString(datestring, Qt::ISODate); if(!date.isValid()) installed = 0; else if(date < entry->releaseDate()) installed = -1; else installed = 1; diff --git a/tdenewstuff/entry.cpp b/tdenewstuff/entry.cpp index 7539bb679..e51c7b01d 100644 --- a/tdenewstuff/entry.cpp +++ b/tdenewstuff/entry.cpp @@ -332,7 +332,7 @@ void Entry::parseDomElement( const TQDomElement &element ) if ( e.tagName() == "version" ) setVersion( e.text().stripWhiteSpace() ); // if ( e.tagName() == "release" ) setRelease( e.text().toInt() ); if ( e.tagName() == "created" ) { - TQDate date = TQT_TQDATE_OBJECT(TQDate::fromString( e.text().stripWhiteSpace(), Qt::ISODate )); + TQDate date = TQDate::fromString( e.text().stripWhiteSpace(), Qt::ISODate ); setReleaseDate( date ); } if ( e.tagName() == "smallpreviewpic1" ) { diff --git a/tdenewstuff/security.cpp b/tdenewstuff/security.cpp index 3bca16166..c6f8a4c3b 100644 --- a/tdenewstuff/security.cpp +++ b/tdenewstuff/security.cpp @@ -226,7 +226,7 @@ void Security::slotCheckValidity() if (file.open(IO_ReadOnly)) { context.reset(); - context.update(TQT_TQIODEVICE_OBJECT(file)); + context.update(file); md5sum = context.hexDigest(); file.close(); } @@ -298,7 +298,7 @@ void Security::slotSignFile() if (file.open(IO_ReadOnly)) { context.reset(); - context.update(TQT_TQIODEVICE_OBJECT(file)); + context.update(file); md5sum = context.hexDigest(); file.close(); } diff --git a/tdeprint/cups/kpschedulepage.cpp b/tdeprint/cups/kpschedulepage.cpp index d7f13c8a4..8614a9c5f 100644 --- a/tdeprint/cups/kpschedulepage.cpp +++ b/tdeprint/cups/kpschedulepage.cpp @@ -220,8 +220,8 @@ void KPSchedulePage::setOptions(const TQMap<TQString,TQString>& opts) else if (t == "third-shift") item = 7; else { - TQTime qt = TQT_TQTIME_OBJECT(TQTime::fromString(t)); - m_tedit->setTime(TQT_TQTIME_OBJECT(qt.addSecs(-3600 * m_gmtdiff))); + TQTime qt = TQTime::fromString(t); + m_tedit->setTime(qt.addSecs(-3600 * m_gmtdiff)); item = 8; } diff --git a/tdestyles/plastik/plastik.cpp b/tdestyles/plastik/plastik.cpp index e03a0788b..2cfd60db1 100644 --- a/tdestyles/plastik/plastik.cpp +++ b/tdestyles/plastik/plastik.cpp @@ -827,7 +827,7 @@ void PlastikStyle::renderGradient(TQPainter *painter, int r_w = result->rect().width(); int r_h = result->rect().height(); int r_x, r_y, r_x2, r_y2; - TQT_TQRECT_OBJECT(result->rect()).coords(&r_x, &r_y, &r_x2, &r_y2); + result->rect().coords(&r_x, &r_y, &r_x2, &r_y2); int rDiff, gDiff, bDiff; int rc, gc, bc; diff --git a/tdeui/kdatepicker.cpp b/tdeui/kdatepicker.cpp index f29e32762..a99763478 100644 --- a/tdeui/kdatepicker.cpp +++ b/tdeui/kdatepicker.cpp @@ -92,7 +92,7 @@ void KDatePicker::fillWeeksCombo(const TQDate &date) // make sure that the week of the lastDay is always inserted: in Chinese calendar // system, this is not always the case if(day < lastDay && day.daysTo(lastDay) < 7 && calendar->weekNumber(day) != calendar->weekNumber(lastDay)) - day = TQT_TQDATE_OBJECT(lastDay.addDays(-7)); + day = lastDay.addDays(-7); } } @@ -371,7 +371,7 @@ KDatePicker::selectMonthClicked() int day = calendar->day(date); // ----- construct a valid date in this month: calendar->setYMD(date, calendar->year(date), month, 1); - date = TQT_TQDATE_OBJECT(date.addDays(TQMIN(day, calendar->daysInMonth(date)) - 1)); + date = date.addDays(TQMIN(day, calendar->daysInMonth(date)) - 1); // ----- set this month setDate(date); } diff --git a/tdeui/kdatetbl.cpp b/tdeui/kdatetbl.cpp index ec5a1a132..4072bafd2 100644 --- a/tdeui/kdatetbl.cpp +++ b/tdeui/kdatetbl.cpp @@ -351,22 +351,22 @@ void KDateTable::previousMonth() void KDateTable::beginningOfMonth() { - setDate(TQT_TQDATE_OBJECT(date.addDays(1 - date.day()))); + setDate(date.addDays(1 - date.day())); } void KDateTable::endOfMonth() { - setDate(TQT_TQDATE_OBJECT(date.addDays(date.daysInMonth() - date.day()))); + setDate(date.addDays(date.daysInMonth() - date.day())); } void KDateTable::beginningOfWeek() { - setDate(TQT_TQDATE_OBJECT(date.addDays(1 - date.dayOfWeek()))); + setDate(date.addDays(1 - date.dayOfWeek())); } void KDateTable::endOfWeek() { - setDate(TQT_TQDATE_OBJECT(date.addDays(7 - date.dayOfWeek()))); + setDate(date.addDays(7 - date.dayOfWeek())); } void @@ -374,22 +374,22 @@ KDateTable::keyPressEvent( TQKeyEvent *e ) { switch( e->key() ) { case Key_Up: - setDate(TQT_TQDATE_OBJECT(date.addDays(-7))); + setDate(date.addDays(-7)); break; case Key_Down: - setDate(TQT_TQDATE_OBJECT(date.addDays(7))); + setDate(date.addDays(7)); break; case Key_Left: - setDate(TQT_TQDATE_OBJECT(date.addDays(-1))); + setDate(date.addDays(-1)); break; case Key_Right: - setDate(TQT_TQDATE_OBJECT(date.addDays(1))); + setDate(date.addDays(1)); break; case Key_Minus: - setDate(TQT_TQDATE_OBJECT(date.addDays(-1))); + setDate(date.addDays(-1)); break; case Key_Plus: - setDate(TQT_TQDATE_OBJECT(date.addDays(1))); + setDate(date.addDays(1)); break; case Key_N: setDate(TQDate::currentDate()); @@ -447,7 +447,7 @@ KDateTable::setFontSize(int size) void KDateTable::wheelEvent ( TQWheelEvent * e ) { - setDate(TQT_TQDATE_OBJECT(date.addMonths( -(int)(e->delta()/120)) )); + setDate(date.addMonths( -(int)(e->delta()/120)) ); e->accept(); } diff --git a/tdeui/kdatetimewidget.cpp b/tdeui/kdatetimewidget.cpp index d7b677af9..76d92edd2 100644 --- a/tdeui/kdatetimewidget.cpp +++ b/tdeui/kdatetimewidget.cpp @@ -52,8 +52,8 @@ void KDateTimeWidget::init() void KDateTimeWidget::setDateTime(const TQDateTime & datetime) { - d->dateWidget->setDate(TQT_TQDATE_OBJECT(datetime.date())); - d->timeWidget->setTime(TQT_TQTIME_OBJECT(datetime.time())); + d->dateWidget->setDate(datetime.date()); + d->timeWidget->setTime(datetime.time()); } TQDateTime KDateTimeWidget::dateTime() const |