diff options
Diffstat (limited to 'korganizer')
112 files changed, 516 insertions, 515 deletions
diff --git a/korganizer/Makefile.am b/korganizer/Makefile.am index 6b434ab8..c89d8b60 100644 --- a/korganizer/Makefile.am +++ b/korganizer/Makefile.am @@ -29,7 +29,7 @@ kcm_korganizer_la_LIBADD = libkorganizer.la $(top_builddir)/libkdepim/libkdepim. kcm_korganizer_la_COMPILE_FIRST = koprefs_base.h kogroupwareprefspage.h libkorganizerpart_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -libkorganizerpart_la_LIBADD = libkorganizer.la +libkorganizerpart_la_LIBADD = libkorganizer.la $(LIB_QT) $(LIB_KDECORE) $(LIB_KPARTS) $(LIB_KIO) $(LIB_KHTML) $(LIB_KDEUI) -L$(top_builddir)/libkdepim/ -lkdepim -L$(top_builddir)/libkcal/ -lkcal -lkorganizer_calendar libkorganizerpart_la_SOURCES = korganizer_part.cpp libkorganizerpart_la_COMPILE_FIRST = publishdialog_base.h koprefs_base.h diff --git a/korganizer/actionmanager.cpp b/korganizer/actionmanager.cpp index b9df9e86..8b938986 100644 --- a/korganizer/actionmanager.cpp +++ b/korganizer/actionmanager.cpp @@ -723,7 +723,7 @@ void ActionManager::file_open( const KURL &url ) // is that URL already opened somewhere else? Activate that window KOrg::MainWindow *korg=ActionManager::findInstance( url ); if ( ( 0 != korg )&&( korg != mMainWindow ) ) { - KWin::activateWindow( korg->topLevelWidget()->winId() ); + KWin::activateWindow( korg->tqtopLevelWidget()->winId() ); return; } @@ -745,7 +745,7 @@ void ActionManager::file_icalimport() TQString progPath; KTempFile tmpfn; - TQString homeDir = TQDir::homeDirPath() + TQString::fromLatin1( "/.calendar" ); + TQString homeDir = TQDir::homeDirPath() + TQString::tqfromLatin1( "/.calendar" ); if ( !TQFile::exists( homeDir ) ) { KMessageBox::error( dialogParent(), @@ -998,7 +998,7 @@ bool ActionManager::saveURL() if ( result != KMessageBox::Continue ) return false; TQString filename = mURL.fileName(); - filename.replace( filename.length() - 4, 4, ".ics" ); + filename.tqreplace( filename.length() - 4, 4, ".ics" ); mURL.setFileName( filename ); if ( mURL.isLocalFile() ) { mFile = mURL.path(); @@ -1043,9 +1043,9 @@ void ActionManager::exportHTML() settings.readConfig(); TQDate qd1; - qd1 = TQDate::currentDate(); + qd1 = TQDate::tqcurrentDate(); TQDate qd2; - qd2 = TQDate::currentDate(); + qd2 = TQDate::tqcurrentDate(); if ( settings.monthView() ) qd2.addMonths( 1 ); else @@ -1702,7 +1702,7 @@ void ActionManager::openEventEditor( const TQString & summary, attData = file; } else { if ( KMessageBox::warningContinueCancel( 0, - i18n("Removing attachments from an email might invalidate its signature."), + i18n("Removing attachments from an email might tqinvalidate its signature."), i18n("Remove Attachments"), KStdGuiItem::cont(), "BodyOnlyInlineAttachment" ) != KMessageBox::Continue ) return; @@ -1916,7 +1916,7 @@ bool ActionManager::queryClose() if ( mCalendar && mCalendar->isModified() ) { int res = KMessageBox::questionYesNoCancel( dialogParent(), - i18n("The calendar contains unsaved changes. Do you want to save them before exiting?"), TQString::null, KStdGuiItem::save(), KStdGuiItem::discard() ); + i18n("The calendar tqcontains unsaved changes. Do you want to save them before exiting?"), TQString::null, KStdGuiItem::save(), KStdGuiItem::discard() ); // Exit on yes and no, don't exit on cancel. If saving fails, ask for exiting. if ( res == KMessageBox::Yes ) { close = saveModifiedURL(); @@ -2011,7 +2011,7 @@ void ActionManager::importCalendar( const KURL &url ) } PreviewDialog *dialog; - dialog = new PreviewDialog( url, mMainWindow->topLevelWidget() ); + dialog = new PreviewDialog( url, mMainWindow->tqtopLevelWidget() ); connect( dialog, TQT_SIGNAL( dialogFinished( PreviewDialog * ) ), TQT_SLOT( slotPreviewDialogFinished( PreviewDialog * ) ) ); connect( dialog, TQT_SIGNAL( openURL( const KURL &, bool ) ), @@ -2104,10 +2104,10 @@ bool ActionManager::handleCommandLine() ret = false; } else if ( args->count() <= 0 ) { // No filenames given => all other args are meaningless, show main Window - mainWindow->topLevelWidget()->show(); + mainWindow->tqtopLevelWidget()->show(); } else if ( !args->isSet( "open" ) ) { // Import, merge, or ask => we need the resource calendar window anyway. - mainWindow->topLevelWidget()->show(); + mainWindow->tqtopLevelWidget()->show(); // Check for import, merge or ask if ( args->isSet( "import" ) ) { @@ -2130,7 +2130,7 @@ bool ActionManager::handleCommandLine() TQWidget *ActionManager::dialogParent() { - return mCalendarView->topLevelWidget(); + return mCalendarView->tqtopLevelWidget(); } #include "actionmanager.moc" diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index ba1bbe6e..91b42b1e 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp @@ -137,7 +137,7 @@ CalendarView::CalendarView( TQWidget *parent, const char *name ) TQBoxLayout *topLayout = new TQVBoxLayout( this ); #ifndef KORG_NOSPLITTER - // create the main layout frames. + // create the main tqlayout frames. mPanner = new TQSplitter( TQSplitter::Horizontal, this, "CalendarView::Panner" ); topLayout->addWidget( mPanner ); @@ -177,7 +177,7 @@ CalendarView::CalendarView( TQWidget *parent, const char *name ) mDateNavigatorContainer = new KDateNavigator( leftFrame, true, "CalendarView::DateNavigator", - TQDate::currentDate() ); + TQDate::tqcurrentDate() ); mTodoList = new KOTodoView( CalendarNull::self(), leftFrame, "todolist" ); mEventViewer = new KOEventViewer ( CalendarNull::self(), leftFrame, "EventViewer" ); @@ -185,7 +185,7 @@ CalendarView::CalendarView( TQWidget *parent, const char *name ) TQWidget *rightBox = new TQWidget( mainBox ); TQBoxLayout *rightLayout = new TQVBoxLayout( rightBox ); - mNavigatorBar = new NavigatorBar( TQDate::currentDate(), rightBox ); + mNavigatorBar = new NavigatorBar( TQDate::tqcurrentDate(), rightBox ); rightLayout->addWidget( mNavigatorBar ); mRightFrame = new TQWidgetStack( rightBox ); @@ -195,7 +195,7 @@ CalendarView::CalendarView( TQWidget *parent, const char *name ) if ( KOPrefs::instance()->mVerticalScreen ) { // mTodoList->setFixedHeight( 60 ); - mTodoList->setFixedHeight( mDateNavigatorContainer->sizeHint().height() ); + mTodoList->setFixedHeight( mDateNavigatorContainer->tqsizeHint().height() ); } #endif @@ -387,7 +387,7 @@ TQDate CalendarView::activeDate( bool fallbackToToday ) // When all else fails, use the navigator start date, or today. if ( fallbackToToday ) { - return TQDate::currentDate(); + return TQDate::tqcurrentDate(); } else { return mDateNavigator->selectedDates().first(); } @@ -547,7 +547,7 @@ void CalendarView::readSettings() TQValueList<int> sizes = config->readIntListEntry( "Separator1" ); if ( sizes.count() != 2 ) { - sizes << mDateNavigatorContainer->minimumSizeHint().width(); + sizes << mDateNavigatorContainer->tqminimumSizeHint().width(); sizes << 300; } mPanner->setSizes( sizes ); @@ -779,14 +779,14 @@ void CalendarView::incidenceChanged( Incidence *oldIncidence, TQString description = i18n( "To-do completed: %1 (%2)" ).arg( newIncidence->summary() ).arg( timeStr ); - Journal::List journals = calendar()->journals( TQDate::currentDate() ); + Journal::List journals = calendar()->journals( TQDate::tqcurrentDate() ); Journal *journal; if ( journals.isEmpty() ) { journal = new Journal(); - journal->setDtStart( TQDateTime::currentDateTime() ); + journal->setDtStart( TQDateTime::tqcurrentDateTime() ); - TQString dateStr = KGlobal::locale()->formatDate( TQDate::currentDate() ); + TQString dateStr = KGlobal::locale()->formatDate( TQDate::tqcurrentDate() ); journal->setSummary( i18n("Journal of %1").arg( dateStr ) ); journal->setDescription( description ); @@ -1137,7 +1137,7 @@ KOEventEditor *CalendarView::newEventEditor( ResourceCalendar *res, const TQStri // let the current view change the default start/end datetime bool allDay = allDayParam; TQDateTime startDt( startDtParam ), endDt( endDtParam ); - // Adjust the start/end date times (i.e. replace invalid values by defaults, + // Adjust the start/end date times (i.e. tqreplace invalid values by defaults, // and let the view adjust the type. dateTimesForNewEvent( startDt, endDt, allDay ); @@ -1248,7 +1248,7 @@ void CalendarView::newTodo( ResourceCalendar *res, const TQString &subRes ) todoEditor->setResource( res, subRes ); if ( mViewManager->currentView()->isEventView() ) { dtDue.setDate( mDateNavigator->selectedDates().first() ); - TQDateTime dtDummy = TQDateTime::currentDateTime(); + TQDateTime dtDummy = TQDateTime::tqcurrentDateTime(); mViewManager->currentView()->eventDurationHint( dtDue, dtDummy, allday ); todoEditor->setDates( dtDue, allday ); } @@ -1669,7 +1669,7 @@ void CalendarView::schedule_forward( Incidence *incidence ) void CalendarView::mailFreeBusy( int daysToPublish ) { - TQDateTime start = TQDateTime::currentDateTime(); + TQDateTime start = TQDateTime::tqcurrentDateTime(); TQDateTime end = start.addDays(daysToPublish); FreeBusy *freebusy = new FreeBusy(mCalendar, start, end); @@ -1865,7 +1865,7 @@ void CalendarView::eventUpdated(Incidence *) void CalendarView::adaptNavigationUnits() { if (mViewManager->currentView()->isEventView()) { - int days = mViewManager->currentView()->currentDateCount(); + int days = mViewManager->currentView()->tqcurrentDateCount(); if (days == 1) { emit changeNavStringPrev(i18n("&Previous Day")); emit changeNavStringNext(i18n("&Next Day")); @@ -2797,7 +2797,7 @@ void CalendarView::getIncidenceHierarchy( Incidence *inc, Incidence::List &children ) { // protecion against looping hierarchies - if ( inc && !children.contains( inc ) ) { + if ( inc && !children.tqcontains( inc ) ) { Incidence::List::ConstIterator it; Incidence::List immediateChildren = inc->relations(); for ( it = immediateChildren.constBegin(); it != immediateChildren.constEnd(); ++it ) { diff --git a/korganizer/calendarview.h b/korganizer/calendarview.h index 5922e8f2..6cdc3154 100644 --- a/korganizer/calendarview.h +++ b/korganizer/calendarview.h @@ -260,7 +260,7 @@ class KDE_EXPORT CalendarView : public KOrg::CalendarViewBase, public Calendar:: /** Add an incidence to the active calendar. @param ical A calendar in iCalendar format containing the incidence. The - calendar must consist of a VCALENDAR component which contains + calendar must consist of a VCALENDAR component which tqcontains the incidence (VEVENT, VTODO, VJOURNAL or VFREEBUSY) and optionally a VTIMEZONE component. If there is more than one incidence, only the first is added to KOrganizer's calendar. @@ -371,7 +371,7 @@ class KDE_EXPORT CalendarView : public KOrg::CalendarViewBase, public Calendar:: /** - Check if clipboard contains vCalendar event. The signal pasteEnabled() is + Check if clipboard tqcontains vCalendar event. The signal pasteEnabled() is emitted as result. */ void checkClipboard(); diff --git a/korganizer/datechecker.cpp b/korganizer/datechecker.cpp index c0ce30eb..0fdcb302 100644 --- a/korganizer/datechecker.cpp +++ b/korganizer/datechecker.cpp @@ -59,14 +59,14 @@ void DateChecker::enableRollover( RolloverType r ) TQT_SLOT( possiblyPastMidnight() ) ); } mUpdateTimer->start( 0, true ); - mLastDayChecked = TQDate::currentDate(); + mLastDayChecked = TQDate::tqcurrentDate(); } mUpdateRollover = r; } void DateChecker::passedMidnight() { - TQDate today = TQDate::currentDate(); + TQDate today = TQDate::tqcurrentDate(); if ( today.month() != mLastDayChecked.month() ) { if ( mUpdateRollover == FollowMonth ) { @@ -78,9 +78,9 @@ void DateChecker::passedMidnight() void DateChecker::possiblyPastMidnight() { - if ( mLastDayChecked != TQDate::currentDate() ) { + if ( mLastDayChecked != TQDate::tqcurrentDate() ) { passedMidnight(); - mLastDayChecked = TQDate::currentDate(); + mLastDayChecked = TQDate::tqcurrentDate(); } // Set the timer to go off 1 second after midnight // or after 8 minutes, whichever comes first. diff --git a/korganizer/datenavigator.cpp b/korganizer/datenavigator.cpp index edc036ce..e03e3c89 100644 --- a/korganizer/datenavigator.cpp +++ b/korganizer/datenavigator.cpp @@ -37,7 +37,7 @@ using namespace KCal; DateNavigator::DateNavigator( TQObject *parent, const char *name ) : TQObject( parent, name ) { - mSelectedDates.append( TQDate::currentDate() ); + mSelectedDates.append( TQDate::tqcurrentDate() ); } DateNavigator::~DateNavigator() @@ -69,7 +69,7 @@ void DateNavigator::selectDate( const TQDate &date ) if ( !d.isValid() ) { kdDebug(5850) << "DateNavigator::selectDates(TQDate): an invalid date was passed as a parameter!" << endl; - d = TQDate::currentDate(); + d = TQDate::tqcurrentDate(); } mSelectedDates.clear(); @@ -143,18 +143,18 @@ void DateNavigator::selectWorkWeek( const TQDate &d ) int dayOfWeek = KOGlobals::self()->calendarSystem()->dayOfWeek( d ); - TQDate currentDate = d.addDays( weekStart - dayOfWeek ); + TQDate tqcurrentDate = d.addDays( weekStart - dayOfWeek ); if ( weekStart != 1 && dayOfWeek < weekStart ) { - currentDate = currentDate.addDays( -7 ); + tqcurrentDate = tqcurrentDate.addDays( -7 ); } mSelectedDates.clear(); - int mask = KOGlobals::self()->getWorkWeekMask(); + int tqmask = KOGlobals::self()->getWorkWeekMask(); for ( int i = 0; i < 7; ++i ) { - if( (1<< ((i + weekStart + 6) % 7)) & (mask) ) { - mSelectedDates.append( currentDate.addDays(i) ); + if( (1<< ((i + weekStart + 6) % 7)) & (tqmask) ) { + mSelectedDates.append( tqcurrentDate.addDays(i) ); } } @@ -163,7 +163,7 @@ void DateNavigator::selectWorkWeek( const TQDate &d ) void DateNavigator::selectToday() { - TQDate d = TQDate::currentDate(); + TQDate d = TQDate::tqcurrentDate(); int dateCount = mSelectedDates.count(); diff --git a/korganizer/datenavigatorcontainer.cpp b/korganizer/datenavigatorcontainer.cpp index ac089294..e1e3223a 100644 --- a/korganizer/datenavigatorcontainer.cpp +++ b/korganizer/datenavigatorcontainer.cpp @@ -207,18 +207,18 @@ void DateNavigatorContainer::resizeEvent( TQResizeEvent * ) #if 0 kdDebug(5850) << "DateNavigatorContainer::resizeEvent()" << endl; kdDebug(5850) << " CURRENT SIZE: " << size() << endl; - kdDebug(5850) << " MINIMUM SIZEHINT: " << minimumSizeHint() << endl; - kdDebug(5850) << " SIZEHINT: " << sizeHint() << endl; - kdDebug(5850) << " MINIMUM SIZE: " << minimumSize() << endl; + kdDebug(5850) << " MINIMUM SIZEHINT: " << tqminimumSizeHint() << endl; + kdDebug(5850) << " SIZEHINT: " << tqsizeHint() << endl; + kdDebug(5850) << " MINIMUM SIZE: " << tqminimumSize() << endl; #endif TQTimer::singleShot( 0, this, TQT_SLOT( resizeAllContents() ) ); } void DateNavigatorContainer::resizeAllContents() { - TQSize minSize = mNavigatorView->minimumSizeHint(); + TQSize minSize = mNavigatorView->tqminimumSizeHint(); -// kdDebug(5850) << " NAVIGATORVIEW minimumSizeHint: " << minSize << endl; +// kdDebug(5850) << " NAVIGATORVIEW tqminimumSizeHint: " << minSize << endl; int margin = KDialog::spacingHint(); int verticalCount = ( size().height() - margin*2 ) / minSize.height(); @@ -286,16 +286,16 @@ void DateNavigatorContainer::resizeAllContents() } } -TQSize DateNavigatorContainer::minimumSizeHint() const +TQSize DateNavigatorContainer::tqminimumSizeHint() const { int margin = KDialog::spacingHint() * 2; - return mNavigatorView->minimumSizeHint() + TQSize( margin, margin ); + return mNavigatorView->tqminimumSizeHint() + TQSize( margin, margin ); } -TQSize DateNavigatorContainer::sizeHint() const +TQSize DateNavigatorContainer::tqsizeHint() const { int margin = KDialog::spacingHint() * 2; - return mNavigatorView->sizeHint() + TQSize( margin, margin ); + return mNavigatorView->tqsizeHint() + TQSize( margin, margin ); } void DateNavigatorContainer::goNextMonth() diff --git a/korganizer/datenavigatorcontainer.h b/korganizer/datenavigatorcontainer.h index e30f19b4..b797427c 100644 --- a/korganizer/datenavigatorcontainer.h +++ b/korganizer/datenavigatorcontainer.h @@ -41,8 +41,8 @@ class DateNavigatorContainer: public QFrame */ void setCalendar( Calendar * ); - TQSize minimumSizeHint() const; - TQSize sizeHint() const; + TQSize tqminimumSizeHint() const; + TQSize tqsizeHint() const; void setUpdateNeeded(); public slots: /** diff --git a/korganizer/eventarchiver.cpp b/korganizer/eventarchiver.cpp index c4adbf82..1cd613e6 100644 --- a/korganizer/eventarchiver.cpp +++ b/korganizer/eventarchiver.cpp @@ -52,7 +52,7 @@ void EventArchiver::runOnce( Calendar* calendar, const TQDate& limitDate, TQWidg void EventArchiver::runAuto( Calendar* calendar, TQWidget* widget, bool withGUI ) { - TQDate limitDate( TQDate::currentDate() ); + TQDate limitDate( TQDate::tqcurrentDate() ); int expiryTime = KOPrefs::instance()->mExpiryTime; switch (KOPrefs::instance()->mExpiryUnit) { case KOPrefs::UnitDays: // Days @@ -190,7 +190,7 @@ void EventArchiver::archiveIncidences( Calendar* calendar, const TQDate& /*limit uids << (*it)->uid(); } for( it = allIncidences.begin(); it != allIncidences.end(); ++it ) { - if ( !uids.contains( (*it)->uid() ) ) { + if ( !uids.tqcontains( (*it)->uid() ) ) { archiveCalendar.deleteIncidence( *it ); } } @@ -247,7 +247,7 @@ bool EventArchiver::isSubTreeComplete( const Todo *todo, const TQDate &limitDate } // This QList is only to prevent infinit recursion - if ( checkedUids.contains( todo->uid() ) ) { + if ( checkedUids.tqcontains( todo->uid() ) ) { // Probably will never happen, calendar.cpp checks for this kdWarning() << "To-do hierarchy loop detected!"; return false; diff --git a/korganizer/filteredit_base.ui b/korganizer/filteredit_base.ui index 9eb53dbf..86f95679 100644 --- a/korganizer/filteredit_base.ui +++ b/korganizer/filteredit_base.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>FilterEdit_base</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -50,7 +50,7 @@ </property> <widget class="QLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>layout3</cstring> + <cstring>tqlayout3</cstring> </property> <hbox> <property name="name"> @@ -95,7 +95,7 @@ </widget> <widget class="QLayoutWidget" row="3" column="0"> <property name="name"> - <cstring>layout1</cstring> + <cstring>tqlayout1</cstring> </property> <hbox> <property name="name"> @@ -111,7 +111,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>15</width> <height>20</height> @@ -165,7 +165,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>16</width> <height>21</height> @@ -220,7 +220,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>110</height> @@ -312,7 +312,7 @@ Only to-dos which have least one attendee will be checked. If you are not in th <slots> <slot>updateFilter()</slot> </slots> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>knuminput.h</includehint> <includehint>knuminput.h</includehint> diff --git a/korganizer/freebusymanager.cpp b/korganizer/freebusymanager.cpp index 65f945ba..187e1082 100644 --- a/korganizer/freebusymanager.cpp +++ b/korganizer/freebusymanager.cpp @@ -80,7 +80,7 @@ FreeBusyDownloadJob::FreeBusyDownloadJob( const TQString &email, const KURL &url KIO::TransferJob *job = KIO::get( url, false, false ); //pass the mainwindow to the job so any prompts are active KOrg::MainWindow *korg = ActionManager::findInstance( KURL() ); - job->setWindow( korg->topLevelWidget() ); + job->setWindow( korg->tqtopLevelWidget() ); connect( job, TQT_SIGNAL( result( KIO::Job * ) ), TQT_SLOT( slotResult( KIO::Job * ) ) ); @@ -140,7 +140,7 @@ void FreeBusyManager::setCalendar( KCal::Calendar *c ) KCal::FreeBusy *FreeBusyManager::ownerFreeBusy() { - TQDateTime start = TQDateTime::currentDateTime(); + TQDateTime start = TQDateTime::tqcurrentDateTime(); TQDateTime end = start.addDays( KOPrefs::instance()->mFreeBusyPublishDays ); FreeBusy *freebusy = new FreeBusy( mCalendar, start, end ); @@ -176,13 +176,13 @@ void FreeBusyManager::slotPerhapsUploadFB() // A timer is already running, so we don't need to do anything return; - int now = static_cast<int>( TQDateTime::currentDateTime().toTime_t() ); + int now = static_cast<int>( TQDateTime::tqcurrentDateTime().toTime_t() ); int eta = static_cast<int>( mNextUploadTime.toTime_t() ) - now; if( !mUploadingFreeBusy ) { // Not currently uploading if( mNextUploadTime.isNull() || - TQDateTime::currentDateTime() > mNextUploadTime ) { + TQDateTime::tqcurrentDateTime() > mNextUploadTime ) { // No uploading have been done in this session, or delay time is over publishFreeBusy(); return; @@ -256,8 +256,8 @@ void FreeBusyManager::publishFreeBusy() // if (emailpos != -1) { // const TQString emailName = defaultEmail.left( emailpos ); // const TQString emailHost = defaultEmail.mid( emailpos + 1 ); -// targetURL = targetURL.url().replace("%25u", emailName, true); -// targetURL = targetURL.url().replace("%25d", emailHost, true); +// targetURL = targetURL.url().tqreplace("%25u", emailName, true); +// targetURL = targetURL.url().tqreplace("%25d", emailHost, true); // } targetURL.setUser( KOPrefs::instance()->mFreeBusyPublishUser ); targetURL.setPass( KOPrefs::instance()->mFreeBusyPublishPassword ); @@ -271,7 +271,7 @@ void FreeBusyManager::publishFreeBusy() } // Save the time of the next free/busy uploading - mNextUploadTime = TQDateTime::currentDateTime(); + mNextUploadTime = TQDateTime::tqcurrentDateTime(); if( KOPrefs::instance()->mFreeBusyPublishDelay > 0 ) mNextUploadTime = mNextUploadTime.addSecs( KOPrefs::instance()->mFreeBusyPublishDelay * 60 ); @@ -280,7 +280,7 @@ void FreeBusyManager::publishFreeBusy() // We need to massage the list a bit so that Outlook understands // it. - messageText = messageText.replace( TQRegExp( "ORGANIZER\\s*:MAILTO:" ), + messageText = messageText.tqreplace( TQRegExp( "ORGANIZER\\s*:MAILTO:" ), "ORGANIZER:" ); // Create a local temp file and save the message to it @@ -318,7 +318,7 @@ void FreeBusyManager::publishFreeBusy() targetURL.setPass( KOPrefs::instance()->mPublishPassword ); } else { // we use something else - targetURL = KOPrefs::instance()->mPublishAnyURL.replace( "%SERVER%", + targetURL = KOPrefs::instance()->mPublishAnyURL.tqreplace( "%SERVER%", emailHost ); targetURL.setUser( KOPrefs::instance()->mPublishUserName ); targetURL.setPass( KOPrefs::instance()->mPublishPassword ); @@ -337,7 +337,7 @@ void FreeBusyManager::publishFreeBusy() false /*don't show progress info*/ ); //pass the mainwindow to the job so any prompts are active KOrg::MainWindow *korg = ActionManager::findInstance( KURL() ); - job->setWindow( korg->topLevelWidget() ); + job->setWindow( korg->tqtopLevelWidget() ); connect( job, TQT_SIGNAL( result( KIO::Job * ) ), TQT_SLOT( slotUploadFreeBusyResult( KIO::Job * ) ) ); @@ -438,7 +438,7 @@ void FreeBusyManager::cancelRetrieval() mRetrieveQueue.clear(); } -KURL replaceVariablesURL( const KURL &url, const TQString &email ) +KURL tqreplaceVariablesURL( const KURL &url, const TQString &email ) { TQString emailName, emailHost; int emailpos = email.find( '@' ); @@ -448,9 +448,9 @@ KURL replaceVariablesURL( const KURL &url, const TQString &email ) } TQString saveStr = url.path(); - saveStr.replace( TQRegExp( "%[Ee][Mm][Aa][Ii][Ll]%" ), email ); - saveStr.replace( TQRegExp( "%[Nn][Aa][Mm][Ee]%" ), emailName ); - saveStr.replace( TQRegExp( "%[Ss][Ee][Rr][Vv][Ee][Rr]%" ), emailHost ); + saveStr.tqreplace( TQRegExp( "%[Ee][Mm][Aa][Ii][Ll]%" ), email ); + saveStr.tqreplace( TQRegExp( "%[Nn][Aa][Mm][Ee]%" ), emailName ); + saveStr.tqreplace( TQRegExp( "%[Ss][Ee][Rr][Vv][Ee][Rr]%" ), emailHost ); KURL retUrl( url ); retUrl.setPath( saveStr ); @@ -468,7 +468,7 @@ bool fbExists( const KURL &url ) TQByteArray data; if ( KIO::NetAccess::synchronousRun( job, 0, &data ) ) { TQString dataStr ( data ); - if ( dataStr.contains( "BEGIN:VCALENDAR" ) ) { + if ( dataStr.tqcontains( "BEGIN:VCALENDAR" ) ) { return true; } } @@ -492,11 +492,11 @@ KURL FreeBusyManager::freeBusyUrl( const TQString &email ) cachedURL.setUser( KOPrefs::instance()->mFreeBusyRetrieveUser ); cachedURL.setPass( KOPrefs::instance()->mFreeBusyRetrievePassword ); } - return replaceVariablesURL( cachedURL, email ); + return tqreplaceVariablesURL( cachedURL, email ); } // Try with the url configurated by preferred email in kaddressbook - KABC::Addressee::List list= KABC::StdAddressBook::self( true )->findByEmail( email ); + KABC::Addressee::List list= KABC::StdAddressBook::self( true )->tqfindByEmail( email ); KABC::Addressee::List::Iterator it; TQString pref; for ( it = list.begin(); it != list.end(); ++it ) { @@ -509,7 +509,7 @@ KURL FreeBusyManager::freeBusyUrl( const TQString &email ) if ( !url.isEmpty() ) { kdDebug(5850) << "FreeBusyManager::freeBusyUrl():" << "Taken url from preferred email:" << url << endl; - return replaceVariablesURL( KURL( url ), email ); + return tqreplaceVariablesURL( KURL( url ), email ); } } } @@ -548,19 +548,19 @@ KURL FreeBusyManager::freeBusyUrl( const TQString &email ) } } - if ( sourceURL.url().contains( TQRegExp( "\\.[xiv]fb$" ) ) ) { // user specified a fullpath - // do variable string replacements to the URL (MS Outlook style) - KURL fullpathURL = replaceVariablesURL( sourceURL, email ); + if ( sourceURL.url().tqcontains( TQRegExp( "\\.[xiv]fb$" ) ) ) { // user specified a fullpath + // do variable string tqreplacements to the URL (MS Outlook style) + KURL fullpathURL = tqreplaceVariablesURL( sourceURL, email ); // This should work with anything thrown at it, not just Kolab // Notice that Kolab URLs are just entered as the base address, e.g. http://server.com/mykolab/ // This means that if the trailing slash is not entered, we can treat this as a custom, non-Kolab URL! // In that case, just pass it on through with substitution for %u and %d // TODO: May want an explicit configuration option in kogroupwareprefspage.ui for this - if ((fullpathURL.url().endsWith("/", true) == false) || (fullpathURL.url().contains("%25u", true)) || (fullpathURL.url().contains("%25d", true))) { + if ((fullpathURL.url().endsWith("/", true) == false) || (fullpathURL.url().tqcontains("%25u", true)) || (fullpathURL.url().tqcontains("%25d", true))) { // A generic URL, substitute %u and %d - fullpathURL = fullpathURL.url().replace("%25u", emailName, true); - fullpathURL = fullpathURL.url().replace("%25d", emailHost, true); + fullpathURL = fullpathURL.url().tqreplace("%25u", emailName, true); + fullpathURL = fullpathURL.url().tqreplace("%25d", emailHost, true); } else { // This is (probably) a Kolab URL! @@ -584,7 +584,7 @@ KURL FreeBusyManager::freeBusyUrl( const TQString &email ) for ( ext = extensions.constBegin(); ext != extensions.constEnd(); ++ext ) { // build a url for this extension sourceURL = KOPrefs::instance()->mFreeBusyRetrieveUrl; - KURL dirURL = replaceVariablesURL( sourceURL, email ); + KURL dirURL = tqreplaceVariablesURL( sourceURL, email ); if ( KOPrefs::instance()->mFreeBusyFullDomainRetrieval ) { dirURL.addPath( email + '.' + (*ext) ); } else { diff --git a/korganizer/freebusymanager.h b/korganizer/freebusymanager.h index a6f4f6ce..4be671e4 100644 --- a/korganizer/freebusymanager.h +++ b/korganizer/freebusymanager.h @@ -90,7 +90,7 @@ class FreeBusyManager : public TQObject, public KCal::FreeBusyCache /** KOrganizer downloads somebody else's free/busy list The call is asynchronous, and upon download, the - receivers slot specified by member will be called. + tqreceivers slot specified by member will be called. The slot should be of type "member(const TQString&, KCal::FreeBusy*)" Return true if a download is initiated, and false otherwise diff --git a/korganizer/incidencechanger.cpp b/korganizer/incidencechanger.cpp index f0dcb7b1..1ffcc628 100644 --- a/korganizer/incidencechanger.cpp +++ b/korganizer/incidencechanger.cpp @@ -132,7 +132,7 @@ kdDebug(5850)<<"IncidenceChanger::deleteIncidence for incidence \""<<incidence-> if ( me->status() == KCal::Attendee::Accepted || me->status() == KCal::Attendee::Delegated ) notifyOrganizer = true; Attendee *newMe = new Attendee( *me ); - newMe->setStatus( KCal::Attendee::Declined ); + newMe->seStatus( KCal::Attendee::Declined ); tmp->clearAttendees(); tmp->addAttendee( newMe ); break; diff --git a/korganizer/interfaces/korganizer/baseview.h b/korganizer/interfaces/korganizer/baseview.h index 6d60a0a5..920559da 100644 --- a/korganizer/interfaces/korganizer/baseview.h +++ b/korganizer/interfaces/korganizer/baseview.h @@ -137,7 +137,7 @@ class KDE_EXPORT BaseView : public QWidget /** Return number of currently shown dates. A return value of 0 means no idea. */ - virtual int currentDateCount() = 0; + virtual int tqcurrentDateCount() = 0; /** Return if this view is a view for displaying events. */ virtual bool isEventView() { return false; } diff --git a/korganizer/interfaces/korganizer/mainwindow.h b/korganizer/interfaces/korganizer/mainwindow.h index dcda1bee..8c98dcd0 100644 --- a/korganizer/interfaces/korganizer/mainwindow.h +++ b/korganizer/interfaces/korganizer/mainwindow.h @@ -68,7 +68,7 @@ class MainWindow /** Return widget whcih represents this main window. */ - virtual TQWidget *topLevelWidget() = 0; + virtual TQWidget *tqtopLevelWidget() = 0; /** Return ActionManager of this main window. */ diff --git a/korganizer/interfaces/korganizer/part.h b/korganizer/interfaces/korganizer/part.h index 2ce21c13..e75e9085 100644 --- a/korganizer/interfaces/korganizer/part.h +++ b/korganizer/interfaces/korganizer/part.h @@ -39,7 +39,7 @@ class Part : public KParts::Part typedef TQPtrList<Part> List; Part( MainWindow *parent, const char *name ) - : KParts::Part( parent?(parent->topLevelWidget()):0, name ), mMainWindow( parent ) {} + : KParts::Part( parent?(parent->tqtopLevelWidget()):0, name ), mMainWindow( parent ) {} virtual ~Part() {} diff --git a/korganizer/journalentry.cpp b/korganizer/journalentry.cpp index c107d618..459b25d4 100644 --- a/korganizer/journalentry.cpp +++ b/korganizer/journalentry.cpp @@ -74,7 +74,7 @@ JournalDateEntry::JournalDateEntry( Calendar *calendar, TQWidget *parent ) : mTitle = new JournalTitleLable( this ); mTitle->setMargin(2); - mTitle->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ); + mTitle->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ); connect( mTitle, TQT_SIGNAL( linkClicked( const TQString & ) ), this, TQT_SLOT( emitNewJournal() ) ); } @@ -213,7 +213,7 @@ JournalEntry::JournalEntry( Journal* j, TQWidget *parent ) : mDeleteButton = new TQToolButton( this, "deleteButton" ); TQPixmap pix = KOGlobals::self()->smallIcon( "editdelete" ); mDeleteButton->setPixmap( pix ); - mDeleteButton->setSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ); + mDeleteButton->tqsetSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ); TQToolTip::add( mDeleteButton, i18n("Delete this journal entry") ); TQWhatsThis::add( mDeleteButton, i18n("Delete this journal entry") ); mLayout->addWidget( mDeleteButton, 0, 4 ); @@ -221,7 +221,7 @@ JournalEntry::JournalEntry( Journal* j, TQWidget *parent ) : mEditButton = new TQToolButton( this, "editButton" ); mEditButton->setPixmap( KOGlobals::self()->smallIcon( "edit" ) ); - mEditButton->setSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ); + mEditButton->tqsetSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ); TQToolTip::add( mEditButton, i18n("Edit this journal entry") ); TQWhatsThis::add( mEditButton, i18n("Opens an editor dialog for this journal entry") ); mLayout->addWidget( mEditButton, 0, 5 ); @@ -230,7 +230,7 @@ JournalEntry::JournalEntry( Journal* j, TQWidget *parent ) : #ifndef KORG_NOPRINTER mPrintButton = new TQToolButton( this, "printButton" ); mPrintButton->setPixmap( KOGlobals::self()->smallIcon( "printer1" ) ); - mPrintButton->setSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ); + mPrintButton->tqsetSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ); TQToolTip::add( mPrintButton, i18n("Print this journal entry") ); TQWhatsThis::add( mPrintButton, i18n("Opens the print dialog for this journal entry") ); mLayout->addWidget( mPrintButton, 0, 6 ); diff --git a/korganizer/kdatenavigator.cpp b/korganizer/kdatenavigator.cpp index 6fe79459..b56c6015 100644 --- a/korganizer/kdatenavigator.cpp +++ b/korganizer/kdatenavigator.cpp @@ -67,7 +67,7 @@ KDateNavigator::KDateNavigator( TQWidget *parent, const char *name ) for( i = 0; i < 7; i++ ) { mHeadings[i] = new TQLabel( this ); mHeadings[i]->setFont( TQFont( generalFont, 10, TQFont::Bold ) ); - mHeadings[i]->setAlignment( AlignCenter ); + mHeadings[i]->tqsetAlignment( AlignCenter ); topLayout->addWidget( mHeadings[i], 1, i + 1 ); } @@ -75,7 +75,7 @@ KDateNavigator::KDateNavigator( TQWidget *parent, const char *name ) // Create the weeknumber labels for( i = 0; i < 6; i++ ) { mWeeknos[i] = new TQLabel( this ); - mWeeknos[i]->setAlignment( AlignCenter ); + mWeeknos[i]->tqsetAlignment( AlignCenter ); mWeeknos[i]->setFont( TQFont( generalFont, 10 ) ); mWeeknos[i]->installEventFilter( this ); @@ -121,8 +121,8 @@ void KDateNavigator::setBaseDate( const TQDate &date ) dates.append( date ); mNavigatorBar->selectDates( dates ); - repaint(); - mDayMatrix->repaint(); + tqrepaint(); + mDayMatrix->tqrepaint(); } } @@ -135,7 +135,7 @@ TQSizePolicy KDateNavigator::sizePolicy () const void KDateNavigator::updateToday() { mDayMatrix->recalculateToday(); - mDayMatrix->repaint(); + mDayMatrix->tqrepaint(); } TQDate KDateNavigator::startDate() const @@ -195,14 +195,14 @@ void KDateNavigator::updateDates() mWeeknos[i]->setText( weeknum ); } -// each updateDates is followed by an updateView -> repaint is issued there ! -// mDayMatrix->repaint(); +// each updateDates is followed by an updateView -> tqrepaint is issued there ! +// mDayMatrix->tqrepaint(); } void KDateNavigator::updateDayMatrix() { mDayMatrix->updateView(); - mDayMatrix->repaint(); + mDayMatrix->tqrepaint(); } void KDateNavigator::setUpdateNeeded() @@ -228,7 +228,7 @@ void KDateNavigator::updateView() // kdDebug(5850) << "KDateNavigator::updateView(), view " << this << endl; updateDayMatrix(); - repaint(); + tqrepaint(); } void KDateNavigator::updateConfig() diff --git a/korganizer/koagenda.cpp b/korganizer/koagenda.cpp index bc456a78..a0aaddbc 100644 --- a/korganizer/koagenda.cpp +++ b/korganizer/koagenda.cpp @@ -73,7 +73,7 @@ MarcusBains::MarcusBains(KOAgenda *_agenda,const char *name ) minutes->start(0, true); mTimeBox = new TQLabel(this); - mTimeBox->setAlignment(Qt::AlignRight | Qt::AlignBottom); + mTimeBox->tqsetAlignment(Qt::AlignRight | Qt::AlignBottom); TQPalette pal = mTimeBox->palette(); pal.setColor(TQColorGroup::Foreground, Qt::red); mTimeBox->setPalette(pal); @@ -92,13 +92,13 @@ MarcusBains::~MarcusBains() int MarcusBains::todayColumn() { - TQDate currentDate = TQDate::currentDate(); + TQDate tqcurrentDate = TQDate::tqcurrentDate(); DateList dateList = agenda->dateList(); DateList::ConstIterator it; int col = 0; for(it = dateList.begin(); it != dateList.end(); ++it) { - if((*it) == currentDate) + if((*it) == tqcurrentDate) return KOGlobals::self()->reverseLayout() ? agenda->columns() - 1 - col : col; ++col; @@ -296,7 +296,7 @@ void KOAgenda::init() setMinimumSize( 30, int( mGridSpacingY + 1 ) ); // setMaximumHeight(mGridSpacingY * mRows + 5); - // Disable horizontal scrollbar. This is a hack. The geometry should be + // Disable horizontal scrollbar. This is a hack. The tqgeometry should be // controlled in a way that the contents horizontally always fits. Then it is // not necessary to turn off the scrollbar. setHScrollBarMode( AlwaysOff ); @@ -1276,7 +1276,7 @@ void KOAgenda::placeAgendaItem( KOAgendaItem *item, double subCellWidth ) // kdDebug(5850) << "KOAgenda::placeAgendaItem(): " << item->incidence()->summary() // << " subCellWidth: " << subCellWidth << endl; - // "left" upper corner, no subcells yet, RTL layouts have right/left switched, widths are negative then + // "left" upper corner, no subcells yet, RTL tqlayouts have right/left switched, widths are negative then TQPoint pt = gridToContents( TQPoint( item->cellXLeft(), item->cellYTop() ) ); // right lower corner TQPoint pt1 = gridToContents( TQPoint( item->cellXLeft() + item->cellWidth(), @@ -1300,11 +1300,11 @@ void KOAgenda::placeAgendaItem( KOAgendaItem *item, double subCellWidth ) xpos = pt.x() + int( subCellPos ); ypos = pt.y(); } - if ( KOGlobals::self()->reverseLayout() ) { // RTL language/layout + if ( KOGlobals::self()->reverseLayout() ) { // RTL language/tqlayout xpos += width; width = -width; } - if ( height<0 ) { // BTT (bottom-to-top) layout ?!? + if ( height<0 ) { // BTT (bottom-to-top) tqlayout ?!? ypos += height; height = -height; } @@ -1393,7 +1393,7 @@ void KOAgenda::drawContents(TQPainter* p, int cx, int cy, int cw, int ch) if ( pt2.x() >= pt1.x() /*&& pt2.y() >= pt1.y()*/) { int gxStart = contentsToGrid( pt1 ).x(); int gxEnd = contentsToGrid( pt2 ).x(); - // correct start/end for rtl layouts + // correct start/end for rtl tqlayouts if ( gxStart > gxEnd ) { int tmp = gxStart; gxStart = gxEnd; @@ -1419,7 +1419,7 @@ void KOAgenda::drawContents(TQPainter* p, int cx, int cy, int cw, int ch) } } } else { - // last entry in holiday mask denotes the previous day not visible (needed for overnight shifts) + // last entry in holiday tqmask denotes the previous day not visible (needed for overnight shifts) if ( gxStart < int(mHolidayMask->count()-1) && !mHolidayMask->at(gxStart)) { dbp.fillRect( xStart, pt1.y(), xWidth, pt2.y() - pt1.y() + 1, KOPrefs::instance()->mWorkingHoursColor ); @@ -1769,7 +1769,7 @@ void KOAgenda::showAgendaItem( KOAgendaItem *agendaItem ) agendaItem->hide(); addChild( agendaItem ); - if ( !mItems.containsRef( agendaItem ) ) { + if ( !mItems.tqcontainsRef( agendaItem ) ) { mItems.append( agendaItem ); } placeSubCells( agendaItem ); @@ -2038,9 +2038,9 @@ void KOAgenda::setDateList(const DateList &selectedDates) marcus_bains(); } -void KOAgenda::setHolidayMask(TQMemArray<bool> *mask) +void KOAgenda::setHolidayMask(TQMemArray<bool> *tqmask) { - mHolidayMask = mask; + mHolidayMask = tqmask; } diff --git a/korganizer/koagendaitem.cpp b/korganizer/koagendaitem.cpp index de1f4ef8..21eea0e1 100644 --- a/korganizer/koagendaitem.cpp +++ b/korganizer/koagendaitem.cpp @@ -737,16 +737,16 @@ void KOAgendaItem::paintEvent( TQPaintEvent *ev ) if ( !mIncidence )return; TQRect visRect = visibleRect(); - // when scrolling horizontally in the side-by-side view, the repainted area is clipped + // when scrolling horizontally in the side-by-side view, the tqrepainted area is clipped // to the newly visible area, which is a problem since the content changes when visRect - // changes, so repaint the full item in that case + // changes, so tqrepaint the full item in that case if ( ev->rect() != visRect && visRect.isValid() && ev->rect().isValid() ) { - repaint( visRect ); + tqrepaint( visRect ); return; } TQPainter p( this ); - const int ft = 2; // frame thickness for layout, see paintFrame() + const int ft = 2; // frame thickness for tqlayout, see paintFrame() const int margin = 1 + ft; // frame + space between frame and content // General idea is to always show the icons (even in the all-day events). @@ -769,7 +769,7 @@ void KOAgendaItem::paintEvent( TQPaintEvent *ev ) if ( static_cast<Todo*>(mIncidence)->isOverdue() ) bgColor = KOPrefs::instance()->todoOverdueColor(); else if ( static_cast<Todo*>(mIncidence)->dtDue().date() == - TQDateTime::currentDateTime().date() ) + TQDateTime::tqcurrentDateTime().date() ) bgColor = KOPrefs::instance()->todoDueTodayColor(); } diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp index c60546f7..8cc7c561 100644 --- a/korganizer/koagendaview.cpp +++ b/korganizer/koagendaview.cpp @@ -137,7 +137,7 @@ KOAlternateLabel::KOAlternateLabel(const TQString &shortlabel, const TQString &l : TQLabel(parent, name), mTextTypeFixed(false), mShortText(shortlabel), mLongText(longlabel), mExtensiveText(extensivelabel) { - setSizePolicy(TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed )); + tqsetSizePolicy(TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed )); if (mExtensiveText.isEmpty()) mExtensiveText = mLongText; squeezeTextToLabel(); } @@ -235,9 +235,9 @@ void KOAlternateLabel::resizeEvent( TQResizeEvent * ) squeezeTextToLabel(); } -TQSize KOAlternateLabel::minimumSizeHint() const +TQSize KOAlternateLabel::tqminimumSizeHint() const { - TQSize sh = TQLabel::minimumSizeHint(); + TQSize sh = TQLabel::tqminimumSizeHint(); sh.setWidth(-1); return sh; } @@ -258,7 +258,7 @@ KOAgendaView::KOAgendaView( Calendar *cal, mPendingChanges( true ), mAreDatesInitialized( false ) { - mSelectedDates.append(TQDate::currentDate()); + mSelectedDates.append(TQDate::tqcurrentDate()); mLayoutDayLabels = 0; mDayLabelsFrame = 0; @@ -313,12 +313,12 @@ KOAgendaView::KOAgendaView( Calendar *cal, if ( KOPrefs::instance()->compactDialogs() ) { mExpandButton = new TQPushButton(mDummyAllDayLeft); mExpandButton->setPixmap( mNotExpandedPixmap ); - mExpandButton->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, + mExpandButton->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) ); connect( mExpandButton, TQT_SIGNAL( clicked() ), TQT_SIGNAL( toggleExpand() ) ); } else { TQLabel *label = new TQLabel( i18n("All Day"), mDummyAllDayLeft ); - label->setAlignment( Qt::AlignRight | Qt::AlignVCenter | Qt::WordBreak ); + label->tqsetAlignment( Qt::AlignRight | Qt::AlignVCenter | Qt::WordBreak ); } mAllDayAgenda = new KOAgenda( 1, calendarView, mAllDayFrame ); @@ -476,7 +476,7 @@ void KOAgendaView::zoomInVertically( ) mTimeLabels->updateConfig(); mTimeLabels->positionChanged(); - mTimeLabels->repaint(); + mTimeLabels->tqrepaint(); updateView(); } @@ -493,7 +493,7 @@ void KOAgendaView::zoomOutVertically( ) mTimeLabels->updateConfig(); mTimeLabels->positionChanged(); - mTimeLabels->repaint(); + mTimeLabels->tqrepaint(); updateView(); } @@ -635,8 +635,8 @@ void KOAgendaView::createDayLabels( bool force ) longstr, veryLongStr, mDayLabels); dayLabel->useShortText(); // will be recalculated in updateDayLabelSizes() anyway dayLabel->setMinimumWidth(1); - dayLabel->setAlignment(TQLabel::AlignHCenter); - if (date == TQDate::currentDate()) { + dayLabel->tqsetAlignment(TQLabel::AlignHCenter); + if (date == TQDate::tqcurrentDate()) { TQFont font = dayLabel->font(); font.setBold(true); dayLabel->setFont(font); @@ -651,7 +651,7 @@ void KOAgendaView::createDayLabels( bool force ) // use a KOAlternateLabel so when the text doesn't fit any more a tooltip is used KOAlternateLabel*label = new KOAlternateLabel( (*textit), (*textit), TQString::null, mDayLabels ); label->setMinimumWidth(1); - label->setAlignment(AlignCenter); + label->tqsetAlignment(AlignCenter); dayLayout->addWidget(label); } @@ -664,7 +664,7 @@ void KOAgendaView::createDayLabels( bool force ) // use a KOAlternateLabel so when the text doesn't fit any more a tooltip is used KOAlternateLabel*label = new KOAlternateLabel( text, text, TQString::null, mDayLabels ); label->setMinimumWidth(1); - label->setAlignment(AlignCenter); + label->tqsetAlignment(AlignCenter); dayLayout->addWidget(label); } } @@ -696,7 +696,7 @@ int KOAgendaView::maxDatesHint() return 0; } -int KOAgendaView::currentDateCount() +int KOAgendaView::tqcurrentDateCount() { return mSelectedDates.count(); } @@ -793,7 +793,7 @@ void KOAgendaView::updateConfig() mTimeLabels->positionChanged(); // for some reason, this needs to be called explicitly - mTimeLabels->repaint(); + mTimeLabels->tqrepaint(); updateTimeBarWidth(); @@ -1343,7 +1343,7 @@ void KOAgendaView::changeIncidenceDisplay( Incidence *incidence, int mode ) } // HACK: Update the view if the all-day agenda has been modified. - // Do this because there are some layout problems in the + // Do this because there are some tqlayout problems in the // all-day agenda that are not easily solved, but clearing // and redrawing works ok. if ( incidence->doesFloat() ) { @@ -1420,7 +1420,7 @@ void KOAgendaView::fillAgenda() void KOAgendaView::displayIncidence( Incidence *incidence ) { - TQDate today = TQDate::currentDate(); + TQDate today = TQDate::tqcurrentDate(); DateTimeList::iterator t; // FIXME: use a visitor here @@ -1523,7 +1523,7 @@ void KOAgendaView::clearView() CalPrinterBase::PrintType KOAgendaView::printType() { - if ( currentDateCount() == 1 ) return CalPrinterBase::Day; + if ( tqcurrentDateCount() == 1 ) return CalPrinterBase::Day; else return CalPrinterBase::Week; } @@ -1639,7 +1639,7 @@ void KOAgendaView::setHolidayMasks() } // Store the information about the day before the visible area (needed for - // overnight working hours) in the last bit of the mask: + // overnight working hours) in the last bit of the tqmask: bool showDay = !KOGlobals::self()->isWorkDay( mSelectedDates[ 0 ].addDays( -1 ) ); mHolidayMask[ mSelectedDates.count() ] = showDay; @@ -1754,8 +1754,8 @@ bool KOAgendaView::filterByResource( Incidence *incidence ) if ( resourceCalendar()->subresourceType( subRes ) == "todo" ) { TQString calmatch = "/.INBOX.directory/Calendar"; TQString i18nmatch = "/.INBOX.directory/" + i18n( "Calendar" ); - if ( subResourceCalendar().contains( calmatch ) || - subResourceCalendar().contains( i18nmatch ) ) { + if ( subResourceCalendar().tqcontains( calmatch ) || + subResourceCalendar().tqcontains( i18nmatch ) ) { return true; } } diff --git a/korganizer/koagendaview.h b/korganizer/koagendaview.h index a31581a0..c44c2508 100644 --- a/korganizer/koagendaview.h +++ b/korganizer/koagendaview.h @@ -80,7 +80,7 @@ class KOAlternateLabel : public QLabel TQWidget *parent = 0, const char *name = 0 ); ~KOAlternateLabel(); - virtual TQSize minimumSizeHint() const; + virtual TQSize tqminimumSizeHint() const; enum TextType { Short = 0, Long = 1, Extensive = 2 }; TextType largestFittingTextType() const; @@ -118,7 +118,7 @@ class KOAgendaView : public KOrg::AgendaView, public KCal::Calendar::Observer virtual int maxDatesHint(); /** Returns number of currently shown dates. */ - virtual int currentDateCount(); + virtual int tqcurrentDateCount(); /** returns the currently selected events */ virtual Incidence::List selectedIncidences(); @@ -218,7 +218,7 @@ class KOAgendaView : public KOrg::AgendaView, public KCal::Calendar::Observer void createDayLabels( bool force ); /** - Set the masks on the agenda widgets indicating, which days are holidays. + Set the tqmasks on the agenda widgets indicating, which days are holidays. */ void setHolidayMasks(); diff --git a/korganizer/koapp.cpp b/korganizer/koapp.cpp index 3fa1f28d..ff533841 100644 --- a/korganizer/koapp.cpp +++ b/korganizer/koapp.cpp @@ -132,7 +132,7 @@ void KOrganizerApp::processCalendar( const KURL &url ) bool hasDocument = !url.isEmpty(); korg = new KOrganizer( "KOrganizer MainWindow" ); korg->init( hasDocument ); - korg->topLevelWidget()->show(); + korg->tqtopLevelWidget()->show(); kdDebug(5850) << "KOrganizerApp::processCalendar(): '" << url.url() << "'" << endl; @@ -145,12 +145,12 @@ void KOrganizerApp::processCalendar( const KURL &url ) korg->view()->updateView(); } } else { - korg->topLevelWidget()->show(); + korg->tqtopLevelWidget()->show(); } // Handle window activation #if defined Q_WS_X11 && ! defined K_WS_QTONLY - KStartupInfo::setNewStartupId( korg->topLevelWidget(), startupId() ); + KStartupInfo::setNewStartupId( korg->tqtopLevelWidget(), startupId() ); #endif } diff --git a/korganizer/koattendeeeditor.cpp b/korganizer/koattendeeeditor.cpp index 8766a333..548e6acb 100644 --- a/korganizer/koattendeeeditor.cpp +++ b/korganizer/koattendeeeditor.cpp @@ -61,10 +61,10 @@ KOAttendeeEditor::KOAttendeeEditor( TQWidget * parent, const char *name ) : { } -void KOAttendeeEditor::initOrganizerWidgets(TQWidget * parent, TQBoxLayout * layout) +void KOAttendeeEditor::initOrganizerWidgets(TQWidget * parent, TQBoxLayout * tqlayout) { mOrganizerHBox = new TQHBox( parent ); - layout->addWidget( mOrganizerHBox ); + tqlayout->addWidget( mOrganizerHBox ); // If creating a new event, then the user is the organizer -> show the // identity combo // readEvent will delete it and set another label text instead, if the user @@ -91,10 +91,10 @@ void KOAttendeeEditor::initOrganizerWidgets(TQWidget * parent, TQBoxLayout * lay mOrganizerHBox->setStretchFactor( mOrganizerCombo, 100 ); } -void KOAttendeeEditor::initEditWidgets(TQWidget * parent, TQBoxLayout * layout) +void KOAttendeeEditor::initEditWidgets(TQWidget * parent, TQBoxLayout * tqlayout) { TQGridLayout *topLayout = new TQGridLayout(); - layout->addLayout( topLayout ); + tqlayout->addLayout( topLayout ); TQString whatsThis = i18n("Edits the name of the attendee selected in the list " "above, or adds a new attendee if there are no attendees" @@ -430,7 +430,7 @@ void KOAttendeeEditor::updateAttendee() a->setUid( mUid ); a->setEmail( email ); a->setRole( Attendee::Role( mRoleCombo->currentItem() ) ); - a->setStatus( Attendee::PartStat( mStatusCombo->currentItem() ) ); + a->seStatus( Attendee::PartStat( mStatusCombo->currentItem() ) ); a->setRSVP( mRsvpButton->isChecked() ); updateCurrentItem(); diff --git a/korganizer/koattendeeeditor.h b/korganizer/koattendeeeditor.h index e75d994e..42728a97 100644 --- a/korganizer/koattendeeeditor.h +++ b/korganizer/koattendeeeditor.h @@ -67,8 +67,8 @@ class KOAttendeeEditor : public QWidget void updateAttendeeSummary( int count ); protected: - void initOrganizerWidgets( TQWidget *parent, TQBoxLayout *layout ); - void initEditWidgets( TQWidget *parent, TQBoxLayout *layout ); + void initOrganizerWidgets( TQWidget *parent, TQBoxLayout *tqlayout ); + void initEditWidgets( TQWidget *parent, TQBoxLayout *tqlayout ); /** Reads values from a KABC::Addressee and inserts a new Attendee * item into the listview with those items. Used when adding attendees diff --git a/korganizer/kocore.cpp b/korganizer/kocore.cpp index b9d404e7..d4829559 100644 --- a/korganizer/kocore.cpp +++ b/korganizer/kocore.cpp @@ -236,7 +236,7 @@ void KOCore::removeXMLGUIClient( TQWidget *wdg ) KXMLGUIClient* KOCore::xmlguiClient( TQWidget *wdg ) const { - TQWidget *topLevel = wdg->topLevelWidget(); + TQWidget *topLevel = wdg->tqtopLevelWidget(); TQMap<TQWidget*, KXMLGUIClient*>::ConstIterator it = mXMLGUIClients.find( topLevel ); if ( it != mXMLGUIClients.end() ) return it.data(); diff --git a/korganizer/kodaymatrix.cpp b/korganizer/kodaymatrix.cpp index 065e44e7..93fb8740 100644 --- a/korganizer/kodaymatrix.cpp +++ b/korganizer/kodaymatrix.cpp @@ -214,9 +214,9 @@ void KODayMatrix::recalculateToday() mDayLabels[ i ] = TQString::number( KOGlobals::self()->calendarSystem()->day( mDays[i] )); // if today is in the currently displayed month, hilight today - if ( mDays[ i ].year() == TQDate::currentDate().year() && - mDays[ i ].month() == TQDate::currentDate().month() && - mDays[ i ].day() == TQDate::currentDate().day() ) { + if ( mDays[ i ].year() == TQDate::tqcurrentDate().year() && + mDays[ i ].month() == TQDate::tqcurrentDate().month() && + mDays[ i ].day() == TQDate::tqcurrentDate().day() ) { mToday = i; } } @@ -386,15 +386,15 @@ void KODayMatrix::mouseReleaseEvent( TQMouseEvent *e ) mSelEnd = mSelInit; if (tmp != mSelStart) { mSelStart = tmp; - repaint(); + tqrepaint(); } } else { mSelStart = mSelInit; - //repaint only if selection has changed + //tqrepaint only if selection has changed if (tmp != mSelEnd) { mSelEnd = tmp; - repaint(); + tqrepaint(); } } @@ -415,15 +415,15 @@ void KODayMatrix::mouseMoveEvent( TQMouseEvent *e ) mSelEnd = mSelInit; if ( tmp != mSelStart ) { mSelStart = tmp; - repaint(); + tqrepaint(); } } else { mSelStart = mSelInit; - //repaint only if selection has changed + //tqrepaint only if selection has changed if ( tmp != mSelEnd ) { mSelEnd = tmp; - repaint(); + tqrepaint(); } } } diff --git a/korganizer/kodaymatrix.h b/korganizer/kodaymatrix.h index b8354f79..3752d52f 100644 --- a/korganizer/kodaymatrix.h +++ b/korganizer/kodaymatrix.h @@ -91,7 +91,7 @@ class DynamicTip : public QToolTip * o no support for Ctrl+click to create groups of dates * (This has not really been supported in the predecessor. It was not very intuitive nor was it * user friendly.) - * This feature has been replaced with dragging a selection on the matrix. The matrix will + * This feature has been tqreplaced with dragging a selection on the matrix. The matrix will * automatically choose the appropriate selection (e.g. you are not any longer able to select * two distinct groups of date selections as in the old class) * o now that you can select more then a week it can happen that not all selected days are @@ -131,7 +131,7 @@ class KODayMatrix: public TQFrame, public KCal::Calendar::Observer /** updates the day matrix to start with the given date. Does all the necessary * checks for holidays or events on a day and stores them for display later on. - * Does NOT update the view visually. Call repaint() for this. + * Does NOT update the view visually. Call tqrepaint() for this. * * @param actdate recalculates the day matrix to show NUMDAYS starting from this * date. @@ -161,7 +161,7 @@ class KODayMatrix: public TQFrame, public KCal::Calendar::Observer /** sets the actual to be displayed selection in the day matrix starting from * start and ending with end. Theview must be manually updated by calling - * repaint. (?) + * tqrepaint. (?) */ void setSelectedDaysFrom( const TQDate &start, const TQDate &end ); @@ -312,7 +312,7 @@ class KODayMatrix: public TQFrame, public KCal::Calendar::Observer int mTodayMarginWidth; /** stores actual size of each day in the widget so that I don't need to ask this data - * on every repaint. + * on every tqrepaint. */ TQRect mDaySize; diff --git a/korganizer/koeditoralarms_base.ui b/korganizer/koeditoralarms_base.ui index 1da10440..d7ccd665 100644 --- a/korganizer/koeditoralarms_base.ui +++ b/korganizer/koeditoralarms_base.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>KOEditorAlarms_base</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -35,7 +35,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout3</cstring> + <cstring>tqlayout3</cstring> </property> <hbox> <property name="name"> @@ -109,7 +109,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout8</cstring> + <cstring>tqlayout8</cstring> </property> <grid> <property name="name"> @@ -298,7 +298,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>41</height> @@ -400,7 +400,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>61</height> @@ -468,7 +468,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> @@ -530,7 +530,7 @@ </widget> <widget class="QLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>layout7</cstring> + <cstring>tqlayout7</cstring> </property> <grid> <property name="name"> @@ -570,7 +570,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>60</height> @@ -662,7 +662,7 @@ <includes> <include location="global" impldecl="in declaration">addresseelineedit.h</include> </includes> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kurlrequester.h</includehint> <includehint>klineedit.h</includehint> diff --git a/korganizer/koeditorattachments.cpp b/korganizer/koeditorattachments.cpp index 99d775e6..19a75a99 100644 --- a/korganizer/koeditorattachments.cpp +++ b/korganizer/koeditorattachments.cpp @@ -151,7 +151,7 @@ class AttachmentListItem : public KIconViewItem if ( mAttachment->isUri() ) { mimeType = KMimeType::findByURL( mAttachment->uri() ); } else { - mimeType = KMimeType::findByContent( mAttachment->decodedData() ); + mimeType = KMimeType::tqfindByContent( mAttachment->decodedData() ); } mAttachment->setMimeType( mimeType->name() ); } @@ -232,7 +232,7 @@ AttachmentEditDialog::AttachmentEditDialog( AttachmentListItem *item, } else { uint size = item->attachment()->size(); grid->addWidget( new TQLabel( i18n( "Size:" ), topFrame ), 4, 0 ); - grid->addWidget( new TQLabel( TQString::fromLatin1( "%1 (%2)" ). + grid->addWidget( new TQLabel( TQString::tqfromLatin1( "%1 (%2)" ). arg( KIO::convertSize( size ) ). arg( KGlobal::locale()->formatNumber( size, 0 ) ), topFrame ), 4, 2 ); @@ -330,7 +330,7 @@ AttachmentIconView::AttachmentIconView( KOEditorAttachments* parent ) KURL AttachmentIconView::tempFileForAttachment( KCal::Attachment *attachment ) { - if ( mTempFiles.contains( attachment ) ) { + if ( mTempFiles.tqcontains( attachment ) ) { return mTempFiles[attachment]; } TQStringList patterns = KMimeType::mimeType( attachment->mimeType() )->patterns(); @@ -625,7 +625,7 @@ void KOEditorAttachments::handlePasteOrDrop( TQMimeSource* source ) addUriAttachment( (*it).url(), TQString::null, label, true ); } } else { // we take anything - addDataAttachment( source->encodedData( source->format() ), + addDataAttachment( source->tqencodedData( source->format() ), source->format(), KMimeType::mimeType( source->format() )->name() ); } @@ -833,7 +833,7 @@ void KOEditorAttachments::addDataAttachment( const TQByteArray &data, item->setData( data ); item->setLabel( nlabel ); if ( mimeType.isEmpty() ) { - item->setMimeType( KMimeType::findByContent( data )->name() ); + item->setMimeType( KMimeType::tqfindByContent( data )->name() ); } else { item->setMimeType( mimeType ); } diff --git a/korganizer/koeditordetails.cpp b/korganizer/koeditordetails.cpp index a882363d..ee57a3d4 100644 --- a/korganizer/koeditordetails.cpp +++ b/korganizer/koeditordetails.cpp @@ -407,7 +407,7 @@ void KOEditorDetails::changeStatusForMe(Attendee::PartStat status) AttendeeListItem *item = static_cast<AttendeeListItem*>( it.current() ); for ( TQStringList::ConstIterator it2( myEmails.begin() ), end( myEmails.end() ); it2 != end; ++it2 ) { if ( item->data()->email() == *it2 ) { - item->data()->setStatus( status ); + item->data()->seStatus( status ); item->updateItem(); } } diff --git a/korganizer/koeditorfreebusy.cpp b/korganizer/koeditorfreebusy.cpp index c56ff033..af8b0f5c 100644 --- a/korganizer/koeditorfreebusy.cpp +++ b/korganizer/koeditorfreebusy.cpp @@ -202,7 +202,7 @@ void FreeBusyItem::setFreeBusyPeriods( FreeBusy* fb ) // No free/busy information //debug only start // int ii ; - // TQDateTime cur = TQDateTime::currentDateTime(); + // TQDateTime cur = TQDateTime::tqcurrentDateTime(); // for( ii = 0; ii < 10 ;++ii ) { // KDGanttViewTaskItem* newSubItem = new KDGanttViewTaskItem( this ); // cur = cur.addSecs( 7200 ); @@ -310,16 +310,16 @@ KOEditorFreeBusy::KOEditorFreeBusy( int spacing, TQWidget *parent, mGanttView->setShowHeaderPopupMenu( false, false, false, false, false, false ); // Initially, show 15 days back and forth // set start to even hours, i.e. to 12:AM 0 Min 0 Sec - TQDateTime horizonStart = TQDateTime( TQDateTime::currentDateTime() + TQDateTime horizonStart = TQDateTime( TQDateTime::tqcurrentDateTime() .addDays( -15 ).date() ); - TQDateTime horizonEnd = TQDateTime::currentDateTime().addDays( 15 ); + TQDateTime horizonEnd = TQDateTime::tqcurrentDateTime().addDays( 15 ); mGanttView->setHorizonStart( horizonStart ); mGanttView->setHorizonEnd( horizonEnd ); mGanttView->setCalendarMode( true ); //mGanttView->setDisplaySubitemsAsGroup( true ); mGanttView->setShowLegendButton( false ); // Initially, center to current date - mGanttView->centerTimelineAfterShow( TQDateTime::currentDateTime() ); + mGanttView->centerTimelineAfterShow( TQDateTime::tqcurrentDateTime() ); if ( KGlobal::locale()->use12Clock() ) mGanttView->setHourFormat( KDGanttView::Hour_12 ); else @@ -580,10 +580,10 @@ bool KOEditorFreeBusy::findFreeSlot( TQDateTime &dtFrom, TQDateTime &dtTo ) // Make sure that we never suggest a date in the past, even if the // user originally scheduled the meeting to be in the past. - if( tryFrom < TQDateTime::currentDateTime() ) { + if( tryFrom < TQDateTime::tqcurrentDateTime() ) { // The slot to look for is at least partially in the past. int secs = tryFrom.secsTo( tryTo ); - tryFrom = TQDateTime::currentDateTime(); + tryFrom = TQDateTime::tqcurrentDateTime(); tryTo = tryFrom.addSecs( secs ); } @@ -852,8 +852,8 @@ void KOEditorFreeBusy::clearSelection() const KDGanttViewItem *item = mGanttView->selectedItem(); if ( item ) mGanttView->setSelected( item, false ); - mGanttView->repaint(); - item->repaint(); + mGanttView->tqrepaint(); + item->tqrepaint(); } void KOEditorFreeBusy::setSelected( int index ) @@ -890,7 +890,7 @@ void KOEditorFreeBusy::changeStatusForMe(KCal::Attendee::PartStat status) { for ( TQStringList::ConstIterator it2( myEmails.begin() ), end( myEmails.end() ); it2 != end; ++it2 ) { if ( item->attendee()->email() == *it2 ) { - item->attendee()->setStatus( status ); + item->attendee()->seStatus( status ); item->updateItem(); } } @@ -912,7 +912,7 @@ void KOEditorFreeBusy::showAttendeeStatusMenu() popup.setItemChecked( currentAttendee()->status(), true ); int status = popup.exec( TQCursor::pos() ); if ( status >= 0 ) { - currentAttendee()->setStatus( (Attendee::PartStat)status ); + currentAttendee()->seStatus( (Attendee::PartStat)status ); updateCurrentItem(); updateAttendeeInput(); } diff --git a/korganizer/koeditorgeneralevent.cpp b/korganizer/koeditorgeneralevent.cpp index 0411c2f8..3466e412 100644 --- a/korganizer/koeditorgeneralevent.cpp +++ b/korganizer/koeditorgeneralevent.cpp @@ -104,36 +104,36 @@ void KOEditorGeneralEvent::initTime(TQWidget *parent,TQBoxLayout *topLayout) TQFrame *timeBoxFrame = new TQFrame(timeGroupBox); - TQGridLayout *layoutTimeBox = new TQGridLayout( timeBoxFrame ); - layoutTimeBox->setSpacing(topLayout->spacing()); - layoutTimeBox->setColStretch( 3, 1 ); + TQGridLayout *tqlayoutTimeBox = new TQGridLayout( timeBoxFrame ); + tqlayoutTimeBox->setSpacing(topLayout->spacing()); + tqlayoutTimeBox->setColStretch( 3, 1 ); mStartDateLabel = new TQLabel(i18n("&Start:"),timeBoxFrame); - layoutTimeBox->addWidget(mStartDateLabel,0,0); + tqlayoutTimeBox->addWidget(mStartDateLabel,0,0); mStartDateEdit = new KDateEdit(timeBoxFrame); - layoutTimeBox->addWidget(mStartDateEdit,0,1); + tqlayoutTimeBox->addWidget(mStartDateEdit,0,1); mStartDateLabel->setBuddy( mStartDateEdit ); mStartTimeEdit = new KTimeEdit(timeBoxFrame); - layoutTimeBox->addWidget(mStartTimeEdit,0,2); + tqlayoutTimeBox->addWidget(mStartTimeEdit,0,2); mEndDateLabel = new TQLabel(i18n("&End:"),timeBoxFrame); - layoutTimeBox->addWidget(mEndDateLabel,1,0); + tqlayoutTimeBox->addWidget(mEndDateLabel,1,0); mEndDateEdit = new KDateEdit(timeBoxFrame); - layoutTimeBox->addWidget(mEndDateEdit,1,1); + tqlayoutTimeBox->addWidget(mEndDateEdit,1,1); mEndDateLabel->setBuddy( mEndDateEdit ); mEndTimeEdit = new KTimeEdit(timeBoxFrame); - layoutTimeBox->addWidget(mEndTimeEdit,1,2); + tqlayoutTimeBox->addWidget(mEndTimeEdit,1,2); mAlldayEventCheckbox = new TQCheckBox(i18n("All-&day"),timeBoxFrame); - layoutTimeBox->addWidget( mAlldayEventCheckbox, 0, 3 ); + tqlayoutTimeBox->addWidget( mAlldayEventCheckbox, 0, 3 ); connect(mAlldayEventCheckbox, TQT_SIGNAL(toggled(bool)),TQT_SLOT(associateTime(bool))); mDurationLabel = new TQLabel( timeBoxFrame ); - layoutTimeBox->addWidget( mDurationLabel, 1, 3 ); + tqlayoutTimeBox->addWidget( mDurationLabel, 1, 3 ); // time widgets are checked if they contain a valid time connect(mStartTimeEdit, TQT_SIGNAL(timeChanged(TQTime)), @@ -148,9 +148,9 @@ void KOEditorGeneralEvent::initTime(TQWidget *parent,TQBoxLayout *topLayout) this, TQT_SLOT(endDateChanged(const TQDate&))); TQLabel *label = new TQLabel( i18n( "Recurrence:" ), timeBoxFrame ); - layoutTimeBox->addWidget( label, 2, 0 ); + tqlayoutTimeBox->addWidget( label, 2, 0 ); TQBoxLayout *recLayout = new TQHBoxLayout(); - layoutTimeBox->addMultiCellLayout( recLayout, 2, 2, 1, 4 ); + tqlayoutTimeBox->addMultiCellLayout( recLayout, 2, 2, 1, 4 ); mRecEditButton = new TQPushButton( timeBoxFrame ); mRecEditButton->setIconSet( KOGlobals::self()->smallIconSet( "recur", 16 ) ); recLayout->addWidget( mRecEditButton ); @@ -160,18 +160,18 @@ void KOEditorGeneralEvent::initTime(TQWidget *parent,TQBoxLayout *topLayout) recLayout->addStretch( 1 ); label = new TQLabel( i18n("Reminder:"), timeBoxFrame ); - layoutTimeBox->addWidget( label, 3, 0 ); + tqlayoutTimeBox->addWidget( label, 3, 0 ); TQBoxLayout *alarmLineLayout = new TQHBoxLayout(); - layoutTimeBox->addMultiCellLayout( alarmLineLayout, 3, 3, 1, 4 ); + tqlayoutTimeBox->addMultiCellLayout( alarmLineLayout, 3, 3, 1, 4 ); initAlarm( timeBoxFrame, alarmLineLayout ); alarmLineLayout->addStretch( 1 ); TQBoxLayout *secLayout = new TQHBoxLayout(); - layoutTimeBox->addLayout( secLayout, 0, 4 ); + tqlayoutTimeBox->addLayout( secLayout, 0, 4 ); initSecrecy( timeBoxFrame, secLayout ); TQBoxLayout *classLayout = new TQHBoxLayout(); - layoutTimeBox->addLayout( classLayout, 1, 4 ); + tqlayoutTimeBox->addLayout( classLayout, 1, 4 ); initClass( timeBoxFrame, classLayout ); } @@ -193,15 +193,15 @@ void KOEditorGeneralEvent::initClass(TQWidget *parent,TQBoxLayout *topLayout) freeTimeLabel->setBuddy( mFreeTimeCombo ); } -void KOEditorGeneralEvent::initInvitationBar(TQWidget * parent, TQBoxLayout * layout) +void KOEditorGeneralEvent::initInvitationBar(TQWidget * parent, TQBoxLayout * tqlayout) { - TQBoxLayout *topLayout = new TQHBoxLayout( layout ); + TQBoxLayout *topLayout = new TQHBoxLayout( tqlayout ); mInvitationBar = new TQFrame( parent ); mInvitationBar->setPaletteBackgroundColor( KGlobalSettings::alternateBackgroundColor() ); topLayout->addWidget( mInvitationBar ); TQBoxLayout *barLayout = new TQHBoxLayout( mInvitationBar ); - barLayout->setSpacing( layout->spacing() ); + barLayout->setSpacing( tqlayout->spacing() ); TQLabel *label = new TQLabel( i18n("You have not yet definitely responded to this invitation." ), mInvitationBar ); barLayout->addWidget( label ); barLayout->addStretch( 1 ); @@ -508,14 +508,14 @@ bool KOEditorGeneralEvent::validateInput() if (!mStartDateEdit->date().isValid()) { KMessageBox::sorry( 0, i18n("Please specify a valid start date, for example '%1'.") - .arg( KGlobal::locale()->formatDate( TQDate::currentDate() ) ) ); + .arg( KGlobal::locale()->formatDate( TQDate::tqcurrentDate() ) ) ); return false; } if (!mEndDateEdit->date().isValid()) { KMessageBox::sorry( 0, i18n("Please specify a valid end date, for example '%1'.") - .arg( KGlobal::locale()->formatDate( TQDate::currentDate() ) ) ); + .arg( KGlobal::locale()->formatDate( TQDate::tqcurrentDate() ) ) ); return false; } diff --git a/korganizer/koeditorgeneralevent.h b/korganizer/koeditorgeneralevent.h index 57ffba8d..7e7916d6 100644 --- a/korganizer/koeditorgeneralevent.h +++ b/korganizer/koeditorgeneralevent.h @@ -48,7 +48,7 @@ class KOEditorGeneralEvent : public KOEditorGeneral void initTime(TQWidget *,TQBoxLayout *); void initClass(TQWidget *,TQBoxLayout *); - void initInvitationBar( TQWidget* parent, TQBoxLayout *layout ); + void initInvitationBar( TQWidget* parent, TQBoxLayout *tqlayout ); void finishSetup(); diff --git a/korganizer/koeditorgeneraljournal.cpp b/korganizer/koeditorgeneraljournal.cpp index 0a4e5ec3..c53babbe 100644 --- a/korganizer/koeditorgeneraljournal.cpp +++ b/korganizer/koeditorgeneraljournal.cpp @@ -196,7 +196,7 @@ bool KOEditorGeneralJournal::validateInput() if (!mDateEdit->date().isValid()) { KMessageBox::sorry( 0, i18n("Please specify a valid date, for example '%1'.") - .arg( KGlobal::locale()->formatDate( TQDate::currentDate() ) ) ); + .arg( KGlobal::locale()->formatDate( TQDate::tqcurrentDate() ) ) ); return false; } diff --git a/korganizer/koeditorgeneraltodo.cpp b/korganizer/koeditorgeneraltodo.cpp index d659e8e9..13ba5192 100644 --- a/korganizer/koeditorgeneraltodo.cpp +++ b/korganizer/koeditorgeneraltodo.cpp @@ -105,59 +105,59 @@ void KOEditorGeneralTodo::initTime(TQWidget *parent,TQBoxLayout *topLayout) i18n("Sets options for due and start dates and times " "for this to-do.") ); - TQGridLayout *layoutTimeBox = new TQGridLayout(timeBoxFrame,1,1); - layoutTimeBox->setSpacing(topLayout->spacing()); + TQGridLayout *tqlayoutTimeBox = new TQGridLayout(timeBoxFrame,1,1); + tqlayoutTimeBox->setSpacing(topLayout->spacing()); TQString whatsThis = i18n("Sets the start date for this to-do"); mStartCheck = new TQCheckBox(i18n("Sta&rt:"),timeBoxFrame); TQWhatsThis::add( mStartCheck, whatsThis ); - layoutTimeBox->addWidget(mStartCheck,0,0); + tqlayoutTimeBox->addWidget(mStartCheck,0,0); connect(mStartCheck,TQT_SIGNAL(toggled(bool)),TQT_SLOT(enableStartEdit(bool))); connect(mStartCheck,TQT_SIGNAL(toggled(bool)),TQT_SLOT(startDateModified())); mStartDateEdit = new KDateEdit(timeBoxFrame); TQWhatsThis::add( mStartDateEdit, whatsThis ); - layoutTimeBox->addWidget(mStartDateEdit,0,1); + tqlayoutTimeBox->addWidget(mStartDateEdit,0,1); connect(mStartDateEdit,TQT_SIGNAL(dateChanged(const TQDate&)),TQT_SLOT(startDateModified())); mStartTimeEdit = new KTimeEdit(timeBoxFrame); TQWhatsThis::add( mStartTimeEdit, i18n("Sets the start time for this to-do.") ); - layoutTimeBox->addWidget(mStartTimeEdit,0,2); + tqlayoutTimeBox->addWidget(mStartTimeEdit,0,2); connect(mStartTimeEdit,TQT_SIGNAL(timeChanged(TQTime)),TQT_SLOT(startDateModified())); whatsThis = i18n("Sets the due date for this to-do."); mDueCheck = new TQCheckBox(i18n("&Due:"),timeBoxFrame); TQWhatsThis::add( mDueCheck, whatsThis ); - layoutTimeBox->addWidget(mDueCheck,1,0); + tqlayoutTimeBox->addWidget(mDueCheck,1,0); connect(mDueCheck,TQT_SIGNAL(toggled(bool)),TQT_SLOT(enableDueEdit(bool))); connect(mDueCheck,TQT_SIGNAL(toggled(bool)),TQT_SIGNAL(dueDateEditToggle(bool))); connect(mDueCheck,TQT_SIGNAL(toggled(bool)),TQT_SLOT(dateChanged())); mDueDateEdit = new KDateEdit(timeBoxFrame); TQWhatsThis::add( mDueDateEdit, whatsThis ); - layoutTimeBox->addWidget(mDueDateEdit,1,1); + tqlayoutTimeBox->addWidget(mDueDateEdit,1,1); connect(mDueDateEdit,TQT_SIGNAL(dateChanged(const TQDate&)),TQT_SLOT(dateChanged())); mDueTimeEdit = new KTimeEdit(timeBoxFrame); TQWhatsThis::add( mDueTimeEdit, i18n("Sets the due time for this to-do.") ); - layoutTimeBox->addWidget(mDueTimeEdit,1,2); + tqlayoutTimeBox->addWidget(mDueTimeEdit,1,2); connect(mDueTimeEdit,TQT_SIGNAL(timeChanged( TQTime )),TQT_SLOT(dateChanged())); mTimeButton = new TQCheckBox(i18n("Ti&me associated"),timeBoxFrame); TQWhatsThis::add( mTimeButton, i18n("Sets whether or not this to-do's start and due dates " "have times associated with them.") ); - layoutTimeBox->addWidget( mTimeButton, 0, 3 ); + tqlayoutTimeBox->addWidget( mTimeButton, 0, 3 ); connect(mTimeButton,TQT_SIGNAL(toggled(bool)),TQT_SLOT(enableTimeEdits(bool))); connect(mTimeButton,TQT_SIGNAL(toggled(bool)),TQT_SLOT(dateChanged())); TQLabel *label = new TQLabel( i18n( "Recurrence:" ), timeBoxFrame ); - layoutTimeBox->addWidget( label, 3, 0 ); + tqlayoutTimeBox->addWidget( label, 3, 0 ); TQBoxLayout *recLayout = new TQHBoxLayout(); - layoutTimeBox->addMultiCellLayout( recLayout, 3, 3, 1, 4 ); + tqlayoutTimeBox->addMultiCellLayout( recLayout, 3, 3, 1, 4 ); mRecEditButton = new TQPushButton( timeBoxFrame ); mRecEditButton->setIconSet( KOGlobals::self()->smallIconSet( "recur", 16 ) ); recLayout->addWidget( mRecEditButton ); @@ -167,17 +167,17 @@ void KOEditorGeneralTodo::initTime(TQWidget *parent,TQBoxLayout *topLayout) recLayout->addStretch( 1 ); label = new TQLabel( i18n("Reminder:"), timeBoxFrame ); - layoutTimeBox->addWidget( label, 4, 0 ); + tqlayoutTimeBox->addWidget( label, 4, 0 ); TQBoxLayout *alarmLineLayout = new TQHBoxLayout(); - layoutTimeBox->addMultiCellLayout( alarmLineLayout, 4, 4, 1, 4 ); + tqlayoutTimeBox->addMultiCellLayout( alarmLineLayout, 4, 4, 1, 4 ); initAlarm( timeBoxFrame, alarmLineLayout ); alarmLineLayout->addStretch( 1 ); - // some more layouting - layoutTimeBox->setColStretch( 3, 1 ); + // some more tqlayouting + tqlayoutTimeBox->setColStretch( 3, 1 ); TQBoxLayout *secLayout = new TQHBoxLayout(); - layoutTimeBox->addLayout( secLayout, 0, 4 ); + tqlayoutTimeBox->addLayout( secLayout, 0, 4 ); initSecrecy( timeBoxFrame, secLayout ); } @@ -252,7 +252,7 @@ void KOEditorGeneralTodo::initPriority(TQWidget *parent, TQBoxLayout *topLayout) priorityLabel->setBuddy( mPriorityCombo ); } -void KOEditorGeneralTodo::initStatus(TQWidget *parent,TQBoxLayout *topLayout) +void KOEditorGeneralTodo::iniStatus(TQWidget *parent,TQBoxLayout *topLayout) { TQBoxLayout *statusLayout = new TQHBoxLayout(topLayout); @@ -284,12 +284,12 @@ void KOEditorGeneralTodo::setDefaults( const TQDateTime &due, bool allDay ) mDueTimeEdit->setTime( due.time() ); } else { // Make it due tomorrow. - mDueDateEdit->setDate( TQDate::currentDate().addDays(1) ); + mDueDateEdit->setDate( TQDate::tqcurrentDate().addDays(1) ); mDueTimeEdit->setTime( TQTime::currentTime() ); } - if ( !due.isValid() || (TQDateTime::currentDateTime() < due) ) { - mStartDateEdit->setDate( TQDate::currentDate() ); + if ( !due.isValid() || (TQDateTime::tqcurrentDateTime() < due) ) { + mStartDateEdit->setDate( TQDate::tqcurrentDate() ); mStartTimeEdit->setTime( TQTime::currentTime() ); } else { mStartDateEdit->setDate( due.date().addDays( -1 ) ); @@ -322,7 +322,7 @@ void KOEditorGeneralTodo::readTodo(Todo *todo, Calendar *calendar, const TQDate } else { mDueDateEdit->setEnabled(false); mDueTimeEdit->setEnabled(false); - mDueDateEdit->setDate(TQDate::currentDate()); + mDueDateEdit->setDate(TQDate::tqcurrentDate()); mDueTimeEdit->setTime(TQTime::currentTime()); mDueCheck->setChecked(false); } @@ -339,7 +339,7 @@ void KOEditorGeneralTodo::readTodo(Todo *todo, Calendar *calendar, const TQDate } else { mStartDateEdit->setEnabled(false); mStartTimeEdit->setEnabled(false); - mStartDateEdit->setDate(TQDate::currentDate()); + mStartDateEdit->setDate(TQDate::tqcurrentDate()); mStartTimeEdit->setTime(TQTime::currentTime()); mStartCheck->setChecked(false); } @@ -545,7 +545,7 @@ void KOEditorGeneralTodo::completedChanged( int index ) { if ( index == 10 ) { mCompletedToggle->setChecked( true ); - mCompletedDateTime = TQDateTime::currentDateTime(); + mCompletedDateTime = TQDateTime::tqcurrentDateTime(); } else { mCompletedToggle->setChecked( false ); } @@ -556,7 +556,7 @@ void KOEditorGeneralTodo::completedChanged() { if ( mCompletedToggle->isChecked() ) { mCompletedCombo->setCurrentItem( 10 ); - mCompletedDateTime = TQDateTime::currentDateTime(); + mCompletedDateTime = TQDateTime::tqcurrentDateTime(); } else { mCompletedCombo->setCurrentItem( 0 ); } diff --git a/korganizer/koeditorgeneraltodo.h b/korganizer/koeditorgeneraltodo.h index 2d07ceca..438ff9c2 100644 --- a/korganizer/koeditorgeneraltodo.h +++ b/korganizer/koeditorgeneraltodo.h @@ -47,7 +47,7 @@ class KOEditorGeneralTodo : public KOEditorGeneral virtual ~KOEditorGeneralTodo(); void initTime(TQWidget *, TQBoxLayout *); - void initStatus(TQWidget *, TQBoxLayout *); + void iniStatus(TQWidget *, TQBoxLayout *); void initCompletion(TQWidget *, TQBoxLayout *); void initPriority(TQWidget *, TQBoxLayout *); diff --git a/korganizer/koeditorrecurrence.cpp b/korganizer/koeditorrecurrence.cpp index 564c3953..46038834 100644 --- a/korganizer/koeditorrecurrence.cpp +++ b/korganizer/koeditorrecurrence.cpp @@ -135,10 +135,10 @@ TQComboBox *RecurBase::createMonthNameCombo( TQWidget *parent, const char *name return combo; } -TQBoxLayout *RecurBase::createFrequencySpinBar( TQWidget *parent, TQLayout *layout, +TQBoxLayout *RecurBase::createFrequencySpinBar( TQWidget *parent, TQLayout *tqlayout, TQString everyText, TQString unitText ) { - TQBoxLayout *freqLayout = new TQHBoxLayout( layout ); + TQBoxLayout *freqLayout = new TQHBoxLayout( tqlayout ); TQString whatsThis = i18n("Sets how often this event or to-do should recur."); TQLabel *preLabel = new TQLabel( everyText, parent ); @@ -590,7 +590,7 @@ ExceptionsWidget::ExceptionsWidget( TQWidget *parent, const char *name ) : TQWhatsThis::add( mExceptionDateEdit, i18n("A date that should be considered an exception " "to the recurrence rules for this event or to-do.") ); - mExceptionDateEdit->setDate( TQDate::currentDate() ); + mExceptionDateEdit->setDate( TQDate::tqcurrentDate() ); boxLayout->addWidget( mExceptionDateEdit, 0, 0 ); TQPushButton *addExceptionButton = new TQPushButton( @@ -991,12 +991,12 @@ KOEditorRecurrence::KOEditorRecurrence( TQWidget* parent, const char *name ) : } // TQFrame *timeFrame = new TQFrame( mTimeGroupBox ); -// TQBoxLayout *layoutTimeFrame = new TQHBoxLayout( timeFrame ); -// layoutTimeFrame->setSpacing( KDialog::spacingHint() ); +// TQBoxLayout *tqlayoutTimeFrame = new TQHBoxLayout( timeFrame ); +// tqlayoutTimeFrame->setSpacing( KDialog::spacingHint() ); mDateTimeLabel = new TQLabel( mTimeGroupBox ); // mDateTimeLabel = new TQLabel( timeFrame ); -// layoutTimeFrame->addWidget( mDateTimeLabel ); +// tqlayoutTimeFrame->addWidget( mDateTimeLabel ); Qt::Orientation orientation; if ( KOPrefs::instance()->mCompactDialogs ) orientation = Horizontal; diff --git a/korganizer/koeditorrecurrence.h b/korganizer/koeditorrecurrence.h index 05074cdd..831ba62b 100644 --- a/korganizer/koeditorrecurrence.h +++ b/korganizer/koeditorrecurrence.h @@ -61,7 +61,7 @@ class RecurBase : public QWidget static TQComboBox *createWeekCountCombo( TQWidget *parent=0, const char *name=0 ); static TQComboBox *createWeekdayCombo( TQWidget *parent=0, const char *name=0 ); static TQComboBox *createMonthNameCombo( TQWidget *parent=0, const char *name=0 ); - TQBoxLayout *createFrequencySpinBar( TQWidget *parent, TQLayout *layout, + TQBoxLayout *createFrequencySpinBar( TQWidget *parent, TQLayout *tqlayout, TQString everyText, TQString unitText ); private: diff --git a/korganizer/koeventeditor.cpp b/korganizer/koeventeditor.cpp index 8a8340fc..69cb9c76 100644 --- a/korganizer/koeventeditor.cpp +++ b/korganizer/koeventeditor.cpp @@ -230,7 +230,7 @@ void KOEventEditor::setDates( const TQDateTime &from, const TQDateTime &to, bool void KOEventEditor::setTexts( const TQString &summary, const TQString &description ) { - if ( description.isEmpty() && summary.contains("\n") ) { + if ( description.isEmpty() && summary.tqcontains("\n") ) { mGeneral->setDescription( summary ); int pos = summary.find( "\n" ); mGeneral->setSummary( summary.left( pos ) ); @@ -242,7 +242,7 @@ void KOEventEditor::setTexts( const TQString &summary, const TQString &descripti void KOEventEditor::loadDefaults() { - TQDateTime from( TQDate::currentDate(), KOPrefs::instance()->mStartTime.time() ); + TQDateTime from( TQDate::tqcurrentDate(), KOPrefs::instance()->mStartTime.time() ); int addSecs = ( KOPrefs::instance()->mDefaultDuration.time().hour()*3600 ) + ( KOPrefs::instance()->mDefaultDuration.time().minute()*60 ); TQDateTime to( from.addSecs( addSecs ) ); diff --git a/korganizer/koeventeditor.h b/korganizer/koeventeditor.h index dbcec875..3d65bb0a 100644 --- a/korganizer/koeventeditor.h +++ b/korganizer/koeventeditor.h @@ -67,7 +67,7 @@ class KOEventEditor : public KOIncidenceEditor /** Sets the given summary and description. If description is empty and the - summary contains multiple lines, the summary will be used as description + summary tqcontains multiple lines, the summary will be used as description and only the first line of summary will be used as the summary. */ void setTexts( const TQString &summary, const TQString &description = TQString::null ); diff --git a/korganizer/koeventviewer.cpp b/korganizer/koeventviewer.cpp index 83534d6a..3937c387 100644 --- a/korganizer/koeventviewer.cpp +++ b/korganizer/koeventviewer.cpp @@ -105,7 +105,7 @@ void KOEventViewer::writeSettings( KConfig * config ) void KOEventViewer::setSource( const TQString &n ) { - UriHandler::process( parentWidget(), n ); + UriHandler::process( tqparentWidget(), n ); } bool KOEventViewer::appendIncidence( Incidence *incidence, const TQDate &date ) @@ -177,10 +177,10 @@ void KOEventViewer::contentsContextMenuEvent( TQContextMenuEvent *e ) switch( menu->exec( TQCursor::pos(), 0 ) ) { case 0: // open - AttachmentHandler::view( parentWidget(), name, uid ); + AttachmentHandler::view( tqparentWidget(), name, uid ); break; case 1: // save as - AttachmentHandler::saveAs( parentWidget(), name, uid ); + AttachmentHandler::saveAs( tqparentWidget(), name, uid ); break; default: break; diff --git a/korganizer/koglobals.cpp b/korganizer/koglobals.cpp index dd55bd37..814ea178 100644 --- a/korganizer/koglobals.cpp +++ b/korganizer/koglobals.cpp @@ -158,9 +158,9 @@ TQStringList KOGlobals::holiday( const TQDate &date ) bool KOGlobals::isWorkDay( const TQDate &date ) { - int mask( ~( KOPrefs::instance()->mWorkWeekMask ) ); + int tqmask( ~( KOPrefs::instance()->mWorkWeekMask ) ); - bool nonWorkDay = ( mask & ( 1 << ( date.dayOfWeek() - 1 ) ) ); + bool nonWorkDay = ( tqmask & ( 1 << ( date.dayOfWeek() - 1 ) ) ); if ( KOPrefs::instance()->mExcludeHolidays && mHolidays ) { TQValueList<KHoliday> list = mHolidays->getHolidays( date ); TQValueList<KHoliday>::ConstIterator it = list.begin(); diff --git a/korganizer/kogroupware.cpp b/korganizer/kogroupware.cpp index 7b799eed..c4e3a607 100644 --- a/korganizer/kogroupware.cpp +++ b/korganizer/kogroupware.cpp @@ -191,13 +191,13 @@ void KOGroupware::incomingDirChanged( const TQString& path ) for ( it = attendees.begin(); it != attendees.end(); ++it ) { if( (*it)->email() == receiver ) { if ( action.startsWith( "accepted" ) ) - (*it)->setStatus( KCal::Attendee::Accepted ); + (*it)->seStatus( KCal::Attendee::Accepted ); else if ( action.startsWith( "tentative" ) ) - (*it)->setStatus( KCal::Attendee::Tentative ); + (*it)->seStatus( KCal::Attendee::Tentative ); else if ( KOPrefs::instance()->outlookCompatCounterProposals() && action.startsWith( "counter" ) ) - (*it)->setStatus( KCal::Attendee::Tentative ); + (*it)->seStatus( KCal::Attendee::Tentative ); else if ( action.startsWith( "delegated" ) ) - (*it)->setStatus( KCal::Attendee::Delegated ); + (*it)->seStatus( KCal::Attendee::Delegated ); break; } } diff --git a/korganizer/kogroupwareprefspage.ui b/korganizer/kogroupwareprefspage.ui index a4e558fb..71d392d6 100644 --- a/korganizer/kogroupwareprefspage.ui +++ b/korganizer/kogroupwareprefspage.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>KOGroupwarePrefsPage</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -41,7 +41,7 @@ <property name="text"> <string>By publishing Free/Busy information, you allow others to take your calendar into account when inviting you for a meeting. Only the times you have already busy are published, not why they are busy. For Kolab2 Server leave this disabled (the information is generated on the server).</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> @@ -60,7 +60,7 @@ Note: If KOrganizer is acting as a KDE Kolab client, this is not required, as th </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout8</cstring> + <cstring>tqlayout8</cstring> </property> <hbox> <property name="name"> @@ -153,7 +153,7 @@ Note: If KOrganizer is acting as a KDE Kolab client, this is not required, as th <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -226,7 +226,7 @@ For security reasons, it is not recommended to store your password in the config <property name="name"> <cstring>publishUser</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>120</width> <height>0</height> @@ -292,7 +292,7 @@ Ask the server administrator for this information.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>50</height> @@ -319,7 +319,7 @@ Ask the server administrator for this information.</string> <property name="text"> <string>By retrieving Free/Busy information that others have published, you can take their calendar into account when inviting them to a meeting.</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> @@ -422,7 +422,7 @@ For example: "https://kolab2.example.com/freebusy/user.xfb"</string> </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout13</cstring> + <cstring>tqlayout13</cstring> </property> <grid> <property name="name"> @@ -508,7 +508,7 @@ For security reasons, it is not recommended to store your password in the config <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>160</height> @@ -627,5 +627,5 @@ For security reasons, it is not recommended to store your password in the config <slot>slotChanged()</slot> </slots> <exportmacro>KDE_EXPORT</exportmacro> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/korganizer/koincidenceeditor.cpp b/korganizer/koincidenceeditor.cpp index 240497e1..9a917699 100644 --- a/korganizer/koincidenceeditor.cpp +++ b/korganizer/koincidenceeditor.cpp @@ -316,7 +316,7 @@ void KOIncidenceEditor::createEmbeddedURLPages( Incidence *i ) if ( !mAttachedDesignerFields.isEmpty() ) { for ( TQPtrList<TQWidget>::Iterator it = mAttachedDesignerFields.begin(); it != mAttachedDesignerFields.end(); ++it ) { - if ( mDesignerFieldForWidget.contains( *it ) ) { + if ( mDesignerFieldForWidget.tqcontains( *it ) ) { mDesignerFields.remove( mDesignerFieldForWidget[ *it ] ); } } diff --git a/korganizer/koincidenceeditor.h b/korganizer/koincidenceeditor.h index 91f22afd..a2ac6055 100644 --- a/korganizer/koincidenceeditor.h +++ b/korganizer/koincidenceeditor.h @@ -78,7 +78,7 @@ class KOIncidenceEditor : public KDialogBase This should be called when editing only one occurrence of a recurring incidence, before showing the editor. - It gives the editor a pointer to the original incidence, which contains all occurrences + It gives the editor a pointer to the original incidence, which tqcontains all occurrences and a pointer to the original incidence already dissociated from the event (mEvent). If the user presses ok/apply the changes made to the incAfterDissociation are commited diff --git a/korganizer/koincidencetooltip.cpp b/korganizer/koincidencetooltip.cpp index 2b2a80f2..c01b5487 100644 --- a/korganizer/koincidencetooltip.cpp +++ b/korganizer/koincidencetooltip.cpp @@ -56,7 +56,7 @@ void KOIncidenceToolTip::add( KOAgendaItem *item, Calendar *calendar, void KOIncidenceToolTip::maybeTip(const TQPoint & pos) { Q_UNUSED( pos ); - KOAgendaItem *item = dynamic_cast<KOAgendaItem*>( parentWidget() ); + KOAgendaItem *item = dynamic_cast<KOAgendaItem*>( tqparentWidget() ); if ( !item ) return; if ( !mText ) diff --git a/korganizer/kojournaleditor.cpp b/korganizer/kojournaleditor.cpp index b53e071e..c7566cae 100644 --- a/korganizer/kojournaleditor.cpp +++ b/korganizer/kojournaleditor.cpp @@ -118,7 +118,7 @@ void KOJournalEditor::newJournal() void KOJournalEditor::setTexts( const TQString &summary, const TQString &description ) { - if ( description.isEmpty() && summary.contains("\n") ) { + if ( description.isEmpty() && summary.tqcontains("\n") ) { mGeneral->setDescription( summary ); int pos = summary.find( "\n" ); mGeneral->setSummary( summary.left( pos ) ); @@ -132,7 +132,7 @@ void KOJournalEditor::setTexts( const TQString &summary, const TQString &descrip void KOJournalEditor::loadDefaults() { - setDate( TQDate::currentDate() ); + setDate( TQDate::tqcurrentDate() ); } bool KOJournalEditor::processInput() diff --git a/korganizer/kojournaleditor.h b/korganizer/kojournaleditor.h index 291940cf..731682e9 100644 --- a/korganizer/kojournaleditor.h +++ b/korganizer/kojournaleditor.h @@ -64,7 +64,7 @@ class KOJournalEditor : public KOIncidenceEditor /** Sets the given summary and description. If description is empty and the - summary contains multiple lines, the summary will be used as description + summary tqcontains multiple lines, the summary will be used as description and only the first line of summary will be used as the summary. */ void setTexts( const TQString &summary, const TQString &description = TQString::null ); diff --git a/korganizer/kojournalview.cpp b/korganizer/kojournalview.cpp index 74a0f17c..4a5513d9 100644 --- a/korganizer/kojournalview.cpp +++ b/korganizer/kojournalview.cpp @@ -64,7 +64,7 @@ KOJournalView::~KOJournalView() void KOJournalView::appendJournal( Journal*journal, const TQDate &dt) { JournalDateEntry *entry = 0; - if ( mEntries.contains( dt ) ) { + if ( mEntries.tqcontains( dt ) ) { entry = mEntries[dt]; } else { entry = new JournalDateEntry( calendar(), mVBox ); @@ -97,7 +97,7 @@ void KOJournalView::appendJournal( Journal*journal, const TQDate &dt) } } -int KOJournalView::currentDateCount() +int KOJournalView::tqcurrentDateCount() { return mEntries.size(); } @@ -211,7 +211,7 @@ void KOJournalView::setIncidenceChanger( IncidenceChangerBase *changer ) void KOJournalView::newJournal() { emit newJournalSignal( 0/*ResourceCalendar*/, TQString()/*subResource*/, - TQDate::currentDate() ); + TQDate::tqcurrentDate() ); } #include "kojournalview.moc" diff --git a/korganizer/kojournalview.h b/korganizer/kojournalview.h index fbc38efb..a22c4d8a 100644 --- a/korganizer/kojournalview.h +++ b/korganizer/kojournalview.h @@ -46,7 +46,7 @@ class KOJournalView : public KOrg::BaseView const char *name = 0); ~KOJournalView(); - virtual int currentDateCount(); + virtual int tqcurrentDateCount(); virtual Incidence::List selectedIncidences(); DateList selectedIncidenceDates() { return DateList(); } void appendJournal( Journal*journal, const TQDate &dt); diff --git a/korganizer/kolistview.cpp b/korganizer/kolistview.cpp index 59b7f17e..35474f89 100644 --- a/korganizer/kolistview.cpp +++ b/korganizer/kolistview.cpp @@ -72,7 +72,7 @@ void KOListViewToolTip::maybeTip( const TQPoint &pos ) if ( i && KOPrefs::instance()->mEnableToolTips ) { /* Calculate the rectangle. */ - r = eventlist->itemRect( it ); + r = eventlist->tqitemRect( it ); /* Show the tip */ TQString tipText( IncidenceFormatter::toolTipStr( mCalendar, i->data() ) ); if ( !tipText.isEmpty() ) { @@ -220,8 +220,8 @@ KOListView::KOListView( Calendar *calendar, mListView->addColumn( i18n("Categories") ); - TQBoxLayout *layoutTop = new TQVBoxLayout( this ); - layoutTop->addWidget( mListView ); + TQBoxLayout *tqlayoutTop = new TQVBoxLayout( this ); + tqlayoutTop->addWidget( mListView ); mPopupMenu = eventPopup(); /* @@ -248,7 +248,7 @@ KOListView::KOListView( Calendar *calendar, new KOListViewToolTip( mListView->viewport(), calendar, mListView ); - mSelectedDates.append( TQDate::currentDate() ); + mSelectedDates.append( TQDate::tqcurrentDate() ); } KOListView::~KOListView() @@ -261,7 +261,7 @@ int KOListView::maxDatesHint() return 0; } -int KOListView::currentDateCount() +int KOListView::tqcurrentDateCount() { return mSelectedDates.count(); } @@ -299,7 +299,7 @@ void KOListView::showDates( bool show ) mListView->setColumnWidth( 1, oldColWidth1 ); mListView->setColumnWidth( 3, oldColWidth3 ); } - mListView->repaint(); + mListView->tqrepaint(); } void KOListView::showDates() @@ -499,9 +499,9 @@ void KOListView::clear() mDateList.clear(); } -TQSize KOListView::sizeHint() const +TQSize KOListView::tqsizeHint() const { - const TQSize s = KOEventView::sizeHint(); - return TQSize( s.width() + style().pixelMetric( TQStyle::PM_ScrollBarExtent ) + 1, + const TQSize s = KOEventView::tqsizeHint(); + return TQSize( s.width() + style().tqpixelMetric( TQStyle::PM_ScrollBarExtent ) + 1, s.height() ); } diff --git a/korganizer/kolistview.h b/korganizer/kolistview.h index 5a5c40d8..e29a5e39 100644 --- a/korganizer/kolistview.h +++ b/korganizer/kolistview.h @@ -76,7 +76,7 @@ class KOListView : public KOEventView ~KOListView(); virtual int maxDatesHint(); - virtual int currentDateCount(); + virtual int tqcurrentDateCount(); virtual Incidence::List selectedIncidences(); virtual DateList selectedIncidenceDates(); @@ -89,7 +89,7 @@ class KOListView : public KOEventView void writeSettings(KConfig *config); void clear(); - TQSize sizeHint() const; + TQSize tqsizeHint() const; public slots: virtual void updateView(); diff --git a/korganizer/komailclient.cpp b/korganizer/komailclient.cpp index 1b3215c0..8b65d1d1 100644 --- a/korganizer/komailclient.cpp +++ b/korganizer/komailclient.cpp @@ -188,18 +188,18 @@ bool KOMailClient::send(const TQString &from,const TQString &_to,const TQString if (KOPrefs::instance()->mMailClient == KOPrefs::MailClientSendmail) { bool needHeaders = true; - TQString command = KStandardDirs::findExe(TQString::fromLatin1("sendmail"), - TQString::fromLatin1("/sbin:/usr/sbin:/usr/lib")); - if (!command.isNull()) command += TQString::fromLatin1(" -oi -t"); + TQString command = KStandardDirs::findExe(TQString::tqfromLatin1("sendmail"), + TQString::tqfromLatin1("/sbin:/usr/sbin:/usr/lib")); + if (!command.isNull()) command += TQString::tqfromLatin1(" -oi -t"); else { - command = KStandardDirs::findExe(TQString::fromLatin1("mail")); + command = KStandardDirs::findExe(TQString::tqfromLatin1("mail")); if (command.isNull()) return false; // give up - command.append(TQString::fromLatin1(" -s ")); + command.append(TQString::tqfromLatin1(" -s ")); command.append(KProcess::quote(subject)); if (bcc) { - command.append(TQString::fromLatin1(" -b ")); + command.append(TQString::tqfromLatin1(" -b ")); command.append(KProcess::quote(from)); } @@ -224,14 +224,14 @@ bool KOMailClient::send(const TQString &from,const TQString &_to,const TQString TQString textComplete; if (needHeaders) { - textComplete += TQString::fromLatin1("From: ") + from + '\n'; - textComplete += TQString::fromLatin1("To: ") + to + '\n'; + textComplete += TQString::tqfromLatin1("From: ") + from + '\n'; + textComplete += TQString::tqfromLatin1("To: ") + to + '\n'; if ( !cc.isEmpty() ) { - textComplete += TQString::fromLatin1("Cc: " ) + cc + '\n'; + textComplete += TQString::tqfromLatin1("Cc: " ) + cc + '\n'; } - if (bcc) textComplete += TQString::fromLatin1("Bcc: ") + from + '\n'; - textComplete += TQString::fromLatin1("Subject: ") + subject + '\n'; - textComplete += TQString::fromLatin1("X-Mailer: KOrganizer") + korgVersion + '\n'; + if (bcc) textComplete += TQString::tqfromLatin1("Bcc: ") + from + '\n'; + textComplete += TQString::tqfromLatin1("Subject: ") + subject + '\n'; + textComplete += TQString::tqfromLatin1("X-Mailer: KOrganizer") + korgVersion + '\n'; } textComplete += '\n'; // end of headers textComplete += body; diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp index 26452541..930e6c8d 100644 --- a/korganizer/komonthview.cpp +++ b/korganizer/komonthview.cpp @@ -78,7 +78,7 @@ void KOMonthCellToolTip::maybeTip( const TQPoint &pos ) if( i && KOPrefs::instance()->mEnableToolTips ) { /* Calculate the rectangle. */ - r=eventlist->itemRect( it ); + r=eventlist->tqitemRect( it ); /* Show the tip */ TQString tipText( IncidenceFormatter::toolTipStr( mCalendar, i->incidence(), mDate ) ); if ( !tipText.isEmpty() ) { @@ -249,7 +249,7 @@ void MonthViewItem::paint( TQPainter *p ) if ( mIncidence && mTodo ) { if ( static_cast<Todo*>( mIncidence )->isOverdue() ) { bgColor = KOPrefs::instance()->todoOverdueColor(); - } else if ( static_cast<Todo*>( mIncidence )->dtDue().date() == TQDate::currentDate() ) { + } else if ( static_cast<Todo*>( mIncidence )->dtDue().date() == TQDate::tqcurrentDate() ) { bgColor = KOPrefs::instance()->todoDueTodayColor(); } } @@ -392,7 +392,7 @@ MonthViewCell::MonthViewCell( KOMonthView *parent) mLabel = new TQLabel( this ); mLabel->setFrameStyle( TQFrame::Panel | TQFrame::Plain ); mLabel->setLineWidth( 1 ); - mLabel->setAlignment( AlignCenter ); + mLabel->tqsetAlignment( AlignCenter ); mItemList = new KNoScrollListBox( this ); mItemList->setMinimumSize( 10, 10 ); @@ -455,7 +455,7 @@ TQDate MonthViewCell::date() const void MonthViewCell::setFrameWidth() { // show current day with a thicker frame - if ( mDate == TQDate::currentDate() ) { + if ( mDate == TQDate::tqcurrentDate() ) { mItemList->setLineWidth( 3 ); } else if ( !isSelected ) { mItemList->setLineWidth( 1 ); @@ -500,7 +500,7 @@ void MonthViewCell::updateCell() { setFrameWidth(); - if ( mDate == TQDate::currentDate() ) { + if ( mDate == TQDate::tqcurrentDate() ) { setPalette( mTodayPalette ); TQPalette pal = mItemList->palette(); @@ -763,7 +763,7 @@ void MonthViewCell::select() enableScrollBars( true ); // don't mess up the cell when it represents today - if( mDate != TQDate::currentDate() ) { + if( mDate != TQDate::tqcurrentDate() ) { mItemList->setFrameStyle( TQFrame::Sunken | TQFrame::Panel ); mItemList->setLineWidth( 3 ); } @@ -832,14 +832,14 @@ KOMonthView::KOMonthView( Calendar *calendar, TQWidget *parent, const char *name // month name on top mLabel = new TQLabel( this ); mLabel->setFont( mfont ); - mLabel->setAlignment( AlignCenter ); + mLabel->tqsetAlignment( AlignCenter ); mLabel->setLineWidth( 0 ); mLabel->setFrameStyle( TQFrame::Plain ); dayLayout->addMultiCellWidget( mLabel, 0, 0, 0, mDaysPerWeek ); // create the day of the week labels (Sun, Mon, etc) and add them to - // the layout. + // the tqlayout. mDayLabels.resize( mDaysPerWeek ); int i; for( i = 0; i < mDaysPerWeek; i++ ) { @@ -847,7 +847,7 @@ KOMonthView::KOMonthView( Calendar *calendar, TQWidget *parent, const char *name label->setFont( bfont ); label->setFrameStyle( TQFrame::Panel | TQFrame::Raised ); label->setLineWidth( 1 ); - label->setAlignment( AlignCenter ); + label->tqsetAlignment( AlignCenter ); mDayLabels.insert( i, label ); @@ -890,7 +890,7 @@ int KOMonthView::maxDatesHint() return mNumCells; } -int KOMonthView::currentDateCount() +int KOMonthView::tqcurrentDateCount() { return mNumCells; } diff --git a/korganizer/komonthview.h b/korganizer/komonthview.h index dafce597..f503a29d 100644 --- a/korganizer/komonthview.h +++ b/korganizer/komonthview.h @@ -251,7 +251,7 @@ class KOMonthView: public KOEventView virtual int maxDatesHint(); /** Returns number of currently shown dates. */ - virtual int currentDateCount(); + virtual int tqcurrentDateCount(); /** Returns the currently selected events */ virtual Incidence::List selectedIncidences(); diff --git a/korganizer/koprefs.cpp b/korganizer/koprefs.cpp index 535fe104..a5b44cce 100644 --- a/korganizer/koprefs.cpp +++ b/korganizer/koprefs.cpp @@ -262,7 +262,7 @@ void KOPrefs::usrWriteConfig() void KOPrefs::setCategoryColor( const TQString &cat, const TQColor & color) { - mCategoryColors.replace( cat, new TQColor( color ) ); + mCategoryColors.tqreplace( cat, new TQColor( color ) ); } TQColor *KOPrefs::categoryColor( const TQString &cat ) @@ -285,7 +285,7 @@ void KOPrefs::setResourceColor ( const TQString &cal, const TQColor &color ) { // kdDebug(5850)<<"KOPrefs::setResourceColor: " << cal << " color: "<< // color.name()<<endl; - mResourceColors.replace( cal, new TQColor( color ) ); + mResourceColors.tqreplace( cal, new TQColor( color ) ); } TQColor* KOPrefs::resourceColor( const TQString &cal ) @@ -403,7 +403,7 @@ bool KOPrefs::thatIsMe( const TQString& _email ) return true; */ - // in case email contains a full name, strip it out + // in case email tqcontains a full name, strip it out // the below is the simpler but slower version of the following KMime code // const TQString email = KPIM::getEmailAddress( _email ); const TQCString tmp = _email.utf8(); diff --git a/korganizer/koprefsdialog.cpp b/korganizer/koprefsdialog.cpp index 37f889cf..63b2a347 100644 --- a/korganizer/koprefsdialog.cpp +++ b/korganizer/koprefsdialog.cpp @@ -442,11 +442,11 @@ class KOPrefsDialogTime : public KPrefsModule KOPrefs::instance()->mReminderTime = mReminderTimeSpin->value(); KOPrefs::instance()->mReminderTimeUnits = mReminderUnitsCombo->currentItem(); - int mask = 0; + int tqmask = 0; for ( int i = 0; i < 7; ++i ) { - if (mWorkDays[i]->isChecked()) mask = mask | (1<<i); + if (mWorkDays[i]->isChecked()) tqmask = tqmask | (1<<i); } - KOPrefs::instance()->mWorkWeekMask = mask; + KOPrefs::instance()->mWorkWeekMask = tqmask; KOPrefs::instance()->writeConfig(); } @@ -774,7 +774,7 @@ void KOPrefsDialogColors::updateCategories() void KOPrefsDialogColors::setCategoryColor() { - mCategoryDict.replace(mCategoryCombo->currentText(), new TQColor(mCategoryButton->color())); + mCategoryDict.tqreplace(mCategoryCombo->currentText(), new TQColor(mCategoryButton->color())); slotWidChanged(); } @@ -823,7 +823,7 @@ void KOPrefsDialogColors::setResourceColor() { kdDebug( 5850) << "KOPrefsDialogColors::setResorceColor()" << endl; - mResourceDict.replace( mResourceIdentifier[mResourceCombo->currentItem()], + mResourceDict.tqreplace( mResourceIdentifier[mResourceCombo->currentItem()], new TQColor( mResourceButton->color() ) ); slotWidChanged(); } @@ -1108,11 +1108,11 @@ KOPrefsDialogPlugins::KOPrefsDialogPlugins( TQWidget *parent, const char* name ) topLayout->addWidget( mListView ); mDescription = new TQLabel( topFrame ); - mDescription->setAlignment( TQLabel::NoAccel | TQLabel::WordBreak | TQLabel::AlignVCenter ); + mDescription->tqsetAlignment( TQLabel::NoAccel | TQLabel::WordBreak | TQLabel::AlignVCenter ); mDescription->setFrameShape( TQLabel::Panel ); mDescription->setFrameShadow( TQLabel::Sunken ); mDescription->setMinimumSize( TQSize( 0, 55 ) ); - mDescription->setSizePolicy( + mDescription->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0, 0, 0, mDescription->sizePolicy().hasHeightForWidth() ) ); topLayout->addWidget( mDescription ); diff --git a/korganizer/korgac/alarmdialog.cpp b/korganizer/korgac/alarmdialog.cpp index 839d463a..6b12f76c 100644 --- a/korganizer/korgac/alarmdialog.cpp +++ b/korganizer/korgac/alarmdialog.cpp @@ -192,7 +192,7 @@ static TQString cleanSummary( const TQString &summary ) { uint maxLen = 45; TQString retStr = summary; - retStr.replace( '\n', ' ' ); + retStr.tqreplace( '\n', ' ' ); if ( retStr.length() > maxLen ) { maxLen -= etc.length(); retStr = retStr.left( maxLen ); @@ -402,7 +402,7 @@ void AlarmDialog::suspend() if ( item->isSelected() && item->isVisible() ) { item->setVisible( false ); item->setSelected( false ); - item->mRemindAt = TQDateTime::currentDateTime().addSecs( unit * mSuspendSpin->value() ); + item->mRemindAt = TQDateTime::tqcurrentDateTime().addSecs( unit * mSuspendSpin->value() ); item->mNotified = false; selitem = item; } @@ -435,8 +435,8 @@ void AlarmDialog::setTimer() int nextReminderAt = -1; for ( TQListViewItemIterator it( mIncidenceListView ) ; it.current() ; ++it ) { AlarmListItem * item = static_cast<AlarmListItem*>( it.current() ); - if ( item->mRemindAt > TQDateTime::currentDateTime() ) { - int secs = TQDateTime::currentDateTime().secsTo( item->mRemindAt ); + if ( item->mRemindAt > TQDateTime::tqcurrentDateTime() ) { + int secs = TQDateTime::tqcurrentDateTime().secsTo( item->mRemindAt ); nextReminderAt = nextReminderAt <= 0 ? secs : QMIN( nextReminderAt, secs ); } } @@ -532,7 +532,7 @@ void AlarmDialog::wakeUp() continue; } - if ( item->mRemindAt <= TQDateTime::currentDateTime() ) { + if ( item->mRemindAt <= TQDateTime::tqcurrentDateTime() ) { if ( !item->isVisible() ) { item->setVisible( true ); item->setSelected( false ); @@ -650,7 +650,7 @@ bool AlarmDialog::ensureKorganizerRunning() const TQString error; TQCString dcopService; - int result = KDCOPServiceStarter::self()->findServiceFor( + int result = KDCOPServiceStarter::self()->tqfindServiceFor( "DCOP/Organizer", TQString::null, TQString::null, &error, &dcopService ); if ( result == 0 ) { @@ -659,12 +659,12 @@ bool AlarmDialog::ensureKorganizerRunning() const // but korganizer not loaded into it...] static const char* const dcopObjectId = "KOrganizerIface"; TQCString dummy; - if ( !kapp->dcopClient()->findObject( + if ( !kapp->dcopClient()->tqfindObject( dcopService, dcopObjectId, "", TQByteArray(), dummy, dummy ) ) { DCOPRef ref( dcopService, dcopService ); // talk to KUniqueApplication or its kontact wrapper DCOPReply reply = ref.call( "load()" ); if ( reply.isValid() && (bool)reply ) { - Q_ASSERT( kapp->dcopClient()->findObject( + Q_ASSERT( kapp->dcopClient()->tqfindObject( dcopService, dcopObjectId, "", TQByteArray(), dummy, dummy ) ); } else { kdWarning() << "Error loading " << dcopService << endl; diff --git a/korganizer/korgac/alarmdockwindow.cpp b/korganizer/korgac/alarmdockwindow.cpp index bef9b1bd..90360dc6 100644 --- a/korganizer/korgac/alarmdockwindow.cpp +++ b/korganizer/korgac/alarmdockwindow.cpp @@ -91,7 +91,7 @@ AlarmDockWindow::AlarmDockWindow( const char *name ) connect( quit, TQT_SIGNAL( activated() ), TQT_SLOT( slotQuit() ) ); } #else //FIXME: remove for KDE 4.0 - quit->disconnect( TQT_SIGNAL( activated() ), qApp, + quit->disconnect( TQT_SIGNAL( activated() ), tqApp, TQT_SLOT( closeAllWindows() ) ); } connect( this, TQT_SIGNAL( quitSelected() ), TQT_SLOT( slotQuit() ) ); @@ -192,7 +192,7 @@ void AlarmDockWindow::slotQuit() "(note that you will not get reminders whilst the daemon is not running)?"), i18n("Close KOrganizer Reminder Daemon"), i18n("Start"), i18n("Do Not Start"), - TQString::fromLatin1("AskForStartAtLogin") + TQString::tqfromLatin1("AskForStartAtLogin") ); bool autostart = true; diff --git a/korganizer/korgac/koalarmclient.cpp b/korganizer/korgac/koalarmclient.cpp index ec19ce9a..7ed25518 100644 --- a/korganizer/korgac/koalarmclient.cpp +++ b/korganizer/korgac/koalarmclient.cpp @@ -108,7 +108,7 @@ void KOAlarmClient::checkAlarms() if ( !cfg->readBoolEntry( "Enabled", true ) ) return; TQDateTime from = mLastChecked.addSecs( 1 ); - mLastChecked = TQDateTime::currentDateTime(); + mLastChecked = TQDateTime::tqcurrentDateTime(); kdDebug(5891) << "Check: " << from.toString() << " - " << mLastChecked.toString() << endl; @@ -188,7 +188,7 @@ void KOAlarmClient::dumpDebug() TQStringList KOAlarmClient::dumpAlarms() { - TQDateTime start = TQDateTime( TQDateTime::currentDateTime().date(), + TQDateTime start = TQDateTime( TQDateTime::tqcurrentDateTime().date(), TQTime( 0, 0 ) ); TQDateTime end = start.addDays( 1 ).addSecs( -1 ); diff --git a/korganizer/korgac/testalarmdlg.cpp b/korganizer/korgac/testalarmdlg.cpp index 5a3ba5a1..7cf090e2 100644 --- a/korganizer/korgac/testalarmdlg.cpp +++ b/korganizer/korgac/testalarmdlg.cpp @@ -48,7 +48,7 @@ int main(int argc,char **argv) Event *e1 = new Event; e1->setSummary( "This is a summary." ); - TQDateTime now = TQDateTime::currentDateTime(); + TQDateTime now = TQDateTime::tqcurrentDateTime(); e1->setDtStart( now ); e1->setDtEnd( now.addDays( 1 ) ); Alarm *a = e1->newAlarm(); @@ -97,19 +97,19 @@ int main(int argc,char **argv) AlarmDialog dlg( mCalendar, 0 ); app.setMainWidget( &dlg ); - dlg.addIncidence( e2, TQDateTime::currentDateTime().addSecs( 60 ), + dlg.addIncidence( e2, TQDateTime::tqcurrentDateTime().addSecs( 60 ), TQString() ); - dlg.addIncidence( t1, TQDateTime::currentDateTime().addSecs( 300 ), + dlg.addIncidence( t1, TQDateTime::tqcurrentDateTime().addSecs( 300 ), TQString( "THIS IS DISPLAY TEXT" ) ); - dlg.addIncidence( e4, TQDateTime::currentDateTime().addSecs( 120 ), + dlg.addIncidence( e4, TQDateTime::tqcurrentDateTime().addSecs( 120 ), TQString( "Fred and Barney get cloned" ) ); - dlg.addIncidence( e3, TQDateTime::currentDateTime().addSecs( 240 ), + dlg.addIncidence( e3, TQDateTime::tqcurrentDateTime().addSecs( 240 ), TQString() ); - dlg.addIncidence( e1, TQDateTime::currentDateTime().addSecs( 180 ), + dlg.addIncidence( e1, TQDateTime::tqcurrentDateTime().addSecs( 180 ), TQString() ); - dlg.addIncidence( t2, TQDateTime::currentDateTime().addSecs( 600 ), + dlg.addIncidence( t2, TQDateTime::tqcurrentDateTime().addSecs( 600 ), TQString( "THIS IS DISPLAY TEXT" ) ); - dlg.addIncidence( t3, TQDateTime::currentDateTime().addSecs( 360 ), + dlg.addIncidence( t3, TQDateTime::tqcurrentDateTime().addSecs( 360 ), TQString() ); dlg.show(); dlg.eventNotification(); diff --git a/korganizer/korganizer.h b/korganizer/korganizer.h index d088becb..d5246b87 100644 --- a/korganizer/korganizer.h +++ b/korganizer/korganizer.h @@ -50,7 +50,7 @@ namespace KCal { class CalendarResources; } using namespace KCal; -// Workaround for moc workaround for visual c++ 6.0 sucking +// Workaround for tqmoc workaround for visual c++ 6.0 sucking typedef KOrg::MainWindow KOrgMainWindow; typedef KParts::MainWindow KPartsMainWindow; @@ -93,7 +93,7 @@ class KOrganizer : public KPartsMainWindow, public KOrgMainWindow virtual KXMLGUIFactory *mainGuiFactory() { return factory(); } virtual KXMLGUIClient *mainGuiClient() { return this; } - virtual TQWidget *topLevelWidget() { return this; } + virtual TQWidget *tqtopLevelWidget() { return this; } virtual bool isCurrentlyActivePart(); diff --git a/korganizer/korganizer_part.cpp b/korganizer/korganizer_part.cpp index 65511bd1..cc6252d5 100644 --- a/korganizer/korganizer_part.cpp +++ b/korganizer/korganizer_part.cpp @@ -66,10 +66,10 @@ typedef KParts::GenericFactory< KOrganizerPart > KOrganizerFactory; K_EXPORT_COMPONENT_FACTORY( libkorganizerpart, KOrganizerFactory ) -KOrganizerPart::KOrganizerPart( TQWidget *parentWidget, const char *widgetName, +KOrganizerPart::KOrganizerPart( TQWidget *tqparentWidget, const char *widgetName, TQObject *parent, const char *name, const TQStringList & ) : - KParts::ReadOnlyPart(parent, name), mTopLevelWidget( parentWidget->topLevelWidget() ) + KParts::ReadOnlyPart(parent, name), mTopLevelWidget( tqparentWidget->tqtopLevelWidget() ) { KGlobal::locale()->insertCatalogue( "libkcal" ); KGlobal::locale()->insertCatalogue( "libkdepim" ); @@ -80,7 +80,7 @@ KOrganizerPart::KOrganizerPart( TQWidget *parentWidget, const char *widgetName, TQString pname( name ); // create a canvas to insert our widget - TQWidget *canvas = new TQWidget( parentWidget, widgetName ); + TQWidget *canvas = new TQWidget( tqparentWidget, widgetName ); canvas->setFocusPolicy( TQWidget::ClickFocus ); setWidget( canvas ); mView = new CalendarView( canvas ); @@ -155,9 +155,9 @@ void KOrganizerPart::slotChangeInfo( Incidence *incidence, const TQDate & ) } } -TQWidget *KOrganizerPart::topLevelWidget() +TQWidget *KOrganizerPart::tqtopLevelWidget() { - return mView->topLevelWidget(); + return mView->tqtopLevelWidget(); } ActionManager *KOrganizerPart::actionManager() diff --git a/korganizer/korganizer_part.h b/korganizer/korganizer_part.h index ad6a4508..1aececaf 100644 --- a/korganizer/korganizer_part.h +++ b/korganizer/korganizer_part.h @@ -58,7 +58,7 @@ class KOrganizerPart: public KParts::ReadOnlyPart, { Q_OBJECT public: - KOrganizerPart( TQWidget *parentWidget, const char *widgetName, + KOrganizerPart( TQWidget *tqparentWidget, const char *widgetName, TQObject *parent, const char *name, const TQStringList & ); virtual ~KOrganizerPart(); @@ -78,7 +78,7 @@ class KOrganizerPart: public KParts::ReadOnlyPart, virtual KXMLGUIFactory *mainGuiFactory() { return factory(); } virtual KXMLGUIClient *mainGuiClient() { return this; } - virtual TQWidget *topLevelWidget(); + virtual TQWidget *tqtopLevelWidget(); virtual ActionManager *actionManager(); virtual KActionCollection *getActionCollection() const { return actionCollection(); } virtual void showStatusMessage( const TQString &message ); diff --git a/korganizer/korganizeriface.h b/korganizer/korganizeriface.h index 88ab61d5..225f0f2d 100644 --- a/korganizer/korganizeriface.h +++ b/korganizer/korganizeriface.h @@ -48,7 +48,7 @@ class KOrganizerIface : virtual public DCOPObject /** Add an incidence to the active calendar. @param iCal A calendar in iCalendar format containing the incidence. The - calendar must consist of a VCALENDAR component which contains + calendar must consist of a VCALENDAR component which tqcontains the incidence (VEVENT, VTODO, VJOURNAL or VFREEBUSY) and optionally a VTIMEZONE component. If there is more than one incidence, only the first is added to KOrganizer's calendar. diff --git a/korganizer/kotimelineview.cpp b/korganizer/kotimelineview.cpp index 1eb1084d..ea987ccf 100644 --- a/korganizer/kotimelineview.cpp +++ b/korganizer/kotimelineview.cpp @@ -94,7 +94,7 @@ KCal::DateList KOTimelineView::selectedIncidenceDates() } /*virtual*/ -int KOTimelineView::currentDateCount() +int KOTimelineView::tqcurrentDateCount() { return 0; } @@ -293,7 +293,7 @@ void KOTimelineView::insertIncidence(KCal::Incidence * incidence) for ( TQDate day = mStartDate; day <= mEndDate; day = day.addDays( 1 ) ) { Event::List events = calendar()->events( day, EventSortStartDate, SortDirectionAscending ); for ( Event::List::ConstIterator it = events.constBegin(); it != events.constEnd(); ++it ) { - if ( events.contains( event ) ) + if ( events.tqcontains( event ) ) insertIncidence( *it, day ); } } diff --git a/korganizer/kotimelineview.h b/korganizer/kotimelineview.h index 81e1eef4..72ba9084 100644 --- a/korganizer/kotimelineview.h +++ b/korganizer/kotimelineview.h @@ -51,7 +51,7 @@ class KOTimelineView : public KOEventView virtual KCal::ListBase<KCal::Incidence> selectedIncidences(); virtual KCal::DateList selectedIncidenceDates(); - virtual int currentDateCount(); + virtual int tqcurrentDateCount(); virtual void showDates(const TQDate&, const TQDate&); virtual void showIncidences(const KCal::ListBase<KCal::Incidence>&, const TQDate &date); virtual void updateView(); diff --git a/korganizer/kotodoeditor.cpp b/korganizer/kotodoeditor.cpp index 9d273b3a..180ff139 100644 --- a/korganizer/kotodoeditor.cpp +++ b/korganizer/kotodoeditor.cpp @@ -128,7 +128,7 @@ void KOTodoEditor::setupGeneral() mGeneral->initHeader( topFrame, topLayout ); mGeneral->initTime(topFrame,topLayout); - mGeneral->initStatus(topFrame,topLayout); + mGeneral->iniStatus(topFrame,topLayout); mGeneral->initDescription(topFrame,topLayout); mGeneral->initAttachments(topFrame,topLayout); connect( mGeneral, TQT_SIGNAL( openURL( const KURL& ) ), @@ -172,7 +172,7 @@ void KOTodoEditor::newTodo() void KOTodoEditor::setTexts( const TQString &summary, const TQString &description ) { - if ( description.isEmpty() && summary.contains("\n") ) { + if ( description.isEmpty() && summary.tqcontains("\n") ) { mGeneral->setDescription( summary ); int pos = summary.find( "\n" ); mGeneral->setSummary( summary.left( pos ) ); @@ -185,7 +185,7 @@ void KOTodoEditor::setTexts( const TQString &summary, const TQString &descriptio void KOTodoEditor::loadDefaults() { kdDebug(5850) << k_funcinfo << endl; - setDates( TQDateTime::currentDateTime().addDays( 7 ), true, 0 ); + setDates( TQDateTime::tqcurrentDateTime().addDays( 7 ), true, 0 ); mGeneral->toggleAlarm( KOPrefs::instance()->defaultTodoReminders() ); } @@ -271,7 +271,7 @@ void KOTodoEditor::setDates( const TQDateTime &due, bool allDay, Todo *relatedEv if ( mTodo ) { mRecurrence->setDefaults( mTodo->dtStart(), due, false ); } else { - mRecurrence->setDefaults( TQDateTime::currentDateTime(), due, false ); + mRecurrence->setDefaults( TQDateTime::tqcurrentDateTime(), due, false ); } } diff --git a/korganizer/kotodoeditor.h b/korganizer/kotodoeditor.h index 5ab3e36d..f743c11c 100644 --- a/korganizer/kotodoeditor.h +++ b/korganizer/kotodoeditor.h @@ -55,7 +55,7 @@ class KOTodoEditor : public KOIncidenceEditor /** Sets the given summary and description. If description is empty and the - summary contains multiple lines, the summary will be used as description + summary tqcontains multiple lines, the summary will be used as description and only the first line of summary will be used as the summary. */ void setTexts( const TQString &summary, const TQString &description = TQString::null ); diff --git a/korganizer/kotodoview.cpp b/korganizer/kotodoview.cpp index 5951d8bc..333e2fbf 100644 --- a/korganizer/kotodoview.cpp +++ b/korganizer/kotodoview.cpp @@ -84,7 +84,7 @@ void KOTodoListViewToolTip::maybeTip( const TQPoint & pos) { /* Calculate the rectangle. */ - r=todolist->itemRect(i); + r=todolist->tqitemRect(i); headerPos = todolist->header()->sectionPos(col)-todolist->contentsX(); r.setLeft( (headerPos < 0 ? 0 : headerPos) ); r.setRight(headerPos + todolist->header()->sectionSize(col)); @@ -563,7 +563,7 @@ void KOTodoView::updateView() mTodoMap.clear(); Todo::List::ConstIterator it; for( it = todoList.begin(); it != todoList.end(); ++it ) { - if ( !mTodoMap.contains( *it ) ) { + if ( !mTodoMap.tqcontains( *it ) ) { insertTodoItem( *it ); } } @@ -635,7 +635,7 @@ void KOTodoView::removeTodoItems() KOTodoViewItem *item; for ( item = mItemsToDelete.first(); item; item = mItemsToDelete.next() ) { Todo *todo = item->todo(); - if ( todo && mTodoMap.contains( todo ) ) { + if ( todo && mTodoMap.tqcontains( todo ) ) { mTodoMap.remove( todo ); } delete item; @@ -656,7 +656,7 @@ bool KOTodoView::scheduleRemoveTodoItem( KOTodoViewItem *todoItem ) void KOTodoView::updateConfig() { - mTodoListView->repaintContents(); + mTodoListView->tqrepaintContents(); } Incidence::List KOTodoView::selectedIncidences() @@ -691,7 +691,7 @@ void KOTodoView::changeIncidenceDisplay(Incidence *incidence, int action) Todo *todo = static_cast<Todo *>(incidence); if ( todo ) { KOTodoViewItem *todoItem = 0; - if ( mTodoMap.contains( todo ) ) { + if ( mTodoMap.tqcontains( todo ) ) { todoItem = mTodoMap[todo]; } switch ( action ) { @@ -705,7 +705,7 @@ void KOTodoView::changeIncidenceDisplay(Incidence *incidence, int action) // correctly update changes in relations Todo*parent = dynamic_cast<Todo*>( todo->relatedTo() ); KOTodoViewItem*parentItem = 0; - if ( parent && mTodoMap.contains(parent) ) { + if ( parent && mTodoMap.tqcontains(parent) ) { parentItem = mTodoMap[ parent ]; } if ( todoItem->parent() != parentItem ) { @@ -797,7 +797,7 @@ void KOTodoView::popupMenu( TQListViewItem *item, const TQPoint &, int column ) if ( mActiveItem->todo()->hasDueDate () ) { mMovePopupMenu->datePicker()->setDate( date ); } else { - mMovePopupMenu->datePicker()->setDate( TQDate::currentDate() ); + mMovePopupMenu->datePicker()->setDate( TQDate::tqcurrentDate() ); } switch ( column ) { case ePriorityColumn: @@ -815,7 +815,7 @@ void KOTodoView::popupMenu( TQListViewItem *item, const TQPoint &, int column ) break; default: mCopyPopupMenu->datePicker()->setDate( date ); - mCopyPopupMenu->datePicker()->setDate( TQDate::currentDate() ); + mCopyPopupMenu->datePicker()->setDate( TQDate::tqcurrentDate() ); mItemPopupMenu->setItemEnabled( ePopupUnSubTodo, mActiveItem->todo()->relatedTo() ); mItemPopupMenu->setItemEnabled( ePopupUnAllSubTodo, @@ -832,7 +832,7 @@ void KOTodoView::newTodo() { kdDebug() << k_funcinfo << endl; emit newTodoSignal( 0/*ResourceCalendar*/, TQString()/*subResource*/, - TQDate::currentDate().addDays(7) ); + TQDate::tqcurrentDate().addDays(7) ); } void KOTodoView::newSubTodo() @@ -917,7 +917,7 @@ void KOTodoView::setNewPercentage( KOTodoViewItem *item, int percentage ) myChild = myChild->nextSibling(); }*/ if ( percentage == 100 ) { - todo->setCompleted( TQDateTime::currentDateTime() ); + todo->setCompleted( TQDateTime::tqcurrentDateTime() ); // If the todo does recur, it doesn't get set as completed. However, the // item is still checked. Uncheck it again. if ( !todo->isCompleted() ) { diff --git a/korganizer/kotodoview.h b/korganizer/kotodoview.h index bc7302d3..1d53a382 100644 --- a/korganizer/kotodoview.h +++ b/korganizer/kotodoview.h @@ -124,7 +124,7 @@ class KOTodoView : public KOrg::BaseView DateList selectedIncidenceDates() { return DateList(); } /** Return number of shown dates. TodoView does not show dates, */ - int currentDateCount() { return 0; } + int tqcurrentDateCount() { return 0; } CalPrinterBase::PrintType printType(); diff --git a/korganizer/kotodoviewitem.cpp b/korganizer/kotodoviewitem.cpp index f5b0adce..bb03fe32 100644 --- a/korganizer/kotodoviewitem.cpp +++ b/korganizer/kotodoviewitem.cpp @@ -243,7 +243,7 @@ bool KOTodoViewItem::isAlternate() #endif } -void KOTodoViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment) +void KOTodoViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment) { TQColorGroup _cg = cg; // If no todo is set, just don't paint anything... @@ -252,12 +252,12 @@ void KOTodoViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, if (isAlternate()) _cg.setColor(TQColorGroup::Base, static_cast< KOTodoListView* >(listView())->alternateBackground()); if (mTodo->hasDueDate()) { - if (mTodo->dtDue().date()==TQDate::currentDate() && + if (mTodo->dtDue().date()==TQDate::tqcurrentDate() && !mTodo->isCompleted()) { _cg.setColor(TQColorGroup::Base, KOPrefs::instance()->mTodoDueTodayColor); _cg.setColor(TQColorGroup::Text, getTextColor(KOPrefs::instance()->mTodoDueTodayColor)); } - if (mTodo->dtDue().date() < TQDate::currentDate() && + if (mTodo->dtDue().date() < TQDate::tqcurrentDate() && !mTodo->isCompleted()) { _cg.setColor(TQColorGroup::Base, KOPrefs::instance()->mTodoOverdueColor); _cg.setColor(TQColorGroup::Text, getTextColor(KOPrefs::instance()->mTodoOverdueColor)); @@ -278,6 +278,6 @@ void KOTodoViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, KGlobalSettings::highlightColor() ); p->restore(); } else { - TQCheckListItem::paintCell(p, _cg, column, width, alignment); + TQCheckListItem::paintCell(p, _cg, column, width, tqalignment); } } diff --git a/korganizer/kotodoviewitem.h b/korganizer/kotodoviewitem.h index 80b3b961..5388d6da 100644 --- a/korganizer/kotodoviewitem.h +++ b/korganizer/kotodoviewitem.h @@ -66,7 +66,7 @@ class KOTodoViewItem : public QCheckListItem bool isAlternate(); int compare( TQListViewItem *i, int col, bool ascending ) const; virtual void paintCell(TQPainter *p, const TQColorGroup &cg, - int column, int width, int alignment); + int column, int width, int tqalignment); protected: #if QT_VERSION >= 300 diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp index 1906a07e..06ae0741 100644 --- a/korganizer/koviewmanager.cpp +++ b/korganizer/koviewmanager.cpp @@ -451,7 +451,7 @@ void KOViewManager::showNextXView() { mAgendaMode = AGENDA_NEXTX; showAgendaView(); - mMainView->dateNavigator()->selectDates( TQDate::currentDate(), + mMainView->dateNavigator()->selectDates( TQDate::tqcurrentDate(), KOPrefs::instance()->mNextXDays ); } diff --git a/korganizer/kowhatsnextview.cpp b/korganizer/kowhatsnextview.cpp index 884b70b2..1ec28ed2 100644 --- a/korganizer/kowhatsnextview.cpp +++ b/korganizer/kowhatsnextview.cpp @@ -65,9 +65,9 @@ KOWhatsNextView::KOWhatsNextView(Calendar *calendar, TQWidget *parent, : KOrg::BaseView(calendar, parent, name) { // TQLabel *dateLabel = -// new TQLabel(KGlobal::locale()->formatDate(TQDate::currentDate()),this); +// new TQLabel(KGlobal::locale()->formatDate(TQDate::tqcurrentDate()),this); // dateLabel->setMargin(2); -// dateLabel->setAlignment(AlignCenter); +// dateLabel->tqsetAlignment(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::currentDateCount() +int KOWhatsNextView::tqcurrentDateCount() { return mStartDate.daysTo( mEndDate ); } @@ -183,7 +183,7 @@ void KOWhatsNextView::updateView() TQStringList myEmails( KOPrefs::instance()->allEmails() ); int replies = 0; - events = calendar()->events( TQDate::currentDate(), TQDate(2975,12,6) ); + events = calendar()->events( TQDate::tqcurrentDate(), TQDate(2975,12,6) ); Event::List::ConstIterator it2; for( it2 = events.begin(); it2 != events.end(); ++it2 ) { Event *ev = *it2; diff --git a/korganizer/kowhatsnextview.h b/korganizer/kowhatsnextview.h index 69c6a62e..211984ed 100644 --- a/korganizer/kowhatsnextview.h +++ b/korganizer/kowhatsnextview.h @@ -55,7 +55,7 @@ class KOWhatsNextView : public KOrg::BaseView const char *name = 0); ~KOWhatsNextView(); - virtual int currentDateCount(); + virtual int tqcurrentDateCount(); virtual Incidence::List selectedIncidences() { return Incidence::List(); } DateList selectedIncidenceDates() { return DateList(); } diff --git a/korganizer/mailscheduler.cpp b/korganizer/mailscheduler.cpp index 0c0ddb96..a5fe92b4 100644 --- a/korganizer/mailscheduler.cpp +++ b/korganizer/mailscheduler.cpp @@ -122,7 +122,7 @@ TQPtrList<ScheduleMessage> MailScheduler::retrieveTransactions() TQTextStream t( &f ); t.setEncoding( TQTextStream::Latin1 ); TQString messageString = t.read(); - messageString.replace( TQRegExp( "\n[ \t]"), "" ); + messageString.tqreplace( TQRegExp( "\n[ \t]"), "" ); messageString = TQString::fromUtf8( messageString.latin1() ); ScheduleMessage *mess = mFormat->parseScheduleMessage( mCalendar, messageString ); diff --git a/korganizer/multiagendaview.cpp b/korganizer/multiagendaview.cpp index a6aa5166..7d77a3da 100644 --- a/korganizer/multiagendaview.cpp +++ b/korganizer/multiagendaview.cpp @@ -60,7 +60,7 @@ MultiAgendaView::MultiAgendaView( Calendar * cal, CalendarView *calendarView, mLeftSplitter = new TQSplitter( Qt::Vertical, topSideBox ); mLeftSplitter->setOpaqueResize( KGlobalSettings::opaqueResize() ); TQLabel *label = new TQLabel( i18n("All Day"), mLeftSplitter ); - label->setAlignment( Qt::AlignRight | Qt::AlignVCenter | Qt::WordBreak ); + label->tqsetAlignment( Qt::AlignRight | Qt::AlignVCenter | Qt::WordBreak ); TQVBox *sideBox = new TQVBox( mLeftSplitter ); EventIndicator *eiSpacer = new EventIndicator( EventIndicator::Top, sideBox ); eiSpacer->changeColumns( 0 ); @@ -265,7 +265,7 @@ void MultiAgendaView::setupViews() int minWidth = 0; for ( TQValueList<TQWidget*>::ConstIterator it = mAgendaWidgets.constBegin(); it != mAgendaWidgets.constEnd(); ++it ) - minWidth = QMAX( minWidth, (*it)->minimumSizeHint().width() ); + minWidth = QMAX( minWidth, (*it)->tqminimumSizeHint().width() ); for ( TQValueList<TQWidget*>::ConstIterator it = mAgendaWidgets.constBegin(); it != mAgendaWidgets.constEnd(); ++it ) (*it)->setMinimumWidth( minWidth ); } @@ -292,10 +292,10 @@ DateList MultiAgendaView::selectedIncidenceDates() return list; } -int MultiAgendaView::currentDateCount() +int MultiAgendaView::tqcurrentDateCount() { FOREACH_VIEW( agendaView ) - return agendaView->currentDateCount(); + return agendaView->tqcurrentDateCount(); return 0; } @@ -427,7 +427,7 @@ void MultiAgendaView::resizeEvent(TQResizeEvent * ev) void MultiAgendaView::resizeScrollView(const TQSize & size) { const int widgetWidth = size.width() - mTimeLabels->width() - mScrollBar->width(); - int width = QMAX( mTopBox->sizeHint().width(), widgetWidth ); + int width = QMAX( mTopBox->tqsizeHint().width(), widgetWidth ); int height = size.height(); if ( width > widgetWidth ) { const int sbHeight = mScrollView->horizontalScrollBar()->height(); @@ -536,7 +536,7 @@ void MultiAgendaView::zoomView( const int delta, const TQPoint & pos, const Qt:: mTimeLabels->updateConfig(); mTimeLabels->positionChanged(); - mTimeLabels->repaint(); + mTimeLabels->tqrepaint(); } // KDE4: not needed, use existing TQSplitter signals instead diff --git a/korganizer/multiagendaview.h b/korganizer/multiagendaview.h index ebdfc900..8fec0b7c 100644 --- a/korganizer/multiagendaview.h +++ b/korganizer/multiagendaview.h @@ -50,7 +50,7 @@ class MultiAgendaView : public AgendaView void deSelectAgendaView() { mSelectedAgendaView = 0; } Incidence::List selectedIncidences(); DateList selectedIncidenceDates(); - int currentDateCount(); + int tqcurrentDateCount(); int maxDatesHint(); bool eventDurationHint(TQDateTime &startDt, TQDateTime &endDt, bool &allDay); diff --git a/korganizer/navigatorbar.cpp b/korganizer/navigatorbar.cpp index f663af81..836c251f 100644 --- a/korganizer/navigatorbar.cpp +++ b/korganizer/navigatorbar.cpp @@ -71,43 +71,43 @@ NavigatorBar::NavigatorBar( TQWidget *parent, const char *name ) pix = KOGlobals::self()->smallIcon( isRTL ? "2rightarrow" : "2leftarrow" ); mPrevYear = new TQPushButton( this ); mPrevYear->setPixmap( pix ); - mPrevYear->setSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ); + mPrevYear->tqsetSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ); TQToolTip::add( mPrevYear, i18n( "Previous year" ) ); pix = KOGlobals::self()->smallIcon( isRTL ? "1rightarrow" : "1leftarrow"); mPrevMonth = new TQPushButton( this ); mPrevMonth->setPixmap( pix ); - mPrevMonth->setSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ); + mPrevMonth->tqsetSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ); TQToolTip::add( mPrevMonth, i18n( "Previous month" ) ); // Create forward navigation buttons pix = KOGlobals::self()->smallIcon( isRTL ? "1leftarrow" : "1rightarrow"); mNextMonth = new TQPushButton( this ); mNextMonth->setPixmap( pix ); - mNextMonth->setSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ); + mNextMonth->tqsetSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ); TQToolTip::add( mNextMonth, i18n( "Next month" ) ); pix = KOGlobals::self()->smallIcon( isRTL ? "2leftarrow" : "2rightarrow"); mNextYear = new TQPushButton( this ); mNextYear->setPixmap( pix ); - mNextYear->setSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ); + mNextYear->tqsetSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ); TQToolTip::add( mNextYear, i18n( "Next year" ) ); // Create month name button mMonth = new ActiveLabel( this ); mMonth->setFont( tfont ); - mMonth->setAlignment( AlignCenter ); - mMonth->setMinimumHeight( mPrevYear->sizeHint().height() ); + mMonth->tqsetAlignment( AlignCenter ); + mMonth->setMinimumHeight( mPrevYear->tqsizeHint().height() ); TQToolTip::add( mMonth, i18n( "Select a month" ) ); // Create year button mYear = new ActiveLabel( this ); mYear->setFont( tfont ); - mYear->setAlignment( AlignCenter ); - mYear->setMinimumHeight( mPrevYear->sizeHint().height() ); + mYear->tqsetAlignment( AlignCenter ); + mYear->setMinimumHeight( mPrevYear->tqsizeHint().height() ); TQToolTip::add( mYear, i18n( "Select a year" ) ); - // set up control frame layout + // set up control frame tqlayout TQHBoxLayout *ctrlLayout = new TQHBoxLayout( this ); ctrlLayout->addWidget( mPrevYear ); ctrlLayout->addWidget( mPrevMonth ); diff --git a/korganizer/plugins/datenums/Makefile.am b/korganizer/plugins/datenums/Makefile.am index 8081a564..9924bf45 100644 --- a/korganizer/plugins/datenums/Makefile.am +++ b/korganizer/plugins/datenums/Makefile.am @@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = libkorg_datenums.la libkorg_datenums_la_SOURCES = configdialog.cpp datenums.cpp libkorg_datenums_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -libkorg_datenums_la_LIBADD = $(top_builddir)/korganizer/libkorganizer.la $(LIB_KDEUI) +libkorg_datenums_la_LIBADD = $(top_builddir)/korganizer/libkorganizer.la $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) noinst_HEADERS = datenums.h diff --git a/korganizer/plugins/exchange/Makefile.am b/korganizer/plugins/exchange/Makefile.am index 39290aad..ab3eb177 100644 --- a/korganizer/plugins/exchange/Makefile.am +++ b/korganizer/plugins/exchange/Makefile.am @@ -15,7 +15,8 @@ libkorg_exchange_la_SOURCES = exchange.cpp exchangedialog.cpp exchangeconfig.cp libkorg_exchange_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) libkorg_exchange_la_LIBADD = $(top_builddir)/korganizer/libkorganizer.la \ $(top_builddir)/libkpimexchange/libkpimexchange.la \ - $(LIB_KDEUI) $(LIB_KPARTS) + $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KPARTS) \ + $(top_builddir)/libkcal/libkcal.la noinst_HEADERS = exchange.h exchangedialog.h exchangeconfig.h diff --git a/korganizer/plugins/exchange/exchange.cpp b/korganizer/plugins/exchange/exchange.cpp index 3d3719ed..8455d61b 100644 --- a/korganizer/plugins/exchange/exchange.cpp +++ b/korganizer/plugins/exchange/exchange.cpp @@ -65,7 +65,7 @@ Exchange::Exchange(KOrg::MainWindow *parent, const char *name) : mAccount = new KPIM::ExchangeAccount( "Calendar/Exchange Plugin" ); mClient = new KPIM::ExchangeClient( mAccount ); - mClient->setWindow( parent->topLevelWidget() ); + mClient->setWindow( parent->tqtopLevelWidget() ); setXMLFile("plugins/exchangeui.rc"); @@ -219,9 +219,9 @@ void Exchange::showError( int error, const TQString& moreInfo /* = TQString::nul if ( error != KPIM::ExchangeClient::ResultOK ) { if ( moreInfo.isNull() ) - KMessageBox::error( mainWindow()->topLevelWidget(), errorText, i18n( "Exchange Plugin" ) ); + KMessageBox::error( mainWindow()->tqtopLevelWidget(), errorText, i18n( "Exchange Plugin" ) ); else - KMessageBox::detailedError( mainWindow()->topLevelWidget(), errorText, moreInfo, i18n( "Exchange Plugin" ) ); + KMessageBox::detailedError( mainWindow()->tqtopLevelWidget(), errorText, moreInfo, i18n( "Exchange Plugin" ) ); } } diff --git a/korganizer/plugins/hebrew/Makefile.am b/korganizer/plugins/hebrew/Makefile.am index 4f48cc58..3326ba1f 100644 --- a/korganizer/plugins/hebrew/Makefile.am +++ b/korganizer/plugins/hebrew/Makefile.am @@ -8,7 +8,7 @@ kde_module_LTLIBRARIES = libkorg_hebrew.la libkorg_hebrew_la_SOURCES = hebrew.cpp configdialog.cpp holiday.cpp parsha.cpp converter.cpp libkorg_hebrew_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -libkorg_hebrew_la_LIBADD = $(LIB_KDECORE) $(LIB_KDEUI) +libkorg_hebrew_la_LIBADD = $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) noinst_HEADERS = hebrew.h configdialog.h parsha.h converter.h holiday.h diff --git a/korganizer/plugins/printing/journal/Makefile.am b/korganizer/plugins/printing/journal/Makefile.am index 6238b1f1..626ecf17 100644 --- a/korganizer/plugins/printing/journal/Makefile.am +++ b/korganizer/plugins/printing/journal/Makefile.am @@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = libkorg_journalprint.la libkorg_journalprint_la_SOURCES =calprintjournalconfig_base.ui journalprint.cpp libkorg_journalprint_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -libkorg_journalprint_la_LIBADD = $(LIB_KDECORE) $(LIB_KDEUI) $(top_builddir)/korganizer/printing/libkorg_stdprinting.la +libkorg_journalprint_la_LIBADD = $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(top_builddir)/korganizer/printing/libkorg_stdprinting.la -L$(top_builddir)/libkdepim/ -lkdepim noinst_HEADERS = diff --git a/korganizer/plugins/printing/journal/calprintjournalconfig_base.ui b/korganizer/plugins/printing/journal/calprintjournalconfig_base.ui index bee91a36..1e41fdb8 100644 --- a/korganizer/plugins/printing/journal/calprintjournalconfig_base.ui +++ b/korganizer/plugins/printing/journal/calprintjournalconfig_base.ui @@ -6,7 +6,7 @@ <property name="name"> <cstring>CalPrintJournal_Base</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -65,7 +65,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout2</cstring> + <cstring>tqlayout2</cstring> </property> <hbox> <property name="name"> @@ -81,7 +81,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>15</width> <height>20</height> @@ -136,7 +136,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>324</width> <height>21</height> @@ -157,7 +157,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>201</height> @@ -193,7 +193,7 @@ <tabstop>mFromDate</tabstop> <tabstop>mToDate</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kdateedit.h</includehint> <includehint>kdateedit.h</includehint> diff --git a/korganizer/plugins/printing/list/calprintlistconfig_base.ui b/korganizer/plugins/printing/list/calprintlistconfig_base.ui index cea873e6..22c6d577 100644 --- a/korganizer/plugins/printing/list/calprintlistconfig_base.ui +++ b/korganizer/plugins/printing/list/calprintlistconfig_base.ui @@ -6,7 +6,7 @@ <property name="name"> <cstring>CalPrintList_Base</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -40,7 +40,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout2</cstring> + <cstring>tqlayout2</cstring> </property> <hbox> <property name="name"> @@ -56,7 +56,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>15</width> <height>20</height> @@ -111,7 +111,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>324</width> <height>21</height> @@ -169,7 +169,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>40</height> @@ -182,5 +182,5 @@ <tabstop>mFromDate</tabstop> <tabstop>mToDate</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/korganizer/plugins/printing/whatsnext/calprintwhatsnextconfig_base.ui b/korganizer/plugins/printing/whatsnext/calprintwhatsnextconfig_base.ui index c93e48ed..c855976a 100644 --- a/korganizer/plugins/printing/whatsnext/calprintwhatsnextconfig_base.ui +++ b/korganizer/plugins/printing/whatsnext/calprintwhatsnextconfig_base.ui @@ -6,7 +6,7 @@ <property name="name"> <cstring>CalPrintWhatsNext_Base</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -40,7 +40,7 @@ </property> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout2</cstring> + <cstring>tqlayout2</cstring> </property> <hbox> <property name="name"> @@ -56,7 +56,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>15</width> <height>20</height> @@ -111,7 +111,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>324</width> <height>21</height> @@ -132,7 +132,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>201</height> @@ -168,7 +168,7 @@ <tabstop>mFromDate</tabstop> <tabstop>mToDate</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kdateedit.h</includehint> <includehint>kdateedit.h</includehint> diff --git a/korganizer/plugins/printing/year/Makefile.am b/korganizer/plugins/printing/year/Makefile.am index f51e29e6..5d691357 100644 --- a/korganizer/plugins/printing/year/Makefile.am +++ b/korganizer/plugins/printing/year/Makefile.am @@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = libkorg_yearlyprint.la libkorg_yearlyprint_la_SOURCES =calprintyearconfig_base.ui yearprint.cpp libkorg_yearlyprint_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -libkorg_yearlyprint_la_LIBADD = $(LIB_KDECORE) $(LIB_KDEUI) $(top_builddir)/korganizer/printing/libkorg_stdprinting.la +libkorg_yearlyprint_la_LIBADD = $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KDEPRINT) $(top_builddir)/korganizer/printing/libkorg_stdprinting.la noinst_HEADERS = diff --git a/korganizer/plugins/printing/year/calprintyearconfig_base.ui b/korganizer/plugins/printing/year/calprintyearconfig_base.ui index 43d906d6..38b7822b 100644 --- a/korganizer/plugins/printing/year/calprintyearconfig_base.ui +++ b/korganizer/plugins/printing/year/calprintyearconfig_base.ui @@ -6,7 +6,7 @@ <property name="name"> <cstring>CalPrintYear_Base</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -84,7 +84,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>120</width> <height>21</height> @@ -106,7 +106,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>131</width> <height>21</height> @@ -187,7 +187,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>40</height> @@ -196,5 +196,5 @@ </spacer> </vbox> </widget> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/korganizer/plugins/projectview/koprojectview.cpp b/korganizer/plugins/projectview/koprojectview.cpp index 6c45ff42..d5abb1f4 100644 --- a/korganizer/plugins/projectview/koprojectview.cpp +++ b/korganizer/plugins/projectview/koprojectview.cpp @@ -107,8 +107,8 @@ KOProjectView::KOProjectView(Calendar *calendar,TQWidget* parent, void KOProjectView::createMainTask() { mMainTask = new KGanttItem(0,i18n("main task"), - TQDateTime::currentDateTime(), - TQDateTime::currentDateTime()); + TQDateTime::tqcurrentDateTime(), + TQDateTime::tqcurrentDateTime()); mMainTask->setMode(KGanttItem::Rubberband); mMainTask->setStyle(KGanttItem::DrawBorder | KGanttItem::DrawText | KGanttItem::DrawHandle); @@ -154,8 +154,8 @@ void KOProjectView::updateView() #if 0 KGanttItem* t1 = new KGanttItem(mGantt->getMainTask(), "task 1, no subtasks", - TQDateTime::currentDateTime().addDays(10), - TQDateTime::currentDateTime().addDays(20) ); + TQDateTime::tqcurrentDateTime().addDays(10), + TQDateTime::tqcurrentDateTime().addDays(20) ); KGanttItem* t2 = new KGanttItem(mGantt->getMainTask(), "task 2, subtasks, no rubberband", TQDateTime(TQDate(2000,10,1)), @@ -188,7 +188,7 @@ void KOProjectView::updateView() mTodoMap.clear(); Todo::List::ConstIterator it; for( it = todoList.begin(); it != todoList.end(); ++it ) { - if ( !mTodoMap.contains( *it ) ) { + if ( !mTodoMap.tqcontains( *it ) ) { insertTodoItem( *it ); } } @@ -224,14 +224,14 @@ KGanttItem *KOProjectView::createTask(KGanttItem *parent,Todo *todo) if (todo->hasStartDate() && !todo->hasDueDate()) { // start date but no due date startDt = todo->dtStart(); - endDt = TQDateTime::currentDateTime(); + endDt = TQDateTime::tqcurrentDateTime(); } else if (!todo->hasStartDate() && todo->hasDueDate()) { // due date but no start date startDt = todo->dtDue(); endDt = todo->dtDue(); } else if (!todo->hasStartDate() || !todo->hasDueDate()) { - startDt = TQDateTime::currentDateTime(); - endDt = TQDateTime::currentDateTime(); + startDt = TQDateTime::tqcurrentDateTime(); + endDt = TQDateTime::tqcurrentDateTime(); } else { startDt = todo->dtStart(); endDt = todo->dtDue(); diff --git a/korganizer/plugins/projectview/koprojectview.h b/korganizer/plugins/projectview/koprojectview.h index aa856621..39062179 100644 --- a/korganizer/plugins/projectview/koprojectview.h +++ b/korganizer/plugins/projectview/koprojectview.h @@ -74,7 +74,7 @@ class KOProjectView : public KOrg::BaseView DateList selectedDates(); /** Return number of shown dates. */ - int currentDateCount() { return 0; } + int tqcurrentDateCount() { return 0; } void readSettings(); void writeSettings(KConfig *); diff --git a/korganizer/plugins/timespanview/kotimespanview.cpp b/korganizer/plugins/timespanview/kotimespanview.cpp index eec3ab46..01fc0cb4 100644 --- a/korganizer/plugins/timespanview/kotimespanview.cpp +++ b/korganizer/plugins/timespanview/kotimespanview.cpp @@ -79,7 +79,7 @@ int KOTimeSpanView::maxDatesHint() return 0; } -int KOTimeSpanView::currentDateCount() +int KOTimeSpanView::tqcurrentDateCount() { return 0; } diff --git a/korganizer/plugins/timespanview/kotimespanview.h b/korganizer/plugins/timespanview/kotimespanview.h index d115b630..49e54ab6 100644 --- a/korganizer/plugins/timespanview/kotimespanview.h +++ b/korganizer/plugins/timespanview/kotimespanview.h @@ -38,7 +38,7 @@ class KOTimeSpanView : public KOEventView ~KOTimeSpanView(); virtual int maxDatesHint(); - virtual int currentDateCount(); + virtual int tqcurrentDateCount(); virtual Incidence::List selectedIncidences(); DateList selectedDates() { return DateList(); } diff --git a/korganizer/printing/calprintdayconfig_base.ui b/korganizer/printing/calprintdayconfig_base.ui index 8abfaa1c..bb1bfc0b 100644 --- a/korganizer/printing/calprintdayconfig_base.ui +++ b/korganizer/printing/calprintdayconfig_base.ui @@ -6,7 +6,7 @@ <property name="name"> <cstring>CalPrintDay_Base</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -56,7 +56,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>121</width> <height>21</height> @@ -73,7 +73,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>121</width> <height>21</height> @@ -228,7 +228,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>201</height> @@ -249,7 +249,7 @@ <includes> <include location="global" impldecl="in declaration">kdateedit.h</include> </includes> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>libkdepim/kdateedit.h</includehint> <includehint>libkdepim/kdateedit.h</includehint> diff --git a/korganizer/printing/calprintdefaultplugins.cpp b/korganizer/printing/calprintdefaultplugins.cpp index 8c2539e8..b62c7add 100644 --- a/korganizer/printing/calprintdefaultplugins.cpp +++ b/korganizer/printing/calprintdefaultplugins.cpp @@ -52,7 +52,7 @@ static TQString cleanString( const TQString &instr ) { TQString ret = instr; - return ret.replace( '\n', ' ' ); + return ret.tqreplace( '\n', ' ' ); } /************************************************************** diff --git a/korganizer/printing/calprinter.cpp b/korganizer/printing/calprinter.cpp index 0ab61fda..0517dec0 100644 --- a/korganizer/printing/calprinter.cpp +++ b/korganizer/printing/calprinter.cpp @@ -178,7 +178,7 @@ CalPrintDialog::CalPrintDialog( KOrg::PrintPlugin::List plugins, mTypeGroup = new TQVButtonGroup( i18n("Print Style"), splitter, "buttonGroup" ); // use the minimal width possible = max width of the radio buttons, not extensible -/* mTypeGroup->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)4, +/* mTypeGroup->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)4, (TQSizePolicy::SizeType)5, 0, 0, mTypeGroup->sizePolicy().hasHeightForWidth() ) );*/ @@ -220,11 +220,11 @@ CalPrintDialog::CalPrintDialog( KOrg::PrintPlugin::List plugins, TQRadioButton *radioButton = new TQRadioButton( p->description(), mTypeGroup ); radioButton->setEnabled( p->enabled() ); mTypeGroup->insert( radioButton, mapit.key() ); -// radioButton->setMinimumHeight( radioButton->sizeHint().height() - 5 ); +// radioButton->setMinimumHeight( radioButton->tqsizeHint().height() - 5 ); } - setMinimumSize( minimumSizeHint() ); - resize( minimumSizeHint() ); + setMinimumSize( tqminimumSizeHint() ); + resize( tqminimumSizeHint() ); } CalPrintDialog::~CalPrintDialog() @@ -255,7 +255,7 @@ void CalPrintDialog::setOrientation( CalPrinter::ePrintOrientation orientation ) KOrg::PrintPlugin *CalPrintDialog::selectedPlugin() { int id = mTypeGroup->selectedId(); - if ( mPluginIDs.contains( id ) ) { + if ( mPluginIDs.tqcontains( id ) ) { return mPluginIDs[id]; } else { return 0; diff --git a/korganizer/printing/calprintincidenceconfig_base.ui b/korganizer/printing/calprintincidenceconfig_base.ui index 5a85fb71..ef238b52 100644 --- a/korganizer/printing/calprintincidenceconfig_base.ui +++ b/korganizer/printing/calprintincidenceconfig_base.ui @@ -6,7 +6,7 @@ <property name="name"> <cstring>CalPrintIncidence_Base</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -90,7 +90,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>201</height> @@ -99,5 +99,5 @@ </spacer> </vbox> </widget> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/korganizer/printing/calprintmonthconfig_base.ui b/korganizer/printing/calprintmonthconfig_base.ui index 00172958..6fd311ea 100644 --- a/korganizer/printing/calprintmonthconfig_base.ui +++ b/korganizer/printing/calprintmonthconfig_base.ui @@ -6,7 +6,7 @@ <property name="name"> <cstring>CalPrintMonth_Base</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -31,7 +31,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>20</height> @@ -131,7 +131,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>17</width> <height>21</height> @@ -200,7 +200,7 @@ <includes> <include location="global" impldecl="in declaration">kdateedit.h</include> </includes> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kcombobox.h</includehint> <includehint>knuminput.h</includehint> diff --git a/korganizer/printing/calprintpluginbase.cpp b/korganizer/printing/calprintpluginbase.cpp index e16e72c6..c0e61b92 100644 --- a/korganizer/printing/calprintpluginbase.cpp +++ b/korganizer/printing/calprintpluginbase.cpp @@ -46,7 +46,7 @@ inline int round(const double x) static TQString cleanStr( const TQString &instr ) { TQString ret = instr; - return ret.replace( '\n', ' ' ); + return ret.tqreplace( '\n', ' ' ); } /****************************************************************** @@ -128,7 +128,7 @@ CalPrintPluginBase::~CalPrintPluginBase() TQWidget *CalPrintPluginBase::createConfigWidget( TQWidget *w ) { TQFrame *wdg = new TQFrame( w ); - TQVBoxLayout *layout = new TQVBoxLayout( wdg ); + TQVBoxLayout *tqlayout = new TQVBoxLayout( wdg ); TQLabel *title = new TQLabel( description(), wdg ); TQFont titleFont( title->font() ); @@ -136,13 +136,13 @@ TQWidget *CalPrintPluginBase::createConfigWidget( TQWidget *w ) titleFont.setBold( true ); title->setFont( titleFont ); - layout->addWidget( title ); - layout->addWidget( new TQLabel( info(), wdg ) ); - layout->addSpacing( 20 ); - layout->addWidget( new TQLabel( i18n("This printing style does not " + tqlayout->addWidget( title ); + tqlayout->addWidget( new TQLabel( info(), wdg ) ); + tqlayout->addSpacing( 20 ); + tqlayout->addWidget( new TQLabel( i18n("This printing style does not " "have any configuration options."), wdg ) ); - layout->addStretch(); + tqlayout->addStretch(); return wdg; } @@ -182,7 +182,7 @@ void CalPrintPluginBase::doLoadConfig() if ( mConfig ) { KConfigGroupSaver saver( mConfig, description() ); mConfig->sync(); - TQDateTime currDate( TQDate::currentDate() ); + TQDateTime currDate( TQDate::tqcurrentDate() ); mFromDate = mConfig->readDateTimeEntry( "FromDate", &currDate ).date(); mToDate = mConfig->readDateTimeEntry( "ToDate" ).date(); mUseColors = mConfig->readBoolEntry( "UseColors", true ); @@ -558,7 +558,7 @@ int CalPrintPluginBase::drawFooter( TQPainter &p, TQRect &footbox ) TQFont oldfont( p.font() ); p.setFont( TQFont( "sans-serif", 6 ) ); TQFontMetrics fm( p.font() ); - TQString dateStr = KGlobal::locale()->formatDateTime( TQDateTime::currentDateTime(), false ); + TQString dateStr = KGlobal::locale()->formatDateTime( TQDateTime::tqcurrentDateTime(), false ); p.drawText( footbox, TQt::AlignCenter | TQt::AlignVCenter | TQt::SingleLine, i18n( "print date: formatted-datetime", "printed: %1" ).arg( dateStr ) ); p.setFont( oldfont ); @@ -1602,7 +1602,7 @@ void CalPrintPluginBase::drawTodo( int &count, Todo *todo, TQPainter &p, // The problem is that relations() does not apply filters, so // we need to compare manually with the complete filtered list! Todo* subtodo = dynamic_cast<Todo *>( *it ); - if (subtodo && todoList.contains( subtodo ) ) { + if (subtodo && todoList.tqcontains( subtodo ) ) { drawTodo( count, subtodo, p, connectSubTodos, strikeoutCompleted, desc, posPriority, posSummary, posDueDt, posPercentComplete, level+1, x, y, width, pageHeight, todoList, &startpt ); @@ -1619,7 +1619,7 @@ void CalPrintPluginBase::drawTodo( int &count, Todo *todo, TQPainter &p, // The problem is that relations() does not apply filters, so // we need to compare manually with the complete filtered list! Todo* subtodo = dynamic_cast<Todo *>( *it ); - if ( subtodo && todoList.contains( subtodo ) ) { + if ( subtodo && todoList.tqcontains( subtodo ) ) { t.append( subtodo ); } } diff --git a/korganizer/printing/calprintpluginbase.h b/korganizer/printing/calprintpluginbase.h index b845b379..16a1cc2f 100644 --- a/korganizer/printing/calprintpluginbase.h +++ b/korganizer/printing/calprintpluginbase.h @@ -259,7 +259,7 @@ class KDE_EXPORT CalPrintPluginBase : public KOrg::PrintPlugin It prints the given text and optionally one or two small month views, as specified by the two TQDate. The printed text can also contain a line feed. - If month2 is invalid, only the month that contains month1 + If month2 is invalid, only the month that tqcontains month1 is printed. E.g. the filofax week view draws just the current month, while the month view draws the previous and the next month. @@ -419,7 +419,7 @@ class KDE_EXPORT CalPrintPluginBase : public KOrg::PrintPlugin On the left side the time scale is printed (using drawTimeLine), then each day gets one column (printed using drawAgendaDayBox), and the events are displayed as boxes (like in korganizer's day/week view). - The first cell of each column contains the all-day events (using + The first cell of each column tqcontains the all-day events (using drawAllDayBox with expandable=false). The given time range cannot be expanded to include all events. \param p TQPainter of the printout @@ -435,7 +435,7 @@ class KDE_EXPORT CalPrintPluginBase : public KOrg::PrintPlugin /** Draw the month table of the month containing the date qd. Each day gets one - box (using drawDayBox) that contains a list of all events on that day. They are arranged + box (using drawDayBox) that tqcontains a list of all events on that day. They are arranged in a matrix, with the first column being the first day of the week (so it might display some days of the previous and the next month). Above the matrix there is a bar showing the weekdays (drawn using drawDaysOfWeek). diff --git a/korganizer/printing/calprinttodoconfig_base.ui b/korganizer/printing/calprinttodoconfig_base.ui index 53fd3bfb..ea2dcff2 100644 --- a/korganizer/printing/calprinttodoconfig_base.ui +++ b/korganizer/printing/calprinttodoconfig_base.ui @@ -6,7 +6,7 @@ <property name="name"> <cstring>CalPrintTodoConfig_Base</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -86,7 +86,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout2</cstring> + <cstring>tqlayout2</cstring> </property> <hbox> <property name="name"> @@ -102,7 +102,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>16</width> <height>20</height> @@ -191,7 +191,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>16</width> <height>21</height> @@ -275,7 +275,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> @@ -341,7 +341,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>121</width> <height>20</height> @@ -358,7 +358,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>121</width> <height>20</height> @@ -447,7 +447,7 @@ <includes> <include location="global" impldecl="in declaration">kdateedit.h</include> </includes> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>libkdepim/kdateedit.h</includehint> <includehint>libkdepim/kdateedit.h</includehint> diff --git a/korganizer/printing/calprintweekconfig_base.ui b/korganizer/printing/calprintweekconfig_base.ui index a14013ce..32ea6fb4 100644 --- a/korganizer/printing/calprintweekconfig_base.ui +++ b/korganizer/printing/calprintweekconfig_base.ui @@ -6,7 +6,7 @@ <property name="name"> <cstring>CalPrintWeek_Base</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -34,7 +34,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>27</height> @@ -62,7 +62,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>16</width> <height>21</height> @@ -118,7 +118,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>110</width> <height>20</height> @@ -246,7 +246,7 @@ <string>Print as &timetable view</string> </property> <property name="whatsThis" stdset="0"> - <string>This view is similar to the weekview in KOrganizer. The week is printed in landscape layout. You can even use the same colors for the items if you check <i>Use Colors</i>.</string> + <string>This view is similar to the weekview in KOrganizer. The week is printed in landscape tqlayout. You can even use the same colors for the items if you check <i>Use Colors</i>.</string> </property> </widget> <widget class="QRadioButton" row="2" column="0" rowspan="1" colspan="3"> @@ -257,7 +257,7 @@ <string>Print as split week view</string> </property> <property name="whatsThis" stdset="0"> - <string>This view is similar to the week view in KOrganizer. The only difference with the timetable view is the page layout. Timetables are printed in landscape, the split week view in portrait.</string> + <string>This view is similar to the week view in KOrganizer. The only difference with the timetable view is the page tqlayout. Timetables are printed in landscape, the split week view in portrait.</string> </property> </widget> </grid> @@ -292,7 +292,7 @@ <includes> <include location="global" impldecl="in declaration">kdateedit.h</include> </includes> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>libkdepim/kdateedit.h</includehint> <includehint>libkdepim/kdateedit.h</includehint> diff --git a/korganizer/publishdialog_base.ui b/korganizer/publishdialog_base.ui index e6574be6..7e7a5ff1 100644 --- a/korganizer/publishdialog_base.ui +++ b/korganizer/publishdialog_base.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>PublishDialog_base</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -112,7 +112,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>241</height> @@ -129,5 +129,5 @@ <tabstop>mRemove</tabstop> <tabstop>mSelectAddressee</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/korganizer/resourceview.cpp b/korganizer/resourceview.cpp index 150aa014..0f2d0e13 100644 --- a/korganizer/resourceview.cpp +++ b/korganizer/resourceview.cpp @@ -83,7 +83,7 @@ static TQString labelFromSubResName( ResourceCalendar *resource, const TQString static TQString labelFromIdentifier( ResourceCalendar *resource, const TQString &identifier ) { TQString subResLabel; - if ( identifier.contains( "/.INBOX.directory/" ) ) { // my subresource + if ( identifier.tqcontains( "/.INBOX.directory/" ) ) { // my subresource TQString subResName = identifier; subResName.remove( TQRegExp( "^.*/\\.INBOX\\.directory/" ) ); subResLabel = labelFromSubResName( resource, subResName ); @@ -238,18 +238,18 @@ void ResourceItem::setStandardResource( bool std ) { if ( mIsStandardResource != std ) { mIsStandardResource = std; - repaint(); + tqrepaint(); } } void ResourceItem::paintCell(TQPainter *p, const TQColorGroup &cg, - int column, int width, int alignment) + int column, int width, int tqalignment) { TQFont oldFont = p->font(); TQFont newFont = oldFont; newFont.setBold( mIsStandardResource && !mIsSubresource ); p->setFont( newFont ); - TQCheckListItem::paintCell( p, cg, column, width, alignment ); + TQCheckListItem::paintCell( p, cg, column, width, tqalignment ); p->setFont( oldFont ); /* TQColorGroup _cg = cg; if(!mResource) return; @@ -595,7 +595,7 @@ void ResourceView::editResource() if ( item->isSubresource() ) { if ( resource->type() == "imap" || resource->type() == "scalix" ) { TQString identifier = item->resourceIdentifier(); - if ( !identifier.contains( "/.INBOX.directory/" ) ) { + if ( !identifier.tqcontains( "/.INBOX.directory/" ) ) { KMessageBox::sorry( this, i18n( "Cannot rename someone else's calendar folder." ) ); @@ -708,7 +708,7 @@ void ResourceView::contextMenuRequested ( TQListViewItem *lvitem, const TQPoint if ( item->isSubresource() && ( item->resource()->type() == "imap" || item->resource()->type() == "scalix" ) ) { - if ( item->resourceIdentifier().contains( "/.INBOX.directory/" ) ) { + if ( item->resourceIdentifier().tqcontains( "/.INBOX.directory/" ) ) { menu->insertItem( i18n("&Rename..."), this, TQT_SLOT( editResource() ) ); } } else { diff --git a/korganizer/resourceview.h b/korganizer/resourceview.h index ee406027..304ab8c6 100644 --- a/korganizer/resourceview.h +++ b/korganizer/resourceview.h @@ -69,7 +69,7 @@ class ResourceItem : public QCheckListItem void update(); virtual void paintCell(TQPainter *p, const TQColorGroup &cg, - int column, int width, int alignment); + int column, int width, int tqalignment); void setResourceColor(TQColor& color); TQColor &resourceColor() {return mResourceColor;} diff --git a/korganizer/searchdialog.cpp b/korganizer/searchdialog.cpp index 2cc4bb44..b8b6ea1e 100644 --- a/korganizer/searchdialog.cpp +++ b/korganizer/searchdialog.cpp @@ -52,11 +52,11 @@ SearchDialog::SearchDialog(Calendar *calendar,TQWidget *parent) mCalendar = calendar; TQFrame *topFrame = plainPage(); - TQVBoxLayout *layout = new TQVBoxLayout(topFrame,0,spacingHint()); + TQVBoxLayout *tqlayout = new TQVBoxLayout(topFrame,0,spacingHint()); // Search expression TQHBoxLayout *subLayout = new TQHBoxLayout(); - layout->addLayout(subLayout); + tqlayout->addLayout(subLayout); searchEdit = new TQLineEdit( "*", topFrame ); // Find all events by default searchLabel = new TQLabel( searchEdit, i18n("&Search for:"), topFrame ); @@ -68,7 +68,7 @@ SearchDialog::SearchDialog(Calendar *calendar,TQWidget *parent) TQHButtonGroup *itemsGroup = new TQHButtonGroup( i18n("Search For"), topFrame ); - layout->addWidget( itemsGroup ); + tqlayout->addWidget( itemsGroup ); mEventsCheck = new TQCheckBox( i18n("&Events"), itemsGroup ); mTodosCheck = new TQCheckBox( i18n("To-&dos"), itemsGroup ); mJournalsCheck = new TQCheckBox( i18n("&Journal entries"), itemsGroup ); @@ -78,7 +78,7 @@ SearchDialog::SearchDialog(Calendar *calendar,TQWidget *parent) // Date range TQGroupBox *rangeGroup = new TQGroupBox( 1, Horizontal, i18n( "Date Range" ), topFrame ); - layout->addWidget( rangeGroup ); + tqlayout->addWidget( rangeGroup ); TQWidget *rangeWidget = new TQWidget( rangeGroup ); TQHBoxLayout *rangeLayout = new TQHBoxLayout( rangeWidget, 0, spacingHint() ); @@ -89,7 +89,7 @@ SearchDialog::SearchDialog(Calendar *calendar,TQWidget *parent) mEndDate = new KDateEdit( rangeWidget ); rangeLayout->addWidget( new TQLabel( mEndDate, i18n("&To:"), rangeWidget ) ); - mEndDate->setDate( TQDate::currentDate().addDays( 365 ) ); + mEndDate->setDate( TQDate::tqcurrentDate().addDays( 365 ) ); rangeLayout->addWidget( mEndDate ); mInclusiveCheck = new TQCheckBox( i18n("E&vents have to be completely included"), @@ -100,7 +100,7 @@ SearchDialog::SearchDialog(Calendar *calendar,TQWidget *parent) // Subjects to search TQHButtonGroup *subjectGroup = new TQHButtonGroup( i18n("Search In"), topFrame ); - layout->addWidget(subjectGroup); + tqlayout->addWidget(subjectGroup); mSummaryCheck = new TQCheckBox( i18n("Su&mmaries"), subjectGroup ); mSummaryCheck->setChecked( true ); @@ -111,7 +111,7 @@ SearchDialog::SearchDialog(Calendar *calendar,TQWidget *parent) // Results list view listView = new KOListView( mCalendar, topFrame ); listView->showDates(); - layout->addWidget( listView ); + tqlayout->addWidget( listView ); if ( KOPrefs::instance()->mCompactDialogs ) { KOGlobals::fitDialogToScreen( this, true ); diff --git a/korganizer/template_management_dialog_base.ui b/korganizer/template_management_dialog_base.ui index 093ff3c5..606db9ec 100644 --- a/korganizer/template_management_dialog_base.ui +++ b/korganizer/template_management_dialog_base.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>TemplateManagementDialog_base</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -75,7 +75,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>51</height> @@ -86,7 +86,7 @@ </widget> <customwidgets> </customwidgets> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klistbox.h</includehint> </includehints> diff --git a/korganizer/templatemanagementdialog.h b/korganizer/templatemanagementdialog.h index fbc4c512..9216108f 100644 --- a/korganizer/templatemanagementdialog.h +++ b/korganizer/templatemanagementdialog.h @@ -56,7 +56,7 @@ Q_OBJECT /* Emitted whenever the user wants to add teh current incidence as a template with the given name. */ void saveTemplate( const TQString& templateName ); - /* Emitted when the dialog changed the list of templates. Calling code can the replace + /* Emitted when the dialog changed the list of templates. Calling code can the tqreplace the list that was handed in with the one this signal transports. */ void templatesChanged( const TQStringList& templates ); diff --git a/korganizer/timelabels.cpp b/korganizer/timelabels.cpp index 81b53c1f..53bc3458 100644 --- a/korganizer/timelabels.cpp +++ b/korganizer/timelabels.cpp @@ -197,7 +197,7 @@ void TimeLabels::updateConfig() sFont.setPointSize( sFont.pointSize()/2 ); TQFontMetrics fmS( sFont ); mMiniWidth += fmS.width( test ) + frameWidth()*2+4 ; - // update geometry restrictions based on new settings + // update tqgeometry restrictions based on new settings setFixedWidth( mMiniWidth ); // update HourSize @@ -237,14 +237,14 @@ void TimeLabels::setAgenda( KOAgenda* agenda ) } -/** This is called in response to repaint() */ +/** This is called in response to tqrepaint() */ void TimeLabels::paintEvent(TQPaintEvent*) { // kdDebug(5850) << "paintevent..." << endl; // this is another hack! // TQPainter painter(this); //TQString c - repaintContents(contentsX(), contentsY(), visibleWidth(), visibleHeight()); + tqrepaintContents(contentsX(), contentsY(), visibleWidth(), visibleHeight()); } #include "timelabels.moc" |