From 67e29a054cfcb1b0d2fe6b0a316cf6b3eec087b7 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 13 Apr 2011 00:46:47 +0000 Subject: Initial conversion of kdepim to TQt This will probably require some tweaking before it will build under Qt4, however Qt3 builds are OK. Any alterations this commit makes to kdepim behaviour under Qt3 are unintentional and should be fixed. git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1227832 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- korganizer/COPYING | 4 +- korganizer/aboutdata.cpp | 4 +- korganizer/aboutdata.h | 4 +- korganizer/actionmanager.cpp | 64 ++++++------ korganizer/actionmanager.h | 13 +-- korganizer/agendaview.cpp | 4 +- korganizer/agendaview.h | 3 +- korganizer/archivedialog.cpp | 8 +- korganizer/archivedialog.h | 7 +- korganizer/calendarview.cpp | 82 +++++++-------- korganizer/calendarview.h | 39 +++---- korganizer/customlistviewitem.h | 14 +-- korganizer/datechecker.cpp | 10 +- korganizer/datechecker.h | 11 +- korganizer/datenavigator.cpp | 8 +- korganizer/datenavigator.h | 9 +- korganizer/datenavigatorcontainer.cpp | 18 ++-- korganizer/datenavigatorcontainer.h | 11 +- korganizer/docprefs.cpp | 4 +- korganizer/docprefs.h | 4 +- korganizer/eventarchiver.cpp | 10 +- korganizer/eventarchiver.h | 13 +-- korganizer/exportwebdialog.cpp | 8 +- korganizer/exportwebdialog.h | 7 +- korganizer/filteredit_base.ui | 42 ++++---- korganizer/filtereditdialog.cpp | 14 +-- korganizer/filtereditdialog.h | 10 +- korganizer/freebusymanager.cpp | 36 +++---- korganizer/freebusymanager.h | 14 +-- korganizer/freebusyurldialog.cpp | 12 +-- korganizer/freebusyurldialog.h | 12 ++- korganizer/history.cpp | 10 +- korganizer/history.h | 7 +- korganizer/ical2vcal.in | 2 +- korganizer/importdialog.cpp | 8 +- korganizer/importdialog.h | 7 +- korganizer/incidencechanger.cpp | 52 +++++----- korganizer/incidencechanger.h | 25 ++--- .../interfaces/calendar/calendardecoration.h | 4 +- korganizer/interfaces/korganizer/baseview.h | 9 +- .../interfaces/korganizer/calendarviewbase.h | 6 +- korganizer/interfaces/korganizer/corehelper.h | 4 +- .../interfaces/korganizer/incidencechangerbase.h | 23 +++-- korganizer/interfaces/korganizer/part.h | 6 +- korganizer/journalentry.cpp | 24 ++--- korganizer/journalentry.h | 10 +- korganizer/kcalendariface.h | 4 +- korganizer/kdatenavigator.cpp | 10 +- korganizer/kdatenavigator.h | 9 +- korganizer/koagenda.cpp | 42 ++++---- korganizer/koagenda.h | 16 +-- korganizer/koagendaitem.cpp | 28 ++--- korganizer/koagendaitem.h | 9 +- korganizer/koagendaview.cpp | 28 ++--- korganizer/koagendaview.h | 21 ++-- korganizer/koapp.cpp | 6 +- korganizer/koapp.h | 5 +- korganizer/koattendeeeditor.cpp | 40 ++++---- korganizer/koattendeeeditor.h | 9 +- korganizer/kocore.cpp | 46 ++++----- korganizer/kocore.h | 14 +-- korganizer/kocorehelper.cpp | 4 +- korganizer/kocorehelper.h | 4 +- korganizer/kocounterdialog.cpp | 8 +- korganizer/kocounterdialog.h | 7 +- korganizer/kodaymatrix.cpp | 26 ++--- korganizer/kodaymatrix.h | 27 ++--- korganizer/kodialogmanager.cpp | 12 +-- korganizer/kodialogmanager.h | 9 +- korganizer/koeditoralarms.cpp | 18 ++-- korganizer/koeditoralarms.h | 7 +- korganizer/koeditoralarms_base.ui | 74 ++++++------- korganizer/koeditorattachments.cpp | 44 ++++---- korganizer/koeditorattachments.h | 15 +-- korganizer/koeditordetails.cpp | 16 +-- korganizer/koeditordetails.h | 10 +- korganizer/koeditorfreebusy.cpp | 30 +++--- korganizer/koeditorfreebusy.h | 7 +- korganizer/koeditorgeneral.cpp | 56 +++++----- korganizer/koeditorgeneral.h | 16 +-- korganizer/koeditorgeneralevent.cpp | 22 ++-- korganizer/koeditorgeneralevent.h | 9 +- korganizer/koeditorgeneraljournal.cpp | 28 ++--- korganizer/koeditorgeneraljournal.h | 9 +- korganizer/koeditorgeneraltodo.cpp | 38 +++---- korganizer/koeditorgeneraltodo.h | 9 +- korganizer/koeditorrecurrence.cpp | 70 ++++++------- korganizer/koeditorrecurrence.h | 47 +++++---- korganizer/koeventeditor.cpp | 12 +-- korganizer/koeventeditor.h | 11 +- korganizer/koeventpopupmenu.cpp | 4 +- korganizer/koeventpopupmenu.h | 5 +- korganizer/koeventview.cpp | 8 +- korganizer/koeventview.h | 9 +- korganizer/koeventviewer.cpp | 8 +- korganizer/koeventviewer.h | 9 +- korganizer/koeventviewerdialog.cpp | 8 +- korganizer/koeventviewerdialog.h | 7 +- korganizer/koglobals.cpp | 8 +- korganizer/koglobals.h | 4 +- korganizer/kogroupware.cpp | 30 +++--- korganizer/kogroupware.h | 13 +-- korganizer/kogroupwareprefspage.ui | 80 +++++++-------- korganizer/kogroupwareprefspage.ui.h | 2 +- korganizer/kohelper.cpp | 4 +- korganizer/kohelper.h | 4 +- korganizer/koidentitymanager.cpp | 4 +- korganizer/koidentitymanager.h | 8 +- korganizer/koincidenceeditor.cpp | 10 +- korganizer/koincidenceeditor.h | 11 +- korganizer/koincidencetooltip.cpp | 4 +- korganizer/koincidencetooltip.h | 6 +- korganizer/kojournaleditor.cpp | 10 +- korganizer/kojournaleditor.h | 11 +- korganizer/kojournalview.cpp | 8 +- korganizer/kojournalview.h | 7 +- korganizer/kolistview.cpp | 24 ++--- korganizer/kolistview.h | 11 +- korganizer/komailclient.cpp | 14 +-- korganizer/komailclient.h | 12 +-- korganizer/komessagebox.cpp | 10 +- korganizer/komessagebox.h | 8 +- korganizer/komonthview.cpp | 34 +++--- korganizer/komonthview.h | 23 +++-- korganizer/konewstuff.cpp | 4 +- korganizer/konewstuff.h | 4 +- korganizer/koprefs.cpp | 14 +-- korganizer/koprefs.h | 4 +- korganizer/koprefsdialog.cpp | 96 ++++++++--------- korganizer/koprefsdialog.h | 21 ++-- korganizer/korgac/alarmdialog.cpp | 22 ++-- korganizer/korgac/alarmdialog.h | 7 +- korganizer/korgac/alarmdockwindow.cpp | 6 +- korganizer/korgac/alarmdockwindow.h | 5 +- korganizer/korgac/koalarmclient.cpp | 16 +-- korganizer/korgac/koalarmclient.h | 9 +- korganizer/korgac/korgacmain.cpp | 4 +- korganizer/korgac/testalarmdlg.cpp | 4 +- korganizer/korganizer.cpp | 4 +- korganizer/korganizer.h | 7 +- korganizer/korganizer_options.h | 4 +- korganizer/korganizer_part.cpp | 10 +- korganizer/korganizer_part.h | 7 +- korganizer/korganizer_part.rc | 2 +- korganizer/korganizerifaceimpl.cpp | 10 +- korganizer/korganizerifaceimpl.h | 8 +- korganizer/korganizerui.rc | 2 +- korganizer/korgplugins.cpp | 4 +- korganizer/kotimelineview.cpp | 12 +-- korganizer/kotimelineview.h | 7 +- korganizer/kotodoeditor.cpp | 16 +-- korganizer/kotodoeditor.h | 11 +- korganizer/kotodoview.cpp | 52 +++++----- korganizer/kotodoview.h | 16 +-- korganizer/kotodoviewitem.cpp | 23 ++--- korganizer/kotodoviewitem.h | 15 ++- korganizer/koviewmanager.cpp | 16 ++- korganizer/koviewmanager.h | 7 +- korganizer/kowhatsnextview.cpp | 10 +- korganizer/kowhatsnextview.h | 10 +- korganizer/kowindowlist.cpp | 4 +- korganizer/kowindowlist.h | 7 +- korganizer/mailscheduler.cpp | 6 +- korganizer/mailscheduler.h | 4 +- korganizer/main.cpp | 4 +- korganizer/multiagendaview.cpp | 28 ++--- korganizer/multiagendaview.h | 5 +- korganizer/navigatorbar.cpp | 12 +-- korganizer/navigatorbar.h | 14 +-- korganizer/plugins/datenums/configdialog.cpp | 4 +- korganizer/plugins/datenums/configdialog.h | 3 +- korganizer/plugins/datenums/datenums.cpp | 4 +- korganizer/plugins/datenums/datenums.h | 2 +- korganizer/plugins/exchange/exchange.cpp | 12 +-- korganizer/plugins/exchange/exchange.h | 3 +- korganizer/plugins/exchange/exchangeconfig.cpp | 4 +- korganizer/plugins/exchange/exchangeconfig.h | 3 +- korganizer/plugins/exchange/exchangedialog.cpp | 4 +- korganizer/plugins/exchange/exchangedialog.h | 3 +- korganizer/plugins/hebrew/configdialog.cpp | 4 +- korganizer/plugins/hebrew/configdialog.h | 7 +- korganizer/plugins/hebrew/hebrew.cpp | 4 +- korganizer/plugins/hebrew/hebrew.h | 2 +- korganizer/plugins/hebrew/holiday.cpp | 2 +- korganizer/plugins/hebrew/parsha.cpp | 2 +- .../printing/journal/calprintjournalconfig_base.ui | 14 +-- .../plugins/printing/journal/journalprint.cpp | 4 +- korganizer/plugins/printing/journal/journalprint.h | 4 +- .../printing/list/calprintlistconfig_base.ui | 18 ++-- korganizer/plugins/printing/list/listprint.cpp | 4 +- korganizer/plugins/printing/list/listprint.h | 4 +- .../whatsnext/calprintwhatsnextconfig_base.ui | 10 +- .../plugins/printing/whatsnext/whatsnextprint.cpp | 4 +- .../plugins/printing/whatsnext/whatsnextprint.h | 4 +- .../printing/year/calprintyearconfig_base.ui | 22 ++-- korganizer/plugins/printing/year/yearprint.cpp | 6 +- korganizer/plugins/printing/year/yearprint.h | 4 +- korganizer/plugins/projectview/koprojectview.cpp | 16 +-- korganizer/plugins/projectview/koprojectview.h | 7 +- korganizer/plugins/projectview/projectview.cpp | 8 +- korganizer/plugins/projectview/projectview.h | 1 + korganizer/plugins/timespanview/kotimespanview.cpp | 8 +- korganizer/plugins/timespanview/kotimespanview.h | 7 +- korganizer/plugins/timespanview/lineview.cpp | 8 +- korganizer/plugins/timespanview/lineview.h | 9 +- korganizer/plugins/timespanview/timeline.cpp | 8 +- korganizer/plugins/timespanview/timeline.h | 9 +- korganizer/plugins/timespanview/timespanview.cpp | 8 +- korganizer/plugins/timespanview/timespanview.h | 1 + korganizer/plugins/timespanview/timespanwidget.cpp | 11 +- korganizer/plugins/timespanview/timespanwidget.h | 9 +- korganizer/previewdialog.cpp | 4 +- korganizer/previewdialog.h | 3 +- korganizer/printing/calprintdayconfig_base.ui | 22 ++-- korganizer/printing/calprintdefaultplugins.cpp | 46 ++++----- korganizer/printing/calprintdefaultplugins.h | 4 +- korganizer/printing/calprinter.cpp | 14 +-- korganizer/printing/calprinter.h | 10 +- .../printing/calprintincidenceconfig_base.ui | 14 +-- korganizer/printing/calprintmonthconfig_base.ui | 16 +-- korganizer/printing/calprintpluginbase.cpp | 114 ++++++++++----------- korganizer/printing/calprintpluginbase.h | 16 +-- korganizer/printing/calprinttodoconfig_base.ui | 48 ++++----- korganizer/printing/calprintweekconfig_base.ui | 28 ++--- korganizer/printing/cellitem.cpp | 6 +- korganizer/printing/cellitem.h | 4 +- korganizer/publishdialog.cpp | 8 +- korganizer/publishdialog.h | 7 +- korganizer/publishdialog_base.ui | 18 ++-- korganizer/resourceview.cpp | 30 +++--- korganizer/resourceview.h | 13 +-- korganizer/searchdialog.cpp | 22 +--- korganizer/searchdialog.h | 7 +- korganizer/statusdialog.cpp | 18 ++-- korganizer/statusdialog.h | 5 +- korganizer/template_management_dialog_base.ui | 10 +- korganizer/templatemanagementdialog.cpp | 16 +-- korganizer/templatemanagementdialog.h | 9 +- korganizer/timelabels.cpp | 10 +- korganizer/timelabels.h | 9 +- korganizer/timelineitem.cpp | 14 +-- korganizer/timelineitem.h | 4 +- korganizer/timezone.cpp | 6 +- korganizer/urihandler.cpp | 14 +-- korganizer/urihandler.h | 6 +- korganizer/version.h | 4 +- 246 files changed, 1762 insertions(+), 1687 deletions(-) (limited to 'korganizer') diff --git a/korganizer/COPYING b/korganizer/COPYING index 54754ab4b..b55fa1466 100644 --- a/korganizer/COPYING +++ b/korganizer/COPYING @@ -59,7 +59,7 @@ modification follow. GNU GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - 0. This License applies to any program or other work which contains + 0. This License applies to any program or other work which tqcontains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" @@ -154,7 +154,7 @@ Sections 1 and 2 above provided that you also do one of the following: The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any +code means all the source code for all modules it tqcontains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include diff --git a/korganizer/aboutdata.cpp b/korganizer/aboutdata.cpp index b5fb98c31..44ff41fea 100644 --- a/korganizer/aboutdata.cpp +++ b/korganizer/aboutdata.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include "aboutdata.h" diff --git a/korganizer/aboutdata.h b/korganizer/aboutdata.h index 7edfc6150..73a9b98ee 100644 --- a/korganizer/aboutdata.h +++ b/korganizer/aboutdata.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef KORG_ABOUTDATA_H #define KORG_ABOUTDATA_H diff --git a/korganizer/actionmanager.cpp b/korganizer/actionmanager.cpp index 8b938986a..09b5c6f45 100644 --- a/korganizer/actionmanager.cpp +++ b/korganizer/actionmanager.cpp @@ -21,8 +21,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include "actionmanager.h" @@ -81,9 +81,9 @@ KOWindowList *ActionManager::mWindowList = 0; ActionManager::ActionManager( KXMLGUIClient *client, CalendarView *widget, - TQObject *parent, KOrg::MainWindow *mainWindow, + TQObject *tqparent, KOrg::MainWindow *mainWindow, bool isPart ) - : TQObject( parent ), KCalendarIface(), mRecent( 0 ), + : TQObject( tqparent ), KCalendarIface(), mRecent( 0 ), mResourceButtonsAction( 0 ), mResourceViewShowAction( 0 ), mCalendar( 0 ), mCalendarResources( 0 ), mResourceView( 0 ), mIsClosing( false ) { @@ -130,7 +130,7 @@ void ActionManager::init() TQTimer::singleShot( 0, this, TQT_SLOT( showTipOnStart() ) ); } // Note: We need this ActionManager to be fully constructed, and - // parent() to have a valid reference to it before the following + // tqparent() to have a valid reference to it before the following // addWindow is called. mWindowList->addWindow( mMainWindow ); @@ -313,10 +313,10 @@ void ActionManager::initActions() mCalendarView, TQT_SLOT( appointment_delete() ), mACollection, "edit_delete" ); if ( mIsPart ) { - KStdAction::find( mCalendarView->dialogManager(), TQT_SLOT( showSearchDialog() ), - mACollection, "korganizer_find" ); + KStdAction::tqfind( mCalendarView->dialogManager(), TQT_SLOT( showSearchDialog() ), + mACollection, "korganizer_tqfind" ); } else { - KStdAction::find( mCalendarView->dialogManager(), TQT_SLOT( showSearchDialog() ), + KStdAction::tqfind( mCalendarView->dialogManager(), TQT_SLOT( showSearchDialog() ), mACollection ); } pasteAction->setEnabled( false ); @@ -402,7 +402,7 @@ void ActionManager::initActions() //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ZOOM ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - // TODO: try to find / create better icons for the following 4 actions + // TODO: try to tqfind / create better icons for the following 4 actions new KAction( i18n( "Zoom In Horizontally" ), "viewmag+", 0, mCalendarView->viewManager(), TQT_SLOT( zoomInHorizontally() ), mACollection, "zoom_in_horizontally" ); @@ -522,7 +522,7 @@ void ActionManager::initActions() connect( mCalendarView, TQT_SIGNAL(organizerEventsSelected(bool)), mSendCancel, TQT_SLOT(setEnabled(bool)) ); - mSendStatusUpdate = new KAction( i18n( "Send Status &Update" ), + mSendStatusUpdate = new KAction( i18n( "Send tqStatus &Update" ), "mail_reply", 0, mCalendarView,TQT_SLOT(schedule_reply()), mACollection, "schedule_reply" ); @@ -1162,7 +1162,7 @@ bool ActionManager::saveModifiedURL() int result = KMessageBox::warningYesNoCancel( dialogParent(), i18n("The calendar has been modified.\nDo you want to save it?"), - TQString::null, + TQString(), KStdGuiItem::save(), KStdGuiItem::discard() ); switch( result ) { case KMessageBox::Yes: @@ -1305,7 +1305,7 @@ void ActionManager::configureDateTime() void ActionManager::showTip() { - KTipDialog::showTip( dialogParent(),TQString::null,true ); + KTipDialog::showTip( dialogParent(),TQString(),true ); } void ActionManager::showTipOnStart() @@ -1534,7 +1534,7 @@ void ActionManager::setTitle() mMainWindow->setTitle(); } -KCalendarIface::ResourceRequestReply ActionManager::resourceRequest( const TQValueList >&, +KCalendarIface::ResourceRequestReply ActionManager::resourceRequest( const TQValueList >&, const TQCString& resource, const TQString& vCalIn ) { @@ -1544,9 +1544,9 @@ KCalendarIface::ResourceRequestReply ActionManager::resourceRequest( const TQVal return reply; } -QPair ActionManager::viewSubResourceCalendar() +TQPair ActionManager::viewSubResourceCalendar() { - QPair p( 0, TQString() ); + TQPair p( 0, TQString() ); // return now if we are running as a part and we aren't the currently active part if ( mIsPart && !mMainWindow->isCurrentlyActivePart() ) { @@ -1634,7 +1634,7 @@ bool ActionManager::isWritable( ResourceCalendar *res, const TQString &subRes, void ActionManager::openEventEditor( const TQString& text ) { - QPairp = viewSubResourceCalendar(); + TQPairp = viewSubResourceCalendar(); if ( isWritable( p.first, p.second, "event" ) ) { mCalendarView->newEvent( p.first, p.second, text ); } @@ -1644,7 +1644,7 @@ void ActionManager::openEventEditor( const TQString& summary, const TQString& description, const TQString& attachment ) { - QPairp = viewSubResourceCalendar(); + TQPairp = viewSubResourceCalendar(); mCalendarView->newEvent( p.first, p.second, summary, description, attachment ); } @@ -1708,11 +1708,11 @@ void ActionManager::openEventEditor( const TQString & summary, return; // due to kmime shortcomings in KDE3, we need to assemble the result manually int begin = 0; - int end = head.find( '\n' ); + int end = head.tqfind( '\n' ); bool skipFolded = false; while ( end >= 0 && end > begin ) { - if ( head.find( "Content-Type:", begin, false ) != begin && - head.find( "Content-Transfer-Encoding:", begin, false ) != begin && + if ( head.tqfind( "Content-Type:", begin, false ) != begin && + head.tqfind( "Content-Transfer-Encoding:", begin, false ) != begin && !(skipFolded && (head[begin] == ' ' || head[end] == '\t')) ) { TQCString line = head.mid( begin, end - begin ); tf.file()->writeBlock( line.data(), line.length() ); @@ -1723,7 +1723,7 @@ void ActionManager::openEventEditor( const TQString & summary, } begin = end + 1; - end = head.find( '\n', begin ); + end = head.tqfind( '\n', begin ); if ( end < 0 && begin < (int)head.length() ) end = head.length() - 1; } @@ -1748,14 +1748,14 @@ void ActionManager::openEventEditor( const TQString & summary, return; } - QPairp = viewSubResourceCalendar(); + TQPairp = viewSubResourceCalendar(); mCalendarView->newEvent( p.first, p.second, summary, description, attData, attendees, attachmentMimetype, action != KOPrefs::Link ); } void ActionManager::openTodoEditor( const TQString& text ) { - QPairp = viewSubResourceCalendar(); + TQPairp = viewSubResourceCalendar(); if ( isWritable( p.first, p.second, "todo" ) ) { mCalendarView->newTodo( p.first, p.second, text ); } @@ -1765,7 +1765,7 @@ void ActionManager::openTodoEditor( const TQString& summary, const TQString& description, const TQString& attachment ) { - QPairp = viewSubResourceCalendar(); + TQPairp = viewSubResourceCalendar(); mCalendarView->newTodo( p.first, p.second, summary, description, attachment ); } @@ -1774,7 +1774,7 @@ void ActionManager::openTodoEditor( const TQString& summary, const TQString& attachment, const TQStringList& attendees ) { - QPairp = viewSubResourceCalendar(); + TQPairp = viewSubResourceCalendar(); mCalendarView->newTodo( p.first, p.second, summary, description, attachment, attendees ); } @@ -1814,7 +1814,7 @@ void ActionManager::openTodoEditor(const TQString & summary, return; } - QPairp = viewSubResourceCalendar(); + TQPairp = viewSubResourceCalendar(); mCalendarView->newTodo( p.first, p.second, summary, description, attData, attendees, @@ -1825,19 +1825,19 @@ void ActionManager::openTodoEditor(const TQString & summary, void ActionManager::openJournalEditor( const TQDate& date ) { - QPairp = viewSubResourceCalendar(); + TQPairp = viewSubResourceCalendar(); mCalendarView->newJournal( p.first, p.second, date ); } void ActionManager::openJournalEditor( const TQString& text, const TQDate& date ) { - QPairp = viewSubResourceCalendar(); + TQPairp = viewSubResourceCalendar(); mCalendarView->newJournal( p.first, p.second, text, date ); } void ActionManager::openJournalEditor( const TQString& text ) { - QPairp = viewSubResourceCalendar(); + TQPairp = viewSubResourceCalendar(); if ( isWritable( p.first, p.second, "journal" ) ) { mCalendarView->newJournal( p.first, p.second, text ); } @@ -1848,7 +1848,7 @@ void ActionManager::openJournalEditor( const TQString& text ) // const TQString& description, // const TQString& attachment ) // { -// QPairp = viewSubResourceCalendar(); +// TQPairp = viewSubResourceCalendar(); // mCalendarView->newJournal( p.first, p.second, summary, description, attachment ); // } @@ -1916,12 +1916,12 @@ bool ActionManager::queryClose() if ( mCalendar && mCalendar->isModified() ) { int res = KMessageBox::questionYesNoCancel( dialogParent(), - i18n("The calendar tqcontains unsaved changes. Do you want to save them before exiting?"), TQString::null, KStdGuiItem::save(), KStdGuiItem::discard() ); + i18n("The calendar contains unsaved changes. Do you want to save them before exiting?"), TQString(), 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(); if ( !close ) { - int res1 = KMessageBox::questionYesNo( dialogParent(), i18n("Unable to save the calendar. Do you still want to close this window?"), TQString::null, KStdGuiItem::close(), KStdGuiItem::cancel() ); + int res1 = KMessageBox::questionYesNo( dialogParent(), i18n("Unable to save the calendar. Do you still want to close this window?"), TQString(), KStdGuiItem::close(), KStdGuiItem::cancel() ); close = ( res1 == KMessageBox::Yes ); } } else { diff --git a/korganizer/actionmanager.h b/korganizer/actionmanager.h index 555d4e7db..0a53255f4 100644 --- a/korganizer/actionmanager.h +++ b/korganizer/actionmanager.h @@ -21,8 +21,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef KORG_ACTIONMANAGER_H #define KORG_ACTIONMANAGER_H @@ -73,9 +73,10 @@ using namespace KCal; class KDE_EXPORT ActionManager : public TQObject, public KCalendarIface { Q_OBJECT + TQ_OBJECT public: ActionManager( KXMLGUIClient *client, CalendarView *widget, - TQObject *parent, KOrg::MainWindow *mainWindow, + TQObject *tqparent, KOrg::MainWindow *mainWindow, bool isPart ); virtual ~ActionManager(); @@ -162,7 +163,7 @@ class KDE_EXPORT ActionManager : public TQObject, public KCalendarIface bool addIncidence( const TQString& ical ); //// Implementation of the DCOP interface - virtual ResourceRequestReply resourceRequest( const TQValueList >& busy, + virtual ResourceRequestReply resourceRequest( const TQValueList >& busy, const TQCString& resource, const TQString& vCalIn ); @@ -356,7 +357,7 @@ class KDE_EXPORT ActionManager : public TQObject, public KCalendarIface void initCalendar( Calendar *cal ); /** - Return widget used as parent for dialogs and message boxes. + Return widget used as tqparent for dialogs and message boxes. */ TQWidget *dialogParent(); @@ -370,7 +371,7 @@ class KDE_EXPORT ActionManager : public TQObject, public KCalendarIface void initActions(); void enableIncidenceActions( bool enable ); - QPair viewSubResourceCalendar(); + TQPair viewSubResourceCalendar(); bool isWritable( ResourceCalendar *res, const TQString &subRes, const TQString &contentsType ); KOrg::Part::List mParts; // List of parts loaded diff --git a/korganizer/agendaview.cpp b/korganizer/agendaview.cpp index df1417897..f2d7f9879 100644 --- a/korganizer/agendaview.cpp +++ b/korganizer/agendaview.cpp @@ -22,8 +22,8 @@ using namespace KOrg; -AgendaView::AgendaView(Calendar * cal, TQWidget * parent, const char * name) : - KOEventView( cal, parent, name ) +AgendaView::AgendaView(Calendar * cal, TQWidget * tqparent, const char * name) : + KOEventView( cal, tqparent, name ) { KCal::CalendarResources *calres = dynamic_cast( cal ); if ( calres ) { diff --git a/korganizer/agendaview.h b/korganizer/agendaview.h index cf262dac5..83ef5e6ac 100644 --- a/korganizer/agendaview.h +++ b/korganizer/agendaview.h @@ -27,8 +27,9 @@ namespace KOrg { class AgendaView : public KOEventView { Q_OBJECT + TQ_OBJECT public: - AgendaView( Calendar *cal,TQWidget *parent=0,const char *name=0 ); + AgendaView( Calendar *cal,TQWidget *tqparent=0,const char *name=0 ); virtual void setTypeAheadReceiver( TQObject * ) = 0; diff --git a/korganizer/archivedialog.cpp b/korganizer/archivedialog.cpp index 48c299e0a..f96761615 100644 --- a/korganizer/archivedialog.cpp +++ b/korganizer/archivedialog.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ // ArchiveDialog -- archive/delete past events. @@ -51,9 +51,9 @@ #include #include "archivedialog.moc" -ArchiveDialog::ArchiveDialog(Calendar *cal,TQWidget *parent, const char *name) +ArchiveDialog::ArchiveDialog(Calendar *cal,TQWidget *tqparent, const char *name) : KDialogBase (Plain,i18n("Archive/Delete Past Events and To-dos"), - User1|Cancel,User1,parent,name,false,true, + User1|Cancel,User1,tqparent,name,false,true, i18n("&Archive")) { mCalendar = cal; diff --git a/korganizer/archivedialog.h b/korganizer/archivedialog.h index 011e213f3..c63194091 100644 --- a/korganizer/archivedialog.h +++ b/korganizer/archivedialog.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef _ARCHIVE_DLG #define _ARCHIVE_DLG @@ -41,8 +41,9 @@ using namespace KCal; class ArchiveDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - ArchiveDialog(Calendar *calendar,TQWidget *parent=0, const char *name=0); + ArchiveDialog(Calendar *calendar,TQWidget *tqparent=0, const char *name=0); virtual ~ArchiveDialog(); signals: diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index 91b42b1e8..84199bfe4 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp @@ -26,8 +26,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include "calendarview.h" @@ -112,8 +112,8 @@ using namespace KOrg; -CalendarView::CalendarView( TQWidget *parent, const char *name ) - : CalendarViewBase( parent, name ), +CalendarView::CalendarView( TQWidget *tqparent, const char *name ) + : CalendarViewBase( tqparent, name ), mHistory( 0 ), mCalendar( CalendarNull::self() ), mChanger( 0 ) @@ -349,9 +349,9 @@ Calendar *CalendarView::calendar() else return CalendarNull::self(); } -QPair CalendarView::viewSubResourceCalendar() +TQPair CalendarView::viewSubResourceCalendar() { - QPair p( 0, TQString() ); + TQPair p( 0, TQString() ); KOrg::BaseView *cV = mViewManager->currentView(); if ( cV && cV == mViewManager->multiAgendaView() ) { cV = mViewManager->multiAgendaView()->selectedAgendaView(); @@ -364,7 +364,7 @@ QPair CalendarView::viewSubResourceCalendar() KOIncidenceEditor *CalendarView::editorDialog( Incidence *incidence ) const { - if (mDialogList.find(incidence) != mDialogList.end ()) + if (mDialogList.tqfind(incidence) != mDialogList.end ()) return mDialogList[incidence]; else return 0; } @@ -456,13 +456,13 @@ bool CalendarView::openCalendar(const TQString& filename, bool merge) i18n( "No calendars found, unable to merge the file into your calendar." ) ); return false; } - // FIXME: This is a nasty hack, since we need to set a parent for the + // FIXME: This is a nasty hack, since we need to set a tqparent for the // resource selection dialog. However, we don't have any UI methods // in the calendar, only in the CalendarResources::DestinationPolicy // So we need to type-cast it and extract it from the CalendarResources - TQWidget *tmpparent = 0; + TQWidget *tmptqparent = 0; if ( cl ) { - tmpparent = cl->dialogParentWidget(); + tmptqparent = cl->dialogParentWidget(); cl->setDialogParentWidget( this ); } @@ -660,7 +660,7 @@ void CalendarView::writeFilterSettings( KConfig *config ) if ( mCurrentFilter ) { config->writeEntry( "Current Filter", mCurrentFilter->name() ); } else { - config->writeEntry( "Current Filter", TQString::null ); + config->writeEntry( "Current Filter", TQString() ); } } @@ -935,7 +935,7 @@ void CalendarView::edit_cut() incidences.append( incidence ); makeChildrenIndependent( incidence ); } else if ( km == KMessageBox::No ) { // all - // load incidence + children + grandchildren... + // load incidence + tqchildren + grandtqchildren... getIncidenceHierarchy( incidence, incidences ); } @@ -971,7 +971,7 @@ void CalendarView::edit_copy() if ( km == KMessageBox::Yes ) { // only one incidences.append( incidence ); } else if ( km == KMessageBox::No ) { // all - // load incidence + children + grandchildren... + // load incidence + tqchildren + grandtqchildren... getIncidenceHierarchy( incidence, incidences ); } @@ -1075,7 +1075,7 @@ void CalendarView::edit_paste() Incidence::List::Iterator it; for ( it = pastedIncidences.begin(); it != pastedIncidences.end(); ++it ) { - QPairp = viewSubResourceCalendar(); + TQPairp = viewSubResourceCalendar(); // FIXME: use a visitor here if ( ( *it )->type() == "Event" ) { @@ -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. tqreplace invalid values by defaults, + // Adjust the start/end date times (i.e. replace invalid values by defaults, // and let the view adjust the type. dateTimesForNewEvent( startDt, endDt, allDay ); @@ -1283,13 +1283,13 @@ void CalendarView::newJournal() void CalendarView::newJournal( ResourceCalendar *res, const TQString &subRes ) { kdDebug(5850) << "CalendarView::newJournal()" << endl; - newJournal( res, subRes, TQString::null, TQDate() ); + newJournal( res, subRes, TQString(), TQDate() ); } void CalendarView::newJournal( ResourceCalendar *res, const TQString &subRes, const TQDate &date) { - newJournal( res, subRes, TQString::null, date ); + newJournal( res, subRes, TQString(), date ); } void CalendarView::newJournal( ResourceCalendar *res, const TQString &subRes, @@ -1314,12 +1314,12 @@ void CalendarView::newSubTodo() if ( todo ) newSubTodo( todo ); } -void CalendarView::newSubTodo(Todo *parentEvent) +void CalendarView::newSubTodo(Todo *tqparentEvent) { KOTodoEditor *todoEditor = mDialogManager->getTodoEditor(); connectIncidenceEditor( todoEditor ); todoEditor->newTodo(); - todoEditor->setDates( TQDateTime(), false, parentEvent ); + todoEditor->setDates( TQDateTime(), false, tqparentEvent ); todoEditor->show(); } @@ -1494,7 +1494,7 @@ void CalendarView::dissociateOccurrence( Incidence *incidence, const TQDate &dat return; } - QPairp = + TQPairp = CalHelper::incSubResourceCalendar( calendar(), incidence ); if ( !mChanger->beginChange( incidence, p.first, p.second ) ) { @@ -1528,7 +1528,7 @@ void CalendarView::dissociateFutureOccurrence( Incidence *incidence, const TQDat return; } - QPairp = + TQPairp = CalHelper::incSubResourceCalendar( calendar(), incidence ); if ( !mChanger->beginChange( incidence, p.first, p.second ) ) { @@ -1976,7 +1976,7 @@ void CalendarView::updateFilter() TQStringList filters; CalFilter *filter; - int pos = mFilters.find( mCurrentFilter ); + int pos = mFilters.tqfind( mCurrentFilter ); if ( pos < 0 ) { mCurrentFilter = 0; } @@ -2216,13 +2216,13 @@ bool CalendarView::editIncidence( Incidence *incidence, const TQDate &date, bool return false; } - // FIXME: This is a nasty hack, since we need to set a parent for the + // FIXME: This is a nasty hack, since we need to set a tqparent for the // resource selection dialog. However, we don't have any UI methods // in the calendar, only in the CalendarResources::DestinationPolicy // So we need to type-cast it and extract it from the CalendarResources - TQWidget *tmpparent = 0; + TQWidget *tmptqparent = 0; if ( stdcal ) { - tmpparent = stdcal->dialogParentWidget(); + tmptqparent = stdcal->dialogParentWidget(); stdcal->setDialogParentWidget( this ); } @@ -2252,7 +2252,7 @@ bool CalendarView::editIncidence( Incidence *incidence, const TQDate &date, bool return true; } - QPairp = + TQPairp = CalHelper::incSubResourceCalendar( calendar(), incidence ); Incidence *savedIncidence = incidence->clone(); @@ -2343,7 +2343,7 @@ void CalendarView::deleteTodoIncidence ( Todo *todo, bool force ) // Delete only the father if( km == KMessageBox::Yes ) { // Instead of making a subto-do independent, why not relate - // it to it's dead father's parent? + // it to it's dead father's tqparent? makeChildrenIndependent ( todo ); mChanger->deleteIncidence( todo, this ); } else if ( km == KMessageBox::No ) { @@ -2377,7 +2377,7 @@ void CalendarView::deleteIncidence(Incidence *incidence, bool force) CanDeleteIncidenceVisitor v; // Let the visitor do special things for special incidence types. - // e.g. todos with children cannot be deleted, so act(..) returns false + // e.g. todos with tqchildren cannot be deleted, so act(..) returns false if ( !v.act( incidence, this ) ) return; //If it is a todo, there are specific delete function @@ -2412,7 +2412,7 @@ void CalendarView::deleteIncidence(Incidence *incidence, bool force) } } - QPairp = + TQPairp = CalHelper::incSubResourceCalendar( calendar(), incidence ); switch(km) { @@ -2428,8 +2428,8 @@ void CalendarView::deleteIncidence(Incidence *incidence, bool force) // Moving the first in a series...don't bother with the nonstandard exclusion list Recurrence *recur = incidence->recurrence(); Event* thisevent = static_cast(incidence); - QDateTime newEnd; - QDateTime newRecurEnd; + TQDateTime newEnd; + TQDateTime newRecurEnd; newRecurEnd = recur->endDateTime(); newEnd.setTime_t( incidence->dtEnd().toTime_t() + ( recur->getNextDateTime( recur->startDateTime() ).toTime_t() - recur->startDateTime().toTime_t() ) ); thisevent->setDtEnd( newEnd ); @@ -2524,14 +2524,14 @@ void CalendarView::purgeCompleted() if ( aTodo && !aTodo->relatedTo() ) rootTodos.append( aTodo ); } - // now that we have a list of all root todos, check them and their children + // now that we have a list of all root todos, check them and their tqchildren for ( it = rootTodos.begin(); it != rootTodos.end(); ++it ) { purgeCompletedSubTodos( *it, allDeleted ); } endMultiModify(); if ( !allDeleted ) { KMessageBox::information( this, i18n("Unable to purge to-dos with " - "uncompleted children."), i18n("Delete To-do"), + "uncompleted tqchildren."), i18n("Delete To-do"), "UncompletedChildrenPurgeTodos" ); } } @@ -2563,7 +2563,7 @@ void CalendarView::updateCategories() allCats.sort(); TQStringList categories( KOPrefs::instance()->mCustomCategories ); for ( TQStringList::ConstIterator si = allCats.constBegin(); si != allCats.constEnd(); ++si ) { - if ( categories.find( *si ) == categories.end() ) { + if ( categories.tqfind( *si ) == categories.end() ) { categories.append( *si ); } } @@ -2609,7 +2609,7 @@ void CalendarView::addIncidenceOn( Incidence *incadd, const TQDate &dt ) todo->setHasDueDate( true ); } - QPairp = viewSubResourceCalendar(); + TQPairp = viewSubResourceCalendar(); if ( !mChanger->addIncidence( incidence, p.first, p.second, this ) ) { KODialogManager::errorSaveIncidence( this, incidence ); @@ -2631,7 +2631,7 @@ void CalendarView::moveIncidenceTo( Incidence *incmove, const TQDate &dt ) } Incidence *oldIncidence = incidence->clone(); - QPairp = viewSubResourceCalendar(); + TQPairp = viewSubResourceCalendar(); if ( !mChanger->beginChange( incidence, p.first, p.second ) ) { delete oldIncidence; @@ -2774,7 +2774,7 @@ Incidence* CalendarView::singleOccurrenceOrAll( Incidence *inc, } if ( dissociationOccurred && commitToCalendar ) { - QPairp = viewSubResourceCalendar(); + TQPairp = viewSubResourceCalendar(); mChanger->addIncidence( incToReturn, p.first, p.second, this ); mChanger->changeIncidence( incSaved, inc, whatChanged, this ); } @@ -2794,16 +2794,16 @@ void CalendarView::selectWeek( const TQDate &date ) } void CalendarView::getIncidenceHierarchy( Incidence *inc, - Incidence::List &children ) + Incidence::List &tqchildren ) { // protecion against looping hierarchies - if ( inc && !children.tqcontains( inc ) ) { + if ( inc && !tqchildren.tqcontains( inc ) ) { Incidence::List::ConstIterator it; Incidence::List immediateChildren = inc->relations(); for ( it = immediateChildren.constBegin(); it != immediateChildren.constEnd(); ++it ) { - getIncidenceHierarchy( *it, children ); + getIncidenceHierarchy( *it, tqchildren ); } - children.append( inc ); + tqchildren.append( inc ); } } diff --git a/korganizer/calendarview.h b/korganizer/calendarview.h index 6cdc3154a..cd04ee98a 100644 --- a/korganizer/calendarview.h +++ b/korganizer/calendarview.h @@ -19,8 +19,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef CALENDARVIEW_H #define CALENDARVIEW_H @@ -56,16 +56,16 @@ class HTMLExportSettings; using namespace KOrg; using namespace KCal; -class CalendarViewExtension : public QWidget +class CalendarViewExtension : public TQWidget { public: - CalendarViewExtension( TQWidget *parent, const char *name = 0 ) - : TQWidget( parent, name ) {} + CalendarViewExtension( TQWidget *tqparent, const char *name = 0 ) + : TQWidget( tqparent, name ) {} class Factory { public: - virtual CalendarViewExtension *create( TQWidget *parent ) = 0; + virtual CalendarViewExtension *create( TQWidget *tqparent ) = 0; }; }; @@ -81,14 +81,15 @@ class CalendarViewExtension : public QWidget class KDE_EXPORT CalendarView : public KOrg::CalendarViewBase, public Calendar::Observer { Q_OBJECT + TQ_OBJECT public: /** Constructs a new calendar view widget. - @param parent parent window - @param name Qt internal widget object name + @param tqparent tqparent window + @param name TQt internal widget object name */ - CalendarView( TQWidget *parent = 0, const char *name = 0 ); + CalendarView( TQWidget *tqparent = 0, const char *name = 0 ); virtual ~CalendarView(); class CalendarViewVisitor : public IncidenceBase::Visitor @@ -115,7 +116,7 @@ class KDE_EXPORT CalendarView : public KOrg::CalendarViewBase, public Calendar:: void setCalendar( Calendar * ); Calendar *calendar(); - QPair viewSubResourceCalendar(); + TQPair viewSubResourceCalendar(); KOrg::History *history() const { return mHistory; } @@ -288,7 +289,7 @@ class KDE_EXPORT CalendarView : public KOrg::CalendarViewBase, public Calendar:: */ void newEvent( ResourceCalendar *res, const TQString &subRes, const TQString &summary, - const TQString &description = TQString::null, + const TQString &description = TQString(), const TQStringList &attachment = TQStringList(), const TQStringList &attendees = TQStringList(), const TQStringList &attachmentMimetypes = TQStringList(), @@ -345,14 +346,14 @@ class KDE_EXPORT CalendarView : public KOrg::CalendarViewBase, public Calendar:: /** create new todo, due on date */ void newTodo( ResourceCalendar *res, const TQString &subRes, const TQDate &date ); - /** create new todo with a parent todo */ + /** create new todo with a tqparent todo */ void newSubTodo(); - /** create new todo with a parent todo */ + /** create new todo with a tqparent todo */ void newSubTodo( Todo * ); void newTodo( ResourceCalendar *res, const TQString &subRes, const TQString &summary, - const TQString &description = TQString::null, + const TQString &description = TQString(), const TQStringList &attachments = TQStringList(), const TQStringList &attendees = TQStringList(), const TQStringList &attachmentMimetypes = TQStringList(), @@ -371,7 +372,7 @@ class KDE_EXPORT CalendarView : public KOrg::CalendarViewBase, public Calendar:: /** - Check if clipboard tqcontains vCalendar event. The signal pasteEnabled() is + Check if clipboard contains vCalendar event. The signal pasteEnabled() is emitted as result. */ void checkClipboard(); @@ -453,10 +454,10 @@ class KDE_EXPORT CalendarView : public KOrg::CalendarViewBase, public Calendar:: */ void appointment_delete(); - /* frees the selected to-do's children from it's relation, update the view */ + /* frees the selected to-do's tqchildren from it's relation, update the view */ void todo_unsub(); - /* frees an incidence's children from it's relation, without update the view + /* frees an incidence's tqchildren from it's relation, without update the view Works with any incidence type, although currently we only pass to-dos */ bool incidence_unsub( Incidence *inc ); @@ -464,7 +465,7 @@ class KDE_EXPORT CalendarView : public KOrg::CalendarViewBase, public Calendar:: /** Make all sub-to-dos of the selected todo independent, update the view */ bool makeSubTodosIndependent ( ); - /** Make all children of incidence independent, not update the view + /** Make all tqchildren of incidence independent, not update the view Works with any incidence type, although currently we only pass to-dos */ bool makeChildrenIndependent( Incidence *inc ); @@ -657,7 +658,7 @@ class KDE_EXPORT CalendarView : public KOrg::CalendarViewBase, public Calendar:: // uncompleted subitems), notAllPurged is set to true. bool purgeCompletedSubTodos( Todo* todo, bool ¬AllPurged ); - /** Returns all incidences having inc has their parent (or grand parent, etc.) + /** Returns all incidences having inc has their tqparent (or grand tqparent, etc.) inc is included in the list too. */ void getIncidenceHierarchy( Incidence *inc, Incidence::List &incidences ); diff --git a/korganizer/customlistviewitem.h b/korganizer/customlistviewitem.h index c25d780d3..485301552 100644 --- a/korganizer/customlistviewitem.h +++ b/korganizer/customlistviewitem.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef CUSTOMLISTVIEWITEM_H #define CUSTOMLISTVIEWITEM_H @@ -32,10 +32,10 @@ template class CustomListViewItem : public KListViewItem { public: - CustomListViewItem( T data, KListView *parent ) : - KListViewItem( parent ), mData( data ) { updateItem(); }; - CustomListViewItem( T data, KListView *parent, KListViewItem* after ) : - KListViewItem( parent, after ), mData( data ) { updateItem(); }; + CustomListViewItem( T data, KListView *tqparent ) : + KListViewItem( tqparent ), mData( data ) { updateItem(); }; + CustomListViewItem( T data, KListView *tqparent, KListViewItem* after ) : + KListViewItem( tqparent, after ), mData( data ) { updateItem(); }; ~CustomListViewItem() {}; void updateItem() {}; @@ -44,7 +44,7 @@ class CustomListViewItem : public KListViewItem TQString key(int column, bool) const { - TQMap::ConstIterator it = mKeyMap.find(column); + TQMap::ConstIterator it = mKeyMap.tqfind(column); if (it == mKeyMap.end()) return text(column); else return *it; } diff --git a/korganizer/datechecker.cpp b/korganizer/datechecker.cpp index 0fdcb302e..0862a8604 100644 --- a/korganizer/datechecker.cpp +++ b/korganizer/datechecker.cpp @@ -19,8 +19,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include @@ -31,8 +31,8 @@ #include "datechecker.h" -DateChecker::DateChecker( TQObject *parent, const char *name ) - : TQObject( parent, name ), mUpdateTimer( 0 ) +DateChecker::DateChecker( TQObject *tqparent, const char *name ) + : TQObject( tqparent, name ), mUpdateTimer( 0 ) { enableRollover( FollowMonth ); } @@ -87,7 +87,7 @@ void DateChecker::possiblyPastMidnight() if ( mUpdateTimer ) { TQTime now = TQTime::currentTime(); TQTime midnight = TQTime( 23, 59, 59 ); - int msecsWait = QMIN( 480000, now.msecsTo( midnight ) + 2000 ); + int msecsWait = TQMIN( 480000, now.msecsTo( midnight ) + 2000 ); mUpdateTimer->stop(); mUpdateTimer->start( msecsWait, true ); diff --git a/korganizer/datechecker.h b/korganizer/datechecker.h index 28ae29548..dc70d01c2 100644 --- a/korganizer/datechecker.h +++ b/korganizer/datechecker.h @@ -19,8 +19,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef DATECHECKER_H #define DATECHECKER_H @@ -34,11 +34,12 @@ class KCalendarSystem; class NavigatorBar; -class DateChecker: public QObject +class DateChecker: public TQObject { Q_OBJECT + TQ_OBJECT public: - DateChecker( TQObject *parent = 0, const char *name = 0 ); + DateChecker( TQObject *tqparent = 0, const char *name = 0 ); ~DateChecker(); /** @@ -66,7 +67,7 @@ class DateChecker: public QObject wrt. the today box and the month box. Only important if you leave KOrganizer idle for long periods of time. - Until we have a reliable way of setting QTimers to go + Until we have a reliable way of setting TQTimers to go off at a particular wall-clock time, we need this, which calls passedMidnight() at the right moments. */ diff --git a/korganizer/datenavigator.cpp b/korganizer/datenavigator.cpp index e03e3c897..4baaf9b86 100644 --- a/korganizer/datenavigator.cpp +++ b/korganizer/datenavigator.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include "datenavigator.h" @@ -34,8 +34,8 @@ using namespace KCal; -DateNavigator::DateNavigator( TQObject *parent, const char *name ) - : TQObject( parent, name ) +DateNavigator::DateNavigator( TQObject *tqparent, const char *name ) + : TQObject( tqparent, name ) { mSelectedDates.append( TQDate::tqcurrentDate() ); } diff --git a/korganizer/datenavigator.h b/korganizer/datenavigator.h index ddb6cf2c8..d2a28bb60 100644 --- a/korganizer/datenavigator.h +++ b/korganizer/datenavigator.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef DATENAVIGATOR_H #define DATENAVIGATOR_H @@ -33,11 +33,12 @@ date are sent to the DateNavigator. The DateNavigator processes the new selection of dates and emits the required signals for the views. */ -class DateNavigator : public QObject +class DateNavigator : public TQObject { Q_OBJECT + TQ_OBJECT public: - DateNavigator( TQObject *parent = 0, const char *name = 0 ); + DateNavigator( TQObject *tqparent = 0, const char *name = 0 ); ~DateNavigator(); KCal::DateList selectedDates(); diff --git a/korganizer/datenavigatorcontainer.cpp b/korganizer/datenavigatorcontainer.cpp index e1e3223ab..462920c5f 100644 --- a/korganizer/datenavigatorcontainer.cpp +++ b/korganizer/datenavigatorcontainer.cpp @@ -19,8 +19,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include @@ -39,9 +39,9 @@ #include #include -DateNavigatorContainer::DateNavigatorContainer( TQWidget *parent, +DateNavigatorContainer::DateNavigatorContainer( TQWidget *tqparent, const char *name ) - : TQFrame( parent, name ), mCalendar( 0 ), + : TQFrame( tqparent, name ), mCalendar( 0 ), mHorizontalCount( 1 ), mVerticalCount( 1 ) { mExtraViews.setAutoDelete( true ); @@ -300,7 +300,7 @@ TQSize DateNavigatorContainer::tqsizeHint() const void DateNavigatorContainer::goNextMonth() { - const QPair p = dateLimits( 1 ); + const TQPair p = dateLimits( 1 ); emit nextMonthClicked( mNavigatorView->month(), p.first, @@ -309,14 +309,14 @@ void DateNavigatorContainer::goNextMonth() void DateNavigatorContainer::goPrevMonth() { - const QPair p = dateLimits( -1 ); + const TQPair p = dateLimits( -1 ); emit prevMonthClicked( mNavigatorView->month(), p.first, p.second ); } -QPair DateNavigatorContainer::dateLimits( int offset ) +TQPair DateNavigatorContainer::dateLimits( int offset ) { const KCalendarSystem *calSys = KOGlobals::self()->calendarSystem(); TQDate firstMonth, lastMonth; @@ -329,8 +329,8 @@ QPair DateNavigatorContainer::dateLimits( int offset ) firstMonth = calSys->addMonths( mNavigatorView->month(), offset ); lastMonth = calSys->addMonths( lastMonth, offset ); - QPair firstMonthBoundary = KODayMatrix::matrixLimits( firstMonth ); - QPair lastMonthBoundary = KODayMatrix::matrixLimits( lastMonth ); + TQPair firstMonthBoundary = KODayMatrix::matrixLimits( firstMonth ); + TQPair lastMonthBoundary = KODayMatrix::matrixLimits( lastMonth ); return qMakePair( firstMonthBoundary.first, lastMonthBoundary.second ); } diff --git a/korganizer/datenavigatorcontainer.h b/korganizer/datenavigatorcontainer.h index b797427cf..f61a1d363 100644 --- a/korganizer/datenavigatorcontainer.h +++ b/korganizer/datenavigatorcontainer.h @@ -19,8 +19,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef DATENAVIGATORCONTAINER_H #define DATENAVIGATORCONTAINER_H @@ -29,11 +29,12 @@ class KDateNavigator; -class DateNavigatorContainer: public QFrame +class DateNavigatorContainer: public TQFrame { Q_OBJECT + TQ_OBJECT public: - DateNavigatorContainer( TQWidget *parent = 0, const char *name = 0 ); + DateNavigatorContainer( TQWidget *tqparent = 0, const char *name = 0 ); ~DateNavigatorContainer(); /** @@ -110,7 +111,7 @@ class DateNavigatorContainer: public QFrame and want to know the boundaries of, for e.g. displaying February and March, use monthOffset = 1. */ - QPair dateLimits( int monthOffset = 0 ); + TQPair dateLimits( int monthOffset = 0 ); KDateNavigator *mNavigatorView; diff --git a/korganizer/docprefs.cpp b/korganizer/docprefs.cpp index 498886be4..8981255f2 100644 --- a/korganizer/docprefs.cpp +++ b/korganizer/docprefs.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include diff --git a/korganizer/docprefs.h b/korganizer/docprefs.h index 70d1cac9d..7e6597e44 100644 --- a/korganizer/docprefs.h +++ b/korganizer/docprefs.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef DOCPREFS_H #define DOCPREFS_H diff --git a/korganizer/eventarchiver.cpp b/korganizer/eventarchiver.cpp index 1cd613e67..300b975e2 100644 --- a/korganizer/eventarchiver.cpp +++ b/korganizer/eventarchiver.cpp @@ -19,8 +19,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include "eventarchiver.h" @@ -36,8 +36,8 @@ #include #include "koprefs.h" -EventArchiver::EventArchiver( TQObject* parent, const char* name ) - : TQObject( parent, name ) +EventArchiver::EventArchiver( TQObject* tqparent, const char* name ) + : TQObject( tqparent, name ) { } @@ -246,7 +246,7 @@ bool EventArchiver::isSubTreeComplete( const Todo *todo, const TQDate &limitDate return false; } - // This QList is only to prevent infinit recursion + // This TQList is only to prevent infinit recursion if ( checkedUids.tqcontains( todo->uid() ) ) { // Probably will never happen, calendar.cpp checks for this kdWarning() << "To-do hierarchy loop detected!"; diff --git a/korganizer/eventarchiver.h b/korganizer/eventarchiver.h index 01897b7ec..8da86debf 100644 --- a/korganizer/eventarchiver.h +++ b/korganizer/eventarchiver.h @@ -19,8 +19,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef EVENTARCHIVER_H #define EVENTARCHIVER_H @@ -44,19 +44,20 @@ using namespace KCal; * Be sure to set mArchiveAction and mArchiveFile before a manual archiving * mAutoArchive is used for auto archiving. */ -class EventArchiver : public QObject +class EventArchiver : public TQObject { Q_OBJECT + TQ_OBJECT public: - EventArchiver( TQObject* parent = 0, const char* name = 0 ); + EventArchiver( TQObject* tqparent = 0, const char* name = 0 ); virtual ~EventArchiver(); /** * Delete or archive events once * @param calendar the calendar to archive * @param limitDate all events *before* the limitDate (not included) will be deleted/archived. - * @param widget parent widget for message boxes + * @param widget tqparent widget for message boxes * Confirmation and "no events to process" dialogs will be shown */ void runOnce( Calendar* calendar, const TQDate& limitDate, TQWidget* widget ); @@ -64,7 +65,7 @@ class EventArchiver : public QObject /** * Delete or archive events. This is called regularly, when auto-archiving is enabled * @param calendar the calendar to archive - * @param widget parent widget for message boxes + * @param widget tqparent widget for message boxes * @param withGUI whether this is called from the dialog, so message boxes should be shown. * Note that error dialogs like "cannot save" are shown even if from this method, so widget * should be set in all cases. diff --git a/korganizer/exportwebdialog.cpp b/korganizer/exportwebdialog.cpp index 869c5b963..0e514abde 100644 --- a/korganizer/exportwebdialog.cpp +++ b/korganizer/exportwebdialog.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include @@ -68,9 +68,9 @@ // because we want custom buttons, a Tabbed dialog, and a different // headline... Maybe we should try to achieve the same without code // duplication. -ExportWebDialog::ExportWebDialog( HTMLExportSettings *settings, TQWidget *parent, +ExportWebDialog::ExportWebDialog( HTMLExportSettings *settings, TQWidget *tqparent, const char *name) - : KDialogBase( Tabbed,i18n("Export Calendar as Web Page"),Help|Default|User1|Cancel, User1, parent, name, false, false, i18n("Export") ), + : KDialogBase( Tabbed,i18n("Export Calendar as Web Page"),Help|Default|User1|Cancel, User1, tqparent, name, false, false, i18n("Export") ), KPrefsWidManager( settings ), mSettings( settings ) { setupGeneralPage(); diff --git a/korganizer/exportwebdialog.h b/korganizer/exportwebdialog.h index 27a0a9860..53b8f09cc 100644 --- a/korganizer/exportwebdialog.h +++ b/korganizer/exportwebdialog.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef _EXPORTWEBDIALOG_H #define _EXPORTWEBDIALOG_H @@ -38,8 +38,9 @@ using namespace KCal; class ExportWebDialog : public KDialogBase, public KPrefsWidManager { Q_OBJECT + TQ_OBJECT public: - ExportWebDialog( HTMLExportSettings *settings, TQWidget *parent = 0, + ExportWebDialog( HTMLExportSettings *settings, TQWidget *tqparent = 0, const char *name = 0 ); virtual ~ExportWebDialog(); diff --git a/korganizer/filteredit_base.ui b/korganizer/filteredit_base.ui index 86f956793..59e2b5bb2 100644 --- a/korganizer/filteredit_base.ui +++ b/korganizer/filteredit_base.ui @@ -1,6 +1,6 @@ FilterEdit_base - + FilterEdit_base @@ -16,12 +16,12 @@ unnamed - + mRulesList - + mNewButton @@ -29,7 +29,7 @@ &New - + mDeleteButton @@ -37,7 +37,7 @@ &Delete - + mDetailsFrame @@ -48,7 +48,7 @@ unnamed - + tqlayout3 @@ -56,7 +56,7 @@ unnamed - + textLabel1 @@ -64,14 +64,14 @@ Name: - + mNameLineEdit - + mRecurringCheck @@ -82,7 +82,7 @@ Select this option if you do not want to show recurring events and to-dos in your views. Daily and weekly recurring items may take a lot of space, so it might be handy to hide them. - + mCompletedCheck @@ -93,7 +93,7 @@ If this box is checked, the filter will hide all to-do items from the list, that have been completed. Optionally, only items that have been completed a given number of days are hidden. - + tqlayout1 @@ -118,7 +118,7 @@ - + mCompletedTimeSpanLabel @@ -174,7 +174,7 @@ - + mHideInactiveTodosCheck @@ -185,7 +185,7 @@ This option hides all to-dos from your list, where the start date has not been reached. (Note that the start date is not the due date of the to-do item.) - + mCategoriesButtonGroup @@ -202,7 +202,7 @@ 6 - + mCatList @@ -227,7 +227,7 @@ - + mCatHideCheck @@ -244,7 +244,7 @@ When this option is enabled, this filter will show all items which do <i>not</i> contain the selected categories. - + mCatShowCheck @@ -261,7 +261,7 @@ When this option is enabled, this filter will show all items containing at least the selected items. - + mCatEditButton @@ -274,7 +274,7 @@ - + mHideTodosNotAssignedToMeCheck @@ -309,9 +309,9 @@ Only to-dos which have least one attendee will be checked. If you are not in th setEnabled(bool) - + updateFilter() - + knuminput.h diff --git a/korganizer/filtereditdialog.cpp b/korganizer/filtereditdialog.cpp index 32138bffb..cf6bf2ffe 100644 --- a/korganizer/filtereditdialog.cpp +++ b/korganizer/filtereditdialog.cpp @@ -20,8 +20,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include @@ -47,8 +47,8 @@ #include "filtereditdialog.moc" FilterEditDialog::FilterEditDialog( TQPtrList *filters, - TQWidget *parent, const char *name) - : KDialogBase( parent, name, false, i18n("Edit Calendar Filters"), + TQWidget *tqparent, const char *name) + : KDialogBase( tqparent, name, false, i18n("Edit Calendar Filters"), Ok | Apply | Cancel ) { setMainWidget( mFilterEdit = new FilterEdit(filters, this)); @@ -92,8 +92,8 @@ void FilterEditDialog::setDialogConsistent(bool consistent) { enableButtonApply( consistent ); } -FilterEdit::FilterEdit(TQPtrList *filters, TQWidget *parent) - : FilterEdit_base( parent), current(0), mCategorySelectDialog( 0 ) +FilterEdit::FilterEdit(TQPtrList *filters, TQWidget *tqparent) + : FilterEdit_base( tqparent), current(0), mCategorySelectDialog( 0 ) { mFilters = filters; TQWhatsThis::add( mNewButton, i18n( "Press this button to define a new filter." ) ); @@ -207,7 +207,7 @@ void FilterEdit::bDeletePressed() { mFilters->remove( selected ); current = 0L; updateFilterList(); - mRulesList->setSelected(QMIN(mRulesList->count()-1, selected), true); + mRulesList->setSelected(TQMIN(mRulesList->count()-1, selected), true); emit filterChanged(); } diff --git a/korganizer/filtereditdialog.h b/korganizer/filtereditdialog.h index 8527fd0b9..76d3c724d 100644 --- a/korganizer/filtereditdialog.h +++ b/korganizer/filtereditdialog.h @@ -19,8 +19,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef _FILTEREDITDIALOG_H #define _FILTEREDITDIALOG_H @@ -45,8 +45,9 @@ using namespace KCal; class FilterEditDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - FilterEditDialog(TQPtrList *,TQWidget *parent=0, const char *name=0); + FilterEditDialog(TQPtrList *,TQWidget *tqparent=0, const char *name=0); virtual ~FilterEditDialog(); signals: @@ -69,8 +70,9 @@ class FilterEditDialog : public KDialogBase class FilterEdit : public FilterEdit_base { Q_OBJECT + TQ_OBJECT public: - FilterEdit(TQPtrList *filters, TQWidget *parent); + FilterEdit(TQPtrList *filters, TQWidget *tqparent); ~FilterEdit(); void updateFilterList(); diff --git a/korganizer/freebusymanager.cpp b/korganizer/freebusymanager.cpp index 187e1082e..546952177 100644 --- a/korganizer/freebusymanager.cpp +++ b/korganizer/freebusymanager.cpp @@ -1,7 +1,7 @@ /* This file is part of the Groupware/KOrganizer integration. - Requires the Qt and KDE widget libraries, available at no cost at + Requires the TQt and KDE widget libraries, available at no cost at http://www.trolltech.com and http://www.kde.org respectively Copyright (c) 2002-2004 Klar�vdalens Datakonsult AB @@ -25,11 +25,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -123,8 +123,8 @@ void FreeBusyDownloadJob::slotResult( KIO::Job *job ) //// -FreeBusyManager::FreeBusyManager( TQObject *parent, const char *name ) - : TQObject( parent, name ), +FreeBusyManager::FreeBusyManager( TQObject *tqparent, const char *name ) + : TQObject( tqparent, name ), mCalendar( 0 ), mTimerID( 0 ), mUploadingFreeBusy( false ), mBrokenUrl( false ) { @@ -252,7 +252,7 @@ void FreeBusyManager::publishFreeBusy() // // Substitute %u and %d [FIXME] // TQString defaultEmail = KOCore()::self()->email(); -// int emailpos = defaultEmail.find( '@' ); +// int emailpos = defaultEmail.tqfind( '@' ); // if (emailpos != -1) { // const TQString emailName = defaultEmail.left( emailpos ); // const TQString emailHost = defaultEmail.mid( emailpos + 1 ); @@ -292,7 +292,7 @@ void FreeBusyManager::publishFreeBusy() #if 0 TQString defaultEmail = KOCore()::self()->email(); - TQString emailHost = defaultEmail.mid( defaultEmail.find( '@' ) + 1 ); + TQString emailHost = defaultEmail.mid( defaultEmail.tqfind( '@' ) + 1 ); // Put target string together KURL targetURL; @@ -309,7 +309,7 @@ void FreeBusyManager::publishFreeBusy() targetURL.setHost( server ); TQString fbname = KOPrefs::instance()->mPublishUserName; - int at = fbname.find('@'); + int at = fbname.tqfind('@'); if( at > 1 && fbname.length() > (uint)at ) { fbname = fbname.left(at); } @@ -438,10 +438,10 @@ void FreeBusyManager::cancelRetrieval() mRetrieveQueue.clear(); } -KURL tqreplaceVariablesURL( const KURL &url, const TQString &email ) +KURL replaceVariablesURL( const KURL &url, const TQString &email ) { TQString emailName, emailHost; - int emailpos = email.find( '@' ); + int emailpos = email.tqfind( '@' ); if( emailpos >= 0 ) { emailName = email.left( emailpos ); emailHost = email.mid( emailpos + 1 ); @@ -492,11 +492,11 @@ KURL FreeBusyManager::freeBusyUrl( const TQString &email ) cachedURL.setUser( KOPrefs::instance()->mFreeBusyRetrieveUser ); cachedURL.setPass( KOPrefs::instance()->mFreeBusyRetrievePassword ); } - return tqreplaceVariablesURL( cachedURL, email ); + return replaceVariablesURL( cachedURL, email ); } // Try with the url configurated by preferred email in kaddressbook - KABC::Addressee::List list= KABC::StdAddressBook::self( true )->tqfindByEmail( email ); + KABC::Addressee::List list= KABC::StdAddressBook::self( true )->findByEmail( 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 tqreplaceVariablesURL( KURL( url ), email ); + return replaceVariablesURL( KURL( url ), email ); } } } @@ -522,7 +522,7 @@ KURL FreeBusyManager::freeBusyUrl( const TQString &email ) // Sanity check: Don't download if it's not a correct email // address (this also avoids downloading for "(empty email)"). - int emailpos = email.find( '@' ); + int emailpos = email.tqfind( '@' ); if( emailpos == -1 ) { return KURL(); } @@ -549,8 +549,8 @@ KURL FreeBusyManager::freeBusyUrl( const TQString &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 ); + // do variable string replacements to the URL (MS Outlook style) + KURL fullpathURL = replaceVariablesURL( 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/ @@ -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 = tqreplaceVariablesURL( sourceURL, email ); + KURL dirURL = replaceVariablesURL( sourceURL, email ); if ( KOPrefs::instance()->mFreeBusyFullDomainRetrieval ) { dirURL.addPath( email + '.' + (*ext) ); } else { diff --git a/korganizer/freebusymanager.h b/korganizer/freebusymanager.h index 4be671e4e..8babe454d 100644 --- a/korganizer/freebusymanager.h +++ b/korganizer/freebusymanager.h @@ -1,7 +1,7 @@ /* This file is part of the Groupware/KOrganizer integration. - Requires the Qt and KDE widget libraries, available at no cost at + Requires the TQt and KDE widget libraries, available at no cost at http://www.trolltech.com and http://www.kde.org respectively Copyright (c) 2002-2004 Klarälvdalens Datakonsult AB @@ -24,11 +24,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -52,9 +52,10 @@ class FreeBusyManager; /** * Class for downloading FreeBusy Lists */ -class FreeBusyDownloadJob : public QObject +class FreeBusyDownloadJob : public TQObject { Q_OBJECT + TQ_OBJECT public: FreeBusyDownloadJob( const TQString &email, const KURL &url, FreeBusyManager *manager, const char *name = 0 ); @@ -79,8 +80,9 @@ class FreeBusyDownloadJob : public QObject class FreeBusyManager : public TQObject, public KCal::FreeBusyCache { Q_OBJECT + TQ_OBJECT public: - FreeBusyManager( TQObject *parent, const char *name ); + FreeBusyManager( TQObject *tqparent, const char *name ); void setCalendar( KCal::Calendar * ); diff --git a/korganizer/freebusyurldialog.cpp b/korganizer/freebusyurldialog.cpp index 61165545d..b98335812 100644 --- a/korganizer/freebusyurldialog.cpp +++ b/korganizer/freebusyurldialog.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include "freebusyurldialog.h" @@ -35,9 +35,9 @@ #include #include -FreeBusyUrlDialog::FreeBusyUrlDialog( KCal::Attendee *attendee, TQWidget *parent, +FreeBusyUrlDialog::FreeBusyUrlDialog( KCal::Attendee *attendee, TQWidget *tqparent, const char *name ) - : KDialogBase( Plain, i18n("Edit Free/Busy Location"), Ok|Cancel, Ok, parent, + : KDialogBase( Plain, i18n("Edit Free/Busy Location"), Ok|Cancel, Ok, tqparent, name, true, false ) { TQFrame *topFrame = plainPage(); @@ -57,9 +57,9 @@ void FreeBusyUrlDialog::slotOk() } -FreeBusyUrlWidget::FreeBusyUrlWidget( KCal::Attendee *attendee, TQWidget *parent, +FreeBusyUrlWidget::FreeBusyUrlWidget( KCal::Attendee *attendee, TQWidget *tqparent, const char *name ) - : TQWidget( parent, name ), mAttendee( attendee ) + : TQWidget( tqparent, name ), mAttendee( attendee ) { TQBoxLayout *topLayout = new TQVBoxLayout( this ); topLayout->setSpacing( KDialog::spacingHint() ); diff --git a/korganizer/freebusyurldialog.h b/korganizer/freebusyurldialog.h index 49c77f3f8..e3a6d5cba 100644 --- a/korganizer/freebusyurldialog.h +++ b/korganizer/freebusyurldialog.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef FREEBUSYURLCONFIG_H #define FREEBUSYURLCONFIG_H @@ -36,8 +36,9 @@ class Attendee; class FreeBusyUrlDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - FreeBusyUrlDialog( KCal::Attendee *, TQWidget *parent = 0, + FreeBusyUrlDialog( KCal::Attendee *, TQWidget *tqparent = 0, const char *name = 0 ); public slots: @@ -47,11 +48,12 @@ class FreeBusyUrlDialog : public KDialogBase FreeBusyUrlWidget *mWidget; }; -class FreeBusyUrlWidget : public QWidget +class FreeBusyUrlWidget : public TQWidget { Q_OBJECT + TQ_OBJECT public: - FreeBusyUrlWidget( KCal::Attendee *, TQWidget *parent = 0, + FreeBusyUrlWidget( KCal::Attendee *, TQWidget *tqparent = 0, const char *name = 0 ); ~FreeBusyUrlWidget(); diff --git a/korganizer/history.cpp b/korganizer/history.cpp index 6207ebec9..c01aed912 100644 --- a/korganizer/history.cpp +++ b/korganizer/history.cpp @@ -19,8 +19,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include "history.h" @@ -57,7 +57,7 @@ void History::undo() entry = mUndoEntry.current(); if ( entry ) emit undoAvailable( entry->text() ); - else emit undoAvailable( TQString::null ); + else emit undoAvailable( TQString() ); } void History::redo() @@ -76,7 +76,7 @@ void History::redo() entry = mRedoEntry.current(); if ( entry ) emit redoAvailable( entry->text() ); - else emit redoAvailable( TQString::null ); + else emit redoAvailable( TQString() ); } void History::truncate() @@ -85,7 +85,7 @@ void History::truncate() mEntries.removeLast(); } mRedoEntry = TQPtrList( mEntries ); - emit redoAvailable( TQString::null ); + emit redoAvailable( TQString() ); } void History::recordDelete( Incidence *incidence ) diff --git a/korganizer/history.h b/korganizer/history.h index 4e71dea14..4b87db8ca 100644 --- a/korganizer/history.h +++ b/korganizer/history.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef KORG_HISTORY_H #define KORG_HISTORY_H @@ -36,9 +36,10 @@ class Incidence; namespace KOrg { -class History : public QObject +class History : public TQObject { Q_OBJECT + TQ_OBJECT public: History( KCal::Calendar * ); diff --git a/korganizer/ical2vcal.in b/korganizer/ical2vcal.in index c83f60104..3bdbdb722 100755 --- a/korganizer/ical2vcal.in +++ b/korganizer/ical2vcal.in @@ -75,7 +75,7 @@ sub process_appointment { undef(%curappt); - # this is a count of the total # of parentheses. + # this is a count of the total # of tqparentheses. while ($pcount) { $line = &getLine; diff --git a/korganizer/importdialog.cpp b/korganizer/importdialog.cpp index 5f4dce6a5..9d5735101 100644 --- a/korganizer/importdialog.cpp +++ b/korganizer/importdialog.cpp @@ -19,8 +19,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include "importdialog.h" @@ -37,8 +37,8 @@ using namespace KCal; -ImportDialog::ImportDialog( const KURL &url, TQWidget *parent, bool isPart ) - : KDialogBase( Plain, i18n("Import Calendar/Event"), Ok | Cancel, Ok, parent, +ImportDialog::ImportDialog( const KURL &url, TQWidget *tqparent, bool isPart ) + : KDialogBase( Plain, i18n("Import Calendar/Event"), Ok | Cancel, Ok, tqparent, 0, true, true ), mUrl( url ) { diff --git a/korganizer/importdialog.h b/korganizer/importdialog.h index 75d5cb1a7..1ee42a159 100644 --- a/korganizer/importdialog.h +++ b/korganizer/importdialog.h @@ -19,8 +19,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef IMPORTDIALOG_H #define IMPORTDIALOG_H @@ -35,8 +35,9 @@ class TQRadioButton; class ImportDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - ImportDialog( const KURL &url, TQWidget *parent, bool isPart ); + ImportDialog( const KURL &url, TQWidget *tqparent, bool isPart ); ~ImportDialog(); public slots: diff --git a/korganizer/incidencechanger.cpp b/korganizer/incidencechanger.cpp index 1ffcc6282..8b922034a 100644 --- a/korganizer/incidencechanger.cpp +++ b/korganizer/incidencechanger.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include "incidencechanger.h" @@ -55,7 +55,7 @@ bool IncidenceChanger::beginChange( Incidence *incidence, bool IncidenceChanger::sendGroupwareMessage( Incidence *incidence, KCal::Scheduler::Method method, KOGlobals::HowChanged action, - TQWidget *parent ) + TQWidget *tqparent ) { if ( KOPrefs::instance()->thatIsMe( incidence->organizer().email() ) && incidence->attendeeCount()>0 && !KOPrefs::instance()->mUseGroupwareCommunication ) { @@ -63,7 +63,7 @@ bool IncidenceChanger::sendGroupwareMessage( Incidence *incidence, return true; } else if( KOPrefs::instance()->mUseGroupwareCommunication ) { return - KOGroupware::instance()->sendICalMessage( parent, method, incidence, action, false ); + KOGroupware::instance()->sendICalMessage( tqparent, method, incidence, action, false ); } return true; } @@ -111,12 +111,12 @@ bool IncidenceChanger::endChange( Incidence *incidence, return calRes->endChange( incidence, res, subRes ); } -bool IncidenceChanger::deleteIncidence( Incidence *incidence, TQWidget *parent ) +bool IncidenceChanger::deleteIncidence( Incidence *incidence, TQWidget *tqparent ) { if ( !incidence ) return true; kdDebug(5850)<<"IncidenceChanger::deleteIncidence for incidence \""<summary()<<"\""<clone(); @@ -132,7 +132,7 @@ kdDebug(5850)<<"IncidenceChanger::deleteIncidence for incidence \""< if ( me->status() == KCal::Attendee::Accepted || me->status() == KCal::Attendee::Delegated ) notifyOrganizer = true; Attendee *newMe = new Attendee( *me ); - newMe->seStatus( KCal::Attendee::Declined ); + newMe->setqStatus( KCal::Attendee::Declined ); tmp->clearAttendees(); tmp->addAttendee( newMe ); break; @@ -152,7 +152,7 @@ kdDebug(5850)<<"IncidenceChanger::deleteIncidence for incidence \""< } bool IncidenceChanger::cutIncidences( const Incidence::List &incidences, - TQWidget *parent ) + TQWidget *tqparent ) { Incidence::List::ConstIterator it; bool doDelete = true; @@ -160,7 +160,7 @@ bool IncidenceChanger::cutIncidences( const Incidence::List &incidences, for ( it = incidences.constBegin(); it != incidences.constEnd(); ++it ) { if ( *it ) { doDelete = sendGroupwareMessage( *it, KCal::Scheduler::Cancel, - KOGlobals::INCIDENCEDELETED, parent ); + KOGlobals::INCIDENCEDELETED, tqparent ); if ( doDelete ) { emit incidenceToBeDeleted( *it ); incsToCut.append( *it ); @@ -180,11 +180,11 @@ bool IncidenceChanger::cutIncidences( const Incidence::List &incidences, } } -bool IncidenceChanger::cutIncidence( Incidence *incidence, TQWidget *parent ) +bool IncidenceChanger::cutIncidence( Incidence *incidence, TQWidget *tqparent ) { Incidence::List incidences; incidences.append( incidence ); - return cutIncidences( incidences, parent ); + return cutIncidences( incidences, tqparent ); } class IncidenceChanger::ComparisonVisitor : public IncidenceBase::Visitor @@ -327,14 +327,14 @@ bool IncidenceChanger::myAttendeeStatusChanged( Incidence *oldInc, Incidence *ne bool IncidenceChanger::changeIncidence( Incidence *oldinc, Incidence *newinc, KOGlobals::WhatChanged action, - TQWidget *parent ) + TQWidget *tqparent ) { - return changeIncidence( oldinc, newinc, action, parent, 0 ); + return changeIncidence( oldinc, newinc, action, tqparent, 0 ); } bool IncidenceChanger::changeIncidence( Incidence *oldinc, Incidence *newinc, KOGlobals::WhatChanged action, - TQWidget *parent, + TQWidget *tqparent, int dontAskForGroupware ) { kdDebug(5850)<<"IncidenceChanger::changeIncidence for incidence \""<summary()<<"\" ( old one was \""<summary()<<"\")"<sum bool success = true; if ( KOPrefs::instance()->mUseGroupwareCommunication ) { success = KOGroupware::instance()->sendICalMessage( - parent, + tqparent, KCal::Scheduler::Request, newinc, KOGlobals::INCIDENCEEDITED, attendeeStatusChanged, dontAskForGroupware ); } @@ -372,19 +372,19 @@ kdDebug(5850)<<"IncidenceChanger::changeIncidence for incidence \""<sum bool IncidenceChanger::addIncidence( Incidence *incidence, ResourceCalendar *res, const TQString &subRes, - TQWidget *parent ) + TQWidget *tqparent ) { - return addIncidence( incidence, res, subRes, parent, 0 ); + return addIncidence( incidence, res, subRes, tqparent, 0 ); } bool IncidenceChanger::addIncidence( Incidence *incidence, ResourceCalendar *res, const TQString &subRes, - TQWidget *parent, int dontAskForGroupware ) + TQWidget *tqparent, int dontAskForGroupware ) { CalendarResources *stdcal = dynamic_cast( mCalendar ); if( stdcal && !stdcal->hasCalendarResources() ) { KMessageBox::sorry( - parent, + tqparent, i18n( "No calendars found, unable to save %1 \"%2\"." ). arg( i18n( incidence->type() ) ). arg( incidence->summary() ) ); @@ -392,14 +392,14 @@ bool IncidenceChanger::addIncidence( Incidence *incidence, return false; } - // FIXME: This is a nasty hack, since we need to set a parent for the + // FIXME: This is a nasty hack, since we need to set a tqparent for the // resource selection dialog. However, we don't have any UI methods // in the calendar, only in the CalendarResources::DestinationPolicy // So we need to type-cast it and extract it from the CalendarResources - TQWidget *tmpparent = 0; + TQWidget *tmptqparent = 0; if ( stdcal ) { - tmpparent = stdcal->dialogParentWidget(); - stdcal->setDialogParentWidget( parent ); + tmptqparent = stdcal->dialogParentWidget(); + stdcal->setDialogParentWidget( tqparent ); } // If a ResourceCalendar isn't provided, then try to compute one @@ -445,7 +445,7 @@ bool IncidenceChanger::addIncidence( Incidence *incidence, arg( incidence->summary() ). arg( pResName ); } - KMessageBox::sorry( parent, errMessage ); + KMessageBox::sorry( tqparent, errMessage ); } kdDebug(5850) << "IncidenceChanger: Can't add incidence" << endl; return false; @@ -453,11 +453,11 @@ bool IncidenceChanger::addIncidence( Incidence *incidence, if ( KOPrefs::instance()->mUseGroupwareCommunication ) { if ( !KOGroupware::instance()->sendICalMessage( - parent, + tqparent, KCal::Scheduler::Request, incidence, KOGlobals::INCIDENCEADDED, false, dontAskForGroupware ) ) { KMessageBox::sorry( - parent, + tqparent, i18n( "Attempt to send the scheduling message failed. " "Please check your Group Scheduling settings. " "Contact your system administrator for more help.") ); diff --git a/korganizer/incidencechanger.h b/korganizer/incidencechanger.h index 5e5595099..09a2bda61 100644 --- a/korganizer/incidencechanger.h +++ b/korganizer/incidencechanger.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef INCIDENCECHANGER_H #define INCIDENCECHANGER_H @@ -33,9 +33,10 @@ namespace KCal { class IncidenceChanger : public KOrg::IncidenceChangerBase { Q_OBJECT + TQ_OBJECT public: - IncidenceChanger( Calendar *cal, TQObject *parent ) - : IncidenceChangerBase( cal, parent ) {} + IncidenceChanger( Calendar *cal, TQObject *tqparent ) + : IncidenceChangerBase( cal, tqparent ) {} ~IncidenceChanger() {} bool beginChange( Incidence *incidence, @@ -44,27 +45,27 @@ class IncidenceChanger : public KOrg::IncidenceChangerBase bool sendGroupwareMessage( Incidence *incidence, KCal::Scheduler::Method method, KOGlobals::HowChanged action, - TQWidget *parent ); + TQWidget *tqparent ); bool endChange( Incidence *incidence, ResourceCalendar *res, const TQString &subRes ); bool addIncidence( Incidence *incidence, ResourceCalendar *res, const TQString &subRes, - TQWidget *parent ); + TQWidget *tqparent ); bool addIncidence( Incidence *incidence, ResourceCalendar *res, const TQString &subRes, - TQWidget *parent, int dontAskForGroupware ); + TQWidget *tqparent, int dontAskForGroupware ); bool changeIncidence( Incidence *oldinc, Incidence *newinc, - KOGlobals::WhatChanged, TQWidget *parent ); + KOGlobals::WhatChanged, TQWidget *tqparent ); bool changeIncidence( Incidence *oldinc, Incidence *newinc, - KOGlobals::WhatChanged, TQWidget *parent, int dontAskForGroupware ); + KOGlobals::WhatChanged, TQWidget *tqparent, int dontAskForGroupware ); - bool deleteIncidence( Incidence *incidence, TQWidget *parent ); + bool deleteIncidence( Incidence *incidence, TQWidget *tqparent ); - bool cutIncidences( const Incidence::List &incidences, TQWidget *parent ); - bool cutIncidence( Incidence *incidence, TQWidget *parent ); + bool cutIncidences( const Incidence::List &incidences, TQWidget *tqparent ); + bool cutIncidence( Incidence *incidence, TQWidget *tqparent ); static bool incidencesEqual( Incidence *inc1, Incidence *inc2 ); static bool assignIncidence( Incidence *inc1, Incidence *inc2 ); diff --git a/korganizer/interfaces/calendar/calendardecoration.h b/korganizer/interfaces/calendar/calendardecoration.h index 1653edb48..cd79f233d 100644 --- a/korganizer/interfaces/calendar/calendardecoration.h +++ b/korganizer/interfaces/calendar/calendardecoration.h @@ -51,12 +51,12 @@ class CalendarDecoration : public Plugin /** Return a short text for a given date, ususally only a few words. */ - virtual TQString shortText( const TQDate & ) { return TQString::null; } + virtual TQString shortText( const TQDate & ) { return TQString(); } /** Return along text for a given date. This text can be of any length, but usually it will have one or a few paragraphs. */ - virtual TQString longText( const TQDate & ) { return TQString::null; } + virtual TQString longText( const TQDate & ) { return TQString(); } /** Return a small pixmap. The size should be something like 30x30 pixels. diff --git a/korganizer/interfaces/korganizer/baseview.h b/korganizer/interfaces/korganizer/baseview.h index 920559daf..31a3edbc0 100644 --- a/korganizer/interfaces/korganizer/baseview.h +++ b/korganizer/interfaces/korganizer/baseview.h @@ -56,20 +56,21 @@ namespace KOrg { @author Preston Brown, Cornelius Schumacher @see KOTodoView, KOEventView, KOListView, KOAgendaView, KOMonthView */ -class KDE_EXPORT BaseView : public QWidget +class KDE_EXPORT BaseView : public TQWidget { Q_OBJECT + TQ_OBJECT public: /** Constructs a view. @param cal Pointer to the calendar object from which events will be retrieved for display. - @param parent parent widget. + @param tqparent tqparent widget. @param name name of this widget. */ - BaseView( Calendar *cal, TQWidget *parent = 0, const char *name = 0 ) - : TQWidget( parent, name ), + BaseView( Calendar *cal, TQWidget *tqparent = 0, const char *name = 0 ) + : TQWidget( tqparent, name ), mReadOnly( false ), mCalendar( cal ), mResource( 0 ), mChanger( 0 ) {} /** diff --git a/korganizer/interfaces/korganizer/calendarviewbase.h b/korganizer/interfaces/korganizer/calendarviewbase.h index 02c2459bb..8afefdd84 100644 --- a/korganizer/interfaces/korganizer/calendarviewbase.h +++ b/korganizer/interfaces/korganizer/calendarviewbase.h @@ -34,11 +34,11 @@ namespace KOrg { @short interface for main calendar view widget @author Cornelius Schumacher */ -class CalendarViewBase : public QWidget +class CalendarViewBase : public TQWidget { public: - CalendarViewBase( TQWidget *parent, const char *name ) - : TQWidget( parent, name ) {} + CalendarViewBase( TQWidget *tqparent, const char *name ) + : TQWidget( tqparent, name ) {} virtual ~CalendarViewBase() {} virtual KCal::Calendar *calendar() = 0; diff --git a/korganizer/interfaces/korganizer/corehelper.h b/korganizer/interfaces/korganizer/corehelper.h index 8c69a1adc..36a89f652 100644 --- a/korganizer/interfaces/korganizer/corehelper.h +++ b/korganizer/interfaces/korganizer/corehelper.h @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef KORG_COREHELPER_H #define KORG_COREHELPER_H diff --git a/korganizer/interfaces/korganizer/incidencechangerbase.h b/korganizer/interfaces/korganizer/incidencechangerbase.h index ec0288aac..ba4faf065 100644 --- a/korganizer/interfaces/korganizer/incidencechangerbase.h +++ b/korganizer/interfaces/korganizer/incidencechangerbase.h @@ -36,18 +36,19 @@ using namespace KCal; namespace KOrg { -class IncidenceChangerBase : public QObject +class IncidenceChangerBase : public TQObject { Q_OBJECT + TQ_OBJECT public: - IncidenceChangerBase( Calendar*cal, TQObject *parent = 0 ) : - TQObject( parent ), mCalendar( cal ) {} + IncidenceChangerBase( Calendar*cal, TQObject *tqparent = 0 ) : + TQObject( tqparent ), mCalendar( cal ) {} virtual ~IncidenceChangerBase() {} virtual bool sendGroupwareMessage( Incidence *incidence, KCal::Scheduler::Method method, KOGlobals::HowChanged action, - TQWidget *parent ) = 0; + TQWidget *tqparent ) = 0; virtual bool beginChange( Incidence *incidence, ResourceCalendar *res, const TQString &subRes ) = 0; @@ -56,20 +57,20 @@ public: virtual bool addIncidence( Incidence *incidence, ResourceCalendar *res, const TQString &subRes, - TQWidget *parent ) = 0; + TQWidget *tqparent ) = 0; virtual bool addIncidence( Incidence *incidence, ResourceCalendar *res, const TQString &subRes, - TQWidget *parent, int dontAskForGroupware) = 0; + TQWidget *tqparent, int dontAskForGroupware) = 0; virtual bool changeIncidence( Incidence *oldinc, Incidence *newinc, - KOGlobals::WhatChanged, TQWidget *parent ) = 0; + KOGlobals::WhatChanged, TQWidget *tqparent ) = 0; virtual bool changeIncidence( Incidence *oldinc, Incidence *newinc, - KOGlobals::WhatChanged, TQWidget *parent, int dontAskForGroupware ) = 0; + KOGlobals::WhatChanged, TQWidget *tqparent, int dontAskForGroupware ) = 0; - virtual bool deleteIncidence( Incidence *incidence, TQWidget *parent ) = 0; + virtual bool deleteIncidence( Incidence *incidence, TQWidget *tqparent ) = 0; - virtual bool cutIncidences( const Incidence::List &incidences, TQWidget *parent ) = 0; - virtual bool cutIncidence( Incidence *incidence, TQWidget *parent ) = 0; + virtual bool cutIncidences( const Incidence::List &incidences, TQWidget *tqparent ) = 0; + virtual bool cutIncidence( Incidence *incidence, TQWidget *tqparent ) = 0; signals: void incidenceAdded( Incidence * ); diff --git a/korganizer/interfaces/korganizer/part.h b/korganizer/interfaces/korganizer/part.h index e75e9085d..a7093e28f 100644 --- a/korganizer/interfaces/korganizer/part.h +++ b/korganizer/interfaces/korganizer/part.h @@ -38,8 +38,8 @@ class Part : public KParts::Part typedef TQPtrList List; - Part( MainWindow *parent, const char *name ) - : KParts::Part( parent?(parent->tqtopLevelWidget()):0, name ), mMainWindow( parent ) {} + Part( MainWindow *tqparent, const char *name ) + : KParts::Part( tqparent?(tqparent->tqtopLevelWidget()):0, name ), mMainWindow( tqparent ) {} virtual ~Part() {} @@ -56,7 +56,7 @@ class Part : public KParts::Part class PartFactory : public KLibFactory { public: - virtual Part *create( MainWindow *parent, const char *name = 0 ) = 0; + virtual Part *create( MainWindow *tqparent, const char *name = 0 ) = 0; protected: virtual TQObject *createObject( TQObject *, const char *,const char *, diff --git a/korganizer/journalentry.cpp b/korganizer/journalentry.cpp index 459b25d4c..5af3a320e 100644 --- a/korganizer/journalentry.cpp +++ b/korganizer/journalentry.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ // @@ -60,16 +60,16 @@ class JournalTitleLable : public KActiveLabel { public: - JournalTitleLable( TQWidget *parent, const char *name=0 ) : KActiveLabel( parent, name ) {} + JournalTitleLable( TQWidget *tqparent, const char *name=0 ) : KActiveLabel( tqparent, name ) {} void openLink( const TQString &/*link*/ ) {} }; -JournalDateEntry::JournalDateEntry( Calendar *calendar, TQWidget *parent ) : - TQVBox( parent ), mCalendar( calendar ) +JournalDateEntry::JournalDateEntry( Calendar *calendar, TQWidget *tqparent ) : + TQVBox( tqparent ), mCalendar( calendar ) { -//kdDebug(5850)<<"JournalEntry::JournalEntry, parent="< QDateTimePair; +typedef TQPair TQDateTimePair; /** Interface class for calendar requests. */ class KCalendarIface : public DCOPObject @@ -54,7 +54,7 @@ class KCalendarIface : public DCOPObject TQDateTime start; TQDateTime end; }; virtual KCalendarIface::ResourceRequestReply resourceRequest( - const TQValueList< QDateTimePair >& busy, + const TQValueList< TQDateTimePair >& busy, const TQCString& resource, const TQString& vCalIn ) = 0; diff --git a/korganizer/kdatenavigator.cpp b/korganizer/kdatenavigator.cpp index b56c60159..abdd8acdf 100644 --- a/korganizer/kdatenavigator.cpp +++ b/korganizer/kdatenavigator.cpp @@ -19,8 +19,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include @@ -45,8 +45,8 @@ #include "kdatenavigator.h" -KDateNavigator::KDateNavigator( TQWidget *parent, const char *name ) - : TQFrame( parent, name ), mBaseDate( 1970, 1, 1 ) +KDateNavigator::KDateNavigator( TQWidget *tqparent, const char *name ) + : TQFrame( tqparent, name ), mBaseDate( 1970, 1, 1 ) { TQGridLayout* topLayout = new TQGridLayout( this, 8, 8 ); @@ -179,7 +179,7 @@ void KDateNavigator::updateDates() // set the week numbers. for( int i = 0; i < 6; i++ ) { - // Use QDate's weekNumber method to determine the week number! + // Use TQDate's weekNumber method to determine the week number! TQDate dtStart = mDayMatrix->getDate( i * 7 ); TQDate dtEnd = mDayMatrix->getDate( ( i + 1 ) * 7 - 1 ); int weeknumstart = calsys->weekNumber( dtStart ); diff --git a/korganizer/kdatenavigator.h b/korganizer/kdatenavigator.h index 682a93588..98bf81d72 100644 --- a/korganizer/kdatenavigator.h +++ b/korganizer/kdatenavigator.h @@ -19,8 +19,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef KDATENAVIGATOR_H #define KDATENAVIGATOR_H @@ -42,11 +42,12 @@ using namespace KCal; class KODayMatrix; -class KDateNavigator: public QFrame +class KDateNavigator: public TQFrame { Q_OBJECT + TQ_OBJECT public: - KDateNavigator( TQWidget *parent = 0, const char *name = 0 ); + KDateNavigator( TQWidget *tqparent = 0, const char *name = 0 ); ~KDateNavigator(); /** diff --git a/korganizer/koagenda.cpp b/korganizer/koagenda.cpp index a0aaddbca..bf25165b3 100644 --- a/korganizer/koagenda.cpp +++ b/korganizer/koagenda.cpp @@ -21,8 +21,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include @@ -67,15 +67,15 @@ MarcusBains::MarcusBains(KOAgenda *_agenda,const char *name ) { setLineWidth(0); setMargin(0); - setBackgroundColor(Qt::red); + setBackgroundColor(TQt::red); minutes = new TQTimer(this); connect(minutes, TQT_SIGNAL(timeout()), this, TQT_SLOT(updateLocation())); minutes->start(0, true); mTimeBox = new TQLabel(this); - mTimeBox->tqsetAlignment(Qt::AlignRight | Qt::AlignBottom); + mTimeBox->tqsetAlignment(TQt::AlignRight | TQt::AlignBottom); TQPalette pal = mTimeBox->palette(); - pal.setColor(TQColorGroup::Foreground, Qt::red); + pal.setColor(TQColorGroup::Foreground, TQt::red); mTimeBox->setPalette(pal); mTimeBox->setAutoMask(true); @@ -172,8 +172,8 @@ void MarcusBains::updateLocationRecalc( bool recalculate ) Create an agenda widget with rows rows and columns columns. */ KOAgenda::KOAgenda( int columns, int rows, int rowSize, CalendarView *calendarView, - TQWidget *parent, const char *name, WFlags f ) - : TQScrollView( parent, name, f ), mChanger( 0 ) + TQWidget *tqparent, const char *name, WFlags f ) + : TQScrollView( tqparent, name, f ), mChanger( 0 ) { mColumns = columns; mRows = rows; @@ -195,8 +195,8 @@ KOAgenda::KOAgenda( int columns, int rows, int rowSize, CalendarView *calendarVi Create an agenda widget with columns columns and one row. This is used for all-day events. */ -KOAgenda::KOAgenda( int columns, CalendarView *calendarView, TQWidget *parent, - const char *name, WFlags f ) : TQScrollView( parent, name, f ) +KOAgenda::KOAgenda( int columns, CalendarView *calendarView, TQWidget *tqparent, + const char *name, WFlags f ) : TQScrollView( tqparent, name, f ) { mColumns = columns; mRows = 1; @@ -279,7 +279,7 @@ void KOAgenda::init() mItemMoved = false; mSelectedItem = 0; - mSelectedUid = TQString::null; + mSelectedUid = TQString(); setAcceptDrops( true ); installEventFilter( this ); @@ -385,7 +385,7 @@ bool KOAgenda::eventFilter ( TQObject *object, TQEvent *event ) case TQEvent::MouseButtonRelease: case TQEvent::MouseMove: return eventFilter_mouse( object, static_cast( event ) ); -#ifndef QT_NO_WHEELEVENT +#ifndef TQT_NO_WHEELEVENT case TQEvent::Wheel: return eventFilter_wheel( object, static_cast( event ) ); #endif @@ -542,7 +542,7 @@ bool KOAgenda::eventFilter_key( TQObject *, TQKeyEvent *ke ) void KOAgenda::emitNewEventForSelection() { - QPairp = mCalendarView->viewSubResourceCalendar(); + TQPairp = mCalendarView->viewSubResourceCalendar(); emit newEventSignal( p.first, p.second ); } @@ -559,7 +559,7 @@ void KOAgenda::finishTypeAhead() mTypeAheadEvents.clear(); mTypeAhead = false; } -#ifndef QT_NO_WHEELEVENT +#ifndef TQT_NO_WHEELEVENT bool KOAgenda::eventFilter_wheel ( TQObject *object, TQWheelEvent *e ) { TQPoint viewportPos; @@ -574,7 +574,7 @@ bool KOAgenda::eventFilter_wheel ( TQObject *object, TQWheelEvent *e ) // e->type()<<" delta: "<< e->delta()<< endl; emit zoomView( -e->delta() , contentsToGrid( viewportToContents( viewportPos ) ), - Qt::Horizontal ); + TQt::Horizontal ); accepted=true; } @@ -586,7 +586,7 @@ bool KOAgenda::eventFilter_wheel ( TQObject *object, TQWheelEvent *e ) } emit zoomView( -e->delta() , contentsToGrid( viewportToContents( viewportPos ) ), - Qt::Vertical ); + TQt::Vertical ); emit mousePosSignal(gridToContents(contentsToGrid(viewportToContents( viewportPos )))); accepted=true; } @@ -724,7 +724,7 @@ bool KOAgenda::eventFilter_mouse(TQObject *object, TQMouseEvent *me) case TQEvent::MouseButtonDblClick: if (object == viewport()) { selectItem(0); - QPairp = mCalendarView->viewSubResourceCalendar(); + TQPairp = mCalendarView->viewSubResourceCalendar(); emit newEventSignal( p.first, p.second ); } else { KOAgendaItem *doubleClickedItem = dynamic_cast( object ); @@ -1002,7 +1002,7 @@ void KOAgenda::performItemAction(const TQPoint& viewportPos) // erase current item (i.e. remove it from the multiItem list) firstItem = moveItem->nextMultiItem(); moveItem->hide(); - mItems.take( mItems.find( moveItem ) ); + mItems.take( mItems.tqfind( moveItem ) ); removeChild( moveItem ); mActionItem->removeMoveItem(moveItem); moveItem=firstItem; @@ -1019,7 +1019,7 @@ void KOAgenda::performItemAction(const TQPoint& viewportPos) // erase current item lastItem = moveItem->prevMultiItem(); moveItem->hide(); - mItems.take( mItems.find(moveItem) ); + mItems.take( mItems.tqfind(moveItem) ); removeChild( moveItem ); moveItem->removeMoveItem( moveItem ); moveItem = lastItem; @@ -1769,7 +1769,7 @@ void KOAgenda::showAgendaItem( KOAgendaItem *agendaItem ) agendaItem->hide(); addChild( agendaItem ); - if ( !mItems.tqcontainsRef( agendaItem ) ) { + if ( !mItems.containsRef( agendaItem ) ) { mItems.append( agendaItem ); } placeSubCells( agendaItem ); @@ -1785,7 +1785,7 @@ bool KOAgenda::removeAgendaItem( KOAgendaItem *item ) TQPtrList conflictItems = thisItem->conflictItems(); removeChild( thisItem ); - int pos = mItems.find( thisItem ); + int pos = mItems.tqfind( thisItem ); if ( pos >= 0 ) { mItems.take( pos ); taken = true; @@ -1811,7 +1811,7 @@ void KOAgenda::deleteItemsToDelete() /*TQSizePolicy KOAgenda::sizePolicy() const { // Thought this would make the all-day event agenda minimum size and the - // normal agenda take the remaining space. But it doesnt work. The QSplitter + // normal agenda take the remaining space. But it doesnt work. The TQSplitter // dont seem to think that an Expanding widget needs more space than a // Preferred one. // But it doesnt hurt, so it stays. diff --git a/korganizer/koagenda.h b/korganizer/koagenda.h index 223ea1aa3..2dfb45517 100644 --- a/korganizer/koagenda.h +++ b/korganizer/koagenda.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef KOAGENDA_H #define KOAGENDA_H @@ -53,6 +53,7 @@ using namespace KCal; class MarcusBains : public TQFrame { Q_OBJECT + TQ_OBJECT public: MarcusBains( KOAgenda *agenda = 0, const char *name = 0 ); void updateLocationRecalc( bool recalculate = false ); @@ -73,11 +74,12 @@ class MarcusBains : public TQFrame class KOAgenda : public TQScrollView { Q_OBJECT + TQ_OBJECT public: KOAgenda ( int columns, int rows, int columnSize, CalendarView *calendarView, - TQWidget *parent=0, const char *name = 0, WFlags f = 0 ); + TQWidget *tqparent=0, const char *name = 0, WFlags f = 0 ); - KOAgenda ( int columns, CalendarView *calendarView, TQWidget *parent = 0, + KOAgenda ( int columns, CalendarView *calendarView, TQWidget *tqparent = 0, const char *name = 0, WFlags f = 0 ); virtual ~KOAgenda(); @@ -215,7 +217,7 @@ class KOAgenda : public TQScrollView /** Handles mouse events. Called from eventFilter */ virtual bool eventFilter_mouse ( TQObject *, TQMouseEvent * ); -#ifndef QT_NO_WHEELEVENT +#ifndef TQT_NO_WHEELEVENT /** Handles mousewheel events. Called from eventFilter */ virtual bool eventFilter_wheel ( TQObject *, TQWheelEvent * ); #endif @@ -287,7 +289,7 @@ class KOAgenda : public TQScrollView /** delete the items that are queued for deletion */ void deleteItemsToDelete(); /** Resizes all the child elements after the size of the agenda - changed. This is needed because Qt seems to have a bug when + changed. This is needed because TQt seems to have a bug when the resizeEvent of one of the widgets in a splitter takes a lot of time / does a lot of resizes.... see bug 80114 */ void resizeAllContents(); @@ -346,7 +348,7 @@ class KOAgenda : public TQScrollView // The KOAgendaItem, which is being moved/resized TQGuardedPtr mActionItem; - QPair mResPair; + TQPair mResPair; // Currently selected item TQGuardedPtr mSelectedItem; diff --git a/korganizer/koagendaitem.cpp b/korganizer/koagendaitem.cpp index 21eea0e11..a7ba07d0c 100644 --- a/korganizer/koagendaitem.cpp +++ b/korganizer/koagendaitem.cpp @@ -19,8 +19,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include @@ -64,10 +64,10 @@ TQPixmap *KOAgendaItem::organizerPxmp = 0; //-------------------------------------------------------------------------- KOAgendaItem::KOAgendaItem( Calendar *calendar, Incidence *incidence, - const TQDate &qd, TQWidget *parent, + const TQDate &qd, TQWidget *tqparent, int itemPos, int itemCount, const char *name, WFlags f ) : - TQWidget( parent, name, f ), mCalendar( calendar ), mIncidence( incidence ), mDate( qd ), + TQWidget( tqparent, name, f ), mCalendar( calendar ), mIncidence( incidence ), mDate( qd ), mLabelText( mIncidence->summary() ), mIconAlarm( false ), mIconRecur( false ), mIconReadonly( false ), mIconReply( false ), mIconGroup( false ), mIconGroupTentative( false ), mIconOrganizer( false ), @@ -75,7 +75,7 @@ KOAgendaItem::KOAgendaItem( Calendar *calendar, Incidence *incidence, mItemPos( itemPos ), mItemCount( itemCount ), mMultiItemInfo( 0 ), mStartMoveInfo( 0 ) { - setBackgroundMode( Qt::NoBackground ); + setBackgroundMode( TQt::NoBackground ); setCellXY( 0, 0, 1 ); setCellXRight( 0 ); @@ -624,7 +624,7 @@ void KOAgendaItem::setConflictItems( TQPtrList ci ) void KOAgendaItem::addConflictItem( KOAgendaItem *ci ) { - if ( mConflictItems.find( ci ) < 0 ) mConflictItems.append( ci ); + if ( mConflictItems.tqfind( ci ) < 0 ) mConflictItems.append( ci ); } TQString KOAgendaItem::label() const @@ -857,10 +857,10 @@ void KOAgendaItem::paintEvent( TQPaintEvent *ev ) int th = ww->boundingRect().height(); delete ww; - int hlHeight = QMAX(fm.boundingRect(longH).height(), - QMAX(alarmPxmp->height(), QMAX(recurPxmp->height(), - QMAX(readonlyPxmp->height(), QMAX(replyPxmp->height(), - QMAX(groupPxmp->height(), organizerPxmp->height())))))); + int hlHeight = TQMAX(fm.boundingRect(longH).height(), + TQMAX(alarmPxmp->height(), TQMAX(recurPxmp->height(), + TQMAX(readonlyPxmp->height(), TQMAX(replyPxmp->height(), + TQMAX(groupPxmp->height(), organizerPxmp->height())))))); bool completelyRenderable = th < (height() - 2 * ft - 2 - hlHeight); @@ -917,7 +917,7 @@ void KOAgendaItem::paintEvent( TQPaintEvent *ev ) mLabelText ); //kdDebug() << "SIZES for " << mLabelText << ": " << width() << " :: " << txtWidth << endl; - ww->drawText( &p, x, margin, Qt::AlignHCenter | KWordWrap::FadeOut ); + ww->drawText( &p, x, margin, TQt::AlignHCenter | KWordWrap::FadeOut ); delete ww; return; } @@ -986,12 +986,12 @@ void KOAgendaItem::paintEvent( TQPaintEvent *ev ) p.setBackgroundColor( bgColor ); p.setPen( textColor ); TQString ws = ww->wrappedString(); - if ( ws.left( ws.length()-1 ).find( '\n' ) >= 0 ) + if ( ws.left( ws.length()-1 ).tqfind( '\n' ) >= 0 ) ww->drawText( &p, eventX, y, - Qt::AlignAuto | KWordWrap::FadeOut ); + TQt::AlignAuto | KWordWrap::FadeOut ); else ww->drawText( &p, eventX + (txtWidth-ww->boundingRect().width()-2*margin)/2, - y, Qt::AlignHCenter | KWordWrap::FadeOut ); + y, TQt::AlignHCenter | KWordWrap::FadeOut ); delete ww; } diff --git a/korganizer/koagendaitem.h b/korganizer/koagendaitem.h index f15594428..fa4b7c432 100644 --- a/korganizer/koagendaitem.h +++ b/korganizer/koagendaitem.h @@ -19,8 +19,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef KOAGENDAITEM_H #define KOAGENDAITEM_H @@ -53,7 +53,7 @@ struct MultiItemInfo /* The KOAgendaItem has to make sure that it receives all mouse events, which are to be used for dragging and resizing. That means it has to be installed as - eventfiler for its children, if it has children, and it has to pass mouse + eventfiler for its tqchildren, if it has tqchildren, and it has to pass mouse events from the cildren to itself. See eventFilter(). @@ -75,9 +75,10 @@ struct MultiItemInfo class KOAgendaItem : public TQWidget, public KOrg::CellItem { Q_OBJECT + TQ_OBJECT public: KOAgendaItem( Calendar *calendar, Incidence *incidence, const TQDate &qd, - TQWidget *parent, + TQWidget *tqparent, int itemPos, int itemCount, const char *name = 0, WFlags f = 0 ); diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp index 8cc7c5616..49a21acf7 100644 --- a/korganizer/koagendaview.cpp +++ b/korganizer/koagendaview.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include @@ -76,8 +76,8 @@ using namespace KOrg; -EventIndicator::EventIndicator(Location loc,TQWidget *parent,const char *name) - : TQFrame(parent,name) +EventIndicator::EventIndicator(Location loc,TQWidget *tqparent,const char *name) + : TQFrame(tqparent,name) { mColumns = 1; mEnabled.resize( mColumns ); @@ -133,8 +133,8 @@ void EventIndicator::enableColumn(int column, bool enable) KOAlternateLabel::KOAlternateLabel(const TQString &shortlabel, const TQString &longlabel, - const TQString &extensivelabel, TQWidget *parent, const char *name ) - : TQLabel(parent, name), mTextTypeFixed(false), mShortText(shortlabel), + const TQString &extensivelabel, TQWidget *tqparent, const char *name ) + : TQLabel(tqparent, name), mTextTypeFixed(false), mShortText(shortlabel), mLongText(longlabel), mExtensiveText(extensivelabel) { tqsetSizePolicy(TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed )); @@ -248,10 +248,10 @@ TQSize KOAlternateLabel::tqminimumSizeHint() const KOAgendaView::KOAgendaView( Calendar *cal, CalendarView *calendarView, - TQWidget *parent, + TQWidget *tqparent, const char *name, bool isSideBySide ) : - KOrg::AgendaView (cal, parent,name), mExpandButton( 0 ), + KOrg::AgendaView (cal, tqparent,name), mExpandButton( 0 ), mAllowAgendaUpdate( true ), mUpdateItem( 0 ), mIsSideBySide( isSideBySide ), @@ -318,7 +318,7 @@ KOAgendaView::KOAgendaView( Calendar *cal, connect( mExpandButton, TQT_SIGNAL( clicked() ), TQT_SIGNAL( toggleExpand() ) ); } else { TQLabel *label = new TQLabel( i18n("All Day"), mDummyAllDayLeft ); - label->tqsetAlignment( Qt::AlignRight | Qt::AlignVCenter | Qt::WordBreak ); + label->tqsetAlignment( TQt::AlignRight | TQt::AlignVCenter | TQt::WordBreak ); } mAllDayAgenda = new KOAgenda( 1, calendarView, mAllDayFrame ); @@ -569,7 +569,7 @@ void KOAgendaView::zoomView( const int delta, const TQPoint &pos, //Zoom to the selected incidence, on the other way // zoom to the date on screen after the first mousewheel move. - if ( orient == Qt::Horizontal ) { + if ( orient == TQt::Horizontal ) { TQDate date=mAgenda->selectedIncidenceDate(); if ( date.isValid() ) zoomDate=date; @@ -649,7 +649,7 @@ void KOAgendaView::createDayLabels( bool force ) TQStringList::ConstIterator textit = texts.begin(); for ( ; textit != texts.end(); ++textit ) { // 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 ); + KOAlternateLabel*label = new KOAlternateLabel( (*textit), (*textit), TQString(), mDayLabels ); label->setMinimumWidth(1); label->tqsetAlignment(AlignCenter); dayLayout->addWidget(label); @@ -662,7 +662,7 @@ void KOAgendaView::createDayLabels( bool force ) TQString text = it->shortText( date ); if ( !text.isEmpty() ) { // 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 ); + KOAlternateLabel*label = new KOAlternateLabel( text, text, TQString(), mDayLabels ); label->setMinimumWidth(1); label->tqsetAlignment(AlignCenter); dayLayout->addWidget(label); @@ -783,7 +783,7 @@ void KOAgendaView::updateConfig() { // kdDebug(5850) << "KOAgendaView::updateConfig()" << endl; - // update config for children + // update config for tqchildren mTimeLabels->updateConfig(); mAgenda->updateConfig(); mAllDayAgenda->updateConfig(); @@ -813,7 +813,7 @@ void KOAgendaView::updateTimeBarWidth() int width; width = mDummyAllDayLeft->fontMetrics().width( i18n("All Day") ); - width = QMAX( width, mTimeLabels->width() ); + width = TQMAX( width, mTimeLabels->width() ); mDummyAllDayLeft->setFixedWidth( width ); mTimeLabels->setFixedWidth( width ); diff --git a/korganizer/koagendaview.h b/korganizer/koagendaview.h index c44c25081..25c1dd159 100644 --- a/korganizer/koagendaview.h +++ b/korganizer/koagendaview.h @@ -19,8 +19,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef KOAGENDAVIEW_H #define KOAGENDAVIEW_H @@ -48,12 +48,13 @@ namespace KOrg { class IncidenceChangerBase; } -class EventIndicator : public QFrame +class EventIndicator : public TQFrame { Q_OBJECT + TQ_OBJECT public: enum Location { Top, Bottom }; - EventIndicator( Location loc = Top, TQWidget *parent = 0, + EventIndicator( Location loc = Top, TQWidget *tqparent = 0, const char *name = 0 ); virtual ~EventIndicator(); @@ -71,13 +72,14 @@ class EventIndicator : public QFrame TQMemArray mEnabled; }; -class KOAlternateLabel : public QLabel +class KOAlternateLabel : public TQLabel { Q_OBJECT + TQ_OBJECT public: KOAlternateLabel( const TQString &shortlabel, const TQString &longlabel, - const TQString &extensivelabel = TQString::null, - TQWidget *parent = 0, const char *name = 0 ); + const TQString &extensivelabel = TQString(), + TQWidget *tqparent = 0, const char *name = 0 ); ~KOAlternateLabel(); virtual TQSize tqminimumSizeHint() const; @@ -106,10 +108,11 @@ class KOAlternateLabel : public QLabel class KOAgendaView : public KOrg::AgendaView, public KCal::Calendar::Observer { Q_OBJECT + TQ_OBJECT public: KOAgendaView( Calendar *cal, CalendarView *calendarView, - TQWidget *parent = 0, + TQWidget *tqparent = 0, const char *name = 0, bool isSideBySide = false ); virtual ~KOAgendaView(); @@ -193,7 +196,7 @@ class KOAgendaView : public KOrg::AgendaView, public KCal::Calendar::Observer void zoomOutVertically( ); void zoomView( const int delta, const TQPoint &pos, - const Qt::Orientation orient=Qt::Horizontal ); + const Qt::Orientation orient=TQt::Horizontal ); void clearTimeSpanSelection(); diff --git a/korganizer/koapp.cpp b/korganizer/koapp.cpp index ff5338419..ffa9e4c08 100644 --- a/korganizer/koapp.cpp +++ b/korganizer/koapp.cpp @@ -20,8 +20,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include @@ -149,7 +149,7 @@ void KOrganizerApp::processCalendar( const KURL &url ) } // Handle window activation -#if defined Q_WS_X11 && ! defined K_WS_QTONLY +#if defined TQ_WS_X11 && ! defined K_WS_TQTONLY KStartupInfo::setNewStartupId( korg->tqtopLevelWidget(), startupId() ); #endif } diff --git a/korganizer/koapp.h b/korganizer/koapp.h index 776f15728..80b3d2d6e 100644 --- a/korganizer/koapp.h +++ b/korganizer/koapp.h @@ -19,8 +19,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef KORGANIZERAPP_H #define KORGANIZERAPP_H @@ -30,6 +30,7 @@ class KOrganizerApp : public KUniqueApplication { Q_OBJECT + TQ_OBJECT public: KOrganizerApp(); ~KOrganizerApp(); diff --git a/korganizer/koattendeeeditor.cpp b/korganizer/koattendeeeditor.cpp index 548e6acb1..d24a8812b 100644 --- a/korganizer/koattendeeeditor.cpp +++ b/korganizer/koattendeeeditor.cpp @@ -55,15 +55,15 @@ using namespace KCal; -KOAttendeeEditor::KOAttendeeEditor( TQWidget * parent, const char *name ) : - TQWidget( parent, name ), +KOAttendeeEditor::KOAttendeeEditor( TQWidget * tqparent, const char *name ) : + TQWidget( tqparent, name ), mDisableItemUpdate( true ) { } -void KOAttendeeEditor::initOrganizerWidgets(TQWidget * parent, TQBoxLayout * tqlayout) +void KOAttendeeEditor::initOrganizerWidgets(TQWidget * tqparent, TQBoxLayout * tqlayout) { - mOrganizerHBox = new TQHBox( parent ); + mOrganizerHBox = new TQHBox( tqparent ); tqlayout->addWidget( mOrganizerHBox ); // If creating a new event, then the user is the organizer -> show the // identity combo @@ -91,7 +91,7 @@ void KOAttendeeEditor::initOrganizerWidgets(TQWidget * parent, TQBoxLayout * tql mOrganizerHBox->setStretchFactor( mOrganizerCombo, 100 ); } -void KOAttendeeEditor::initEditWidgets(TQWidget * parent, TQBoxLayout * tqlayout) +void KOAttendeeEditor::initEditWidgets(TQWidget * tqparent, TQBoxLayout * tqlayout) { TQGridLayout *topLayout = new TQGridLayout(); tqlayout->addLayout( topLayout ); @@ -99,12 +99,12 @@ void KOAttendeeEditor::initEditWidgets(TQWidget * parent, TQBoxLayout * tqlayout TQString whatsThis = i18n("Edits the name of the attendee selected in the list " "above, or adds a new attendee if there are no attendees" "in the list."); - TQLabel *attendeeLabel = new TQLabel( parent ); + TQLabel *attendeeLabel = new TQLabel( tqparent ); TQWhatsThis::add( attendeeLabel, whatsThis ); attendeeLabel->setText( i18n("Na&me:") ); topLayout->addWidget( attendeeLabel, 0, 0 ); - mNameEdit = new KPIM::AddresseeLineEdit( parent ); + mNameEdit = new KPIM::AddresseeLineEdit( tqparent ); TQWhatsThis::add( mNameEdit, whatsThis ); mNameEdit->setClickMessage( i18n("Click to add a new attendee") ); attendeeLabel->setBuddy( mNameEdit ); @@ -116,12 +116,12 @@ void KOAttendeeEditor::initEditWidgets(TQWidget * parent, TQBoxLayout * tqlayout whatsThis = i18n("Edits the role of the attendee selected " "in the list above."); - TQLabel *attendeeRoleLabel = new TQLabel( parent ); + TQLabel *attendeeRoleLabel = new TQLabel( tqparent ); TQWhatsThis::add( attendeeRoleLabel, whatsThis ); attendeeRoleLabel->setText( i18n("Ro&le:") ); topLayout->addWidget( attendeeRoleLabel, 1, 0 ); - mRoleCombo = new TQComboBox( false, parent ); + mRoleCombo = new TQComboBox( false, tqparent ); TQWhatsThis::add( mRoleCombo, whatsThis ); mRoleCombo->insertStringList( Attendee::roleList() ); attendeeRoleLabel->setBuddy( mRoleCombo ); @@ -129,17 +129,17 @@ void KOAttendeeEditor::initEditWidgets(TQWidget * parent, TQBoxLayout * tqlayout TQT_SLOT( updateAttendee() ) ); topLayout->addWidget( mRoleCombo, 1, 1 ); - mDelegateLabel = new TQLabel( parent ); + mDelegateLabel = new TQLabel( tqparent ); topLayout->addWidget( mDelegateLabel, 1, 2 ); whatsThis = i18n("Edits the current attendance status of the attendee " "selected in the list above."); - TQLabel *statusLabel = new TQLabel( parent ); + TQLabel *statusLabel = new TQLabel( tqparent ); TQWhatsThis::add( statusLabel, whatsThis ); statusLabel->setText( i18n("Stat&us:") ); topLayout->addWidget( statusLabel, 2, 0 ); - mStatusCombo = new TQComboBox( false, parent ); + mStatusCombo = new TQComboBox( false, tqparent ); TQWhatsThis::add( mStatusCombo, whatsThis ); // mStatusCombo->insertStringList( Attendee::statusList() ); mStatusCombo->insertItem( SmallIcon( "help" ), Attendee::statusName( Attendee::NeedsAction ) ); @@ -157,7 +157,7 @@ void KOAttendeeEditor::initEditWidgets(TQWidget * parent, TQBoxLayout * tqlayout topLayout->setColStretch( 2, 1 ); - mRsvpButton = new TQCheckBox( parent ); + mRsvpButton = new TQCheckBox( tqparent ); TQWhatsThis::add( mRsvpButton, i18n("Edits whether to send an email to the attendee " "selected in the list above to request " @@ -166,7 +166,7 @@ void KOAttendeeEditor::initEditWidgets(TQWidget * parent, TQBoxLayout * tqlayout connect( mRsvpButton, TQT_SIGNAL( clicked() ), TQT_SLOT( updateAttendee() ) ); topLayout->addWidget( mRsvpButton, 2, 2 ); - TQWidget *buttonBox = new TQWidget( parent ); + TQWidget *buttonBox = new TQWidget( tqparent ); TQVBoxLayout *buttonLayout = new TQVBoxLayout( buttonBox ); mAddButton = new TQPushButton( i18n("&New"), buttonBox ); @@ -250,7 +250,7 @@ void KOAttendeeEditor::fillOrganizerCombo() const TQStringList lst = KOPrefs::instance()->fullEmails(); TQStringList uniqueList; for( TQStringList::ConstIterator it = lst.begin(); it != lst.end(); ++it ) { - if ( uniqueList.find( *it ) == uniqueList.end() ) + if ( uniqueList.tqfind( *it ) == uniqueList.end() ) uniqueList << *it; } mOrganizerCombo->insertStringList( uniqueList ); @@ -262,7 +262,7 @@ void KOAttendeeEditor::addNewAttendee() // suggest to edit that first if ( TQListViewItem* item = hasExampleAttendee() ) { KMessageBox::information( this, - i18n( "Please edit the example attendee, before adding more." ), TQString::null, + i18n( "Please edit the example attendee, before adding more." ), TQString(), "EditExistingExampleAttendeeFirst" ); // make sure the example attendee is selected item->setSelected( true ); @@ -367,7 +367,7 @@ void KOAttendeeEditor::setEnableAttendeeInput(bool enabled) void KOAttendeeEditor::clearAttendeeInput() { mNameEdit->setText(""); - mUid = TQString::null; + mUid = TQString(); mRoleCombo->setCurrentItem(0); mStatusCombo->setCurrentItem(0); mRsvpButton->setChecked(true); @@ -430,7 +430,7 @@ void KOAttendeeEditor::updateAttendee() a->setUid( mUid ); a->setEmail( email ); a->setRole( Attendee::Role( mRoleCombo->currentItem() ) ); - a->seStatus( Attendee::PartStat( mStatusCombo->currentItem() ) ); + a->setqStatus( Attendee::PartStat( mStatusCombo->currentItem() ) ); a->setRSVP( mRsvpButton->isChecked() ); updateCurrentItem(); @@ -566,7 +566,7 @@ KABC::Addressee::List KOAttendeeEditor::expandDistList( const TQString &text ) TQValueList::ConstIterator eit; for ( eit = eList.begin(); eit != eList.end(); ++eit ) { KABC::Addressee a = (*eit).addressee; - if ( !a.preferredEmail().isEmpty() && aList.find( a ) == aList.end() ) { + if ( !a.preferredEmail().isEmpty() && aList.tqfind( a ) == aList.end() ) { aList.append( a ) ; } } @@ -581,7 +581,7 @@ KABC::Addressee::List KOAttendeeEditor::expandDistList( const TQString &text ) TQValueList::ConstIterator eit; for ( eit = eList.begin(); eit != eList.end(); ++eit ) { KABC::Addressee a = (*eit).addressee; - if ( !a.preferredEmail().isEmpty() && aList.find( a ) == aList.end() ) { + if ( !a.preferredEmail().isEmpty() && aList.tqfind( a ) == aList.end() ) { aList.append( a ) ; } } diff --git a/korganizer/koattendeeeditor.h b/korganizer/koattendeeeditor.h index 42728a978..85c15e8e2 100644 --- a/korganizer/koattendeeeditor.h +++ b/korganizer/koattendeeeditor.h @@ -44,11 +44,12 @@ namespace KCal { /** Common base class for attendee editor and free busy view. */ -class KOAttendeeEditor : public QWidget +class KOAttendeeEditor : public TQWidget { Q_OBJECT + TQ_OBJECT public: - KOAttendeeEditor( TQWidget *parent, const char *name = 0 ); + KOAttendeeEditor( TQWidget *tqparent, const char *name = 0 ); virtual void insertAttendee( KCal::Attendee *attendee, bool fetchFB = true ) = 0; virtual void removeAttendee( KCal::Attendee *attendee ) = 0; @@ -67,8 +68,8 @@ class KOAttendeeEditor : public QWidget void updateAttendeeSummary( int count ); protected: - void initOrganizerWidgets( TQWidget *parent, TQBoxLayout *tqlayout ); - void initEditWidgets( TQWidget *parent, TQBoxLayout *tqlayout ); + void initOrganizerWidgets( TQWidget *tqparent, TQBoxLayout *tqlayout ); + void initEditWidgets( TQWidget *tqparent, 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 d4829559a..6313dd2fa 100644 --- a/korganizer/kocore.cpp +++ b/korganizer/kocore.cpp @@ -19,8 +19,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include "kocore.h" @@ -170,7 +170,7 @@ KOrg::CalendarDecoration *KOCore::loadCalendarDecoration( const TQString &name ) return 0; } -KOrg::Part *KOCore::loadPart( KService::Ptr service, KOrg::MainWindow *parent ) +KOrg::Part *KOCore::loadPart( KService::Ptr service, KOrg::MainWindow *tqparent ) { kdDebug(5850) << "loadPart: library: " << service->library() << endl; @@ -194,7 +194,7 @@ KOrg::Part *KOCore::loadPart( KService::Ptr service, KOrg::MainWindow *parent ) return 0; } - return pluginFactory->create( parent ); + return pluginFactory->create( tqparent ); } KOrg::PrintPlugin *KOCore::loadPrintPlugin( KService::Ptr service ) @@ -237,20 +237,20 @@ void KOCore::removeXMLGUIClient( TQWidget *wdg ) KXMLGUIClient* KOCore::xmlguiClient( TQWidget *wdg ) const { TQWidget *topLevel = wdg->tqtopLevelWidget(); - TQMap::ConstIterator it = mXMLGUIClients.find( topLevel ); + TQMap::ConstIterator it = mXMLGUIClients.tqfind( topLevel ); if ( it != mXMLGUIClients.end() ) return it.data(); return 0; } -KOrg::Part *KOCore::loadPart( const TQString &name, KOrg::MainWindow *parent ) +KOrg::Part *KOCore::loadPart( const TQString &name, KOrg::MainWindow *tqparent ) { KTrader::OfferList list = availableParts(); KTrader::OfferList::ConstIterator it; for( it = list.begin(); it != list.end(); ++it ) { if ( (*it)->desktopEntryName() == name ) { - return loadPart( *it, parent ); + return loadPart( *it, tqparent ); } } return 0; @@ -279,7 +279,7 @@ KOrg::CalendarDecoration::List KOCore::calendarDecorations() for( it = plugins.begin(); it != plugins.end(); ++it ) { if ( (*it)->hasServiceType("Calendar/Decoration") ) { TQString name = (*it)->desktopEntryName(); - if ( selectedPlugins.find( name ) != selectedPlugins.end() ) { + if ( selectedPlugins.tqfind( name ) != selectedPlugins.end() ) { KOrg::CalendarDecoration *d = loadCalendarDecoration(*it); mCalendarDecorations.append( d ); } @@ -291,7 +291,7 @@ KOrg::CalendarDecoration::List KOCore::calendarDecorations() return mCalendarDecorations; } -KOrg::Part::List KOCore::loadParts( KOrg::MainWindow *parent ) +KOrg::Part::List KOCore::loadParts( KOrg::MainWindow *tqparent ) { KOrg::Part::List parts; @@ -300,15 +300,15 @@ KOrg::Part::List KOCore::loadParts( KOrg::MainWindow *parent ) KTrader::OfferList plugins = availableParts(); KTrader::OfferList::ConstIterator it; for( it = plugins.begin(); it != plugins.end(); ++it ) { - if ( selectedPlugins.find( (*it)->desktopEntryName() ) != + if ( selectedPlugins.tqfind( (*it)->desktopEntryName() ) != selectedPlugins.end() ) { - KOrg::Part *part = loadPart( *it, parent ); + KOrg::Part *part = loadPart( *it, tqparent ); if ( part ) { - if ( !parent->mainGuiClient() ) { - kdError() << "KOCore::loadParts(): parent has no mainGuiClient." + if ( !tqparent->mainGuiClient() ) { + kdError() << "KOCore::loadParts(): tqparent has no mainGuiClient." << endl; } else { - parent->mainGuiClient()->insertChildClient( part ); + tqparent->mainGuiClient()->insertChildClient( part ); parts.append( part ); } } @@ -326,7 +326,7 @@ KOrg::PrintPlugin::List KOCore::loadPrintPlugins() KTrader::OfferList plugins = availablePrintPlugins(); KTrader::OfferList::ConstIterator it; for( it = plugins.begin(); it != plugins.end(); ++it ) { - if ( selectedPlugins.find( (*it)->desktopEntryName() ) != + if ( selectedPlugins.tqfind( (*it)->desktopEntryName() ) != selectedPlugins.end() ) { KOrg::PrintPlugin *part = loadPrintPlugin( *it ); if ( part ) loadedPlugins.append( part ); @@ -346,26 +346,26 @@ void KOCore::unloadPlugins() mCalendarDecorationsLoaded = false; } -void KOCore::unloadParts( KOrg::MainWindow *parent, KOrg::Part::List &parts ) +void KOCore::unloadParts( KOrg::MainWindow *tqparent, KOrg::Part::List &parts ) { KOrg::Part *part; for( part = parts.first(); part; part = parts.next() ) { - parent->mainGuiClient()->removeChildClient( part ); + tqparent->mainGuiClient()->removeChildClient( part ); delete part; } parts.clear(); } -KOrg::Part::List KOCore::reloadParts( KOrg::MainWindow *parent, +KOrg::Part::List KOCore::reloadParts( KOrg::MainWindow *tqparent, KOrg::Part::List &parts ) { - KXMLGUIFactory *factory = parent->mainGuiClient()->factory(); - factory->removeClient( parent->mainGuiClient() ); + KXMLGUIFactory *factory = tqparent->mainGuiClient()->factory(); + factory->removeClient( tqparent->mainGuiClient() ); - unloadParts( parent, parts ); - KOrg::Part::List list = loadParts( parent ); + unloadParts( tqparent, parts ); + KOrg::Part::List list = loadParts( tqparent ); - factory->addClient( parent->mainGuiClient() ); + factory->addClient( tqparent->mainGuiClient() ); return list; } diff --git a/korganizer/kocore.h b/korganizer/kocore.h index f28382635..9feaaf0a0 100644 --- a/korganizer/kocore.h +++ b/korganizer/kocore.h @@ -19,8 +19,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef KOCORE_H #define KOCORE_H @@ -52,15 +52,15 @@ class KDE_EXPORT KOCore KOrg::CalendarDecoration *loadCalendarDecoration( KService::Ptr service ); KOrg::CalendarDecoration *loadCalendarDecoration( const TQString & ); - KOrg::Part *loadPart( KService::Ptr, KOrg::MainWindow *parent ); - KOrg::Part *loadPart( const TQString &, KOrg::MainWindow *parent ); + KOrg::Part *loadPart( KService::Ptr, KOrg::MainWindow *tqparent ); + KOrg::Part *loadPart( const TQString &, KOrg::MainWindow *tqparent ); KOrg::PrintPlugin *loadPrintPlugin( KService::Ptr service ); KOrg::PrintPlugin *loadPrintPlugin( const TQString & ); KOrg::CalendarDecoration::List calendarDecorations(); KOrg::PrintPlugin::List loadPrintPlugins(); - KOrg::Part::List loadParts( KOrg::MainWindow *parent ); + KOrg::Part::List loadParts( KOrg::MainWindow *tqparent ); void addXMLGUIClient( TQWidget*, KXMLGUIClient *guiclient ); void removeXMLGUIClient( TQWidget* ); @@ -70,7 +70,7 @@ class KDE_EXPORT KOCore Unload the parts in &p parts for this main window. Clears parts. */ - void unloadParts( KOrg::MainWindow *parent, KOrg::Part::List &parts ); + void unloadParts( KOrg::MainWindow *tqparent, KOrg::Part::List &parts ); void unloadPlugins(); void reloadPlugins(); @@ -79,7 +79,7 @@ class KDE_EXPORT KOCore Unloads the parts from the main window. Loads the parts that are listed in KOPrefs and returns a list of these parts. */ - KOrg::Part::List reloadParts( KOrg::MainWindow *parent, + KOrg::Part::List reloadParts( KOrg::MainWindow *tqparent, KOrg::Part::List &parts ); KPIM::IdentityManager* identityManager(); diff --git a/korganizer/kocorehelper.cpp b/korganizer/kocorehelper.cpp index 5538d9c33..3b69fb7d6 100644 --- a/korganizer/kocorehelper.cpp +++ b/korganizer/kocorehelper.cpp @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include "kocorehelper.h" diff --git a/korganizer/kocorehelper.h b/korganizer/kocorehelper.h index ff3c55a35..b140f78e3 100644 --- a/korganizer/kocorehelper.h +++ b/korganizer/kocorehelper.h @@ -20,8 +20,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef _KOCOREHELPER_H #define _KOCOREHELPER_H diff --git a/korganizer/kocounterdialog.cpp b/korganizer/kocounterdialog.cpp index a8a581d06..1490b8048 100644 --- a/korganizer/kocounterdialog.cpp +++ b/korganizer/kocounterdialog.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ @@ -32,8 +32,8 @@ #include "kocounterdialog.h" #include "kocounterdialog.moc" -KOCounterDialog::KOCounterDialog( Calendar *calendar, TQWidget *parent, const char *name ) - : KDialogBase( parent, name, false, i18n("Counter-Event Viewer"), +KOCounterDialog::KOCounterDialog( Calendar *calendar, TQWidget *tqparent, const char *name ) + : KDialogBase( tqparent, name, false, i18n("Counter-Event Viewer"), User1 | User2, User1, false, i18n("Decline"), i18n("Accept") ) { mEventViewer = new KOEventViewer( calendar, this ); diff --git a/korganizer/kocounterdialog.h b/korganizer/kocounterdialog.h index 64757e987..c18f9153c 100644 --- a/korganizer/kocounterdialog.h +++ b/korganizer/kocounterdialog.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef KOCOUNTERDIALOG_H #define KOCOUNTERDIALOG_H @@ -39,8 +39,9 @@ class KOEventViewer; class KOCounterDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - KOCounterDialog(Calendar *calendar, TQWidget *parent = 0, const char *name = 0 ); + KOCounterDialog(Calendar *calendar, TQWidget *tqparent = 0, const char *name = 0 ); virtual ~KOCounterDialog(); void setIncidence( Incidence *incidence ); diff --git a/korganizer/kodaymatrix.cpp b/korganizer/kodaymatrix.cpp index 93fb8740f..cb172e9ce 100644 --- a/korganizer/kodaymatrix.cpp +++ b/korganizer/kodaymatrix.cpp @@ -22,8 +22,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include @@ -57,17 +57,17 @@ #undef FocusIn #undef KeyPress #undef None -#undef Status +#undef tqStatus #endif // ============================================================================ // D Y N A M I C T I P // ============================================================================ -DynamicTip::DynamicTip( TQWidget * parent ) - : TQToolTip( parent ) +DynamicTip::DynamicTip( TQWidget * tqparent ) + : TQToolTip( tqparent ) { - mMatrix = static_cast( parent ); + mMatrix = static_cast( tqparent ); } @@ -99,12 +99,12 @@ void DynamicTip::maybeTip( const TQPoint &pos ) const int KODayMatrix::NOSELECTION = -1000; const int KODayMatrix::NUMDAYS = 42; -KODayMatrix::KODayMatrix( TQWidget *parent, const char *name ) - : TQFrame( parent, name ), mCalendar( 0 ), mStartDate(), mPendingChanges( false ) +KODayMatrix::KODayMatrix( TQWidget *tqparent, const char *name ) + : TQFrame( tqparent, name ), mCalendar( 0 ), mStartDate(), mPendingChanges( false ) { // initialize dynamic arrays - mDays = new QDate[ NUMDAYS ]; - mDayLabels = new QString[ NUMDAYS ]; + mDays = new TQDate[ NUMDAYS ]; + mDayLabels = new TQString[ NUMDAYS ]; mEvents = new int[ NUMDAYS ]; mToolTip = new DynamicTip( this ); @@ -279,7 +279,7 @@ void KODayMatrix::updateView( const TQDate &actdate ) for( int i = 0; i < NUMDAYS; i++ ) { //if it is a holy day then draw it red. Sundays are consider holidays, too TQStringList holidays = KOGlobals::self()->holiday( mDays[ i ] ); - TQString holiStr = TQString::null; + TQString holiStr = TQString(); if ( ( KOGlobals::self()->calendarSystem()->dayOfWeek( mDays[ i ] ) == KOGlobals::self()->calendarSystem()->weekDayOfPray() ) || @@ -681,7 +681,7 @@ void KODayMatrix::paintEvent( TQPaintEvent * ) } p.drawText(col*dwidth, row*dheight, dwidth, dheight, - Qt::AlignHCenter | Qt::AlignVCenter, mDayLabels[i]); + TQt::AlignHCenter | TQt::AlignVCenter, mDayLabels[i]); // reset color to actual color if ( holiday ) { @@ -710,7 +710,7 @@ void KODayMatrix::resizeEvent( TQResizeEvent * ) } /* static */ -QPair KODayMatrix::matrixLimits( const TQDate &month ) +TQPair KODayMatrix::matrixLimits( const TQDate &month ) { const KCalendarSystem *calSys = KOGlobals::self()->calendarSystem(); TQDate d = month; diff --git a/korganizer/kodaymatrix.h b/korganizer/kodaymatrix.h index 3752d52f6..443ecc0e4 100644 --- a/korganizer/kodaymatrix.h +++ b/korganizer/kodaymatrix.h @@ -20,8 +20,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef KODAYMATRIX_H #define KODAYMATRIX_H @@ -53,19 +53,19 @@ using namespace KCal; * This class asks the day matrix object for a appropriate label which * is in our special case the name of the holiday or null if this day is no holiday. */ -class DynamicTip : public QToolTip +class DynamicTip : public TQToolTip { public: /** - * Constructor that expects a KODayMatrix object as parent. + * Constructor that expects a KODayMatrix object as tqparent. * - * @param parent the parent KODayMatrix control. + * @param tqparent the tqparent KODayMatrix control. */ - DynamicTip( TQWidget *parent ); + DynamicTip( TQWidget *tqparent ); protected: /** - * Qt's callback to ask the object to provide an approrpiate text for the + * TQt's callback to ask the object to provide an approrpiate text for the * tooltip to be shown. * * @param pos coordinates of the mouse. @@ -73,14 +73,14 @@ class DynamicTip : public QToolTip void maybeTip( const TQPoint &pos ); private: - /** the parent control this tooltip is designed for. */ + /** the tqparent control this tooltip is designed for. */ KODayMatrix *mMatrix; }; /** * Replacement for kdpdatebuton.cpp that used 42 widgets for the day matrix to be displayed. * Cornelius thought this was a waste of memory and a lot of overhead. - * In addition the selection was not very intuitive so I decided to rewrite it using a QFrame + * In addition the selection was not very intuitive so I decided to rewrite it using a TQFrame * that draws the labels and allows for dragging selection while maintaining nearly full * compatibility in behavior with its predecessor. * @@ -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 tqreplaced with dragging a selection on the matrix. The matrix will + * This feature has been replaced 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 @@ -105,14 +105,15 @@ class DynamicTip : public QToolTip class KODayMatrix: public TQFrame, public KCal::Calendar::Observer { Q_OBJECT + TQ_OBJECT public: /** constructor to create a day matrix widget. * - * @param parent widget that is the parent of the day matrix. + * @param tqparent widget that is the tqparent of the day matrix. * Normally this should be a KDateNavigator * @param name name of the widget */ - KODayMatrix( TQWidget *parent, const char *name ); + KODayMatrix( TQWidget *tqparent, const char *name ); /** destructor that deallocates all dynamically allocated private members. */ @@ -121,7 +122,7 @@ class KODayMatrix: public TQFrame, public KCal::Calendar::Observer /** returns the first and last date of the 6*7 matrix that displays @p month * @param month The month we want to get matrix boundaries */ - static QPair matrixLimits( const TQDate &month ); + static TQPair matrixLimits( const TQDate &month ); /** Associate a calendar with this day matrix. If there is a calendar, the day diff --git a/korganizer/kodialogmanager.cpp b/korganizer/kodialogmanager.cpp index 11f01aa58..ff26d005a 100644 --- a/korganizer/kodialogmanager.cpp +++ b/korganizer/kodialogmanager.cpp @@ -19,8 +19,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include @@ -90,8 +90,8 @@ KODialogManager::KODialogManager( CalendarView *mainView ) : mFilterEditDialog = 0; mCategoryEditDialog = new KPIM::CategoryEditDialog( KOPrefs::instance(), mMainView ); - // don't set any specific parent for the dialog, as its kept around and reused - // in different cases where it should have different parents + // don't set any specific tqparent for the dialog, as its kept around and reused + // in different cases where it should have different tqparents KWin::setMainWindow( mCategoryEditDialog, 0 ); connect( mainView, TQT_SIGNAL( categoriesChanged() ), mCategoryEditDialog, TQT_SLOT( reload() ) ); @@ -108,9 +108,9 @@ KODialogManager::~KODialogManager() delete mFilterEditDialog; } -void KODialogManager::errorSaveIncidence( TQWidget *parent, Incidence *incidence ) +void KODialogManager::errorSaveIncidence( TQWidget *tqparent, Incidence *incidence ) { - KMessageBox::sorry( parent, i18n("Unable to save %1 \"%2\".") + KMessageBox::sorry( tqparent, i18n("Unable to save %1 \"%2\".") .arg( i18n( incidence->type() ) ) .arg( incidence->summary() ) ); } diff --git a/korganizer/kodialogmanager.h b/korganizer/kodialogmanager.h index 63fee901e..b078e01d4 100644 --- a/korganizer/kodialogmanager.h +++ b/korganizer/kodialogmanager.h @@ -19,8 +19,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef KODIALOGMANAGER_H #define KODIALOGMANAGER_H @@ -48,9 +48,10 @@ using namespace KCal; This class manages the dialogs used by the calendar view. It owns the objects and handles creation and selection. */ -class KODialogManager : public QObject +class KODialogManager : public TQObject { Q_OBJECT + TQ_OBJECT public: KODialogManager( CalendarView * ); virtual ~KODialogManager(); @@ -69,7 +70,7 @@ class KODialogManager : public QObject void connectTypeAhead( KOEventEditor *editor, KOrg::AgendaView *agenda ); - static void errorSaveIncidence( TQWidget *parent, Incidence *incidence ); + static void errorSaveIncidence( TQWidget *tqparent, Incidence *incidence ); public slots: void showOptionsDialog(); diff --git a/korganizer/koeditoralarms.cpp b/korganizer/koeditoralarms.cpp index 8f3cb4648..d45495783 100644 --- a/korganizer/koeditoralarms.cpp +++ b/korganizer/koeditoralarms.cpp @@ -19,8 +19,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include "koeditoralarms_base.h" @@ -51,10 +51,10 @@ #include -class AlarmListViewItem : public QListViewItem +class AlarmListViewItem : public TQListViewItem { public: - AlarmListViewItem( TQListView *parent, KCal::Alarm *alarm, const TQCString &inctype ); + AlarmListViewItem( TQListView *tqparent, KCal::Alarm *alarm, const TQCString &inctype ); virtual ~AlarmListViewItem(); KCal::Alarm *alarm() const { return mAlarm; } void construct(); @@ -67,9 +67,9 @@ class AlarmListViewItem : public QListViewItem TQCString mIncType; }; -AlarmListViewItem::AlarmListViewItem( TQListView *parent, KCal::Alarm *alarm, +AlarmListViewItem::AlarmListViewItem( TQListView *tqparent, KCal::Alarm *alarm, const TQCString &inctype ) - : TQListViewItem( parent ), mIncType( inctype ) + : TQListViewItem( tqparent ), mIncType( inctype ) { if ( alarm ) { mAlarm = new KCal::Alarm( *alarm ); @@ -188,9 +188,9 @@ void AlarmListViewItem::construct() KOEditorAlarms::KOEditorAlarms( const TQCString &type, - KCal::Alarm::List *alarms, TQWidget *parent, + KCal::Alarm::List *alarms, TQWidget *tqparent, const char *name ) - : KDialogBase( parent, name, true, i18n("Advanced Reminders"), Ok | Cancel ), + : KDialogBase( tqparent, name, true, i18n("Advanced Reminders"), Ok | Cancel ), mType( type ), mAlarms( alarms ),mCurrentItem( 0 ) { if ( mType != "Todo" ) { @@ -385,7 +385,7 @@ void KOEditorAlarms::writeAlarm( KCal::Alarm *alarm ) add << KCal::Person( *it ); } // TODO: Add a subject line and possibilities for attachments - alarm->setEmailAlarm( TQString::null, mWidget->mEmailText->text(), + alarm->setEmailAlarm( TQString(), mWidget->mEmailText->text(), add ); break; } case 0: // Display diff --git a/korganizer/koeditoralarms.h b/korganizer/koeditoralarms.h index 971df799b..399a4693a 100644 --- a/korganizer/koeditoralarms.h +++ b/korganizer/koeditoralarms.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef KOEDITORALARMS_H #define KOEDITORALARMS_H @@ -34,9 +34,10 @@ class AlarmListViewItem; class KOEditorAlarms : public KDialogBase { Q_OBJECT + TQ_OBJECT public: KOEditorAlarms( const TQCString &type, - KCal::Alarm::List *alarms, TQWidget *parent = 0, + KCal::Alarm::List *alarms, TQWidget *tqparent = 0, const char *name = 0 ); ~KOEditorAlarms(); diff --git a/korganizer/koeditoralarms_base.ui b/korganizer/koeditoralarms_base.ui index d7ccd6651..2d0501599 100644 --- a/korganizer/koeditoralarms_base.ui +++ b/korganizer/koeditoralarms_base.ui @@ -1,6 +1,6 @@ KOEditorAlarms_base - + KOEditorAlarms_base @@ -22,7 +22,7 @@ 0 - + mTimeGroup @@ -33,7 +33,7 @@ unnamed - + tqlayout3 @@ -41,7 +41,7 @@ unnamed - + mAlarmOffset @@ -60,7 +60,7 @@ - + minute(s) @@ -80,7 +80,7 @@ mOffsetUnit - + before the start @@ -107,7 +107,7 @@ - + tqlayout8 @@ -115,7 +115,7 @@ unnamed - + mHowOftenLabel @@ -137,7 +137,7 @@ mRepeatCount - + mRepeatCount @@ -154,7 +154,7 @@ 1 - + mIntervalLabel @@ -168,7 +168,7 @@ mRepeatInterval - + mRepeats @@ -184,7 +184,7 @@ &Repeat: - + mRepeatInterval @@ -208,7 +208,7 @@ - + mTypeGroup @@ -219,7 +219,7 @@ unnamed - + mAlarmType @@ -250,7 +250,7 @@ 0 - + mTypeDisplayRadio @@ -261,7 +261,7 @@ true - + mTypeSoundRadio @@ -269,7 +269,7 @@ A&udio - + mTypeAppRadio @@ -277,7 +277,7 @@ Program - + mTypeEmailRadio @@ -321,11 +321,11 @@ Vertical - + mTypeStack - + WStackPage @@ -339,7 +339,7 @@ 0 - + mDisplayTextLabel @@ -350,14 +350,14 @@ mDisplayText - + mDisplayText - + WStackPage @@ -371,7 +371,7 @@ 0 - + mSoundFileLabel @@ -409,7 +409,7 @@ - + WStackPage @@ -423,7 +423,7 @@ 0 - + mApplicationLabel @@ -442,7 +442,7 @@ *.*|All files - + mAppArgumentsLabel @@ -453,7 +453,7 @@ mAppArguments - + mAppArguments @@ -477,7 +477,7 @@ - + WStackPage @@ -491,7 +491,7 @@ 0 - + mEmailTextLabel @@ -502,7 +502,7 @@ mEmailText - + mEmailText @@ -512,7 +512,7 @@ mEmailAddress - + mEmailToLabel @@ -528,7 +528,7 @@ - + tqlayout7 @@ -536,7 +536,7 @@ unnamed - + mRemoveButton @@ -544,7 +544,7 @@ &Remove - + mAddButton @@ -552,7 +552,7 @@ - + mDuplicateButton @@ -577,7 +577,7 @@ - + Type diff --git a/korganizer/koeditorattachments.cpp b/korganizer/koeditorattachments.cpp index 19a75a992..ddade8815 100644 --- a/korganizer/koeditorattachments.cpp +++ b/korganizer/koeditorattachments.cpp @@ -19,8 +19,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include "koeditorattachments.h" @@ -73,8 +73,8 @@ class AttachmentListItem : public KIconViewItem { public: - AttachmentListItem( KCal::Attachment*att, TQIconView *parent ) : - KIconViewItem( parent ) + AttachmentListItem( KCal::Attachment*att, TQIconView *tqparent ) : + KIconViewItem( tqparent ) { if ( att ) { mAttachment = new KCal::Attachment( *att ); @@ -151,7 +151,7 @@ class AttachmentListItem : public KIconViewItem if ( mAttachment->isUri() ) { mimeType = KMimeType::findByURL( mAttachment->uri() ); } else { - mimeType = KMimeType::tqfindByContent( mAttachment->decodedData() ); + mimeType = KMimeType::findByContent( mAttachment->decodedData() ); } mAttachment->setMimeType( mimeType->name() ); } @@ -164,8 +164,8 @@ class AttachmentListItem : public KIconViewItem }; AttachmentEditDialog::AttachmentEditDialog( AttachmentListItem *item, - TQWidget *parent ) - : KDialogBase ( Plain, i18n( "Add Attachment" ), Ok|Cancel, Ok, parent, 0, false, false ), + TQWidget *tqparent ) + : KDialogBase ( Plain, i18n( "Add Attachment" ), Ok|Cancel, Ok, tqparent, 0, false, false ), mItem( item ), mURLRequester( 0 ) { TQFrame *topFrame = plainPage(); @@ -313,16 +313,16 @@ void AttachmentEditDialog::urlSelected( const TQString &url ) mIcon->setPixmap( AttachmentListItem::icon( mMimeType, kurl.path() ) ); } -AttachmentIconView::AttachmentIconView( KOEditorAttachments* parent ) - : KIconView( parent ), - mParent( parent ) +AttachmentIconView::AttachmentIconView( KOEditorAttachments* tqparent ) + : KIconView( tqparent ), + mParent( tqparent ) { setSelectionMode( TQIconView::Extended ); setMode( KIconView::Select ); setItemTextPos( TQIconView::Right ); setArrangement( TQIconView::LeftToRight ); - setMaxItemWidth( QMAX(maxItemWidth(), 250) ); - setMinimumHeight( QMAX(fontMetrics().height(), 16) + 12 ); + setMaxItemWidth( TQMAX(maxItemWidth(), 250) ); + setMinimumHeight( TQMAX(fontMetrics().height(), 16) + 12 ); connect( this, TQT_SIGNAL( dropped ( TQDropEvent *, const TQValueList & ) ), this, TQT_SLOT( handleDrop( TQDropEvent *, const TQValueList & ) ) ); @@ -337,10 +337,10 @@ KURL AttachmentIconView::tempFileForAttachment( KCal::Attachment *attachment ) KTempFile *file; if ( !patterns.empty() ) { - file = new KTempFile( TQString::null, + file = new KTempFile( TQString(), TQString( patterns.first() ).remove( '*' ),0600 ); } else { - file = new KTempFile( TQString::null, TQString::null, 0600 ); + file = new KTempFile( TQString(), TQString(), 0600 ); } file->setAutoDelete( true ); file->file()->open( IO_WriteOnly ); @@ -447,9 +447,9 @@ void AttachmentIconView::dragEnterEvent( TQDragEnterEvent *event ) mParent->dragEnterEvent( event ); } -KOEditorAttachments::KOEditorAttachments( int spacing, TQWidget *parent, +KOEditorAttachments::KOEditorAttachments( int spacing, TQWidget *tqparent, const char *name ) - : TQWidget( parent, name ) + : TQWidget( tqparent, name ) { TQBoxLayout *topLayout = new TQHBoxLayout( this ); topLayout->setSpacing( spacing ); @@ -574,7 +574,7 @@ void KOEditorAttachments::handlePasteOrDrop( TQMimeSource* source ) TQStringList lst = TQStringList::split( '\n', text, FALSE ); for ( TQStringList::ConstIterator it = lst.constBegin(); it != lst.constEnd(); ++it ) { urls.append( *it ); - labels.append( TQString::null ); + labels.append( TQString() ); } probablyWeHaveUris = true; } @@ -609,7 +609,7 @@ void KOEditorAttachments::handlePasteOrDrop( TQMimeSource* source ) if ( mAttachments->findItem( label ) ) { label += '~' + randomString( 3 ); } - addUriAttachment( (*it).url(), TQString::null, label, true ); + addUriAttachment( (*it).url(), TQString(), label, true ); } } else if ( action != DRAG_CANCEL ) { if ( probablyWeHaveUris ) { @@ -622,7 +622,7 @@ void KOEditorAttachments::handlePasteOrDrop( TQMimeSource* source ) if ( mAttachments->findItem( label ) ) { label += '~' + randomString( 3 ); } - addUriAttachment( (*it).url(), TQString::null, label, true ); + addUriAttachment( (*it).url(), TQString(), label, true ); } } else { // we take anything addDataAttachment( source->tqencodedData( source->format() ), @@ -675,7 +675,7 @@ void KOEditorAttachments::slotAddData() if ( label.isEmpty() ) { label = uri.prettyURL(); } - addUriAttachment( uri.url(), TQString::null, label, true ); + addUriAttachment( uri.url(), TQString(), label, true ); } } @@ -833,7 +833,7 @@ void KOEditorAttachments::addDataAttachment( const TQByteArray &data, item->setData( data ); item->setLabel( nlabel ); if ( mimeType.isEmpty() ) { - item->setMimeType( KMimeType::tqfindByContent( data )->name() ); + item->setMimeType( KMimeType::findByContent( data )->name() ); } else { item->setMimeType( mimeType ); } @@ -874,7 +874,7 @@ void KOEditorAttachments::writeIncidence( KCal::Incidence *i ) void KOEditorAttachments::slotCopy() { - TQApplication::clipboard()->setData( mAttachments->mimeData(), QClipboard::Clipboard ); + TQApplication::clipboard()->setData( mAttachments->mimeData(), TQClipboard::Clipboard ); } void KOEditorAttachments::slotCut() diff --git a/korganizer/koeditorattachments.h b/korganizer/koeditorattachments.h index dfcdb2b5f..b5df45c67 100644 --- a/korganizer/koeditorattachments.h +++ b/korganizer/koeditorattachments.h @@ -19,8 +19,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef KOEDITORATTACHMENTS_H #define KOEDITORATTACHMENTS_H @@ -57,8 +57,9 @@ class KTempDir; class AttachmentEditDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - AttachmentEditDialog( AttachmentListItem *item, TQWidget *parent=0 ); + AttachmentEditDialog( AttachmentListItem *item, TQWidget *tqparent=0 ); void accept(); @@ -77,11 +78,12 @@ class AttachmentEditDialog : public KDialogBase KURLRequester *mURLRequester; }; -class KOEditorAttachments : public QWidget +class KOEditorAttachments : public TQWidget { Q_OBJECT + TQ_OBJECT public: - KOEditorAttachments( int spacing = 8, TQWidget *parent = 0, + KOEditorAttachments( int spacing = 8, TQWidget *tqparent = 0, const char *name = 0 ); ~KOEditorAttachments(); @@ -150,10 +152,11 @@ class KOEditorAttachments : public QWidget class AttachmentIconView : public KIconView { Q_OBJECT + TQ_OBJECT friend class KOEditorAttachments; public: - AttachmentIconView( KOEditorAttachments* parent=0 ); + AttachmentIconView( KOEditorAttachments* tqparent=0 ); KURL tempFileForAttachment( KCal::Attachment *attachment ); TQDragObject *mimeData(); ~AttachmentIconView(); diff --git a/korganizer/koeditordetails.cpp b/korganizer/koeditordetails.cpp index ee57a3d43..9d31182c0 100644 --- a/korganizer/koeditordetails.cpp +++ b/korganizer/koeditordetails.cpp @@ -19,8 +19,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include "koeditordetails.h" @@ -91,8 +91,8 @@ void CustomListViewItem::updateItem() setText(6, mData->delegator()); } -KOAttendeeListView::KOAttendeeListView ( TQWidget *parent, const char *name ) - : KListView(parent, name) +KOAttendeeListView::KOAttendeeListView ( TQWidget *tqparent, const char *name ) + : KListView(tqparent, name) { setAcceptDrops( true ); setAllColumnsShowFocus( true ); @@ -178,9 +178,9 @@ void KOAttendeeListView::dropEvent( TQDropEvent *e ) } -KOEditorDetails::KOEditorDetails( int spacing, TQWidget *parent, +KOEditorDetails::KOEditorDetails( int spacing, TQWidget *tqparent, const char *name ) - : KOAttendeeEditor( parent, name), mDisableItemUpdate( false ) + : KOAttendeeEditor( tqparent, name), mDisableItemUpdate( false ) { TQBoxLayout *topLayout = new TQVBoxLayout( this ); topLayout->setSpacing( spacing ); @@ -199,7 +199,7 @@ KOEditorDetails::KOEditorDetails( int spacing, TQWidget *parent, mListView->addColumn( i18n("Name"), 200 ); mListView->addColumn( i18n("Email"), 200 ); mListView->addColumn( i18n("Role"), 80 ); - mListView->addColumn( i18n("Status"), 100 ); + mListView->addColumn( i18n("tqStatus"), 100 ); mListView->addColumn( i18n("RSVP"), 55 ); mListView->addColumn( i18n("Delegated to"), 120 ); mListView->addColumn( i18n("Delegated from" ), 120 ); @@ -407,7 +407,7 @@ void KOEditorDetails::changeStatusForMe(Attendee::PartStat status) AttendeeListItem *item = static_cast( it.current() ); for ( TQStringList::ConstIterator it2( myEmails.begin() ), end( myEmails.end() ); it2 != end; ++it2 ) { if ( item->data()->email() == *it2 ) { - item->data()->seStatus( status ); + item->data()->setqStatus( status ); item->updateItem(); } } diff --git a/korganizer/koeditordetails.h b/korganizer/koeditordetails.h index 890841f6e..697c46406 100644 --- a/korganizer/koeditordetails.h +++ b/korganizer/koeditordetails.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef _KOEDITORDETAILS_H #define _KOEDITORDETAILS_H @@ -60,8 +60,9 @@ typedef CustomListViewItem AttendeeListItem; class KOAttendeeListView : public KListView { Q_OBJECT + TQ_OBJECT public: - KOAttendeeListView (TQWidget *parent=0, const char *name=0); + KOAttendeeListView (TQWidget *tqparent=0, const char *name=0); virtual ~KOAttendeeListView(); virtual void addAttendee( const TQString& newAttendee ); public slots: @@ -78,8 +79,9 @@ signals: class KOEditorDetails : public KOAttendeeEditor { Q_OBJECT + TQ_OBJECT public: - KOEditorDetails (int spacing = 8,TQWidget* parent = 0, const char* name = 0); + KOEditorDetails (int spacing = 8,TQWidget* tqparent = 0, const char* name = 0); virtual ~KOEditorDetails(); /** Set widgets to default values */ diff --git a/korganizer/koeditorfreebusy.cpp b/korganizer/koeditorfreebusy.cpp index af8b0f5c5..da7f36f04 100644 --- a/korganizer/koeditorfreebusy.cpp +++ b/korganizer/koeditorfreebusy.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include @@ -69,8 +69,8 @@ class FreeBusyItem : public KDGanttViewTaskItem { public: - FreeBusyItem( Attendee *attendee, KDGanttView *parent ) : - KDGanttViewTaskItem( parent, parent->lastItem() ), mAttendee( attendee ), mTimerID( 0 ), + FreeBusyItem( Attendee *attendee, KDGanttView *tqparent ) : + KDGanttViewTaskItem( tqparent, tqparent->lastItem() ), mAttendee( attendee ), mTimerID( 0 ), mIsDownloading( false ) { Q_ASSERT( attendee ); @@ -92,7 +92,7 @@ class FreeBusyItem : public KDGanttViewTaskItem TQString key( int column, bool ) const { - TQMap::ConstIterator it = mKeyMap.find( column ); + TQMap::ConstIterator it = mKeyMap.tqfind( column ); if ( it == mKeyMap.end() ) return listViewText( column ); else return *it; } @@ -172,7 +172,7 @@ void FreeBusyItem::setFreeBusyPeriods( FreeBusy* fb ) KDGanttViewTaskItem *newSubItem = new KDGanttViewTaskItem( this ); newSubItem->setStartTime( per.start() ); newSubItem->setEndTime( per.end() ); - newSubItem->setColors( Qt::red, Qt::red, Qt::red ); + newSubItem->setColors( TQt::red, TQt::red, TQt::red ); TQString toolTip = ""; toolTip += "" + i18n( "Freebusy Period" ) + ""; @@ -209,7 +209,7 @@ void FreeBusyItem::setFreeBusyPeriods( FreeBusy* fb ) // newSubItem->setStartTime( cur ); // cur = cur.addSecs( 7200 ); // newSubItem->setEndTime( cur ); - // newSubItem->setColors( Qt::red, Qt::red, Qt::red ); + // newSubItem->setColors( TQt::red, TQt::red, TQt::red ); // } //debug only end setFreeBusy( 0 ); @@ -222,9 +222,9 @@ void FreeBusyItem::setFreeBusyPeriods( FreeBusy* fb ) //// -KOEditorFreeBusy::KOEditorFreeBusy( int spacing, TQWidget *parent, +KOEditorFreeBusy::KOEditorFreeBusy( int spacing, TQWidget *tqparent, const char *name ) - : KOAttendeeEditor( parent, name ) + : KOAttendeeEditor( tqparent, name ) { TQVBoxLayout *topLayout = new TQVBoxLayout( this ); topLayout->setSpacing( spacing ); @@ -327,7 +327,7 @@ KOEditorFreeBusy::KOEditorFreeBusy( int spacing, TQWidget *parent, // mEventRectangle is the colored rectangle representing the event being modified mEventRectangle = new KDIntervalColorRectangle( mGanttView ); - mEventRectangle->setColor( Qt::magenta ); + mEventRectangle->setColor( TQt::magenta ); mGanttView->addIntervalBackgroundColor( mEventRectangle ); connect( mGanttView, TQT_SIGNAL ( timeIntervalSelected( const TQDateTime &, @@ -544,7 +544,7 @@ void KOEditorFreeBusy::slotPickDate() if( success ) { if ( start == mDtStart && end == mDtEnd ) { KMessageBox::information( this, - i18n( "The meeting already has suitable start/end times." ), TQString::null, + i18n( "The meeting already has suitable start/end times." ), TQString(), "MeetingTimeOKFreeBusy" ); } else { if ( KMessageBox::questionYesNo( @@ -553,7 +553,7 @@ void KOEditorFreeBusy::slotPickDate() "Start: %1
End: %2
" "Would you like to move the meeting to this time slot?" ). arg( start.toString(), end.toString() ), - TQString::null, + TQString(), KStdGuiItem::yes(), KStdGuiItem::no(), "MeetingMovedFreeBusy" ) == KMessageBox::Yes ) { emit dateTimesChanged( start, end ); @@ -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()->seStatus( status ); + item->attendee()->setqStatus( 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()->seStatus( (Attendee::PartStat)status ); + currentAttendee()->setqStatus( (Attendee::PartStat)status ); updateCurrentItem(); updateAttendeeInput(); } @@ -920,7 +920,7 @@ void KOEditorFreeBusy::showAttendeeStatusMenu() void KOEditorFreeBusy::listViewClicked(int button, KDGanttViewItem * item) { - if ( button == Qt::LeftButton && item == 0 ) + if ( button == TQt::LeftButton && item == 0 ) addNewAttendee(); } diff --git a/korganizer/koeditorfreebusy.h b/korganizer/koeditorfreebusy.h index 72ce6e7d4..ec870d22d 100644 --- a/korganizer/koeditorfreebusy.h +++ b/korganizer/koeditorfreebusy.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef KOEDITORFREEBUSY_H #define KOEDITORFREEBUSY_H @@ -45,8 +45,9 @@ namespace KCal { class KOEditorFreeBusy : public KOAttendeeEditor { Q_OBJECT + TQ_OBJECT public: - KOEditorFreeBusy( int spacing = 8, TQWidget *parent = 0, + KOEditorFreeBusy( int spacing = 8, TQWidget *tqparent = 0, const char *name = 0 ); virtual ~KOEditorFreeBusy(); diff --git a/korganizer/koeditorgeneral.cpp b/korganizer/koeditorgeneral.cpp index 6b7e2caa7..3a15188ab 100644 --- a/korganizer/koeditorgeneral.cpp +++ b/korganizer/koeditorgeneral.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ @@ -68,8 +68,8 @@ #include "koeditorgeneral.moc" #include "kohelper.h" -KOEditorGeneral::KOEditorGeneral( TQObject *parent, const char* name) : - TQObject( parent, name ), mAttachments(0) +KOEditorGeneral::KOEditorGeneral( TQObject *tqparent, const char* name) : + TQObject( tqparent, name ), mAttachments(0) { mType = "Event"; ResourceCached::setEditorWindowOpen(true); @@ -82,8 +82,8 @@ KOEditorGeneral::~KOEditorGeneral() } -FocusLineEdit::FocusLineEdit( TQWidget *parent ) - : TQLineEdit( parent ), mSkipFirst( true ) +FocusLineEdit::FocusLineEdit( TQWidget *tqparent ) + : TQLineEdit( tqparent ), mSkipFirst( true ) { } @@ -98,37 +98,37 @@ void FocusLineEdit::focusInEvent ( TQFocusEvent *e ) } -void KOEditorGeneral::initHeader( TQWidget *parent,TQBoxLayout *topLayout) +void KOEditorGeneral::initHeader( TQWidget *tqparent,TQBoxLayout *topLayout) { TQGridLayout *headerLayout = new TQGridLayout(); headerLayout->setSpacing( topLayout->spacing() ); topLayout->addLayout( headerLayout ); TQString whatsThis = i18n("Sets the Title of this event or to-do."); - TQLabel *summaryLabel = new TQLabel( i18n("T&itle:"), parent ); + TQLabel *summaryLabel = new TQLabel( i18n("T&itle:"), tqparent ); TQWhatsThis::add( summaryLabel, whatsThis ); TQFont f = summaryLabel->font(); f.setBold( true ); summaryLabel->setFont(f); headerLayout->addWidget(summaryLabel,1,0); - mSummaryEdit = new FocusLineEdit( parent ); + mSummaryEdit = new FocusLineEdit( tqparent ); TQWhatsThis::add( mSummaryEdit, whatsThis ); connect( mSummaryEdit, TQT_SIGNAL( focusReceivedSignal() ), TQT_SIGNAL( focusReceivedSignal() ) ); headerLayout->addWidget(mSummaryEdit,1,1); summaryLabel->setBuddy( mSummaryEdit ); - mAttendeeSummaryLabel = new TQLabel( parent ); + mAttendeeSummaryLabel = new TQLabel( tqparent ); updateAttendeeSummary( 0 ); headerLayout->addWidget( mAttendeeSummaryLabel, 1, 2 ); whatsThis = i18n("Sets where the event or to-do will take place."); - TQLabel *locationLabel = new TQLabel( i18n("&Location:"), parent ); + TQLabel *locationLabel = new TQLabel( i18n("&Location:"), tqparent ); TQWhatsThis::add( locationLabel, whatsThis ); headerLayout->addWidget(locationLabel,2,0); - mLocationEdit = new TQLineEdit( parent ); + mLocationEdit = new TQLineEdit( tqparent ); TQWhatsThis::add( mLocationEdit, whatsThis ); headerLayout->addMultiCellWidget( mLocationEdit, 2, 2, 1, 2 ); locationLabel->setBuddy( mLocationEdit ); @@ -136,31 +136,31 @@ void KOEditorGeneral::initHeader( TQWidget *parent,TQBoxLayout *topLayout) TQBoxLayout *thirdLineLayout = new TQHBoxLayout(); headerLayout->addMultiCellLayout( thirdLineLayout, 3, 3, 0, 2 ); - mResourceLabel = new TQLabel( parent ); + mResourceLabel = new TQLabel( tqparent ); mResourceLabel->hide(); thirdLineLayout->addWidget( mResourceLabel ); whatsThis = i18n("Allows you to select the categories that this event or to-do belongs to."); - TQLabel *categoriesLabel = new TQLabel( i18n("Categories:"), parent ); + TQLabel *categoriesLabel = new TQLabel( i18n("Categories:"), tqparent ); TQWhatsThis::add( categoriesLabel, whatsThis ); thirdLineLayout->addWidget( categoriesLabel ); - mCategoriesLabel = new KSqueezedTextLabel( parent ); + mCategoriesLabel = new KSqueezedTextLabel( tqparent ); TQWhatsThis::add( mCategoriesLabel, whatsThis ); mCategoriesLabel->setFrameStyle(TQFrame::Panel|TQFrame::Sunken); thirdLineLayout->addWidget( mCategoriesLabel ); - mCategoriesButton = new TQPushButton( parent ); + mCategoriesButton = new TQPushButton( tqparent ); mCategoriesButton->setText(i18n("Select...")); TQWhatsThis::add( mCategoriesButton, whatsThis ); connect(mCategoriesButton,TQT_SIGNAL(clicked()),TQT_SLOT(selectCategories())); thirdLineLayout->addWidget( mCategoriesButton ); } -void KOEditorGeneral::initSecrecy(TQWidget *parent, TQBoxLayout *topLayout) +void KOEditorGeneral::initSecrecy(TQWidget *tqparent, TQBoxLayout *topLayout) { TQBoxLayout *secrecyLayout = new TQHBoxLayout( topLayout ); - TQLabel *secrecyLabel = new TQLabel(i18n("Acc&ess:"),parent); + TQLabel *secrecyLabel = new TQLabel(i18n("Acc&ess:"),tqparent); TQString whatsThis = i18n("Sets whether the access to this event or to-do " "is restricted. Please note that KOrganizer " "currently does not use this setting, so the " @@ -171,16 +171,16 @@ void KOEditorGeneral::initSecrecy(TQWidget *parent, TQBoxLayout *topLayout) TQWhatsThis::add( secrecyLabel, whatsThis ); secrecyLayout->addWidget(secrecyLabel); - mSecrecyCombo = new TQComboBox(parent); + mSecrecyCombo = new TQComboBox(tqparent); TQWhatsThis::add( mSecrecyCombo, whatsThis ); mSecrecyCombo->insertStringList(Incidence::secrecyList()); secrecyLayout->addWidget(mSecrecyCombo); secrecyLabel->setBuddy( mSecrecyCombo ); } -void KOEditorGeneral::initDescription(TQWidget *parent,TQBoxLayout *topLayout) +void KOEditorGeneral::initDescription(TQWidget *tqparent,TQBoxLayout *topLayout) { - mDescriptionEdit = new KTextEdit(parent); + mDescriptionEdit = new KTextEdit(tqparent); TQWhatsThis::add( mDescriptionEdit, i18n("Sets the description for this event or to-do. This " "will be displayed in a reminder if one is set, " @@ -194,16 +194,16 @@ void KOEditorGeneral::initDescription(TQWidget *parent,TQBoxLayout *topLayout) topLayout->addWidget(mDescriptionEdit, 4); } -void KOEditorGeneral::initAlarm( TQWidget *parent, TQBoxLayout *topLayout ) +void KOEditorGeneral::initAlarm( TQWidget *tqparent, TQBoxLayout *topLayout ) { TQBoxLayout *alarmLayout = new TQHBoxLayout( topLayout ); - mAlarmButton = new TQCheckBox( parent ); + mAlarmButton = new TQCheckBox( tqparent ); TQWhatsThis::add( mAlarmButton, i18n( "Enable reminders for this event or to-do." ) ); TQToolTip::add( mAlarmButton, i18n( "Enable reminders" ) ); alarmLayout->addWidget( mAlarmButton ); - mAlarmAdvancedButton = new TQPushButton( parent ); + mAlarmAdvancedButton = new TQPushButton( tqparent ); mAlarmAdvancedButton->setIconSet( KOGlobals::self()->smallIconSet( "bell", 16 ) ); TQWhatsThis::add( mAlarmAdvancedButton, i18n( "Push this button to create an advanced set of reminders " @@ -212,7 +212,7 @@ void KOEditorGeneral::initAlarm( TQWidget *parent, TQBoxLayout *topLayout ) connect( mAlarmAdvancedButton, TQT_SIGNAL(clicked()), TQT_SLOT(editAlarms()) ); alarmLayout->addWidget( mAlarmAdvancedButton ); - mSimpleAlarmBox = new TQHBox( parent ); + mSimpleAlarmBox = new TQHBox( tqparent ); alarmLayout->addWidget( mSimpleAlarmBox ); TQString whatsThis, toolTip; @@ -235,7 +235,7 @@ void KOEditorGeneral::initAlarm( TQWidget *parent, TQBoxLayout *topLayout ) TQWhatsThis::add( mAlarmIncrCombo, whatsThis ); TQToolTip::add( mAlarmIncrCombo, toolTip ); - mAlarmInfoLabel = new TQLabel( parent ); + mAlarmInfoLabel = new TQLabel( tqparent ); if ( mType == "Event" ) { mAlarmInfoLabel->setText( i18n( "before the start" ) ); } else { @@ -253,9 +253,9 @@ void KOEditorGeneral::initAlarm( TQWidget *parent, TQBoxLayout *topLayout ) connect( mAlarmButton, TQT_SIGNAL(toggled(bool)), mAlarmInfoLabel, TQT_SLOT(setEnabled(bool)) ); } -void KOEditorGeneral::initAttachments(TQWidget *parent,TQBoxLayout *topLayout) +void KOEditorGeneral::initAttachments(TQWidget *tqparent,TQBoxLayout *topLayout) { - mAttachments = new KOEditorAttachments( KDialog::spacingHint(), parent ); + mAttachments = new KOEditorAttachments( KDialog::spacingHint(), tqparent ); connect( mAttachments, TQT_SIGNAL( openURL( const KURL & ) ) , this, TQT_SIGNAL( openURL( const KURL & ) ) ); topLayout->addWidget( mAttachments, 1 ); diff --git a/korganizer/koeditorgeneral.h b/korganizer/koeditorgeneral.h index 1a9d6017c..d67305cf1 100644 --- a/korganizer/koeditorgeneral.h +++ b/korganizer/koeditorgeneral.h @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef KOEDITORGENERAL_H #define KOEDITORGENERAL_H @@ -46,11 +46,12 @@ namespace KCal { } using namespace KCal; -class FocusLineEdit : public QLineEdit +class FocusLineEdit : public TQLineEdit { Q_OBJECT + TQ_OBJECT public: - FocusLineEdit( TQWidget *parent ); + FocusLineEdit( TQWidget *tqparent ); signals: void focusReceivedSignal(); @@ -62,14 +63,15 @@ class FocusLineEdit : public QLineEdit bool mSkipFirst; }; -class KOEditorGeneral : public QObject +class KOEditorGeneral : public TQObject { Q_OBJECT + TQ_OBJECT public: - KOEditorGeneral (TQObject* parent=0,const char* name=0); + KOEditorGeneral (TQObject* tqparent=0,const char* name=0); virtual ~KOEditorGeneral(); - void initHeader( TQWidget *parent,TQBoxLayout *topLayout ); + void initHeader( TQWidget *tqparent,TQBoxLayout *topLayout ); void initDescription(TQWidget *,TQBoxLayout *); void initSecrecy(TQWidget *,TQBoxLayout *); void initAlarm(TQWidget *,TQBoxLayout *); diff --git a/korganizer/koeditorgeneralevent.cpp b/korganizer/koeditorgeneralevent.cpp index 3466e4125..123632f36 100644 --- a/korganizer/koeditorgeneralevent.cpp +++ b/korganizer/koeditorgeneralevent.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include @@ -56,9 +56,9 @@ #include "koeditorgeneralevent.h" #include "koeditorgeneralevent.moc" -KOEditorGeneralEvent::KOEditorGeneralEvent(TQObject* parent, +KOEditorGeneralEvent::KOEditorGeneralEvent(TQObject* tqparent, const char* name) : - KOEditorGeneral( parent, name) + KOEditorGeneral( tqparent, name) { connect( this, TQT_SIGNAL( dateTimesChanged( const TQDateTime &, const TQDateTime & )), TQT_SLOT( setDuration() ) ); @@ -91,12 +91,12 @@ void KOEditorGeneralEvent::finishSetup() mSummaryEdit->setFocus(); } -void KOEditorGeneralEvent::initTime(TQWidget *parent,TQBoxLayout *topLayout) +void KOEditorGeneralEvent::initTime(TQWidget *tqparent,TQBoxLayout *topLayout) { TQBoxLayout *timeLayout = new TQVBoxLayout(topLayout); TQGroupBox *timeGroupBox = new TQGroupBox(1,TQGroupBox::Horizontal, - i18n("Date && Time"),parent); + i18n("Date && Time"),tqparent); TQWhatsThis::add( timeGroupBox, i18n("Sets options related to the date and time of the " "event or to-do.") ); @@ -175,17 +175,17 @@ void KOEditorGeneralEvent::initTime(TQWidget *parent,TQBoxLayout *topLayout) initClass( timeBoxFrame, classLayout ); } -void KOEditorGeneralEvent::initClass(TQWidget *parent,TQBoxLayout *topLayout) +void KOEditorGeneralEvent::initClass(TQWidget *tqparent,TQBoxLayout *topLayout) { TQBoxLayout *classLayout = new TQHBoxLayout(topLayout); - TQLabel *freeTimeLabel = new TQLabel(i18n("S&how time as:"),parent); + TQLabel *freeTimeLabel = new TQLabel(i18n("S&how time as:"),tqparent); TQString whatsThis = i18n("Sets how this time will appear on your Free/Busy " "information."); TQWhatsThis::add( freeTimeLabel, whatsThis ); classLayout->addWidget(freeTimeLabel); - mFreeTimeCombo = new TQComboBox(false, parent); + mFreeTimeCombo = new TQComboBox(false, tqparent); TQWhatsThis::add( mFreeTimeCombo, whatsThis ); mFreeTimeCombo->insertItem(i18n("Busy")); mFreeTimeCombo->insertItem(i18n("Free")); @@ -193,10 +193,10 @@ void KOEditorGeneralEvent::initClass(TQWidget *parent,TQBoxLayout *topLayout) freeTimeLabel->setBuddy( mFreeTimeCombo ); } -void KOEditorGeneralEvent::initInvitationBar(TQWidget * parent, TQBoxLayout * tqlayout) +void KOEditorGeneralEvent::initInvitationBar(TQWidget * tqparent, TQBoxLayout * tqlayout) { TQBoxLayout *topLayout = new TQHBoxLayout( tqlayout ); - mInvitationBar = new TQFrame( parent ); + mInvitationBar = new TQFrame( tqparent ); mInvitationBar->setPaletteBackgroundColor( KGlobalSettings::alternateBackgroundColor() ); topLayout->addWidget( mInvitationBar ); diff --git a/korganizer/koeditorgeneralevent.h b/korganizer/koeditorgeneralevent.h index 7e7916d6e..83b09ecc5 100644 --- a/korganizer/koeditorgeneralevent.h +++ b/korganizer/koeditorgeneralevent.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef _KOEDITORGENERALEVENT_H #define _KOEDITORGENERALEVENT_H @@ -42,13 +42,14 @@ using namespace KCal; class KOEditorGeneralEvent : public KOEditorGeneral { Q_OBJECT + TQ_OBJECT public: - KOEditorGeneralEvent (TQObject* parent=0,const char* name=0); + KOEditorGeneralEvent (TQObject* tqparent=0,const char* name=0); virtual ~KOEditorGeneralEvent(); void initTime(TQWidget *,TQBoxLayout *); void initClass(TQWidget *,TQBoxLayout *); - void initInvitationBar( TQWidget* parent, TQBoxLayout *tqlayout ); + void initInvitationBar( TQWidget* tqparent, TQBoxLayout *tqlayout ); void finishSetup(); diff --git a/korganizer/koeditorgeneraljournal.cpp b/korganizer/koeditorgeneraljournal.cpp index c53babbe7..274c58b90 100644 --- a/korganizer/koeditorgeneraljournal.cpp +++ b/korganizer/koeditorgeneraljournal.cpp @@ -20,8 +20,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include "koeditorgeneraljournal.h" @@ -45,9 +45,9 @@ #include -KOEditorGeneralJournal::KOEditorGeneralJournal( TQWidget *parent, +KOEditorGeneralJournal::KOEditorGeneralJournal( TQWidget *tqparent, const char *name ) - : KOEditorGeneral( parent, name ) + : KOEditorGeneral( tqparent, name ) { setType( "Journal" ); } @@ -56,43 +56,43 @@ KOEditorGeneralJournal::~KOEditorGeneralJournal() { } -void KOEditorGeneralJournal::initTitle( TQWidget *parent, TQBoxLayout *topLayout ) +void KOEditorGeneralJournal::initTitle( TQWidget *tqparent, TQBoxLayout *topLayout ) { TQHBoxLayout *hbox = new TQHBoxLayout( topLayout ); TQString whatsThis = i18n("Sets the title of this journal."); - TQLabel *summaryLabel = new TQLabel( i18n("T&itle:"), parent ); + TQLabel *summaryLabel = new TQLabel( i18n("T&itle:"), tqparent ); TQWhatsThis::add( summaryLabel, whatsThis ); TQFont f = summaryLabel->font(); f.setBold( true ); summaryLabel->setFont( f ); hbox->addWidget( summaryLabel ); - mSummaryEdit = new FocusLineEdit( parent ); + mSummaryEdit = new FocusLineEdit( tqparent ); TQWhatsThis::add( mSummaryEdit, whatsThis ); summaryLabel->setBuddy( mSummaryEdit ); hbox->addWidget( mSummaryEdit ); } -void KOEditorGeneralJournal::initDate( TQWidget *parent, TQBoxLayout *topLayout ) +void KOEditorGeneralJournal::initDate( TQWidget *tqparent, TQBoxLayout *topLayout ) { // TQBoxLayout *dateLayout = new TQVBoxLayout(topLayout); TQBoxLayout *dateLayout = new TQHBoxLayout( topLayout ); - mDateLabel = new TQLabel( i18n("&Date:"), parent); + mDateLabel = new TQLabel( i18n("&Date:"), tqparent); dateLayout->addWidget( mDateLabel ); - mDateEdit = new KDateEdit( parent ); + mDateEdit = new KDateEdit( tqparent ); dateLayout->addWidget( mDateEdit ); mDateLabel->setBuddy( mDateEdit ); dateLayout->addStretch(); - mTimeCheckBox = new TQCheckBox( i18n("&Time: "), parent ); + mTimeCheckBox = new TQCheckBox( i18n("&Time: "), tqparent ); dateLayout->addWidget( mTimeCheckBox ); - mTimeEdit = new KTimeEdit( parent ); + mTimeEdit = new KTimeEdit( tqparent ); dateLayout->addWidget( mTimeEdit ); connect( mTimeCheckBox, TQT_SIGNAL(toggled(bool)), mTimeEdit, TQT_SLOT(setEnabled(bool)) ); @@ -120,9 +120,9 @@ kdDebug()<<"KOEditorGeneralJournal::setTime, time is valid"<append(""); mDescriptionEdit->setReadOnly( false ); mDescriptionEdit->setOverwriteMode( false ); diff --git a/korganizer/koeditorgeneraljournal.h b/korganizer/koeditorgeneraljournal.h index 649a6d345..f8155ea20 100644 --- a/korganizer/koeditorgeneraljournal.h +++ b/korganizer/koeditorgeneraljournal.h @@ -19,8 +19,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef KOEDITORGENERALJOURNAL_H #define KOEDITORGENERALJOURNAL_H @@ -48,13 +48,14 @@ using namespace KCal; class KOEditorGeneralJournal : public KOEditorGeneral { Q_OBJECT + TQ_OBJECT public: - KOEditorGeneralJournal ( TQWidget *parent=0, const char* name=0 ); + KOEditorGeneralJournal ( TQWidget *tqparent=0, const char* name=0 ); virtual ~KOEditorGeneralJournal(); void initDate( TQWidget *, TQBoxLayout * ); void initDescription( TQWidget *, TQBoxLayout * ); - void initTitle( TQWidget *parent, TQBoxLayout *topLayout ); + void initTitle( TQWidget *tqparent, TQBoxLayout *topLayout ); /** Set widgets to default values */ void setDefaults( const TQDate &date ); diff --git a/korganizer/koeditorgeneraltodo.cpp b/korganizer/koeditorgeneraltodo.cpp index 13ba5192d..93caec36f 100644 --- a/korganizer/koeditorgeneraltodo.cpp +++ b/korganizer/koeditorgeneraltodo.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include @@ -56,8 +56,8 @@ #include "koeditorgeneraltodo.h" #include "koeditorgeneraltodo.moc" -KOEditorGeneralTodo::KOEditorGeneralTodo( TQObject *parent, const char *name ) - : KOEditorGeneral( parent, name ) +KOEditorGeneralTodo::KOEditorGeneralTodo( TQObject *tqparent, const char *name ) + : KOEditorGeneral( tqparent, name ) { setType( "Todo" ); } @@ -91,13 +91,13 @@ void KOEditorGeneralTodo::finishSetup() mSummaryEdit->setFocus(); } -void KOEditorGeneralTodo::initTime(TQWidget *parent,TQBoxLayout *topLayout) +void KOEditorGeneralTodo::initTime(TQWidget *tqparent,TQBoxLayout *topLayout) { kdDebug(5850) << k_funcinfo << endl; TQBoxLayout *timeLayout = new TQVBoxLayout(topLayout); TQGroupBox *timeGroupBox = new TQGroupBox(1,TQGroupBox::Horizontal, - i18n("Date && Time"),parent); + i18n("Date && Time"),tqparent); timeLayout->addWidget(timeGroupBox); TQFrame *timeBoxFrame = new TQFrame(timeGroupBox); @@ -182,14 +182,14 @@ void KOEditorGeneralTodo::initTime(TQWidget *parent,TQBoxLayout *topLayout) } -void KOEditorGeneralTodo::initCompletion( TQWidget *parent, TQBoxLayout *topLayout ) +void KOEditorGeneralTodo::initCompletion( TQWidget *tqparent, TQBoxLayout *topLayout ) { TQHBoxLayout *completionLayout = new TQHBoxLayout( topLayout ); - TQLabel *label = new TQLabel( i18n( "&Completed:" ), parent ); + TQLabel *label = new TQLabel( i18n( "&Completed:" ), tqparent ); completionLayout->addWidget( label ); - mCompletedToggle = new TQCheckBox( parent ); + mCompletedToggle = new TQCheckBox( tqparent ); TQToolTip::add( mCompletedToggle, i18n( "Toggle between 0% and 100% complete" ) ); TQWhatsThis::add( mCompletedToggle, @@ -199,7 +199,7 @@ void KOEditorGeneralTodo::initCompletion( TQWidget *parent, TQBoxLayout *topLayo completionLayout->addWidget( mCompletedToggle ); label->setBuddy( mCompletedToggle ); - mCompletedCombo = new TQComboBox( parent ); + mCompletedCombo = new TQComboBox( tqparent ); TQToolTip::add( mCompletedCombo, i18n( "Select the completed percentage" ) ); TQWhatsThis::add( mCompletedCombo, @@ -212,25 +212,25 @@ void KOEditorGeneralTodo::initCompletion( TQWidget *parent, TQBoxLayout *topLayo connect( mCompletedCombo, TQT_SIGNAL(activated(int)), TQT_SLOT(completedChanged(int)) ); completionLayout->addWidget( mCompletedCombo ); - mCompletedLabel = new TQLabel( i18n( "completed on", "on" ), parent ); + mCompletedLabel = new TQLabel( i18n( "completed on", "on" ), tqparent ); mCompletedLabel->hide(); completionLayout->addWidget( mCompletedLabel ); - mCompletionDateEdit = new KDateEdit( parent ); + mCompletionDateEdit = new KDateEdit( tqparent ); mCompletionDateEdit->hide(); completionLayout->addWidget( mCompletionDateEdit ); - mCompletionTimeEdit = new KTimeEdit( parent, TQTime() ); + mCompletionTimeEdit = new KTimeEdit( tqparent, TQTime() ); mCompletionTimeEdit->hide(); completionLayout->addWidget( mCompletionTimeEdit ); } -void KOEditorGeneralTodo::initPriority(TQWidget *parent, TQBoxLayout *topLayout) +void KOEditorGeneralTodo::initPriority(TQWidget *tqparent, TQBoxLayout *topLayout) { - TQLabel *priorityLabel = new TQLabel( i18n( "&Priority:" ), parent ); + TQLabel *priorityLabel = new TQLabel( i18n( "&Priority:" ), tqparent ); topLayout->addWidget( priorityLabel ); - mPriorityCombo = new TQComboBox( parent ); + mPriorityCombo = new TQComboBox( tqparent ); TQToolTip::add( mPriorityCombo, i18n( "Set the priority of the to-do" ) ); TQWhatsThis::add( mPriorityCombo, @@ -252,15 +252,15 @@ void KOEditorGeneralTodo::initPriority(TQWidget *parent, TQBoxLayout *topLayout) priorityLabel->setBuddy( mPriorityCombo ); } -void KOEditorGeneralTodo::iniStatus(TQWidget *parent,TQBoxLayout *topLayout) +void KOEditorGeneralTodo::initqStatus(TQWidget *tqparent,TQBoxLayout *topLayout) { TQBoxLayout *statusLayout = new TQHBoxLayout(topLayout); - initCompletion( parent, statusLayout ); + initCompletion( tqparent, statusLayout ); statusLayout->addStretch( 1 ); - initPriority( parent, statusLayout ); + initPriority( tqparent, statusLayout ); } void KOEditorGeneralTodo::setDefaults( const TQDateTime &due, bool allDay ) diff --git a/korganizer/koeditorgeneraltodo.h b/korganizer/koeditorgeneraltodo.h index 438ff9c28..cd50285eb 100644 --- a/korganizer/koeditorgeneraltodo.h +++ b/korganizer/koeditorgeneraltodo.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef _KOEDITORGENERALTODO_H #define _KOEDITORGENERALTODO_H @@ -42,12 +42,13 @@ using namespace KCal; class KOEditorGeneralTodo : public KOEditorGeneral { Q_OBJECT + TQ_OBJECT public: - KOEditorGeneralTodo (TQObject* parent=0,const char* name=0); + KOEditorGeneralTodo (TQObject* tqparent=0,const char* name=0); virtual ~KOEditorGeneralTodo(); void initTime(TQWidget *, TQBoxLayout *); - void iniStatus(TQWidget *, TQBoxLayout *); + void initqStatus(TQWidget *, TQBoxLayout *); void initCompletion(TQWidget *, TQBoxLayout *); void initPriority(TQWidget *, TQBoxLayout *); diff --git a/korganizer/koeditorrecurrence.cpp b/korganizer/koeditorrecurrence.cpp index 46038834e..834ea1ce2 100644 --- a/korganizer/koeditorrecurrence.cpp +++ b/korganizer/koeditorrecurrence.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include @@ -60,8 +60,8 @@ /////////////////////////// RecurBase /////////////////////////////// -RecurBase::RecurBase( TQWidget *parent, const char *name ) : - TQWidget( parent, name ) +RecurBase::RecurBase( TQWidget *tqparent, const char *name ) : + TQWidget( tqparent, name ) { mFrequencyEdit = new TQSpinBox( 1, 9999, 1, this ); mFrequencyEdit->setValue( 1 ); @@ -84,9 +84,9 @@ int RecurBase::frequency() return mFrequencyEdit->value(); } -TQComboBox *RecurBase::createWeekCountCombo( TQWidget *parent, const char *name ) +TQComboBox *RecurBase::createWeekCountCombo( TQWidget *tqparent, const char *name ) { - TQComboBox *combo = new TQComboBox( parent, name ); + TQComboBox *combo = new TQComboBox( tqparent, name ); TQWhatsThis::add( combo, i18n("The number of the week from the beginning " "of the month on which this event or to-do " @@ -105,9 +105,9 @@ TQComboBox *RecurBase::createWeekCountCombo( TQWidget *parent, const char *name return combo; } -TQComboBox *RecurBase::createWeekdayCombo( TQWidget *parent, const char *name ) +TQComboBox *RecurBase::createWeekdayCombo( TQWidget *tqparent, const char *name ) { - TQComboBox *combo = new TQComboBox( parent, name ); + TQComboBox *combo = new TQComboBox( tqparent, name ); TQWhatsThis::add( combo, i18n("The weekday on which this event or to-do " "should recur.") ); @@ -119,9 +119,9 @@ TQComboBox *RecurBase::createWeekdayCombo( TQWidget *parent, const char *name ) return combo; } -TQComboBox *RecurBase::createMonthNameCombo( TQWidget *parent, const char *name ) +TQComboBox *RecurBase::createMonthNameCombo( TQWidget *tqparent, const char *name ) { - TQComboBox *combo = new TQComboBox( parent, name ); + TQComboBox *combo = new TQComboBox( tqparent, name ); TQWhatsThis::add( combo, i18n("The month during which this event or to-do " "should recur.") ); @@ -135,13 +135,13 @@ TQComboBox *RecurBase::createMonthNameCombo( TQWidget *parent, const char *name return combo; } -TQBoxLayout *RecurBase::createFrequencySpinBar( TQWidget *parent, TQLayout *tqlayout, +TQBoxLayout *RecurBase::createFrequencySpinBar( TQWidget *tqparent, TQLayout *tqlayout, TQString everyText, TQString unitText ) { TQBoxLayout *freqLayout = new TQHBoxLayout( tqlayout ); TQString whatsThis = i18n("Sets how often this event or to-do should recur."); - TQLabel *preLabel = new TQLabel( everyText, parent ); + TQLabel *preLabel = new TQLabel( everyText, tqparent ); TQWhatsThis::add( preLabel, whatsThis ); freqLayout->addWidget( preLabel ); @@ -149,7 +149,7 @@ TQBoxLayout *RecurBase::createFrequencySpinBar( TQWidget *parent, TQLayout *tqla preLabel->setBuddy( frequencyEdit() ); TQWhatsThis::add( preLabel->buddy(), whatsThis ); - TQLabel *postLabel = new TQLabel( unitText, parent ); + TQLabel *postLabel = new TQLabel( unitText, tqparent ); TQWhatsThis::add( postLabel, whatsThis ); freqLayout->addWidget( postLabel ); freqLayout->addStretch(); @@ -158,8 +158,8 @@ TQBoxLayout *RecurBase::createFrequencySpinBar( TQWidget *parent, TQLayout *tqla /////////////////////////// RecurDaily /////////////////////////////// -RecurDaily::RecurDaily( TQWidget *parent, const char *name ) : - RecurBase( parent, name ) +RecurDaily::RecurDaily( TQWidget *tqparent, const char *name ) : + RecurBase( tqparent, name ) { TQBoxLayout *topLayout = new TQVBoxLayout( this ); topLayout->setSpacing( KDialog::spacingHint() ); @@ -170,8 +170,8 @@ RecurDaily::RecurDaily( TQWidget *parent, const char *name ) : /////////////////////////// RecurWeekly /////////////////////////////// -RecurWeekly::RecurWeekly( TQWidget *parent, const char *name ) : - RecurBase( parent, name ) +RecurWeekly::RecurWeekly( TQWidget *tqparent, const char *name ) : + RecurBase( tqparent, name ) { TQBoxLayout *topLayout = new TQVBoxLayout( this ); topLayout->setSpacing( KDialog::spacingHint() ); @@ -223,8 +223,8 @@ TQBitArray RecurWeekly::days() /////////////////////////// RecurMonthly /////////////////////////////// -RecurMonthly::RecurMonthly( TQWidget *parent, const char *name ) : - RecurBase( parent, name ) +RecurMonthly::RecurMonthly( TQWidget *tqparent, const char *name ) : + RecurBase( tqparent, name ) { TQBoxLayout *topLayout = new TQVBoxLayout( this ); topLayout->setSpacing( KDialog::spacingHint() ); @@ -396,8 +396,8 @@ int RecurMonthly::weekday() /////////////////////////// RecurYearly /////////////////////////////// -RecurYearly::RecurYearly( TQWidget *parent, const char *name ) : - RecurBase( parent, name ) +RecurYearly::RecurYearly( TQWidget *tqparent, const char *name ) : + RecurBase( tqparent, name ) { TQBoxLayout *topLayout = new TQVBoxLayout( this ); topLayout->setSpacing( KDialog::spacingHint() ); @@ -573,8 +573,8 @@ int RecurYearly::day() //////////////////////////// ExceptionsWidget ////////////////////////// -ExceptionsWidget::ExceptionsWidget( TQWidget *parent, const char *name ) : - TQWidget( parent, name ) +ExceptionsWidget::ExceptionsWidget( TQWidget *tqparent, const char *name ) : + TQWidget( tqparent, name ) { TQBoxLayout *topLayout = new TQVBoxLayout( this ); @@ -675,8 +675,8 @@ DateList ExceptionsWidget::dates() ///////////////////////// ExceptionsDialog /////////////////////////// -ExceptionsDialog::ExceptionsDialog( TQWidget *parent, const char *name ) : - KDialogBase( parent, name, true, i18n("Edit Exceptions"), Ok|Cancel ) +ExceptionsDialog::ExceptionsDialog( TQWidget *tqparent, const char *name ) : + KDialogBase( tqparent, name, true, i18n("Edit Exceptions"), Ok|Cancel ) { mExceptions = new ExceptionsWidget( this ); setMainWidget( mExceptions ); @@ -694,9 +694,9 @@ DateList ExceptionsDialog::dates() ///////////////////////// RecurrenceRangeWidget /////////////////////////// -RecurrenceRangeWidget::RecurrenceRangeWidget( TQWidget *parent, +RecurrenceRangeWidget::RecurrenceRangeWidget( TQWidget *tqparent, const char *name ) - : TQWidget( parent, name ) + : TQWidget( tqparent, name ) { TQBoxLayout *topLayout = new TQVBoxLayout( this ); @@ -829,9 +829,9 @@ void RecurrenceRangeWidget::setDateTimes( const TQDateTime &start, ///////////////////////// RecurrenceRangeDialog /////////////////////////// -RecurrenceRangeDialog::RecurrenceRangeDialog( TQWidget *parent, +RecurrenceRangeDialog::RecurrenceRangeDialog( TQWidget *tqparent, const char *name ) : - KDialogBase( parent, name, true, i18n("Edit Recurrence Range"), Ok|Cancel ) + KDialogBase( tqparent, name, true, i18n("Edit Recurrence Range"), Ok|Cancel ) { mRecurrenceRangeWidget = new RecurrenceRangeWidget( this ); setMainWidget( mRecurrenceRangeWidget ); @@ -870,8 +870,8 @@ void RecurrenceRangeDialog::setDateTimes( const TQDateTime &start, //////////////////////////// RecurrenceChooser //////////////////////// -RecurrenceChooser::RecurrenceChooser( TQWidget *parent, const char *name ) : - TQWidget( parent, name ) +RecurrenceChooser::RecurrenceChooser( TQWidget *tqparent, const char *name ) : + TQWidget( tqparent, name ) { TQBoxLayout *topLayout = new TQVBoxLayout( this ); @@ -965,8 +965,8 @@ void RecurrenceChooser::emitChoice() /////////////////////////////// Main Widget ///////////////////////////// -KOEditorRecurrence::KOEditorRecurrence( TQWidget* parent, const char *name ) : - TQWidget( parent, name ) +KOEditorRecurrence::KOEditorRecurrence( TQWidget* tqparent, const char *name ) : + TQWidget( tqparent, name ) { TQGridLayout *topLayout = new TQGridLayout( this ); topLayout->setSpacing( KDialog::spacingHint() ); @@ -1633,8 +1633,8 @@ void KOEditorRecurrence::restoreValues() mExceptions->setDates( mSaveRec.exDates() ); } -KOEditorRecurrenceDialog::KOEditorRecurrenceDialog(TQWidget * parent) - : KDialogBase( parent, 0, false, i18n("Recurrence"), Ok|Cancel ), mRecurEnabled( false ) +KOEditorRecurrenceDialog::KOEditorRecurrenceDialog(TQWidget * tqparent) + : KDialogBase( tqparent, 0, false, i18n("Recurrence"), Ok|Cancel ), mRecurEnabled( false ) { mRecurrence = new KOEditorRecurrence( this ); setMainWidget( mRecurrence ); diff --git a/korganizer/koeditorrecurrence.h b/korganizer/koeditorrecurrence.h index 831ba62ba..3060d660a 100644 --- a/korganizer/koeditorrecurrence.h +++ b/korganizer/koeditorrecurrence.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef _KOEDITORRECURRENCE_H #define _KOEDITORRECURRENCE_H @@ -44,10 +44,10 @@ class Incidence; } using namespace KCal; -class RecurBase : public QWidget +class RecurBase : public TQWidget { public: - RecurBase( TQWidget *parent = 0, const char *name = 0 ); + RecurBase( TQWidget *tqparent = 0, const char *name = 0 ); void setFrequency( int ); int frequency(); @@ -58,10 +58,10 @@ class RecurBase : public QWidget TQWidget *frequencyEdit(); protected: - 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 *tqlayout, + static TQComboBox *createWeekCountCombo( TQWidget *tqparent=0, const char *name=0 ); + static TQComboBox *createWeekdayCombo( TQWidget *tqparent=0, const char *name=0 ); + static TQComboBox *createMonthNameCombo( TQWidget *tqparent=0, const char *name=0 ); + TQBoxLayout *createFrequencySpinBar( TQWidget *tqparent, TQLayout *tqlayout, TQString everyText, TQString unitText ); private: @@ -71,13 +71,13 @@ class RecurBase : public QWidget class RecurDaily : public RecurBase { public: - RecurDaily( TQWidget *parent = 0, const char *name = 0 ); + RecurDaily( TQWidget *tqparent = 0, const char *name = 0 ); }; class RecurWeekly : public RecurBase { public: - RecurWeekly( TQWidget *parent = 0, const char *name = 0 ); + RecurWeekly( TQWidget *tqparent = 0, const char *name = 0 ); void setDays( const TQBitArray & ); TQBitArray days(); @@ -89,7 +89,7 @@ class RecurWeekly : public RecurBase class RecurMonthly : public RecurBase { public: - RecurMonthly( TQWidget *parent = 0, const char *name = 0 ); + RecurMonthly( TQWidget *tqparent = 0, const char *name = 0 ); void setByDay( int day ); void setByPos( int count, int weekday ); @@ -116,7 +116,7 @@ class RecurYearly : public RecurBase public: enum YearlyType { byDay, byPos, byMonth }; - RecurYearly( TQWidget *parent = 0, const char *name = 0 ); + RecurYearly( TQWidget *tqparent = 0, const char *name = 0 ); void setByDay( int day ); void setByPos( int count, int weekday, int month ); @@ -146,11 +146,12 @@ class RecurYearly : public RecurBase TQSpinBox *mByDaySpin; }; -class RecurrenceChooser : public QWidget +class RecurrenceChooser : public TQWidget { Q_OBJECT + TQ_OBJECT public: - RecurrenceChooser( TQWidget *parent = 0, const char *name = 0 ); + RecurrenceChooser( TQWidget *tqparent = 0, const char *name = 0 ); enum { Daily, Weekly, Monthly, Yearly }; @@ -182,8 +183,9 @@ class ExceptionsBase class ExceptionsWidget : public TQWidget, public ExceptionsBase { Q_OBJECT + TQ_OBJECT public: - ExceptionsWidget( TQWidget *parent = 0, const char *name = 0 ); + ExceptionsWidget( TQWidget *tqparent = 0, const char *name = 0 ); void setDates( const DateList & ); DateList dates(); @@ -202,7 +204,7 @@ class ExceptionsWidget : public TQWidget, public ExceptionsBase class ExceptionsDialog : public KDialogBase, public ExceptionsBase { public: - ExceptionsDialog( TQWidget *parent, const char *name = 0 ); + ExceptionsDialog( TQWidget *tqparent, const char *name = 0 ); void setDates( const DateList & ); DateList dates(); @@ -229,8 +231,9 @@ class RecurrenceRangeBase class RecurrenceRangeWidget : public TQWidget, public RecurrenceRangeBase { Q_OBJECT + TQ_OBJECT public: - RecurrenceRangeWidget( TQWidget *parent = 0, const char *name = 0 ); + RecurrenceRangeWidget( TQWidget *tqparent = 0, const char *name = 0 ); void setDefaults( const TQDateTime &from ); @@ -259,7 +262,7 @@ class RecurrenceRangeWidget : public TQWidget, public RecurrenceRangeBase class RecurrenceRangeDialog : public KDialogBase, public RecurrenceRangeBase { public: - RecurrenceRangeDialog( TQWidget *parent = 0, const char *name = 0 ); + RecurrenceRangeDialog( TQWidget *tqparent = 0, const char *name = 0 ); void setDefaults( const TQDateTime &from ); @@ -276,11 +279,12 @@ class RecurrenceRangeDialog : public KDialogBase, public RecurrenceRangeBase RecurrenceRangeWidget *mRecurrenceRangeWidget; }; -class KOEditorRecurrence : public QWidget +class KOEditorRecurrence : public TQWidget { Q_OBJECT + TQ_OBJECT public: - KOEditorRecurrence ( TQWidget *parent = 0, const char *name = 0 ); + KOEditorRecurrence ( TQWidget *tqparent = 0, const char *name = 0 ); virtual ~KOEditorRecurrence(); enum { Daily, Weekly, Monthly, Yearly }; @@ -345,8 +349,9 @@ class KOEditorRecurrence : public QWidget class KOEditorRecurrenceDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - KOEditorRecurrenceDialog( TQWidget *parent ); + KOEditorRecurrenceDialog( TQWidget *tqparent ); KOEditorRecurrence* editor() const { return mRecurrence; } protected slots: diff --git a/korganizer/koeventeditor.cpp b/korganizer/koeventeditor.cpp index 69cb9c76f..3373778a4 100644 --- a/korganizer/koeventeditor.cpp +++ b/korganizer/koeventeditor.cpp @@ -19,8 +19,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include @@ -50,8 +50,8 @@ #include "koeventeditor.h" -KOEventEditor::KOEventEditor( Calendar *calendar, TQWidget *parent ) - : KOIncidenceEditor( TQString::null, calendar, parent ), +KOEventEditor::KOEventEditor( Calendar *calendar, TQWidget *tqparent ) + : KOIncidenceEditor( TQString(), calendar, tqparent ), mEvent( 0 ), mCalendar( 0 ), mGeneral( 0 ), mRecurrence( 0 ), mFreeBusy( 0 ) { } @@ -232,7 +232,7 @@ void KOEventEditor::setTexts( const TQString &summary, const TQString &descripti { if ( description.isEmpty() && summary.tqcontains("\n") ) { mGeneral->setDescription( summary ); - int pos = summary.find( "\n" ); + int pos = summary.tqfind( "\n" ); mGeneral->setSummary( summary.left( pos ) ); } else { mGeneral->setSummary( summary ); @@ -307,7 +307,7 @@ bool KOEventEditor::processInput() mEvent->setOrganizer( Person( KOPrefs::instance()->fullName(), KOPrefs::instance()->email() ) ); writeEvent( mEvent ); - // NOTE: triggered by addIncidence, the kolab resource might open a non-modal dialog (parent is not available in the resource) to select a resource folder. Thus the user can close this dialog before addIncidence() returns. + // NOTE: triggered by addIncidence, the kolab resource might open a non-modal dialog (tqparent is not available in the resource) to select a resource folder. Thus the user can close this dialog before addIncidence() returns. if ( !mChanger->addIncidence( mEvent, mResource, mSubResource, this ) ) { delete mEvent; mEvent = 0; diff --git a/korganizer/koeventeditor.h b/korganizer/koeventeditor.h index 3d65bb0ac..c9559a1ee 100644 --- a/korganizer/koeventeditor.h +++ b/korganizer/koeventeditor.h @@ -19,8 +19,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef KOEVENTEDITOR_H #define KOEVENTEDITOR_H @@ -48,11 +48,12 @@ using namespace KCal; class KOEventEditor : public KOIncidenceEditor { Q_OBJECT + TQ_OBJECT public: /** Construct new event editor. */ - KOEventEditor( Calendar *calendar, TQWidget *parent ); + KOEventEditor( Calendar *calendar, TQWidget *tqparent ); virtual ~KOEventEditor(void); void init(); @@ -67,10 +68,10 @@ class KOEventEditor : public KOIncidenceEditor /** Sets the given summary and description. If description is empty and the - summary tqcontains multiple lines, the summary will be used as description + summary contains 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 ); + void setTexts( const TQString &summary, const TQString &description = TQString() ); /** Edit an existing event. */ diff --git a/korganizer/koeventpopupmenu.cpp b/korganizer/koeventpopupmenu.cpp index b0326ee52..3c5dd5196 100644 --- a/korganizer/koeventpopupmenu.cpp +++ b/korganizer/koeventpopupmenu.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include diff --git a/korganizer/koeventpopupmenu.h b/korganizer/koeventpopupmenu.h index 96911b8cb..8232da4e4 100644 --- a/korganizer/koeventpopupmenu.h +++ b/korganizer/koeventpopupmenu.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef KOEVENTPOPUPMENU_H #define KOEVENTPOPUPMENU_H @@ -38,6 +38,7 @@ using namespace KCal; class KOEventPopupMenu : public TQPopupMenu { Q_OBJECT + TQ_OBJECT public: KOEventPopupMenu(); diff --git a/korganizer/koeventview.cpp b/korganizer/koeventview.cpp index 9e01ea4e0..8938d8d45 100644 --- a/korganizer/koeventview.cpp +++ b/korganizer/koeventview.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include @@ -44,8 +44,8 @@ using namespace KOrg; //--------------------------------------------------------------------------- -KOEventView::KOEventView(Calendar *cal,TQWidget *parent,const char *name) - : KOrg::BaseView(cal,parent,name) +KOEventView::KOEventView(Calendar *cal,TQWidget *tqparent,const char *name) + : KOrg::BaseView(cal,tqparent,name) { } diff --git a/korganizer/koeventview.h b/korganizer/koeventview.h index 69f6377f9..0a29e0c93 100644 --- a/korganizer/koeventview.h +++ b/korganizer/koeventview.h @@ -19,8 +19,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef _KOEVENTVIEW_H #define _KOEVENTVIEW_H @@ -55,16 +55,17 @@ class TQPopupMenu; class KOEventView : public KOrg::BaseView { Q_OBJECT + TQ_OBJECT public: /** * Constructs a view. * @param cal is a pointer to the calendar object from which events * will be retrieved for display. - * @param parent is the parent TQWidget. + * @param tqparent is the tqparent TQWidget. * @param name is the view name. */ - KOEventView(Calendar *cal,TQWidget *parent=0,const char *name=0); + KOEventView(Calendar *cal,TQWidget *tqparent=0,const char *name=0); /** * Destructor. Views will do view-specific cleanups here. diff --git a/korganizer/koeventviewer.cpp b/korganizer/koeventviewer.cpp index 3937c3871..8cd16faad 100644 --- a/korganizer/koeventviewer.cpp +++ b/korganizer/koeventviewer.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include "koeventviewer.h" @@ -39,8 +39,8 @@ #include #include -KOEventViewer::KOEventViewer( Calendar *calendar, TQWidget *parent, const char *name ) - : TQTextBrowser( parent, name ), mCalendar( calendar ), mDefaultText("") +KOEventViewer::KOEventViewer( Calendar *calendar, TQWidget *tqparent, const char *name ) + : TQTextBrowser( tqparent, name ), mCalendar( calendar ), mDefaultText("") { mIncidence = 0; connect( this, TQT_SIGNAL(highlighted(const TQString &)), TQT_SLOT(message(const TQString &)) ); diff --git a/korganizer/koeventviewer.h b/korganizer/koeventviewer.h index c4022d026..19ef3774d 100644 --- a/korganizer/koeventviewer.h +++ b/korganizer/koeventviewer.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef KOEVENTVIEWER_H #define KOEVENTVIEWER_H @@ -37,11 +37,12 @@ using namespace KCal; /** Viewer widget for events. */ -class KDE_EXPORT KOEventViewer : public QTextBrowser +class KDE_EXPORT KOEventViewer : public TQTextBrowser { Q_OBJECT + TQ_OBJECT public: - explicit KOEventViewer( Calendar *calendar, TQWidget *parent = 0, const char *name = 0 ); + explicit KOEventViewer( Calendar *calendar, TQWidget *tqparent = 0, const char *name = 0 ); virtual ~KOEventViewer(); /** diff --git a/korganizer/koeventviewerdialog.cpp b/korganizer/koeventviewerdialog.cpp index d88aa31c2..eccf2ac9e 100644 --- a/korganizer/koeventviewerdialog.cpp +++ b/korganizer/koeventviewerdialog.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include "koeventviewerdialog.h" @@ -28,9 +28,9 @@ #include -KOEventViewerDialog::KOEventViewerDialog( Calendar *calendar, TQWidget *parent, +KOEventViewerDialog::KOEventViewerDialog( Calendar *calendar, TQWidget *tqparent, const char *name, bool compact ) - : KDialogBase( parent, name, false, i18n("Event Viewer"), Ok, Ok, false, + : KDialogBase( tqparent, name, false, i18n("Event Viewer"), Ok, Ok, false, i18n("Edit") ) { mEventViewer = new KOEventViewer( calendar, this ); diff --git a/korganizer/koeventviewerdialog.h b/korganizer/koeventviewerdialog.h index dc0ceb7b7..147df9062 100644 --- a/korganizer/koeventviewerdialog.h +++ b/korganizer/koeventviewerdialog.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef KOEVENTVIEWERDIALOG_H #define KOEVENTVIEWERDIALOG_H @@ -41,8 +41,9 @@ class KOEventViewer; class KDE_EXPORT KOEventViewerDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - explicit KOEventViewerDialog( Calendar *calendar, TQWidget *parent = 0, + explicit KOEventViewerDialog( Calendar *calendar, TQWidget *tqparent = 0, const char *name = 0, bool compact = false ); virtual ~KOEventViewerDialog(); diff --git a/korganizer/koglobals.cpp b/korganizer/koglobals.cpp index 814ea178e..8f41e82cd 100644 --- a/korganizer/koglobals.cpp +++ b/korganizer/koglobals.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include @@ -126,11 +126,7 @@ void KOGlobals::fitDialogToScreen( TQWidget *wid, bool force ) bool KOGlobals::reverseLayout() { -#if QT_VERSION >= 0x030000 return TQApplication::reverseLayout(); -#else - return false; -#endif } TQPixmap KOGlobals::smallIcon( const TQString& name ) diff --git a/korganizer/koglobals.h b/korganizer/koglobals.h index 119eb6c1d..74a2006c3 100644 --- a/korganizer/koglobals.h +++ b/korganizer/koglobals.h @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef KORG_GLOBALS_H #define KORG_GLOBALS_H diff --git a/korganizer/kogroupware.cpp b/korganizer/kogroupware.cpp index c4e3a607c..5bf8d8fb4 100644 --- a/korganizer/kogroupware.cpp +++ b/korganizer/kogroupware.cpp @@ -1,7 +1,7 @@ /* This file is part of the Groupware/KOrganizer integration. - Requires the Qt and KDE widget libraries, available at no cost at + Requires the TQt and KDE widget libraries, available at no cost at http://www.trolltech.com and http://www.kde.org respectively Copyright (c) 2002-2004 Klarälvdalens Datakonsult AB @@ -24,11 +24,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -174,7 +174,7 @@ void KOGroupware::incomingDirChanged( const TQString& path ) KCal::Scheduler::Method method = static_cast( message->method() ); - KCal::ScheduleMessage::Status status = message->status(); + KCal::ScheduleMessage::tqStatus status = message->status(); KCal::Incidence* incidence = dynamic_cast( message->event() ); if(!incidence) { @@ -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)->seStatus( KCal::Attendee::Accepted ); + (*it)->setqStatus( KCal::Attendee::Accepted ); else if ( action.startsWith( "tentative" ) ) - (*it)->seStatus( KCal::Attendee::Tentative ); + (*it)->setqStatus( KCal::Attendee::Tentative ); else if ( KOPrefs::instance()->outlookCompatCounterProposals() && action.startsWith( "counter" ) ) - (*it)->seStatus( KCal::Attendee::Tentative ); + (*it)->setqStatus( KCal::Attendee::Tentative ); else if ( action.startsWith( "delegated" ) ) - (*it)->seStatus( KCal::Attendee::Delegated ); + (*it)->setqStatus( KCal::Attendee::Delegated ); break; } } @@ -238,7 +238,7 @@ class KOInvitationFormatterHelper : public InvitationFormatterHelper * Return true means accept the changes * Return false means revert the changes */ -bool KOGroupware::sendICalMessage( TQWidget* parent, +bool KOGroupware::sendICalMessage( TQWidget* tqparent, KCal::Scheduler::Method method, Incidence* incidence, KOGlobals::HowChanged action, @@ -318,7 +318,7 @@ bool KOGroupware::sendICalMessage( TQWidget* parent, } rc = KMessageBox::questionYesNo( - parent, txt, i18n( "Group Scheduling Email" ), + tqparent, txt, i18n( "Group Scheduling Email" ), KGuiItem( i18n( "Send Email" ) ), KGuiItem( i18n( "Do Not Send" ) ) ); } else { return true; @@ -331,14 +331,14 @@ bool KOGroupware::sendICalMessage( TQWidget* parent, // Ask if the user wants to tell the organizer about the current status TQString txt = i18n( "Do you want to send a status update to the " "organizer of this task?"); - rc = KMessageBox::questionYesNo( parent, txt, TQString::null, i18n("Send Update"), i18n("Do Not Send") ); + rc = KMessageBox::questionYesNo( tqparent, txt, TQString(), i18n("Send Update"), i18n("Do Not Send") ); } else if( incidence->type() == "Event" ) { TQString txt; if ( attendeeStatusChanged && method == Scheduler::Request ) { txt = i18n( "Your status as an attendee of this event changed. " "Do you want to send a status update to the event organizer?" ); method = Scheduler::Reply; - rc = KMessageBox::questionYesNo( parent, txt, TQString::null, i18n("Send Update"), i18n("Do Not Send") ); + rc = KMessageBox::questionYesNo( tqparent, txt, TQString(), i18n("Send Update"), i18n("Do Not Send") ); } else { if( action == KOGlobals::INCIDENCEDELETED ) { const TQStringList myEmails = KOPrefs::instance()->allEmails(); @@ -360,14 +360,14 @@ bool KOGroupware::sendICalMessage( TQWidget* parent, "Do you want to send an updated response to the organizer " "declining the invitation?" ); rc = KMessageBox::questionYesNo( - parent, txt, i18n( "Group Scheduling Email" ), + tqparent, txt, i18n( "Group Scheduling Email" ), KGuiItem( i18n( "Send Update" ) ), KGuiItem( i18n( "Do Not Send" ) ) ); setDoNotNotify( rc == KMessageBox::No ); } else { txt = i18n( "You are not the organizer of this event. Editing it will " "bring your calendar out of sync with the organizer's calendar. " "Do you really want to edit it?" ); - rc = KMessageBox::warningYesNo( parent, txt ); + rc = KMessageBox::warningYesNo( tqparent, txt ); return ( rc == KMessageBox::Yes ); } } diff --git a/korganizer/kogroupware.h b/korganizer/kogroupware.h index 5df80a6ac..4e74ed432 100644 --- a/korganizer/kogroupware.h +++ b/korganizer/kogroupware.h @@ -1,7 +1,7 @@ /* This file is part of the Groupware/KOrganizer integration. - Requires the Qt and KDE widget libraries, available at no cost at + Requires the TQt and KDE widget libraries, available at no cost at http://www.trolltech.com and http://www.kde.org respectively Copyright (c) 2002-2004 Klarälvdalens Datakonsult AB @@ -24,11 +24,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -62,9 +62,10 @@ class IncidenceChangerBase; using namespace KOrg; -class KOGroupware : public QObject +class KOGroupware : public TQObject { Q_OBJECT + TQ_OBJECT public: static KOGroupware* create( CalendarView*, KCal::CalendarResources* ); static KOGroupware* instance(); @@ -75,7 +76,7 @@ class KOGroupware : public QObject Returns false if the user cancels the dialog, and true if the user presses Yes og or No. */ - bool sendICalMessage( TQWidget *parent, KCal::Scheduler::Method method, + bool sendICalMessage( TQWidget *tqparent, KCal::Scheduler::Method method, Incidence* incidence, KOGlobals::HowChanged action, bool attendeeStatusChanged, diff --git a/korganizer/kogroupwareprefspage.ui b/korganizer/kogroupwareprefspage.ui index 71d392d67..4f1e604d1 100644 --- a/korganizer/kogroupwareprefspage.ui +++ b/korganizer/kogroupwareprefspage.ui @@ -1,6 +1,6 @@ KOGroupwarePrefsPage - + KOGroupwarePrefsPage @@ -16,14 +16,14 @@ unnamed - + groupwareTab true - + tab @@ -34,7 +34,7 @@ unnamed - + TextLabel1 @@ -45,7 +45,7 @@ WordBreak|AlignVCenter - + publishEnable @@ -58,7 +58,7 @@ It is possible to skip this option and mail or upload your Free/Busy information Note: If KOrganizer is acting as a KDE Kolab client, this is not required, as the Kolab2 server taking care of publishing your Free/Busy information and manages the access to it from other users. - + tqlayout8 @@ -66,7 +66,7 @@ Note: If KOrganizer is acting as a KDE Kolab client, this is not required, as th unnamed - + publishDelayLabel @@ -80,7 +80,7 @@ Note: If KOrganizer is acting as a KDE Kolab client, this is not required, as th Configure minimum the interval of time in minutes between each upload here. This configuration is only effective in case you choose to publish your information automatically. - + publishDelay @@ -93,7 +93,7 @@ Note: If KOrganizer is acting as a KDE Kolab client, this is not required, as th - + Layout16 @@ -101,7 +101,7 @@ Note: If KOrganizer is acting as a KDE Kolab client, this is not required, as th unnamed - + TextLabel3 @@ -115,7 +115,7 @@ Note: If KOrganizer is acting as a KDE Kolab client, this is not required, as th Configure the number of calendar days you wish to be published and available to others here. - + publishDays @@ -132,7 +132,7 @@ Note: If KOrganizer is acting as a KDE Kolab client, this is not required, as th Configure the number of calendar days you wish to be published and available to others here. - + TextLabel4 @@ -162,7 +162,7 @@ Note: If KOrganizer is acting as a KDE Kolab client, this is not required, as th - + ButtonGroup2 @@ -173,7 +173,7 @@ Note: If KOrganizer is acting as a KDE Kolab client, this is not required, as th unnamed - + publishUrl @@ -185,7 +185,7 @@ Note: If KOrganizer is acting as a KDE Kolab client, this is not required, as th Ask the server administrator for this information. - + publishSavePassword @@ -197,7 +197,7 @@ Ask the server administrator for this information. For security reasons, it is not recommended to store your password in the configuration file. - + textLabel2 @@ -211,7 +211,7 @@ For security reasons, it is not recommended to store your password in the config Enter your groupware server login password here. - + publishPassword @@ -222,7 +222,7 @@ For security reasons, it is not recommended to store your password in the config Enter your groupware server login password here. - + publishUser @@ -238,7 +238,7 @@ For security reasons, it is not recommended to store your password in the config A Kolab2 server specificity: Registered your UID (Unique IDentifier). By default your UID would be your email address on the Kolab2 server but it may also be different. In the last case enter your UID. - + TextLabel6 @@ -254,7 +254,7 @@ A Kolab2 server specificity: Registered your UID (Unique IDentifier). By default A Kolab2 server specificity: Registered your UID (Unique IDentifier). By default your UID would be your email address on the Kolab2 server but it may also be different. In the last case enter your UID. - + frame5 @@ -265,7 +265,7 @@ A Kolab2 server specificity: Registered your UID (Unique IDentifier). By default Sunken - + TextLabel7 @@ -301,7 +301,7 @@ Ask the server administrator for this information. - + tab @@ -312,7 +312,7 @@ Ask the server administrator for this information. unnamed - + TextLabel2 @@ -323,7 +323,7 @@ Ask the server administrator for this information. WordBreak|AlignVCenter - + retrieveEnable @@ -334,7 +334,7 @@ Ask the server administrator for this information. Check this box to retrieve other peoples' Free/Busy information automatically. Note that you have to fill the correct server information to make this possible. - + fullDomainRetrieval @@ -351,7 +351,7 @@ Ask the server administrator for this information. Check this box to download a free/busy file in the format "user@domain.ifb" (for example joe@company.com.ifb). Otherwise, it will download a free/busy file in the format user.ifb (for example joe.ifb). Ask the server Administrator if you are not sure about how to configure this option. - + ButtonGroup2_2 @@ -362,7 +362,7 @@ Ask the server administrator for this information. unnamed - + Layout7_2 @@ -370,7 +370,7 @@ Ask the server administrator for this information. unnamed - + TextLabel7_2 @@ -390,7 +390,7 @@ Alternatively, you can specify a full path to the Free/Busy file, For example: "https://kolab2.example.com/freebusy/user.xfb" - + retrieveUrl @@ -409,7 +409,7 @@ For example: "https://kolab2.example.com/freebusy/user.xfb" - + frame7 @@ -420,7 +420,7 @@ For example: "https://kolab2.example.com/freebusy/user.xfb" Sunken - + tqlayout13 @@ -428,7 +428,7 @@ For example: "https://kolab2.example.com/freebusy/user.xfb" unnamed - + retrieveUser @@ -438,7 +438,7 @@ For example: "https://kolab2.example.com/freebusy/user.xfb" A Kolab2 server specificity: Registered your UID (Unique IDentifier). By default your UID would be your email address on the Kolab2 server but it may also be different. In the last case enter your UID. - + textLabel3 @@ -454,7 +454,7 @@ A Kolab2 server specificity: Registered your UID (Unique IDentifier). By default A Kolab2 server specificity: Registered your UID (Unique IDentifier). By default your UID would be your email address on the Kolab2 server but it may also be different. In the last case enter your UID. - + textLabel4 @@ -468,7 +468,7 @@ A Kolab2 server specificity: Registered your UID (Unique IDentifier). By default Enter your groupware server login password here. - + retrievePassword @@ -481,7 +481,7 @@ A Kolab2 server specificity: Registered your UID (Unique IDentifier). By default - + retrieveSavePassword @@ -620,12 +620,12 @@ For security reasons, it is not recommended to store your password in the config kdepimmacros.h kogroupwareprefspage.ui.h - + changed() - - + + slotChanged() - + KDE_EXPORT diff --git a/korganizer/kogroupwareprefspage.ui.h b/korganizer/kogroupwareprefspage.ui.h index aea1618ed..c45191b36 100644 --- a/korganizer/kogroupwareprefspage.ui.h +++ b/korganizer/kogroupwareprefspage.ui.h @@ -2,7 +2,7 @@ ** ui.h extension file, included from the uic-generated form implementation. ** ** If you wish to add, delete or rename functions or slots use -** Qt Designer which will update this file, preserving your code. Create an +** TQt Designer which will update this file, preserving your code. Create an ** init() function in place of a constructor, and a destroy() function in ** place of a destructor. *****************************************************************************/ diff --git a/korganizer/kohelper.cpp b/korganizer/kohelper.cpp index 3b7bd8776..b96412c8f 100644 --- a/korganizer/kohelper.cpp +++ b/korganizer/kohelper.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include diff --git a/korganizer/kohelper.h b/korganizer/kohelper.h index 07d91058b..049459b4f 100644 --- a/korganizer/kohelper.h +++ b/korganizer/kohelper.h @@ -19,8 +19,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef KOHELPER_H #define KOHELPER_H diff --git a/korganizer/koidentitymanager.cpp b/korganizer/koidentitymanager.cpp index 86bac4c9f..fde652ff7 100644 --- a/korganizer/koidentitymanager.cpp +++ b/korganizer/koidentitymanager.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include "koidentitymanager.h" diff --git a/korganizer/koidentitymanager.h b/korganizer/koidentitymanager.h index c1a70fc21..8fcf88117 100644 --- a/korganizer/koidentitymanager.h +++ b/korganizer/koidentitymanager.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef KOIDENTITYMANAGER_H @@ -32,8 +32,8 @@ namespace KOrg { class IdentityManager : public KPIM::IdentityManager { public: - IdentityManager( TQObject * parent=0, const char * name=0 ) - : KPIM::IdentityManager( true /*readonly*/, parent, name ) {} + IdentityManager( TQObject * tqparent=0, const char * name=0 ) + : KPIM::IdentityManager( true /*readonly*/, tqparent, name ) {} protected: virtual void createDefaultIdentity( TQString& fullName, TQString& emailAddress ); diff --git a/korganizer/koincidenceeditor.cpp b/korganizer/koincidenceeditor.cpp index 9a917699e..9047cff95 100644 --- a/korganizer/koincidenceeditor.cpp +++ b/korganizer/koincidenceeditor.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include @@ -56,9 +56,9 @@ #include "templatemanagementdialog.h" KOIncidenceEditor::KOIncidenceEditor( const TQString &caption, - Calendar *calendar, TQWidget *parent ) + Calendar *calendar, TQWidget *tqparent ) : KDialogBase( Tabbed, caption, Ok | Apply | Cancel | Default, Ok, - parent, 0, false, false ), + tqparent, 0, false, false ), mAttendeeEditor( 0 ), mResource( 0 ), mIsCounter( false ), mIsCreateTask( false ), mRecurIncidence( 0 ), mRecurIncidenceAfterDissoc( 0 ) { @@ -197,7 +197,7 @@ void KOIncidenceEditor::setupDesignerTabs( const TQString &type ) "korganizer/designer/" + type + "/*.ui", true, true ); for ( TQStringList::iterator it = list.begin(); it != list.end(); ++it ) { const TQString &fn = (*it).mid( (*it).findRev('/') + 1 ); - if ( activePages.find( fn ) != activePages.end() ) { + if ( activePages.tqfind( fn ) != activePages.end() ) { addDesignerTab( *it ); } } diff --git a/korganizer/koincidenceeditor.h b/korganizer/koincidenceeditor.h index a2ac6055a..4ff8915b2 100644 --- a/korganizer/koincidenceeditor.h +++ b/korganizer/koincidenceeditor.h @@ -19,8 +19,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef KOINCIDENCEEDITOR_H #define KOINCIDENCEEDITOR_H @@ -57,12 +57,13 @@ using namespace KOrg; class KOIncidenceEditor : public KDialogBase { Q_OBJECT + TQ_OBJECT public: /** Construct new IncidenceEditor. */ KOIncidenceEditor( const TQString &caption, Calendar *calendar, - TQWidget *parent ); + TQWidget *tqparent ); virtual ~KOIncidenceEditor(); /** This incidence has been modified externally */ @@ -78,7 +79,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 tqcontains all occurrences + It gives the editor a pointer to the original incidence, which contains 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 @@ -133,7 +134,7 @@ class KOIncidenceEditor : public KDialogBase virtual void slotTemplatesChanged( const TQStringList& ); protected: - virtual TQString type() { return TQString::null; } + virtual TQString type() { return TQString(); } virtual TQStringList& templates() const = 0; virtual void loadTemplate( /*const*/ CalendarLocal& ) = 0; diff --git a/korganizer/koincidencetooltip.cpp b/korganizer/koincidencetooltip.cpp index c01b5487a..ca1e76721 100644 --- a/korganizer/koincidencetooltip.cpp +++ b/korganizer/koincidencetooltip.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include diff --git a/korganizer/koincidencetooltip.h b/korganizer/koincidencetooltip.h index 348ab890b..7b8a3536d 100644 --- a/korganizer/koincidencetooltip.h +++ b/korganizer/koincidencetooltip.h @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef KOINCIDENCETOOLTIP_H #define KOINCIDENCETOOLTIP_H @@ -37,7 +37,7 @@ class KOAgendaItem; /** @author Reinhold Kainhofer */ -class KOIncidenceToolTip : public QToolTip +class KOIncidenceToolTip : public TQToolTip { public: KOIncidenceToolTip( TQWidget *widget, Calendar *calendar, const TQDate &date, TQToolTipGroup *group = 0 ) diff --git a/korganizer/kojournaleditor.cpp b/korganizer/kojournaleditor.cpp index c7566cae7..3570f6eca 100644 --- a/korganizer/kojournaleditor.cpp +++ b/korganizer/kojournaleditor.cpp @@ -20,8 +20,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include "kojournaleditor.h" @@ -43,8 +43,8 @@ using namespace KCal; -KOJournalEditor::KOJournalEditor( Calendar *calendar, TQWidget *parent ) : - KOIncidenceEditor( i18n("Edit Journal Entry"), calendar, parent ) +KOJournalEditor::KOJournalEditor( Calendar *calendar, TQWidget *tqparent ) : + KOIncidenceEditor( i18n("Edit Journal Entry"), calendar, tqparent ) { mJournal = 0; } @@ -120,7 +120,7 @@ void KOJournalEditor::setTexts( const TQString &summary, const TQString &descrip { if ( description.isEmpty() && summary.tqcontains("\n") ) { mGeneral->setDescription( summary ); - int pos = summary.find( "\n" ); + int pos = summary.tqfind( "\n" ); mGeneral->setSummary( summary.left( pos ) ); } else { mGeneral->setSummary( summary ); diff --git a/korganizer/kojournaleditor.h b/korganizer/kojournaleditor.h index 731682e9d..7f7573898 100644 --- a/korganizer/kojournaleditor.h +++ b/korganizer/kojournaleditor.h @@ -20,8 +20,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef KOJOURNALEDITOR_H #define KOJOURNALEDITOR_H @@ -46,11 +46,12 @@ class KOEditorGeneralJournal; class KOJournalEditor : public KOIncidenceEditor { Q_OBJECT + TQ_OBJECT public: /** Constructs a new Journal editor. */ - KOJournalEditor( Calendar *calendar, TQWidget *parent ); + KOJournalEditor( Calendar *calendar, TQWidget *tqparent ); virtual ~KOJournalEditor(); void init(); @@ -64,10 +65,10 @@ class KOJournalEditor : public KOIncidenceEditor /** Sets the given summary and description. If description is empty and the - summary tqcontains multiple lines, the summary will be used as description + summary contains 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 ); + void setTexts( const TQString &summary, const TQString &description = TQString() ); /** Edit an existing Journal. */ void editIncidence(Incidence *, const TQDate &date, Calendar *); diff --git a/korganizer/kojournalview.cpp b/korganizer/kojournalview.cpp index 4a5513d98..412ef5a7e 100644 --- a/korganizer/kojournalview.cpp +++ b/korganizer/kojournalview.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ // @@ -42,9 +42,9 @@ #include "koglobals.h" using namespace KOrg; -KOJournalView::KOJournalView(Calendar *calendar, TQWidget *parent, +KOJournalView::KOJournalView(Calendar *calendar, TQWidget *tqparent, const char *name) - : KOrg::BaseView(calendar, parent, name) + : KOrg::BaseView(calendar, tqparent, name) { TQVBoxLayout*topLayout = new TQVBoxLayout( this ); topLayout->setAutoAdd(true); diff --git a/korganizer/kojournalview.h b/korganizer/kojournalview.h index a22c4d8aa..404c6b936 100644 --- a/korganizer/kojournalview.h +++ b/korganizer/kojournalview.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef KOJOURNALVIEW_H #define KOJOURNALVIEW_H @@ -41,8 +41,9 @@ class TQVBox; class KOJournalView : public KOrg::BaseView { Q_OBJECT + TQ_OBJECT public: - KOJournalView( Calendar *calendar, TQWidget *parent = 0, + KOJournalView( Calendar *calendar, TQWidget *tqparent = 0, const char *name = 0); ~KOJournalView(); diff --git a/korganizer/kolistview.cpp b/korganizer/kolistview.cpp index 35474f899..973550d65 100644 --- a/korganizer/kolistview.cpp +++ b/korganizer/kolistview.cpp @@ -20,8 +20,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include @@ -56,10 +56,10 @@ enum { }; -KOListViewToolTip::KOListViewToolTip( TQWidget* parent, +KOListViewToolTip::KOListViewToolTip( TQWidget* tqparent, Calendar *calendar, KListView *lv ) - :TQToolTip( parent ), mCalendar( calendar ) + :TQToolTip( tqparent ), mCalendar( calendar ) { eventlist = lv; } @@ -135,9 +135,9 @@ bool KOListView::ListItemVisitor::visit( Event *e ) TQString endDateTime; mItem->setText( StartDateTime_Column, IncidenceFormatter::dateTimeToString( e->dtStart(), e->doesFloat() ) ); - mItem->setSortKey( StartDateTime_Column, e->dtStart().toString( Qt::ISODate ) ); + mItem->setSortKey( StartDateTime_Column, e->dtStart().toString( TQt::ISODate ) ); mItem->setText( EndDateTime_Column, IncidenceFormatter::dateTimeToString( e->dtEnd(), e->doesFloat() ) ); - mItem->setSortKey( EndDateTime_Column, e->dtEnd().toString( Qt::ISODate ) ); + mItem->setSortKey( EndDateTime_Column, e->dtEnd().toString( TQt::ISODate ) ); mItem->setText( Categories_Column, e->categoriesStr() ); return true; @@ -167,14 +167,14 @@ bool KOListView::ListItemVisitor::visit( Todo *t ) if ( t->hasStartDate() ) { mItem->setText( StartDateTime_Column, IncidenceFormatter::dateTimeToString( t->dtStart(), t->doesFloat() ) ); - mItem->setSortKey( StartDateTime_Column, t->dtStart().toString( Qt::ISODate ) ); + mItem->setSortKey( StartDateTime_Column, t->dtStart().toString( TQt::ISODate ) ); } else { mItem->setText( StartDateTime_Column, "---" ); } if ( t->hasDueDate() ) { mItem->setText( EndDateTime_Column, IncidenceFormatter::dateTimeToString( t->dtDue(), t->doesFloat() ) ); - mItem->setSortKey( EndDateTime_Column, t->dtDue().toString( Qt::ISODate ) ); + mItem->setSortKey( EndDateTime_Column, t->dtDue().toString( TQt::ISODate ) ); } else { mItem->setText( EndDateTime_Column, "---" ); } @@ -190,16 +190,16 @@ bool KOListView::ListItemVisitor::visit( Journal *j ) // Just use the first line mItem->setText( Summary_Column, j->description().section( "\n", 0, 0 ) ); mItem->setText( StartDateTime_Column, IncidenceFormatter::dateTimeToString( j->dtStart(), j->doesFloat() ) ); - mItem->setSortKey( StartDateTime_Column, j->dtStart().toString( Qt::ISODate ) ); + mItem->setSortKey( StartDateTime_Column, j->dtStart().toString( TQt::ISODate ) ); return true; } KOListView::KOListView( Calendar *calendar, - TQWidget *parent, + TQWidget *tqparent, const char *name, bool nonInteractive ) - : KOEventView( calendar, parent, name ) + : KOEventView( calendar, tqparent, name ) { mActiveItem = 0; mIsNonInteractive = nonInteractive; @@ -352,7 +352,7 @@ void KOListView::addIncidences( const Incidence::List &incidenceList, const TQDa void KOListView::addIncidence( Incidence *incidence, const TQDate &date ) { - if ( mUidDict.find( incidence->uid() ) ) { + if ( mUidDict.tqfind( incidence->uid() ) ) { return; } diff --git a/korganizer/kolistview.h b/korganizer/kolistview.h index e29a5e39f..50d0ab5cf 100644 --- a/korganizer/kolistview.h +++ b/korganizer/kolistview.h @@ -20,8 +20,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef _KOLISTVIEW_H #define _KOLISTVIEW_H @@ -41,10 +41,10 @@ typedef CustomListViewItem KOListViewItem; class KOListView; -class KOListViewToolTip : public QToolTip +class KOListViewToolTip : public TQToolTip { public: - KOListViewToolTip ( TQWidget* parent, Calendar *calendar, KListView* lv ); + KOListViewToolTip ( TQWidget* tqparent, Calendar *calendar, KListView* lv ); protected: void maybeTip( const TQPoint &pos ); @@ -68,9 +68,10 @@ class KOListViewToolTip : public QToolTip class KOListView : public KOEventView { Q_OBJECT + TQ_OBJECT public: explicit KOListView( Calendar *calendar, - TQWidget *parent = 0, + TQWidget *tqparent = 0, const char *name = 0, bool nonInteractive = false ); ~KOListView(); diff --git a/korganizer/komailclient.cpp b/korganizer/komailclient.cpp index 8b65d1d18..423225977 100644 --- a/korganizer/komailclient.cpp +++ b/korganizer/komailclient.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include @@ -148,7 +148,7 @@ bool KOMailClient::mailOrganizer(IncidenceBase *incidence,const TQString &attach bool bcc = KOPrefs::instance()->mBcc; - return send(from,to,TQString::null,subject,body,bcc,attachment); + return send(from,to,TQString(),subject,body,bcc,attachment); } bool KOMailClient::mailTo(IncidenceBase *incidence,const TQString &recipients, @@ -165,7 +165,7 @@ bool KOMailClient::mailTo(IncidenceBase *incidence,const TQString &recipients, TQString body = IncidenceFormatter::mailBodyString(incidence); bool bcc = KOPrefs::instance()->mBcc; kdDebug () << "KOMailClient::mailTo " << recipients << endl; - return send(from,recipients,TQString::null,subject,body,bcc,attachment); + return send(from,recipients,TQString(),subject,body,bcc,attachment); } bool KOMailClient::send(const TQString &from,const TQString &_to,const TQString &cc, @@ -253,10 +253,10 @@ bool KOMailClient::send(const TQString &from,const TQString &_to,const TQString if (!kMailOpenComposer(to,cc,bcc ? from : "",subject,body,0,KURL())) return false; } else { TQString meth; - int idx = attachment.find("METHOD"); + int idx = attachment.tqfind("METHOD"); if (idx>=0) { - idx = attachment.find(':',idx)+1; - const int newline = attachment.find('\n',idx); + idx = attachment.tqfind(':',idx)+1; + const int newline = attachment.tqfind('\n',idx); meth = attachment.mid(idx, newline - idx - 1); meth = meth.lower().stripWhiteSpace(); } else { diff --git a/korganizer/komailclient.h b/korganizer/komailclient.h index 3051bab7e..d919b83fc 100644 --- a/korganizer/komailclient.h +++ b/korganizer/komailclient.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef KOMAILCLIENT_H #define KOMAILCLIENT_H @@ -38,16 +38,16 @@ class KOMailClient KOMailClient(); virtual ~KOMailClient(); - bool mailAttendees(IncidenceBase *,const TQString &attachment=TQString::null); - bool mailOrganizer(IncidenceBase *,const TQString &attachment=TQString::null, const TQString &sub = TQString::null); - bool mailTo(IncidenceBase *,const TQString &recipients,const TQString &attachment=TQString::null); + bool mailAttendees(IncidenceBase *,const TQString &attachment=TQString()); + bool mailOrganizer(IncidenceBase *,const TQString &attachment=TQString(), const TQString &sub = TQString()); + bool mailTo(IncidenceBase *,const TQString &recipients,const TQString &attachment=TQString()); protected: /** Send mail with specified from, to and subject field and body as text. If * bcc is set, send a blind carbon copy to the sender from */ bool send(const TQString &from,const TQString &to,const TQString &cc, const TQString &subject,const TQString &body,bool bcc=false, - const TQString &attachment=TQString::null); + const TQString &attachment=TQString()); int kMailOpenComposer(const TQString& to, const TQString& cc, const TQString& bcc, const TQString& subject, diff --git a/korganizer/komessagebox.cpp b/korganizer/komessagebox.cpp index 1874fe202..dbc1e8afd 100644 --- a/korganizer/komessagebox.cpp +++ b/korganizer/komessagebox.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include @@ -28,12 +28,12 @@ #include "komessagebox.h" -int KOMessageBox::fourBtnMsgBox( TQWidget *parent, TQMessageBox::Icon type, +int KOMessageBox::fourBtnMsgBox( TQWidget *tqparent, TQMessageBox::Icon type, const TQString &text, const TQString &caption, const KGuiItem &button1, const KGuiItem &button2, const KGuiItem &button3, int options) { - KDialogBase *dialog= new KDialogBase( parent, "KOMessageBox", true, + KDialogBase *dialog= new KDialogBase( tqparent, "KOMessageBox", true, caption.isEmpty() ? "" : caption, KDialogBase::Yes | KDialogBase::No | KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Yes, @@ -48,7 +48,7 @@ int KOMessageBox::fourBtnMsgBox( TQWidget *parent, TQMessageBox::Icon type, bool checkboxResult = false; int result = KMessageBox::createKMessageBox(dialog, type, text, TQStringList(), - TQString::null, &checkboxResult, options); + TQString(), &checkboxResult, options); switch (result) { case KDialogBase::Yes: result = KMessageBox::Yes; break; case KDialogBase::No: result = KMessageBox::No; break; diff --git a/korganizer/komessagebox.h b/korganizer/komessagebox.h index a1499bfe6..1ddfa88c2 100644 --- a/korganizer/komessagebox.h +++ b/korganizer/komessagebox.h @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef KOMESSAGEBOX_H #define KOMESSAGEBOX_H @@ -33,8 +33,8 @@ class KOMessageBox { public: - static int fourBtnMsgBox( TQWidget *parent, TQMessageBox::Icon type, - const TQString &text, const TQString &caption = TQString::null, + static int fourBtnMsgBox( TQWidget *tqparent, TQMessageBox::Icon type, + const TQString &text, const TQString &caption = TQString(), const KGuiItem &button1 = KStdGuiItem::yes(), const KGuiItem &button2 = KStdGuiItem::no(), const KGuiItem &button3 = KStdGuiItem::cont(), int options = 0 ); diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp index 930e6c8d3..ad03aec43 100644 --- a/korganizer/komonthview.cpp +++ b/korganizer/komonthview.cpp @@ -19,8 +19,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include @@ -61,11 +61,11 @@ //-------------------------------------------------------------------------- -KOMonthCellToolTip::KOMonthCellToolTip( TQWidget *parent, +KOMonthCellToolTip::KOMonthCellToolTip( TQWidget *tqparent, Calendar *calendar, const TQDate &date, KNoScrollListBox *lv ) - : TQToolTip( parent ), mCalendar( calendar ), mDate( date ) + : TQToolTip( tqparent ), mCalendar( calendar ), mDate( date ) { eventlist = lv; } @@ -87,8 +87,8 @@ void KOMonthCellToolTip::maybeTip( const TQPoint &pos ) } } -KNoScrollListBox::KNoScrollListBox( TQWidget *parent, const char *name ) - : TQListBox( parent, name ), +KNoScrollListBox::KNoScrollListBox( TQWidget *tqparent, const char *name ) + : TQListBox( tqparent, name ), mSqueezing( false ) { TQPalette pal = palette(); @@ -239,11 +239,7 @@ TQColor MonthViewItem::catColor() const void MonthViewItem::paint( TQPainter *p ) { -#if QT_VERSION >= 0x030000 bool sel = isSelected(); -#else - bool sel = selected(); -#endif TQColor bgColor = TQColor(); // Default invalid color; if ( mIncidence && mTodo ) { @@ -347,8 +343,8 @@ void MonthViewItem::paint( TQPainter *p ) } TQFontMetrics fm = p->fontMetrics(); int yPos; - int pmheight = QMAX( mRecurPixmap.height(), - QMAX( mAlarmPixmap.height(), mReplyPixmap.height() ) ); + int pmheight = TQMAX( mRecurPixmap.height(), + TQMAX( mAlarmPixmap.height(), mReplyPixmap.height() ) ); if( pmheight < fm.height() ) yPos = fm.ascent() + fm.leading()/2; else @@ -361,8 +357,8 @@ void MonthViewItem::paint( TQPainter *p ) int MonthViewItem::height( const TQListBox *lb ) const { - return QMAX( QMAX( mRecurPixmap.height(), mReplyPixmap.height() ), - QMAX( mAlarmPixmap.height(), lb->fontMetrics().lineSpacing()+1) ); + return TQMAX( TQMAX( mRecurPixmap.height(), mReplyPixmap.height() ), + TQMAX( mAlarmPixmap.height(), lb->fontMetrics().lineSpacing()+1) ); } int MonthViewItem::width( const TQListBox *lb ) const @@ -382,9 +378,9 @@ int MonthViewItem::width( const TQListBox *lb ) const } -MonthViewCell::MonthViewCell( KOMonthView *parent) - : TQWidget( parent ), - mMonthView( parent ), mPrimary( false ), mHoliday( false ), +MonthViewCell::MonthViewCell( KOMonthView *tqparent) + : TQWidget( tqparent ), + mMonthView( tqparent ), mPrimary( false ), mHoliday( false ), isSelected( false ) { TQVBoxLayout *topLayout = new TQVBoxLayout( this ); @@ -814,8 +810,8 @@ void MonthViewCell::contextMenu( TQListBoxItem *item ) } -KOMonthView::KOMonthView( Calendar *calendar, TQWidget *parent, const char *name ) - : KOEventView( calendar, parent, name ), +KOMonthView::KOMonthView( Calendar *calendar, TQWidget *tqparent, const char *name ) + : KOEventView( calendar, tqparent, name ), mDaysPerWeek( 7 ), mNumWeeks( 6 ), mNumCells( mDaysPerWeek * mNumWeeks ), mShortDayLabels( false ), mWidthLongDayLabel( 0 ), mSelectedCell( 0 ) { diff --git a/korganizer/komonthview.h b/korganizer/komonthview.h index f503a29d5..7a988559a 100644 --- a/korganizer/komonthview.h +++ b/korganizer/komonthview.h @@ -19,8 +19,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef _KOMONTHVIEW_H @@ -33,10 +33,10 @@ class KNoScrollListBox; -class KOMonthCellToolTip : public QToolTip +class KOMonthCellToolTip : public TQToolTip { public: - KOMonthCellToolTip (TQWidget* parent, Calendar *calendar, const TQDate &date, KNoScrollListBox* lv ); + KOMonthCellToolTip (TQWidget* tqparent, Calendar *calendar, const TQDate &date, KNoScrollListBox* lv ); protected: void maybeTip( const TQPoint & pos); @@ -48,11 +48,12 @@ class KOMonthCellToolTip : public QToolTip }; -class KNoScrollListBox: public QListBox +class KNoScrollListBox: public TQListBox { Q_OBJECT + TQ_OBJECT public: - KNoScrollListBox(TQWidget *parent=0, const char *name=0); + KNoScrollListBox(TQWidget *tqparent=0, const char *name=0); ~KNoScrollListBox() {} void setBackground( bool primary, bool workday ); @@ -74,7 +75,7 @@ class KNoScrollListBox: public QListBox }; -class MonthViewItem: public QListBoxItem +class MonthViewItem: public TQListBoxItem { public: MonthViewItem( Incidence *, const TQDateTime &qd, const TQString & title ); @@ -131,9 +132,10 @@ class KOMonthView; @see KOMonthView */ -class MonthViewCell : public QWidget +class MonthViewCell : public TQWidget { Q_OBJECT + TQ_OBJECT public: class CreateItemVisitor; MonthViewCell( KOMonthView * ); @@ -143,7 +145,7 @@ class MonthViewCell : public QWidget /** @return Date of cell */ TQDate date() const; - /** @return MonthView parent */ + /** @return MonthView tqparent */ KOMonthView *monthView() { return mMonthView; } /** @@ -243,8 +245,9 @@ class MonthViewCell : public QWidget class KOMonthView: public KOEventView { Q_OBJECT + TQ_OBJECT public: - KOMonthView(Calendar *cal, TQWidget *parent = 0, const char *name = 0 ); + KOMonthView(Calendar *cal, TQWidget *tqparent = 0, const char *name = 0 ); ~KOMonthView(); /** Returns maximum number of days supported by the komonthview */ diff --git a/korganizer/konewstuff.cpp b/korganizer/konewstuff.cpp index 83ee226da..1c9daa813 100644 --- a/korganizer/konewstuff.cpp +++ b/korganizer/konewstuff.cpp @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include diff --git a/korganizer/konewstuff.h b/korganizer/konewstuff.h index ba70394fa..92e9a0dc3 100644 --- a/korganizer/konewstuff.h +++ b/korganizer/konewstuff.h @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef KONEWSTUFF_H #define KONEWSTUFF_H diff --git a/korganizer/koprefs.cpp b/korganizer/koprefs.cpp index a5b44cce0..66dd686df 100644 --- a/korganizer/koprefs.cpp +++ b/korganizer/koprefs.cpp @@ -19,8 +19,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include @@ -75,7 +75,7 @@ KOPrefs::KOPrefs() : mDefaultTimeBarFont = KGlobalSettings::generalFont(); // make a large default time bar font, at least 16 points. mDefaultTimeBarFont.setPointSize( - QMAX( mDefaultTimeBarFont.pointSize() + 4, 16 ) ); + TQMAX( mDefaultTimeBarFont.pointSize() + 4, 16 ) ); mDefaultMonthViewFont = KGlobalSettings::generalFont(); // make it a bit smaller @@ -403,7 +403,7 @@ bool KOPrefs::thatIsMe( const TQString& _email ) return true; */ - // in case email tqcontains a full name, strip it out + // in case email contains 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(); @@ -418,14 +418,14 @@ bool KOPrefs::thatIsMe( const TQString& _email ) if ( email == (*it).primaryEmailAddress() ) return true; const TQStringList & aliases = (*it).emailAliases(); - if ( aliases.find( email ) != aliases.end() ) + if ( aliases.tqfind( email ) != aliases.end() ) return true; } - if ( mAdditionalMails.find( email ) != mAdditionalMails.end() ) + if ( mAdditionalMails.tqfind( email ) != mAdditionalMails.end() ) return true; TQStringList lst = mMyAddrBookMails; - if ( lst.find( email ) != lst.end() ) + if ( lst.tqfind( email ) != lst.end() ) return true; return false; } diff --git a/korganizer/koprefs.h b/korganizer/koprefs.h index fcda71437..013407e38 100644 --- a/korganizer/koprefs.h +++ b/korganizer/koprefs.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef KOPREFS_H #define KOPREFS_H diff --git a/korganizer/koprefsdialog.cpp b/korganizer/koprefsdialog.cpp index 63b2a3476..d074ae91d 100644 --- a/korganizer/koprefsdialog.cpp +++ b/korganizer/koprefsdialog.cpp @@ -19,8 +19,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include @@ -80,8 +80,8 @@ #include -KOPrefsDialogMain::KOPrefsDialogMain( TQWidget *parent, const char *name ) - : KPrefsModule( KOPrefs::instance(), parent, name ) +KOPrefsDialogMain::KOPrefsDialogMain( TQWidget *tqparent, const char *name ) + : KPrefsModule( KOPrefs::instance(), tqparent, name ) { TQBoxLayout *topTopLayout = new TQVBoxLayout( this ); @@ -138,9 +138,9 @@ void KOPrefsDialogMain::toggleEmailSettings( bool on ) extern "C" { - KDE_EXPORT KCModule *create_korganizerconfigmain( TQWidget *parent, const char * ) + KDE_EXPORT KCModule *create_korganizerconfigmain( TQWidget *tqparent, const char * ) { - return new KOPrefsDialogMain( parent, "kcmkorganizermain" ); + return new KOPrefsDialogMain( tqparent, "kcmkorganizermain" ); } } @@ -148,8 +148,8 @@ extern "C" class KOPrefsDialogTime : public KPrefsModule { public: - KOPrefsDialogTime( TQWidget *parent, const char *name ) - : KPrefsModule( KOPrefs::instance(), parent, name ) + KOPrefsDialogTime( TQWidget *tqparent, const char *name ) + : KPrefsModule( KOPrefs::instance(), tqparent, name ) { TQBoxLayout *topTopLayout = new TQVBoxLayout( this ); @@ -212,7 +212,7 @@ class KOPrefsDialogTime : public KPrefsModule // Read all system time zones #if defined(USE_SOLARIS) // MARCO snprintf(buf, MAXPATHLEN, - "/bin/find %s \\( -name src -prune \\) -o -type f -print | /bin/cut -b %d-", + "/bin/tqfind %s \\( -name src -prune \\) -o -type f -print | /bin/cut -b %d-", ZONEINFODIR, strlen(ZONEINFODIR) + 2); if (f = popen(buf, "r")) @@ -340,7 +340,7 @@ class KOPrefsDialogTime : public KPrefsModule TQCheckBox *cb = addWidBool( KOPrefs::instance()->defaultAudioFileRemindersItem(), audioFileRemindersBox )->checkBox(); - cb->setText( TQString::null ); + cb->setText( TQString() ); if ( KOPrefs::instance()->audioFilePathItem()->value().isEmpty() ) { TQString defAudioFile = KGlobal::dirs()->findResourceDir( "sound", "KDE-Sys-Warning.ogg"); @@ -436,7 +436,7 @@ class KOPrefsDialogTime : public KPrefsModule KOPrefs::instance()->mTimeZoneId = mTimeZoneCombo->currentText(); KOPrefs::instance()->mHolidays = ( mHolidayCombo->currentItem() == 0 ) ? // (None) - TQString::null : + TQString() : mRegionMap[mHolidayCombo->currentText()]; KOPrefs::instance()->mReminderTime = mReminderTimeSpin->value(); @@ -479,10 +479,10 @@ class KOPrefsDialogTime : public KPrefsModule extern "C" { - KCModule *create_korganizerconfigtime( TQWidget *parent, const char * ) + KCModule *create_korganizerconfigtime( TQWidget *tqparent, const char * ) { KGlobal::locale()->insertCatalogue( "timezones" ); - return new KOPrefsDialogTime( parent, "kcmkorganizertime" ); + return new KOPrefsDialogTime( tqparent, "kcmkorganizertime" ); } } @@ -490,8 +490,8 @@ extern "C" class KOPrefsDialogViews : public KPrefsModule { public: - KOPrefsDialogViews( TQWidget *parent, const char *name ) - : KPrefsModule( KOPrefs::instance(), parent, name ) + KOPrefsDialogViews( TQWidget *tqparent, const char *name ) + : KPrefsModule( KOPrefs::instance(), tqparent, name ) { TQBoxLayout *topTopLayout = new TQVBoxLayout( this ); @@ -579,9 +579,9 @@ class KOPrefsDialogViews : public KPrefsModule extern "C" { - KCModule *create_korganizerconfigviews( TQWidget *parent, const char * ) + KCModule *create_korganizerconfigviews( TQWidget *tqparent, const char * ) { - return new KOPrefsDialogViews( parent, "kcmkorganizerviews" ); + return new KOPrefsDialogViews( tqparent, "kcmkorganizerviews" ); } } @@ -589,8 +589,8 @@ extern "C" class KOPrefsDialogFonts : public KPrefsModule { public: - KOPrefsDialogFonts( TQWidget *parent, const char *name ) - : KPrefsModule( KOPrefs::instance(), parent, name ) + KOPrefsDialogFonts( TQWidget *tqparent, const char *name ) + : KPrefsModule( KOPrefs::instance(), tqparent, name ) { TQBoxLayout *topTopLayout = new TQVBoxLayout( this ); @@ -639,15 +639,15 @@ class KOPrefsDialogFonts : public KPrefsModule extern "C" { - KCModule *create_korganizerconfigfonts( TQWidget *parent, const char * ) + KCModule *create_korganizerconfigfonts( TQWidget *tqparent, const char * ) { - return new KOPrefsDialogFonts( parent, "kcmkorganizerfonts" ); + return new KOPrefsDialogFonts( tqparent, "kcmkorganizerfonts" ); } } -KOPrefsDialogColors::KOPrefsDialogColors( TQWidget *parent, const char *name ) - : KPrefsModule( KOPrefs::instance(), parent, name ) +KOPrefsDialogColors::KOPrefsDialogColors( TQWidget *tqparent, const char *name ) + : KPrefsModule( KOPrefs::instance(), tqparent, name ) { TQBoxLayout *topTopLayout = new TQVBoxLayout( this ); @@ -781,7 +781,7 @@ void KOPrefsDialogColors::setCategoryColor() void KOPrefsDialogColors::updateCategoryColor() { TQString cat = mCategoryCombo->currentText(); - TQColor *color = mCategoryDict.find(cat); + TQColor *color = mCategoryDict.tqfind(cat); if (!color) { color = KOPrefs::instance()->categoryColor(cat); } @@ -832,7 +832,7 @@ void KOPrefsDialogColors::updateResourceColor() { kdDebug( 5850 ) << "KOPrefsDialogColors::updateResourceColor()" << endl; TQString res= mResourceIdentifier[mResourceCombo->currentItem()]; - TQColor *color = mCategoryDict.find(res); + TQColor *color = mCategoryDict.tqfind(res); if( !color ) { color = KOPrefs::instance()->resourceColor( res ); } @@ -842,15 +842,15 @@ void KOPrefsDialogColors::updateResourceColor() } extern "C" { - KCModule *create_korganizerconfigcolors( TQWidget *parent, const char * ) + KCModule *create_korganizerconfigcolors( TQWidget *tqparent, const char * ) { - return new KOPrefsDialogColors( parent, "kcmkorganizercolors" ); + return new KOPrefsDialogColors( tqparent, "kcmkorganizercolors" ); } } -KOPrefsDialogGroupScheduling::KOPrefsDialogGroupScheduling( TQWidget *parent, const char *name ) - : KPrefsModule( KOPrefs::instance(), parent, name ) +KOPrefsDialogGroupScheduling::KOPrefsDialogGroupScheduling( TQWidget *tqparent, const char *name ) + : KPrefsModule( KOPrefs::instance(), tqparent, name ) { TQBoxLayout *topTopLayout = new TQVBoxLayout( this ); @@ -1005,17 +1005,17 @@ void KOPrefsDialogGroupScheduling::updateInput() extern "C" { - KCModule *create_korganizerconfiggroupscheduling( TQWidget *parent, + KCModule *create_korganizerconfiggroupscheduling( TQWidget *tqparent, const char * ) { - return new KOPrefsDialogGroupScheduling( parent, + return new KOPrefsDialogGroupScheduling( tqparent, "kcmkorganizergroupscheduling" ); } } -KOPrefsDialogGroupwareScheduling::KOPrefsDialogGroupwareScheduling( TQWidget *parent, const char *name ) - : KPrefsModule( KOPrefs::instance(), parent, name ) +KOPrefsDialogGroupwareScheduling::KOPrefsDialogGroupwareScheduling( TQWidget *tqparent, const char *name ) + : KPrefsModule( KOPrefs::instance(), tqparent, name ) { mGroupwarePage = new KOGroupwarePrefsPage( this ); connect( mGroupwarePage, TQT_SIGNAL( changed() ), TQT_SLOT( slotWidChanged() ) ); @@ -1069,9 +1069,9 @@ void KOPrefsDialogGroupwareScheduling::usrWriteConfig() extern "C" { - KCModule *create_korganizerconfigfreebusy( TQWidget *parent, const char * ) + KCModule *create_korganizerconfigfreebusy( TQWidget *tqparent, const char * ) { - return new KOPrefsDialogGroupwareScheduling( parent, + return new KOPrefsDialogGroupwareScheduling( tqparent, "kcmkorganizerfreebusy" ); } } @@ -1080,8 +1080,8 @@ extern "C" class PluginItem : public TQCheckListItem { public: - PluginItem( TQListView *parent, KService::Ptr service ) : - TQCheckListItem( parent, service->name(), TQCheckListItem::CheckBox ), mService( service ) + PluginItem( TQListView *tqparent, KService::Ptr service ) : + TQCheckListItem( tqparent, service->name(), TQCheckListItem::CheckBox ), mService( service ) {} KService::Ptr service() { return mService; } private: @@ -1092,8 +1092,8 @@ class PluginItem : public TQCheckListItem { /** Dialog for selecting and configuring KOrganizer plugins */ -KOPrefsDialogPlugins::KOPrefsDialogPlugins( TQWidget *parent, const char* name ) - : KPrefsModule( KOPrefs::instance(), parent, name ) +KOPrefsDialogPlugins::KOPrefsDialogPlugins( TQWidget *tqparent, const char* name ) + : KPrefsModule( KOPrefs::instance(), tqparent, name ) { TQBoxLayout *topTopLayout = new TQVBoxLayout( this ); @@ -1121,7 +1121,7 @@ KOPrefsDialogPlugins::KOPrefsDialogPlugins( TQWidget *parent, const char* name ) TQWidget *buttonRow = new TQWidget( topFrame ); TQBoxLayout *buttonRowLayout = new TQHBoxLayout( buttonRow ); mConfigureButton = new KPushButton( KGuiItem( i18n("Configure &Plugin..."), - "configure", TQString::null, i18n("This button allows you to configure" + "configure", TQString(), i18n("This button allows you to configure" " the plugin that you have selected in the list above") ), buttonRow ); buttonRowLayout->addWidget( mConfigureButton ); @@ -1150,7 +1150,7 @@ void KOPrefsDialogPlugins::usrReadConfig() KTrader::OfferList::ConstIterator it; for( it = plugins.begin(); it != plugins.end(); ++it ) { TQCheckListItem *item = new PluginItem( mListView, *it ); - if ( selectedPlugins.find( (*it)->desktopEntryName() ) != + if ( selectedPlugins.tqfind( (*it)->desktopEntryName() ) != selectedPlugins.end() ) { item->setOn( true ); } @@ -1192,7 +1192,7 @@ void KOPrefsDialogPlugins::selectionChanged( TQListViewItem *i ) PluginItem *item = dynamic_cast( i ); if ( !item ) { mConfigureButton->setEnabled( false ); - mDescription->setText( TQString::null ); + mDescription->setText( TQString() ); return; } @@ -1210,9 +1210,9 @@ void KOPrefsDialogPlugins::selectionChanged( TQListViewItem *i ) extern "C" { - KCModule *create_korganizerconfigplugins( TQWidget *parent, const char * ) + KCModule *create_korganizerconfigplugins( TQWidget *tqparent, const char * ) { - return new KOPrefsDialogPlugins( parent, + return new KOPrefsDialogPlugins( tqparent, "kcmkorganizerplugins" ); } } @@ -1220,13 +1220,13 @@ extern "C" extern "C" { - KCModule *create_korgdesignerfields( TQWidget *parent, const char * ) { - return new KOPrefsDesignerFields( parent, "kcmkorgdesignerfields" ); + KCModule *create_korgdesignerfields( TQWidget *tqparent, const char * ) { + return new KOPrefsDesignerFields( tqparent, "kcmkorgdesignerfields" ); } } -KOPrefsDesignerFields::KOPrefsDesignerFields( TQWidget *parent, const char *name ) - : KCMDesignerFields( parent, name ) +KOPrefsDesignerFields::KOPrefsDesignerFields( TQWidget *tqparent, const char *name ) + : KCMDesignerFields( tqparent, name ) { } diff --git a/korganizer/koprefsdialog.h b/korganizer/koprefsdialog.h index 8be91a821..c50b5f370 100644 --- a/korganizer/koprefsdialog.h +++ b/korganizer/koprefsdialog.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef KOPREFSDIALOG_H #define KOPREFSDIALOG_H @@ -41,8 +41,9 @@ class TQListView; class KDE_EXPORT KOPrefsDialogMain : public KPrefsModule { Q_OBJECT + TQ_OBJECT public: - KOPrefsDialogMain( TQWidget *parent, const char *name ); + KOPrefsDialogMain( TQWidget *tqparent, const char *name ); protected slots: void toggleEmailSettings( bool on ); @@ -53,8 +54,9 @@ class KDE_EXPORT KOPrefsDialogMain : public KPrefsModule class KDE_EXPORT KOPrefsDialogColors : public KPrefsModule { Q_OBJECT + TQ_OBJECT public: - KOPrefsDialogColors( TQWidget *parent, const char *name ); + KOPrefsDialogColors( TQWidget *tqparent, const char *name ); protected: void usrWriteConfig(); @@ -83,8 +85,9 @@ class KDE_EXPORT KOPrefsDialogColors : public KPrefsModule class KDE_EXPORT KOPrefsDialogGroupScheduling : public KPrefsModule { Q_OBJECT + TQ_OBJECT public: - KOPrefsDialogGroupScheduling( TQWidget *parent, const char *name ); + KOPrefsDialogGroupScheduling( TQWidget *tqparent, const char *name ); protected: void usrReadConfig(); @@ -106,8 +109,9 @@ class KOGroupwarePrefsPage; class KDE_EXPORT KOPrefsDialogGroupwareScheduling : public KPrefsModule { Q_OBJECT + TQ_OBJECT public: - KOPrefsDialogGroupwareScheduling( TQWidget *parent, const char *name ); + KOPrefsDialogGroupwareScheduling( TQWidget *tqparent, const char *name ); protected: void usrReadConfig(); @@ -120,8 +124,9 @@ class KDE_EXPORT KOPrefsDialogGroupwareScheduling : public KPrefsModule class KDE_EXPORT KOPrefsDialogPlugins : public KPrefsModule { Q_OBJECT + TQ_OBJECT public: - KOPrefsDialogPlugins( TQWidget *parent, const char *name ); + KOPrefsDialogPlugins( TQWidget *tqparent, const char *name ); protected slots: void usrReadConfig(); @@ -139,7 +144,7 @@ class KDE_EXPORT KOPrefsDialogPlugins : public KPrefsModule class KDE_EXPORT KOPrefsDesignerFields : public KPIM::KCMDesignerFields { public: - KOPrefsDesignerFields( TQWidget *parent = 0, const char *name = 0 ); + KOPrefsDesignerFields( TQWidget *tqparent = 0, const char *name = 0 ); protected: TQString localUiDir(); diff --git a/korganizer/korgac/alarmdialog.cpp b/korganizer/korgac/alarmdialog.cpp index 6b12f76c2..e095950a4 100644 --- a/korganizer/korgac/alarmdialog.cpp +++ b/korganizer/korgac/alarmdialog.cpp @@ -19,8 +19,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include @@ -65,8 +65,8 @@ static int defSuspendUnit = 0; // 0=>minutes, 1=>hours, 2=>days, 3=>weeks class AlarmListItem : public KListViewItem { public: - AlarmListItem( const TQString &uid, TQListView *parent ) - : KListViewItem( parent ), mUid( uid ), mNotified( false ) + AlarmListItem( const TQString &uid, TQListView *tqparent ) + : KListViewItem( tqparent ), mUid( uid ), mNotified( false ) { } @@ -96,10 +96,10 @@ int AlarmListItem::compare( TQListViewItem *item, int iCol, bool bAscending ) co typedef TQValueList ItemList; -AlarmDialog::AlarmDialog( KCal::CalendarResources *calendar, TQWidget *parent, const char *name ) +AlarmDialog::AlarmDialog( KCal::CalendarResources *calendar, TQWidget *tqparent, const char *name ) : KDialogBase( Plain, WType_TopLevel | WStyle_Customize | WStyle_StaysOnTop | WStyle_DialogBorder, - parent, name, false, i18n("Reminder"), + tqparent, name, false, i18n("Reminder"), Ok | User1 | User2 | User3, NoDefault, false, i18n("Edit..."), i18n("Dismiss All"), i18n("Dismiss Reminder") ), mCalendar( calendar ), mSuspendTimer(this) @@ -437,7 +437,7 @@ void AlarmDialog::setTimer() AlarmListItem * item = static_cast( it.current() ); if ( item->mRemindAt > TQDateTime::tqcurrentDateTime() ) { int secs = TQDateTime::tqcurrentDateTime().secsTo( item->mRemindAt ); - nextReminderAt = nextReminderAt <= 0 ? secs : QMIN( nextReminderAt, secs ); + nextReminderAt = nextReminderAt <= 0 ? secs : TQMIN( nextReminderAt, secs ); } } @@ -650,8 +650,8 @@ bool AlarmDialog::ensureKorganizerRunning() const TQString error; TQCString dcopService; - int result = KDCOPServiceStarter::self()->tqfindServiceFor( - "DCOP/Organizer", TQString::null, TQString::null, &error, &dcopService ); + int result = KDCOPServiceStarter::self()->findServiceFor( + "DCOP/Organizer", TQString(), TQString(), &error, &dcopService ); if ( result == 0 ) { // OK, so korganizer (or kontact) is running. Now ensure the object we @@ -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()->tqfindObject( + if ( !kapp->dcopClient()->findObject( 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()->tqfindObject( + Q_ASSERT( kapp->dcopClient()->findObject( dcopService, dcopObjectId, "", TQByteArray(), dummy, dummy ) ); } else { kdWarning() << "Error loading " << dcopService << endl; diff --git a/korganizer/korgac/alarmdialog.h b/korganizer/korgac/alarmdialog.h index 75208f654..e82832fad 100644 --- a/korganizer/korgac/alarmdialog.h +++ b/korganizer/korgac/alarmdialog.h @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef ALARMDIALOG_H #define ALARMDIALOG_H @@ -44,8 +44,9 @@ class TQSplitter; class AlarmDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - explicit AlarmDialog( CalendarResources *calendar, TQWidget *parent = 0, const char *name = 0 ); + explicit AlarmDialog( CalendarResources *calendar, TQWidget *tqparent = 0, const char *name = 0 ); ~AlarmDialog(); diff --git a/korganizer/korgac/alarmdockwindow.cpp b/korganizer/korgac/alarmdockwindow.cpp index 90360dc6a..27badddbb 100644 --- a/korganizer/korgac/alarmdockwindow.cpp +++ b/korganizer/korgac/alarmdockwindow.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include "alarmdockwindow.h" @@ -178,7 +178,7 @@ void AlarmDockWindow::enableAutostart( bool enable ) void AlarmDockWindow::mousePressEvent( TQMouseEvent *e ) { if ( e->button() == LeftButton ) { - kapp->startServiceByDesktopName( "korganizer", TQString::null ); + kapp->startServiceByDesktopName( "korganizer", TQString() ); } else { KSystemTray::mousePressEvent( e ); } diff --git a/korganizer/korgac/alarmdockwindow.h b/korganizer/korgac/alarmdockwindow.h index 548e39aa2..f73c667b6 100644 --- a/korganizer/korgac/alarmdockwindow.h +++ b/korganizer/korgac/alarmdockwindow.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef ALARMDOCKWINDOW_H #define ALARMDOCKWINDOW_H @@ -31,6 +31,7 @@ class AlarmDockWindow : public KSystemTray { Q_OBJECT + TQ_OBJECT public: AlarmDockWindow( const char *name = 0 ); virtual ~AlarmDockWindow(); diff --git a/korganizer/korgac/koalarmclient.cpp b/korganizer/korgac/koalarmclient.cpp index 7ed25518a..c1254f12c 100644 --- a/korganizer/korgac/koalarmclient.cpp +++ b/korganizer/korgac/koalarmclient.cpp @@ -20,8 +20,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include "koalarmclient.h" @@ -39,8 +39,8 @@ #include -KOAlarmClient::KOAlarmClient( TQObject *parent, const char *name ) - : DCOPObject( "ac" ), TQObject( parent, name ), mDialog( 0 ) +KOAlarmClient::KOAlarmClient( TQObject *tqparent, const char *name ) + : DCOPObject( "ac" ), TQObject( tqparent, name ), mDialog( 0 ) { kdDebug(5890) << "KOAlarmClient::KOAlarmClient()" << endl; @@ -116,8 +116,8 @@ void KOAlarmClient::checkAlarms() TQValueList::ConstIterator it; for( it = alarms.begin(); it != alarms.end(); ++it ) { - kdDebug(5891) << "REMINDER: " << (*it)->parent()->summary() << endl; - Incidence *incidence = mCalendar->incidence( (*it)->parent()->uid() ); + kdDebug(5891) << "REMINDER: " << (*it)->tqparent()->summary() << endl; + Incidence *incidence = mCalendar->incidence( (*it)->tqparent()->uid() ); createReminder( mCalendar, incidence, from, (*it)->text() ); } } @@ -163,7 +163,7 @@ void KOAlarmClient::quit() kapp->quit(); } -bool KOAlarmClient::commitData( QSessionManager& ) +bool KOAlarmClient::commitData( TQSessionManager& ) { emit saveAllSignal(); saveLastCheckTime(); @@ -201,7 +201,7 @@ TQStringList KOAlarmClient::dumpAlarms() TQValueList::ConstIterator it; for( it = alarms.begin(); it != alarms.end(); ++it ) { Alarm *a = *it; - lst << TQString(" ") + a->parent()->summary() + " (" + lst << TQString(" ") + a->tqparent()->summary() + " (" + a->time().toString() + ")"; } diff --git a/korganizer/korgac/koalarmclient.h b/korganizer/korgac/koalarmclient.h index c8eee984e..b1b8c189c 100644 --- a/korganizer/korgac/koalarmclient.h +++ b/korganizer/korgac/koalarmclient.h @@ -20,8 +20,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef KOALARMCLIENT_H #define KOALARMCLIENT_H @@ -44,11 +44,12 @@ class Incidence; class KOAlarmClient : public TQObject, virtual public AlarmClientIface, public KSessionManaged { Q_OBJECT + TQ_OBJECT public: - KOAlarmClient( TQObject *parent = 0, const char *name = 0 ); + KOAlarmClient( TQObject *tqparent = 0, const char *name = 0 ); ~KOAlarmClient(); - bool commitData( QSessionManager & ); + bool commitData( TQSessionManager & ); // DCOP interface void quit(); diff --git a/korganizer/korgac/korgacmain.cpp b/korganizer/korgac/korgacmain.cpp index b4c9df7f6..6df1f0e16 100644 --- a/korganizer/korgac/korgacmain.cpp +++ b/korganizer/korgac/korgacmain.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include diff --git a/korganizer/korgac/testalarmdlg.cpp b/korganizer/korgac/testalarmdlg.cpp index 7cf090e29..1d9159ae7 100644 --- a/korganizer/korgac/testalarmdlg.cpp +++ b/korganizer/korgac/testalarmdlg.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include diff --git a/korganizer/korganizer.cpp b/korganizer/korganizer.cpp index 69ab0f4a3..96a458200 100644 --- a/korganizer/korganizer.cpp +++ b/korganizer/korganizer.cpp @@ -25,8 +25,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include "korganizer.h" diff --git a/korganizer/korganizer.h b/korganizer/korganizer.h index d5246b875..facf9f59d 100644 --- a/korganizer/korganizer.h +++ b/korganizer/korganizer.h @@ -25,8 +25,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef KORGANIZER_H #define KORGANIZER_H @@ -65,10 +65,11 @@ typedef KParts::MainWindow KPartsMainWindow; class KOrganizer : public KPartsMainWindow, public KOrgMainWindow { Q_OBJECT + TQ_OBJECT public: /** Constructs a new main window. - @param name Qt internal widget name + @param name TQt internal widget name */ KOrganizer( const char *name = 0 ); virtual ~KOrganizer(); diff --git a/korganizer/korganizer_options.h b/korganizer/korganizer_options.h index cbe7e036b..52511ac9c 100644 --- a/korganizer/korganizer_options.h +++ b/korganizer/korganizer_options.h @@ -19,8 +19,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef KORGANIZER_OPTIONS_H diff --git a/korganizer/korganizer_part.cpp b/korganizer/korganizer_part.cpp index cc6252d57..064c4f12a 100644 --- a/korganizer/korganizer_part.cpp +++ b/korganizer/korganizer_part.cpp @@ -19,8 +19,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include "korganizer_part.h" @@ -67,9 +67,9 @@ typedef KParts::GenericFactory< KOrganizerPart > KOrganizerFactory; K_EXPORT_COMPONENT_FACTORY( libkorganizerpart, KOrganizerFactory ) KOrganizerPart::KOrganizerPart( TQWidget *tqparentWidget, const char *widgetName, - TQObject *parent, const char *name, + TQObject *tqparent, const char *name, const TQStringList & ) : - KParts::ReadOnlyPart(parent, name), mTopLevelWidget( tqparentWidget->tqtopLevelWidget() ) + KParts::ReadOnlyPart(tqparent, name), mTopLevelWidget( tqparentWidget->tqtopLevelWidget() ) { KGlobal::locale()->insertCatalogue( "libkcal" ); KGlobal::locale()->insertCatalogue( "libkdepim" ); @@ -151,7 +151,7 @@ void KOrganizerPart::slotChangeInfo( Incidence *incidence, const TQDate & ) emit textChanged( incidence->summary() + " / " + incidence->dtStartTimeStr() ); } else { - emit textChanged( TQString::null ); + emit textChanged( TQString() ); } } diff --git a/korganizer/korganizer_part.h b/korganizer/korganizer_part.h index 1aececaf4..fb6584e19 100644 --- a/korganizer/korganizer_part.h +++ b/korganizer/korganizer_part.h @@ -19,8 +19,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef KORGANIZER_PART_H #define KORGANIZER_PART_H @@ -57,9 +57,10 @@ class KOrganizerPart: public KParts::ReadOnlyPart, public KOrg::MainWindow { Q_OBJECT + TQ_OBJECT public: KOrganizerPart( TQWidget *tqparentWidget, const char *widgetName, - TQObject *parent, const char *name, const TQStringList & ); + TQObject *tqparent, const char *name, const TQStringList & ); virtual ~KOrganizerPart(); static KAboutData *createAboutData(); diff --git a/korganizer/korganizer_part.rc b/korganizer/korganizer_part.rc index da92935a0..5115d2269 100644 --- a/korganizer/korganizer_part.rc +++ b/korganizer/korganizer_part.rc @@ -39,7 +39,7 @@ - + &View diff --git a/korganizer/korganizerifaceimpl.cpp b/korganizer/korganizerifaceimpl.cpp index e482e0f4a..9ec8b26cf 100644 --- a/korganizer/korganizerifaceimpl.cpp +++ b/korganizer/korganizerifaceimpl.cpp @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -35,8 +35,8 @@ KOrganizerIfaceImpl::KOrganizerIfaceImpl( ActionManager* actionManager, - TQObject* parent, const char* name ) - : DCOPObject( "KOrganizerIface" ), TQObject( parent, name ), + TQObject* tqparent, const char* name ) + : DCOPObject( "KOrganizerIface" ), TQObject( tqparent, name ), mActionManager( actionManager ) { } diff --git a/korganizer/korganizerifaceimpl.h b/korganizer/korganizerifaceimpl.h index 3efa4b17a..4ecddcb05 100644 --- a/korganizer/korganizerifaceimpl.h +++ b/korganizer/korganizerifaceimpl.h @@ -18,11 +18,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -42,7 +42,7 @@ class ActionManager; class KDE_EXPORT KOrganizerIfaceImpl : public TQObject, virtual public KOrganizerIface { public: KOrganizerIfaceImpl( ActionManager* mActionManager, - TQObject* parent=0, const char* name=0 ); + TQObject* tqparent=0, const char* name=0 ); ~KOrganizerIfaceImpl(); bool openURL( const TQString &url ); diff --git a/korganizer/korganizerui.rc b/korganizer/korganizerui.rc index 82e97f713..5ece25d32 100644 --- a/korganizer/korganizerui.rc +++ b/korganizer/korganizerui.rc @@ -122,7 +122,7 @@ - + diff --git a/korganizer/korgplugins.cpp b/korganizer/korgplugins.cpp index 5bd9be910..84e4f2ef8 100644 --- a/korganizer/korgplugins.cpp +++ b/korganizer/korgplugins.cpp @@ -19,8 +19,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include #include diff --git a/korganizer/kotimelineview.cpp b/korganizer/kotimelineview.cpp index ea987ccf5..93296daaf 100644 --- a/korganizer/kotimelineview.cpp +++ b/korganizer/kotimelineview.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ @@ -41,9 +41,9 @@ using namespace KOrg; using namespace KCal; -KOTimelineView::KOTimelineView(Calendar *calendar, TQWidget *parent, +KOTimelineView::KOTimelineView(Calendar *calendar, TQWidget *tqparent, const char *name) - : KOEventView(calendar, parent, name), + : KOEventView(calendar, tqparent, name), mEventPopup( 0 ) { TQVBoxLayout* vbox = new TQVBoxLayout(this); @@ -340,8 +340,8 @@ void KOTimelineView::itemMoved(KDGanttViewItem * item) if ( duration < 0 ) duration = 0; } i->setDuration( duration ); - TimelineItem *parent = static_cast( tlit->parent() ); - parent->moveItems( i, tlit->originalStart().secsTo( newStart ), duration + allDayOffset ); + TimelineItem *tqparent = static_cast( tlit->tqparent() ); + tqparent->moveItems( i, tlit->originalStart().secsTo( newStart ), duration + allDayOffset ); mChanger->endChange( i, 0, TQString() ); } diff --git a/korganizer/kotimelineview.h b/korganizer/kotimelineview.h index 72ba90840..36907e6b1 100644 --- a/korganizer/kotimelineview.h +++ b/korganizer/kotimelineview.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef KOTIMELINEVIEW_H #define KOTIMELINEVIEW_H @@ -44,8 +44,9 @@ namespace KOrg { class KOTimelineView : public KOEventView { Q_OBJECT + TQ_OBJECT public: - KOTimelineView(Calendar *calendar, TQWidget *parent = 0, + KOTimelineView(Calendar *calendar, TQWidget *tqparent = 0, const char *name = 0); ~KOTimelineView(); diff --git a/korganizer/kotodoeditor.cpp b/korganizer/kotodoeditor.cpp index 180ff1394..f996321ea 100644 --- a/korganizer/kotodoeditor.cpp +++ b/korganizer/kotodoeditor.cpp @@ -20,8 +20,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include @@ -51,8 +51,8 @@ #include "kotodoeditor.h" #include "kocore.h" -KOTodoEditor::KOTodoEditor( Calendar *calendar, TQWidget *parent ) : - KOIncidenceEditor( TQString::null, calendar, parent ), +KOTodoEditor::KOTodoEditor( Calendar *calendar, TQWidget *tqparent ) : + KOIncidenceEditor( TQString(), calendar, tqparent ), mTodo( 0 ), mCalendar( 0 ), mRelatedTodo( 0 ), mGeneral( 0 ), mRecurrence( 0 ) { } @@ -128,7 +128,7 @@ void KOTodoEditor::setupGeneral() mGeneral->initHeader( topFrame, topLayout ); mGeneral->initTime(topFrame,topLayout); - mGeneral->iniStatus(topFrame,topLayout); + mGeneral->initqStatus(topFrame,topLayout); mGeneral->initDescription(topFrame,topLayout); mGeneral->initAttachments(topFrame,topLayout); connect( mGeneral, TQT_SIGNAL( openURL( const KURL& ) ), @@ -174,7 +174,7 @@ void KOTodoEditor::setTexts( const TQString &summary, const TQString &descriptio { if ( description.isEmpty() && summary.tqcontains("\n") ) { mGeneral->setDescription( summary ); - int pos = summary.find( "\n" ); + int pos = summary.tqfind( "\n" ); mGeneral->setSummary( summary.left( pos ) ); } else { mGeneral->setSummary( summary ); @@ -257,7 +257,7 @@ void KOTodoEditor::setDates( const TQDateTime &due, bool allDay, Todo *relatedEv { mRelatedTodo = relatedEvent; - // inherit some properties from parent todo + // inherit some properties from tqparent todo if ( mRelatedTodo ) { mGeneral->setCategories( mRelatedTodo->categories() ); } @@ -306,7 +306,7 @@ void KOTodoEditor::writeTodo( Todo *todo ) } writeDesignerFields( todo ); - // set related incidence, i.e. parent to-do in this case. + // set related incidence, i.e. tqparent to-do in this case. if ( mRelatedTodo ) { todo->setRelatedTo( mRelatedTodo ); } diff --git a/korganizer/kotodoeditor.h b/korganizer/kotodoeditor.h index f743c11cf..5322714f2 100644 --- a/korganizer/kotodoeditor.h +++ b/korganizer/kotodoeditor.h @@ -20,8 +20,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef _KOTODOEDITOR_H #define _KOTODOEDITOR_H @@ -37,11 +37,12 @@ class KOEditorRecurrence; class KOTodoEditor : public KOIncidenceEditor { Q_OBJECT + TQ_OBJECT public: /** Constructs a new todo editor. */ - KOTodoEditor( Calendar *calendar, TQWidget *parent ); + KOTodoEditor( Calendar *calendar, TQWidget *tqparent ); virtual ~KOTodoEditor(); void init(); @@ -55,10 +56,10 @@ class KOTodoEditor : public KOIncidenceEditor /** Sets the given summary and description. If description is empty and the - summary tqcontains multiple lines, the summary will be used as description + summary contains 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 ); + void setTexts( const TQString &summary, const TQString &description = TQString() ); /** Edit an existing todo. */ void editIncidence(Incidence *incidence, const TQDate &date, Calendar* calendar); diff --git a/korganizer/kotodoview.cpp b/korganizer/kotodoview.cpp index 333e2fbf5..475a2f636 100644 --- a/korganizer/kotodoview.cpp +++ b/korganizer/kotodoview.cpp @@ -19,8 +19,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include @@ -64,10 +64,10 @@ using namespace KOrg; #include "calprinter.h" #endif -KOTodoListViewToolTip::KOTodoListViewToolTip (TQWidget *parent, +KOTodoListViewToolTip::KOTodoListViewToolTip (TQWidget *tqparent, Calendar *calendar, KOTodoListView *lv ) - :TQToolTip(parent), mCalendar( calendar ) + :TQToolTip(tqparent), mCalendar( calendar ) { todolist=lv; } @@ -100,8 +100,8 @@ void KOTodoListViewToolTip::maybeTip( const TQPoint & pos) -KOTodoListView::KOTodoListView( TQWidget *parent, const char *name ) - : KListView( parent, name ), mCalendar( 0 ), mChanger( 0 ) +KOTodoListView::KOTodoListView( TQWidget *tqparent, const char *name ) + : KListView( tqparent, name ), mCalendar( 0 ), mChanger( 0 ) { mOldCurrent = 0; mMousePressed = false; @@ -227,7 +227,7 @@ void KOTodoListView::contentsDropEvent( TQDropEvent *e ) mChanger->changeIncidence( oldTodo, existingTodo, KOGlobals::RELATION_MODIFIED, this ); mChanger->endChange( existingTodo, 0, TQString() ); } else { - KMessageBox::sorry( this, i18n("Unable to change to-do's parent, " + KMessageBox::sorry( this, i18n("Unable to change to-do's tqparent, " "because the to-do cannot be locked.") ); } delete oldTodo; @@ -263,7 +263,7 @@ void KOTodoListView::contentsDropEvent( TQDropEvent *e ) TQStringList emails = KPIM::splitEmailAddrList( text ); for(TQStringList::ConstIterator it = emails.begin();it!=emails.end();++it) { kdDebug(5850) << " Email: " << (*it) << endl; - int pos = (*it).find("<"); + int pos = (*it).tqfind("<"); TQString name = (*it).left(pos); TQString email = (*it).mid(pos); if (!email.isEmpty() && todoi) { @@ -299,7 +299,7 @@ void KOTodoListView::contentsMousePressEvent(TQMouseEvent* e) treeStepSize() * (i->depth() + (rootIsDecorated() ? 1 : 0)) + itemMargin() || p.x() < header()->sectionPos(header()->mapToIndex(0))) { - if (e->button()==Qt::LeftButton) { + if (e->button()==TQt::LeftButton) { mPressPos = e->pos(); mMousePressed = true; } @@ -360,8 +360,8 @@ void KOTodoListView::contentsMouseDoubleClickEvent(TQMouseEvent *e) ///////////////////////////////////////////////////////////////////////////// -KOTodoView::KOTodoView( Calendar *calendar, TQWidget *parent, const char* name) - : KOrg::BaseView( calendar, parent, name ) +KOTodoView::KOTodoView( Calendar *calendar, TQWidget *tqparent, const char* name) + : KOrg::BaseView( calendar, tqparent, name ) { TQBoxLayout *topLayout = new TQVBoxLayout( this ); @@ -558,7 +558,7 @@ void KOTodoView::updateView() */ // Put for each Event a KOTodoViewItem in the list view. Don't rely on a - // specific order of events. That means that we have to generate parent items + // specific order of events. That means that we have to generate tqparent items // recursively for proper hierarchical display of Todos. mTodoMap.clear(); Todo::List::ConstIterator it; @@ -603,7 +603,7 @@ TQMap::ConstIterator // kdDebug(5850) << " has Related" << endl; TQMap::ConstIterator itemIterator; - itemIterator = mTodoMap.find(relatedTodo); + itemIterator = mTodoMap.tqfind(relatedTodo); if (itemIterator == mTodoMap.end()) { // kdDebug(5850) << " related not yet in list" << endl; itemIterator = insertTodoItem (relatedTodo); @@ -612,7 +612,7 @@ TQMap::ConstIterator // and one into the map. Sure finding is more easy but why? -zecke KOTodoViewItem *todoItem; - // in case we found a related parent, which has no KOTodoViewItem yet, this must + // in case we found a related tqparent, which has no KOTodoViewItem yet, this must // be the case where 2 items refer to each other, therefore simply create item as root item if ( *itemIterator == 0 ) { todo->setRelatedTo(0); // break the recursion, else we will have troubles later @@ -703,15 +703,15 @@ void KOTodoView::changeIncidenceDisplay(Incidence *incidence, int action) scheduleRemoveTodoItem( todoItem ); } else { // correctly update changes in relations - Todo*parent = dynamic_cast( todo->relatedTo() ); - KOTodoViewItem*parentItem = 0; - if ( parent && mTodoMap.tqcontains(parent) ) { - parentItem = mTodoMap[ parent ]; + Todo*tqparent = dynamic_cast( todo->relatedTo() ); + KOTodoViewItem*tqparentItem = 0; + if ( tqparent && mTodoMap.tqcontains(tqparent) ) { + tqparentItem = mTodoMap[ tqparent ]; } - if ( todoItem->parent() != parentItem ) { + if ( todoItem->tqparent() != tqparentItem ) { // The relations changed - if ( parentItem ) { - parentItem->insertItem( todoItem ); + if ( tqparentItem ) { + tqparentItem->insertItem( todoItem ); } else { mTodoListView->insertItem( todoItem ); } @@ -992,7 +992,7 @@ void KOTodoView::copyTodoToDate( TQDate date ) newTodo->setDtDue( dt ); newTodo->setPercentComplete( 0 ); - QPairp = + TQPairp = CalHelper::incSubResourceCalendar( calendar(), mActiveItem->todo() ); mChanger->addIncidence( newTodo, p.first, p.second, this ); @@ -1011,7 +1011,7 @@ TQPopupMenu *KOTodoView::getCategoryPopupMenu( KOTodoViewItem *todoItem ) ++it ) { int index = tempMenu->insertItem( *it ); mCategory[ index ] = *it; - if ( checkedCategories.find( *it ) != checkedCategories.end() ) + if ( checkedCategories.tqfind( *it ) != checkedCategories.end() ) tempMenu->setItemChecked( index, true ); } @@ -1030,7 +1030,7 @@ void KOTodoView::changedCategories(int index) Todo *oldTodo = todo->clone(); TQStringList categories = todo->categories (); - if ( categories.find( mCategory[index] ) != categories.end() ) + if ( categories.tqfind( mCategory[index] ) != categories.end() ) categories.remove( mCategory[index] ); else categories.insert( categories.end(), mCategory[index] ); @@ -1072,7 +1072,7 @@ void KOTodoView::setNewPercentageDelayed( KOTodoViewItem *item, int percentage ) void KOTodoView::processDelayedNewPercentage() { - TQValueList< QPair< KOTodoViewItem *, int> >::Iterator it; + TQValueList< TQPair< KOTodoViewItem *, int> >::Iterator it; for ( it = mPercentChangedMap.begin(); it != mPercentChangedMap.end(); ++it ) setNewPercentage( (*it).first, (*it).second ); @@ -1128,7 +1128,7 @@ void KOTodoView::addQuickTodo() delete todo; return; } - mQuickAdd->setText( TQString::null ); + mQuickAdd->setText( TQString() ); } } diff --git a/korganizer/kotodoview.h b/korganizer/kotodoview.h index 1d53a3827..03a41b9fe 100644 --- a/korganizer/kotodoview.h +++ b/korganizer/kotodoview.h @@ -19,8 +19,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef KOTODOVIEW_H #define KOTODOVIEW_H @@ -55,10 +55,10 @@ class Calendar; using namespace KCal; using namespace KOrg; -class KOTodoListViewToolTip : public QToolTip +class KOTodoListViewToolTip : public TQToolTip { public: - KOTodoListViewToolTip( TQWidget *parent, Calendar *calendar, KOTodoListView *lv ); + KOTodoListViewToolTip( TQWidget *tqparent, Calendar *calendar, KOTodoListView *lv ); protected: void maybeTip( const TQPoint &pos ); @@ -72,8 +72,9 @@ class KOTodoListViewToolTip : public QToolTip class KOTodoListView : public KListView { Q_OBJECT + TQ_OBJECT public: - KOTodoListView( TQWidget *parent = 0, const char *name = 0 ); + KOTodoListView( TQWidget *tqparent = 0, const char *name = 0 ); ~KOTodoListView(); void setCalendar( Calendar * ); @@ -112,8 +113,9 @@ class KOTodoListView : public KListView class KOTodoView : public KOrg::BaseView { Q_OBJECT + TQ_OBJECT public: - KOTodoView( Calendar *cal, TQWidget *parent = 0, const char *name = 0 ); + KOTodoView( Calendar *cal, TQWidget *tqparent = 0, const char *name = 0 ); ~KOTodoView(); void setCalendar( Calendar * ); @@ -218,7 +220,7 @@ class KOTodoView : public KOrg::BaseView TQMap mTodoMap; TQPtrList mItemsToDelete; - TQValueList< QPair > mPercentChangedMap; + TQValueList< TQPair > mPercentChangedMap; DocPrefs *mDocPrefs; TQString mCurrentDoc; diff --git a/korganizer/kotodoviewitem.cpp b/korganizer/kotodoviewitem.cpp index bb03fe32c..02369d91a 100644 --- a/korganizer/kotodoviewitem.cpp +++ b/korganizer/kotodoviewitem.cpp @@ -20,8 +20,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include "kotodoviewitem.h" @@ -38,14 +38,14 @@ #include -KOTodoViewItem::KOTodoViewItem( TQListView *parent, Todo *todo, KOTodoView *kotodo) - : TQCheckListItem( parent , "", CheckBox ), mTodo( todo ), mTodoView( kotodo ) +KOTodoViewItem::KOTodoViewItem( TQListView *tqparent, Todo *todo, KOTodoView *kotodo) + : TQCheckListItem( tqparent , "", CheckBox ), mTodo( todo ), mTodoView( kotodo ) { construct(); } -KOTodoViewItem::KOTodoViewItem( KOTodoViewItem *parent, Todo *todo, KOTodoView *kotodo ) - : TQCheckListItem( parent, "", CheckBox ), mTodo( todo ), mTodoView( kotodo ) +KOTodoViewItem::KOTodoViewItem( KOTodoViewItem *tqparent, Todo *todo, KOTodoView *kotodo ) + : TQCheckListItem( tqparent, "", CheckBox ), mTodo( todo ), mTodoView( kotodo ) { construct(); } @@ -119,14 +119,11 @@ int KOTodoViewItem::compare( TQListViewItem *it, int col, bool ascending ) const } } -#if QT_VERSION >= 300 void KOTodoViewItem::paintBranches(TQPainter *p,const TQColorGroup & cg,int w, int y,int h) { TQListViewItem::paintBranches(p,cg,w,y,h); } -#else -#endif void KOTodoViewItem::construct() { @@ -154,7 +151,7 @@ void KOTodoViewItem::construct() setText( KOTodoView::eDueDateColumn, dtStr ); mEffectiveDueDate = mTodo->dtDue(); KOTodoViewItem *myParent; - if ( ( myParent = dynamic_cast( parent() ) ) ) + if ( ( myParent = dynamic_cast( tqparent() ) ) ) if ( !myParent->mEffectiveDueDate.isValid() || myParent->mEffectiveDueDate > mEffectiveDueDate ) { myParent->mEffectiveDueDate = mEffectiveDueDate; @@ -216,12 +213,12 @@ bool KOTodoViewItem::isAlternate() { KOTodoViewItem *item; bool previous = true; - if (TQListViewItem::parent()) + if (TQListViewItem::tqparent()) { - item = dynamic_cast(TQListViewItem::parent()); + item = dynamic_cast(TQListViewItem::tqparent()); if (item) previous = item->m_odd; - item = dynamic_cast(TQListViewItem::parent()->firstChild()); + item = dynamic_cast(TQListViewItem::tqparent()->firstChild()); } else { diff --git a/korganizer/kotodoviewitem.h b/korganizer/kotodoviewitem.h index 5388d6da0..9f7032f89 100644 --- a/korganizer/kotodoviewitem.h +++ b/korganizer/kotodoviewitem.h @@ -20,8 +20,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef KOTODOVIEWITEM_H #define KOTODOVIEWITEM_H @@ -45,18 +45,18 @@ class KOTodoView; @author Cornelius Schumacher @see KOTodoView */ -class KOTodoViewItem : public QCheckListItem +class KOTodoViewItem : public TQCheckListItem { public: /** Constructor. - @param parent is the list view to which this item belongs. + @param tqparent is the list view to which this item belongs. @param todo is the todo to have the item display information for. @param kotodo is a pointer to the KOTodoView object. */ - KOTodoViewItem(TQListView *parent, Todo *todo, KOTodoView *kotodo); - KOTodoViewItem(KOTodoViewItem *parent, Todo *todo, KOTodoView *kotodo); + KOTodoViewItem(TQListView *tqparent, Todo *todo, KOTodoView *kotodo); + KOTodoViewItem(KOTodoViewItem *tqparent, Todo *todo, KOTodoView *kotodo); virtual ~KOTodoViewItem() {} void construct(); @@ -69,10 +69,7 @@ class KOTodoViewItem : public QCheckListItem int column, int width, int tqalignment); protected: -#if QT_VERSION >= 300 void paintBranches(TQPainter *p,const TQColorGroup & cg,int w,int y,int h); -#else -#endif virtual void stateChange(bool); private: diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp index 06ae07418..e04e0c9a9 100644 --- a/korganizer/koviewmanager.cpp +++ b/korganizer/koviewmanager.cpp @@ -19,8 +19,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include @@ -315,11 +315,7 @@ void KOViewManager::zoomOutVertically() void KOViewManager::addView(KOrg::BaseView *view) { connectView( view ); -#if QT_VERSION >= 300 mMainView->viewStack()->addWidget( view ); -#else - mMainView->viewStack()->addWidget( view, 1 ); -#endif } void KOViewManager::showWhatsNextView() @@ -358,12 +354,12 @@ void KOViewManager::showAgendaView() const bool showSideBySide = !isLocalFile && ( showBoth || mode == KOPrefs::CalendarsSideBySide ); - TQWidget *parent = mMainView->viewStack(); + TQWidget *tqparent = mMainView->viewStack(); if ( !mAgendaViewTabs && showBoth ) { mAgendaViewTabs = new TQTabWidget( mMainView->viewStack() ); connect( mAgendaViewTabs, TQT_SIGNAL( currentChanged( TQWidget* ) ), this, TQT_SLOT( currentAgendaViewTabChanged( TQWidget* ) ) ); - parent = mAgendaViewTabs; + tqparent = mAgendaViewTabs; KConfig *config = KOGlobals::self()->config(); config->setGroup( "Views" ); @@ -373,7 +369,7 @@ void KOViewManager::showAgendaView() if ( !mAgendaView && showMerged ) { mAgendaView = new KOAgendaView( mMainView->calendar(), mMainView, - parent, + tqparent, "KOViewManager::AgendaView" ); addView(mAgendaView); @@ -390,7 +386,7 @@ void KOViewManager::showAgendaView() if ( !mAgendaSideBySideView && showSideBySide ) { mAgendaSideBySideView = - new MultiAgendaView( mMainView->calendar(), mMainView, parent, + new MultiAgendaView( mMainView->calendar(), mMainView, tqparent, "KOViewManager::AgendaSideBySideView" ); addView(mAgendaSideBySideView); diff --git a/korganizer/koviewmanager.h b/korganizer/koviewmanager.h index 9fe521e4f..c8900d019 100644 --- a/korganizer/koviewmanager.h +++ b/korganizer/koviewmanager.h @@ -19,8 +19,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef KOVIEWMANAGER_H #define KOVIEWMANAGER_H @@ -49,9 +49,10 @@ using namespace KCal; This class manages the views of the calendar. It owns the objects and handles creation and selection. */ -class KOViewManager : public QObject +class KOViewManager : public TQObject { Q_OBJECT + TQ_OBJECT public: enum AgendaMode { diff --git a/korganizer/kowhatsnextview.cpp b/korganizer/kowhatsnextview.cpp index 1ec28ed2f..4f3b3dc2d 100644 --- a/korganizer/kowhatsnextview.cpp +++ b/korganizer/kowhatsnextview.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include @@ -60,9 +60,9 @@ void WhatsNextTextBrowser::setSource(const TQString& n) } } -KOWhatsNextView::KOWhatsNextView(Calendar *calendar, TQWidget *parent, +KOWhatsNextView::KOWhatsNextView(Calendar *calendar, TQWidget *tqparent, const char *name) - : KOrg::BaseView(calendar, parent, name) + : KOrg::BaseView(calendar, tqparent, name) { // TQLabel *dateLabel = // new TQLabel(KGlobal::locale()->formatDate(TQDate::tqcurrentDate()),this); @@ -302,7 +302,7 @@ void KOWhatsNextView::appendEvent( Incidence *ev, const TQDateTime &start, void KOWhatsNextView::appendTodo( Incidence *ev ) { - if ( mTodos.find( ev ) != mTodos.end() ) return; + if ( mTodos.tqfind( ev ) != mTodos.end() ) return; mTodos.append( ev ); diff --git a/korganizer/kowhatsnextview.h b/korganizer/kowhatsnextview.h index 211984ed9..7fd07aeb7 100644 --- a/korganizer/kowhatsnextview.h +++ b/korganizer/kowhatsnextview.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef KOWHATSNEXTVIEW_H #define KOWHATSNEXTVIEW_H @@ -34,8 +34,9 @@ class KOEventViewerDialog; class WhatsNextTextBrowser : public TQTextBrowser { Q_OBJECT + TQ_OBJECT public: - WhatsNextTextBrowser(TQWidget *parent) : TQTextBrowser(parent) {} + WhatsNextTextBrowser(TQWidget *tqparent) : TQTextBrowser(tqparent) {} void setSource(const TQString &); @@ -50,8 +51,9 @@ class WhatsNextTextBrowser : public TQTextBrowser { class KOWhatsNextView : public KOrg::BaseView { Q_OBJECT + TQ_OBJECT public: - KOWhatsNextView(Calendar *calendar, TQWidget *parent = 0, + KOWhatsNextView(Calendar *calendar, TQWidget *tqparent = 0, const char *name = 0); ~KOWhatsNextView(); diff --git a/korganizer/kowindowlist.cpp b/korganizer/kowindowlist.cpp index ddb3d680a..4d9c5353e 100644 --- a/korganizer/kowindowlist.cpp +++ b/korganizer/kowindowlist.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include diff --git a/korganizer/kowindowlist.h b/korganizer/kowindowlist.h index 97ce2d1f2..f6e58319a 100644 --- a/korganizer/kowindowlist.h +++ b/korganizer/kowindowlist.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef KOWINDOWLIST_H #define KOWINDOWLIST_H @@ -40,9 +40,10 @@ class KURL; @short manages a list of all KOrganizer instances @author Cornelius Schumacher */ -class KOWindowList : public QObject +class KOWindowList : public TQObject { Q_OBJECT + TQ_OBJECT public: /** Constructs a new list of KOrganizer windows. There should only be one diff --git a/korganizer/mailscheduler.cpp b/korganizer/mailscheduler.cpp index a5fe92b40..5176ca22a 100644 --- a/korganizer/mailscheduler.cpp +++ b/korganizer/mailscheduler.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include @@ -176,7 +176,7 @@ bool MailScheduler::acceptCounterProposal( Incidence *incidence ) exInc = mCalendar->incidenceFromSchedulingID( incidence->uid() ); incidence->setRevision( incidence->revision() + 1 ); if ( exInc ) { - incidence->setRevision( QMAX( incidence->revision(), exInc->revision() + 1 ) ); + incidence->setRevision( TQMAX( incidence->revision(), exInc->revision() + 1 ) ); // some stuff we don't want to change, just to be safe incidence->setSchedulingID( exInc->schedulingID() ); incidence->setUid( exInc->uid() ); diff --git a/korganizer/mailscheduler.h b/korganizer/mailscheduler.h index 7553ee74d..d57a2886c 100644 --- a/korganizer/mailscheduler.h +++ b/korganizer/mailscheduler.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef MAILSCHEDULER_H #define MAILSCHEDULER_H diff --git a/korganizer/main.cpp b/korganizer/main.cpp index 997956447..39a219d6a 100644 --- a/korganizer/main.cpp +++ b/korganizer/main.cpp @@ -19,8 +19,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include "koapp.h" diff --git a/korganizer/multiagendaview.cpp b/korganizer/multiagendaview.cpp index 7d77a3da7..d613941c4 100644 --- a/korganizer/multiagendaview.cpp +++ b/korganizer/multiagendaview.cpp @@ -41,8 +41,8 @@ for(TQValueList::ConstIterator it = mAgendaViews.constBegin(); \ using namespace KOrg; MultiAgendaView::MultiAgendaView( Calendar * cal, CalendarView *calendarView, - TQWidget * parent, const char *name ) : - AgendaView( cal, parent, name ), + TQWidget * tqparent, const char *name ) : + AgendaView( cal, tqparent, name ), mSelectedAgendaView( 0 ), mLastMovedSplitter( 0 ), mUpdateOnShow( false ), @@ -57,10 +57,10 @@ MultiAgendaView::MultiAgendaView( Calendar * cal, CalendarView *calendarView, TQVBox *topSideBox = new TQVBox( this ); mLeftTopSpacer = new TQWidget( topSideBox ); mLeftTopSpacer->setFixedHeight( topLabelHeight ); - mLeftSplitter = new TQSplitter( Qt::Vertical, topSideBox ); + mLeftSplitter = new TQSplitter( TQt::Vertical, topSideBox ); mLeftSplitter->setOpaqueResize( KGlobalSettings::opaqueResize() ); TQLabel *label = new TQLabel( i18n("All Day"), mLeftSplitter ); - label->tqsetAlignment( Qt::AlignRight | Qt::AlignVCenter | Qt::WordBreak ); + label->tqsetAlignment( TQt::AlignRight | TQt::AlignVCenter | TQt::WordBreak ); TQVBox *sideBox = new TQVBox( mLeftSplitter ); EventIndicator *eiSpacer = new EventIndicator( EventIndicator::Top, sideBox ); eiSpacer->changeColumns( 0 ); @@ -81,14 +81,14 @@ MultiAgendaView::MultiAgendaView( Calendar * cal, CalendarView *calendarView, topSideBox = new TQVBox( this ); mRightTopSpacer = new TQWidget( topSideBox ); mRightTopSpacer->setFixedHeight( topLabelHeight ); - mRightSplitter = new TQSplitter( Qt::Vertical, topSideBox ); + mRightSplitter = new TQSplitter( TQt::Vertical, topSideBox ); mRightSplitter->setOpaqueResize( KGlobalSettings::opaqueResize() ); new TQWidget( mRightSplitter ); sideBox = new TQVBox( mRightSplitter ); eiSpacer = new EventIndicator( EventIndicator::Top, sideBox ); eiSpacer->setFixedHeight( eiSpacer->minimumHeight() ); eiSpacer->changeColumns( 0 ); - mScrollBar = new TQScrollBar( Qt::Vertical, sideBox ); + mScrollBar = new TQScrollBar( TQt::Vertical, sideBox ); eiSpacer = new EventIndicator( EventIndicator::Bottom, sideBox ); eiSpacer->setFixedHeight( eiSpacer->minimumHeight() ); eiSpacer->changeColumns( 0 ); @@ -265,7 +265,7 @@ void MultiAgendaView::setupViews() int minWidth = 0; for ( TQValueList::ConstIterator it = mAgendaWidgets.constBegin(); it != mAgendaWidgets.constEnd(); ++it ) - minWidth = QMAX( minWidth, (*it)->tqminimumSizeHint().width() ); + minWidth = TQMAX( minWidth, (*it)->tqminimumSizeHint().width() ); for ( TQValueList::ConstIterator it = mAgendaWidgets.constBegin(); it != mAgendaWidgets.constEnd(); ++it ) (*it)->setMinimumWidth( minWidth ); } @@ -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->tqsizeHint().width(), widgetWidth ); + int width = TQMAX( mTopBox->tqsizeHint().width(), widgetWidth ); int height = size.height(); if ( width > widgetWidth ) { const int sbHeight = mScrollView->horizontalScrollBar()->height(); @@ -459,17 +459,17 @@ void MultiAgendaView::updateConfig() bool MultiAgendaView::eventFilter(TQObject * obj, TQEvent * event) { - if ( obj->className() == TQCString("QSplitterHandle") ) { + if ( obj->className() == TQCString(TQSPLITTERHANDLE_OBJECT_NAME_STRING) ) { // KDE4: not needed anymore, TQSplitter has a moved signal there if ( (event->type() == TQEvent::MouseMove && KGlobalSettings::opaqueResize()) || event->type() == TQEvent::MouseButtonRelease ) { FOREACH_VIEW( agenda ) { - if ( agenda->splitter() == obj->parent() ) + if ( agenda->splitter() == obj->tqparent() ) mLastMovedSplitter = agenda->splitter(); } - if ( mLeftSplitter == obj->parent() ) + if ( mLeftSplitter == obj->tqparent() ) mLastMovedSplitter = mLeftSplitter; - else if ( mRightSplitter == obj->parent() ) + else if ( mRightSplitter == obj->tqparent() ) mLastMovedSplitter = mRightSplitter; TQTimer::singleShot( 0, this, TQT_SLOT(resizeSplitters()) ); } @@ -522,7 +522,7 @@ void MultiAgendaView::resizeSpacers( int newY ) void MultiAgendaView::zoomView( const int delta, const TQPoint & pos, const Qt::Orientation ori ) { - if ( ori == Qt::Vertical ) { + if ( ori == TQt::Vertical ) { if ( delta > 0 ) { if ( KOPrefs::instance()->mHourSize > 4 ) KOPrefs::instance()->mHourSize--; @@ -542,7 +542,7 @@ void MultiAgendaView::zoomView( const int delta, const TQPoint & pos, const Qt:: // KDE4: not needed, use existing TQSplitter signals instead void MultiAgendaView::installSplitterEventFilter(TQSplitter * splitter) { - TQObjectList *objlist = splitter->queryList( "QSplitterHandle" ); + TQObjectList *objlist = splitter->queryList( TQSPLITTERHANDLE_OBJECT_NAME_STRING ); // HACK: when not being visible, the splitter handle is sometimes not found // for unknown reasons, so trigger an update when we are shown again if ( objlist->count() == 0 && !isVisible() ) diff --git a/korganizer/multiagendaview.h b/korganizer/multiagendaview.h index 8fec0b7c3..c25f3903b 100644 --- a/korganizer/multiagendaview.h +++ b/korganizer/multiagendaview.h @@ -41,9 +41,10 @@ namespace KOrg { class MultiAgendaView : public AgendaView { Q_OBJECT + TQ_OBJECT public: explicit MultiAgendaView( Calendar* cal, CalendarView *calendarView, - TQWidget *parent = 0, const char *name = 0 ); + TQWidget *tqparent = 0, const char *name = 0 ); ~MultiAgendaView(); KOAgendaView *selectedAgendaView(); @@ -77,7 +78,7 @@ class MultiAgendaView : public AgendaView bool eventFilter( TQObject *obj, TQEvent *event ); private: - void addView( const TQString &label, KCal::ResourceCalendar *res, const TQString &subRes = TQString::null ); + void addView( const TQString &label, KCal::ResourceCalendar *res, const TQString &subRes = TQString() ); void deleteViews(); void recreateViews(); void setupViews(); diff --git a/korganizer/navigatorbar.cpp b/korganizer/navigatorbar.cpp index 836c251fa..b22b3f709 100644 --- a/korganizer/navigatorbar.cpp +++ b/korganizer/navigatorbar.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include @@ -42,8 +42,8 @@ #include "navigatorbar.h" -ActiveLabel::ActiveLabel( TQWidget *parent, const char *name ) - : TQLabel( parent, name ) +ActiveLabel::ActiveLabel( TQWidget *tqparent, const char *name ) + : TQLabel( tqparent, name ) { } @@ -53,8 +53,8 @@ void ActiveLabel::mouseReleaseEvent( TQMouseEvent * ) } -NavigatorBar::NavigatorBar( TQWidget *parent, const char *name ) - : TQWidget( parent, name ), mHasMinWidth( false ) +NavigatorBar::NavigatorBar( TQWidget *tqparent, const char *name ) + : TQWidget( tqparent, name ), mHasMinWidth( false ) { TQFont tfont = font(); tfont.setPointSize( 10 ); diff --git a/korganizer/navigatorbar.h b/korganizer/navigatorbar.h index 05d624a58..19cda40a5 100644 --- a/korganizer/navigatorbar.h +++ b/korganizer/navigatorbar.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef NAVIGATORBAR_H #define NAVIGATORBAR_H @@ -31,11 +31,12 @@ class TQPushButton; class TQFrame; -class ActiveLabel : public QLabel +class ActiveLabel : public TQLabel { Q_OBJECT + TQ_OBJECT public: - ActiveLabel( TQWidget *parent, const char *name = 0 ); + ActiveLabel( TQWidget *tqparent, const char *name = 0 ); signals: void clicked(); @@ -45,11 +46,12 @@ class ActiveLabel : public QLabel }; -class NavigatorBar: public QWidget +class NavigatorBar: public TQWidget { Q_OBJECT + TQ_OBJECT public: - NavigatorBar( TQWidget *parent = 0, const char *name = 0 ); + NavigatorBar( TQWidget *tqparent = 0, const char *name = 0 ); ~NavigatorBar(); void showButtons( bool left, bool right ); diff --git a/korganizer/plugins/datenums/configdialog.cpp b/korganizer/plugins/datenums/configdialog.cpp index 3766e2ffd..6f5c4d86a 100644 --- a/korganizer/plugins/datenums/configdialog.cpp +++ b/korganizer/plugins/datenums/configdialog.cpp @@ -34,8 +34,8 @@ #include "configdialog.h" #include "configdialog.moc" -ConfigDialog::ConfigDialog(TQWidget *parent) - : KDialogBase(Plain,i18n("Configure Day Numbers"),Ok|Cancel,Ok,parent) +ConfigDialog::ConfigDialog(TQWidget *tqparent) + : KDialogBase(Plain,i18n("Configure Day Numbers"),Ok|Cancel,Ok,tqparent) { TQFrame *topFrame = plainPage(); TQVBoxLayout *topLayout = new TQVBoxLayout(topFrame,0,spacingHint()); diff --git a/korganizer/plugins/datenums/configdialog.h b/korganizer/plugins/datenums/configdialog.h index 992eeccce..f7291bd42 100644 --- a/korganizer/plugins/datenums/configdialog.h +++ b/korganizer/plugins/datenums/configdialog.h @@ -26,8 +26,9 @@ class TQButtonGroup; class ConfigDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - ConfigDialog(TQWidget *parent=0); + ConfigDialog(TQWidget *tqparent=0); virtual ~ConfigDialog(); protected: diff --git a/korganizer/plugins/datenums/datenums.cpp b/korganizer/plugins/datenums/datenums.cpp index af022837e..a8c8fbd98 100644 --- a/korganizer/plugins/datenums/datenums.cpp +++ b/korganizer/plugins/datenums/datenums.cpp @@ -40,9 +40,9 @@ Datenums::Datenums() mDateNum = config.readNumEntry( "ShowDayNumbers", 0 ); } -void Datenums::configure(TQWidget *parent) +void Datenums::configure(TQWidget *tqparent) { - ConfigDialog *dlg = new ConfigDialog(parent); + ConfigDialog *dlg = new ConfigDialog(tqparent); dlg->exec(); delete dlg; } diff --git a/korganizer/plugins/datenums/datenums.h b/korganizer/plugins/datenums/datenums.h index f9ca7783a..c15b04ebd 100644 --- a/korganizer/plugins/datenums/datenums.h +++ b/korganizer/plugins/datenums/datenums.h @@ -30,7 +30,7 @@ class Datenums : public CalendarDecoration { Datenums(); ~Datenums() {} - void configure(TQWidget *parent); + void configure(TQWidget *tqparent); TQString shortText(const TQDate &); TQString info(); diff --git a/korganizer/plugins/exchange/exchange.cpp b/korganizer/plugins/exchange/exchange.cpp index 8455d61bb..f2aaa33e5 100644 --- a/korganizer/plugins/exchange/exchange.cpp +++ b/korganizer/plugins/exchange/exchange.cpp @@ -46,18 +46,18 @@ using namespace KCal; // Needed for connecting slots class ExchangeFactory : public KOrg::PartFactory { public: - KOrg::Part *create(KOrg::MainWindow *parent, const char *name) + KOrg::Part *create(KOrg::MainWindow *tqparent, const char *name) { kdDebug(5850) << "Registering Exchange Plugin...\n"; KGlobal::locale()->insertCatalogue("libkpimexchange"); - return new Exchange(parent,name); + return new Exchange(tqparent,name); } }; K_EXPORT_COMPONENT_FACTORY( libkorg_exchange, ExchangeFactory ) -Exchange::Exchange(KOrg::MainWindow *parent, const char *name) : - KOrg::Part(parent,name) +Exchange::Exchange(KOrg::MainWindow *tqparent, const char *name) : + KOrg::Part(tqparent,name) { setInstance( new KInstance( "korganizer" ) ); @@ -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->tqtopLevelWidget() ); + mClient->setWindow( tqparent->tqtopLevelWidget() ); setXMLFile("plugins/exchangeui.rc"); @@ -187,7 +187,7 @@ void Exchange::configure() mAccount->save( "Calendar/Exchange Plugin" ); } -void Exchange::showError( int error, const TQString& moreInfo /* = TQString::null */ ) +void Exchange::showError( int error, const TQString& moreInfo /* = TQString() */ ) { TQString errorText; switch( error ) { diff --git a/korganizer/plugins/exchange/exchange.h b/korganizer/plugins/exchange/exchange.h index 22a15f1c7..8f0210045 100644 --- a/korganizer/plugins/exchange/exchange.h +++ b/korganizer/plugins/exchange/exchange.h @@ -35,6 +35,7 @@ using namespace KCal; class Exchange : public KOrg::Part { Q_OBJECT + TQ_OBJECT public: Exchange( KOrg::MainWindow *, const char *name ); ~Exchange(); @@ -58,7 +59,7 @@ class Exchange : public KOrg::Part { private: void test2(); - void showError( int error, const TQString& moreInfo = TQString::null ); + void showError( int error, const TQString& moreInfo = TQString() ); KPIM::ExchangeClient *mClient; KPIM::ExchangeAccount* mAccount; diff --git a/korganizer/plugins/exchange/exchangeconfig.cpp b/korganizer/plugins/exchange/exchangeconfig.cpp index fe01324ac..76e6abe7d 100644 --- a/korganizer/plugins/exchange/exchangeconfig.cpp +++ b/korganizer/plugins/exchange/exchangeconfig.cpp @@ -31,8 +31,8 @@ #include "exchangeconfig.h" -ExchangeConfig::ExchangeConfig( KPIM::ExchangeAccount* account, TQWidget* parent ) - : KDialogBase(Plain,i18n("Exchange Plugin"),Ok|Cancel,Ok,parent) +ExchangeConfig::ExchangeConfig( KPIM::ExchangeAccount* account, TQWidget* tqparent ) + : KDialogBase(Plain,i18n("Exchange Plugin"),Ok|Cancel,Ok,tqparent) { mAccount = account; diff --git a/korganizer/plugins/exchange/exchangeconfig.h b/korganizer/plugins/exchange/exchangeconfig.h index 0e18bfe2e..095f73cd1 100644 --- a/korganizer/plugins/exchange/exchangeconfig.h +++ b/korganizer/plugins/exchange/exchangeconfig.h @@ -30,8 +30,9 @@ class ExchangeConfig : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - ExchangeConfig(KPIM::ExchangeAccount* account, TQWidget *parent=0); + ExchangeConfig(KPIM::ExchangeAccount* account, TQWidget *tqparent=0); virtual ~ExchangeConfig(); // protected: diff --git a/korganizer/plugins/exchange/exchangedialog.cpp b/korganizer/plugins/exchange/exchangedialog.cpp index de56a3a19..8c5cb74f2 100644 --- a/korganizer/plugins/exchange/exchangedialog.cpp +++ b/korganizer/plugins/exchange/exchangedialog.cpp @@ -30,8 +30,8 @@ #include "exchangedialog.h" -ExchangeDialog::ExchangeDialog( const TQDate &_start, const TQDate &_end, TQWidget *parent) - : KDialogBase(Plain,i18n("Exchange Plugin"),Ok|Cancel,Ok,parent) +ExchangeDialog::ExchangeDialog( const TQDate &_start, const TQDate &_end, TQWidget *tqparent) + : KDialogBase(Plain,i18n("Exchange Plugin"),Ok|Cancel,Ok,tqparent) { TQFrame *topFrame = plainPage(); TQGridLayout *topLayout = new TQGridLayout( topFrame, 2, 2, 3 ); diff --git a/korganizer/plugins/exchange/exchangedialog.h b/korganizer/plugins/exchange/exchangedialog.h index b2635f7ab..1aa17c38f 100644 --- a/korganizer/plugins/exchange/exchangedialog.h +++ b/korganizer/plugins/exchange/exchangedialog.h @@ -27,8 +27,9 @@ class TQComboBox; class ExchangeDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - ExchangeDialog( const TQDate &start, const TQDate &end, TQWidget *parent=0); + ExchangeDialog( const TQDate &start, const TQDate &end, TQWidget *tqparent=0); virtual ~ExchangeDialog(); protected slots: diff --git a/korganizer/plugins/hebrew/configdialog.cpp b/korganizer/plugins/hebrew/configdialog.cpp index 6298151ac..ee74a5777 100644 --- a/korganizer/plugins/hebrew/configdialog.cpp +++ b/korganizer/plugins/hebrew/configdialog.cpp @@ -26,8 +26,8 @@ #include #include -ConfigDialog::ConfigDialog(TQWidget * parent):KDialogBase(Plain, i18n("Configure Holidays"), Ok|Cancel, Ok, - parent) +ConfigDialog::ConfigDialog(TQWidget * tqparent):KDialogBase(Plain, i18n("Configure Holidays"), Ok|Cancel, Ok, + tqparent) { TQFrame *topFrame = plainPage(); TQVBoxLayout *topLayout = diff --git a/korganizer/plugins/hebrew/configdialog.h b/korganizer/plugins/hebrew/configdialog.h index 1638f75c3..1ef1153f7 100644 --- a/korganizer/plugins/hebrew/configdialog.h +++ b/korganizer/plugins/hebrew/configdialog.h @@ -27,9 +27,12 @@ */ class ConfigDialog:public KDialogBase { -Q_OBJECT public: + Q_OBJECT + TQ_OBJECT - ConfigDialog(TQWidget * parent = 0); +public: + + ConfigDialog(TQWidget * tqparent = 0); virtual ~ ConfigDialog(); protected: diff --git a/korganizer/plugins/hebrew/hebrew.cpp b/korganizer/plugins/hebrew/hebrew.cpp index 8a9f37bd4..ce0d96966 100644 --- a/korganizer/plugins/hebrew/hebrew.cpp +++ b/korganizer/plugins/hebrew/hebrew.cpp @@ -103,9 +103,9 @@ TQString Hebrew::info() i18n("This plugin provides the date in the Jewish calendar."); } -void Hebrew::configure(TQWidget * parent) +void Hebrew::configure(TQWidget * tqparent) { - ConfigDialog *dlg = new ConfigDialog(parent); //parent? + ConfigDialog *dlg = new ConfigDialog(tqparent); //tqparent? dlg->exec(); delete dlg; diff --git a/korganizer/plugins/hebrew/hebrew.h b/korganizer/plugins/hebrew/hebrew.h index c337f7ef4..80507fad4 100644 --- a/korganizer/plugins/hebrew/hebrew.h +++ b/korganizer/plugins/hebrew/hebrew.h @@ -34,7 +34,7 @@ public: ~Hebrew() { } - void configure(TQWidget * parent); + void configure(TQWidget * tqparent); TQString shortText(const TQDate &); TQString info(); diff --git a/korganizer/plugins/hebrew/holiday.cpp b/korganizer/plugins/hebrew/holiday.cpp index 9b5ea3f11..c6afbb613 100644 --- a/korganizer/plugins/hebrew/holiday.cpp +++ b/korganizer/plugins/hebrew/holiday.cpp @@ -34,7 +34,7 @@ Holiday::~Holiday() * We are also influenced by the IsraelP flag */ -QStringList +TQStringList Holiday::FindHoliday(int month, int day, int weekday, int kvia, bool leap_year_p, bool israel_p, int day_number, int year) diff --git a/korganizer/plugins/hebrew/parsha.cpp b/korganizer/plugins/hebrew/parsha.cpp index d8ff2dd6f..bba30f620 100644 --- a/korganizer/plugins/hebrew/parsha.cpp +++ b/korganizer/plugins/hebrew/parsha.cpp @@ -22,7 +22,7 @@ Parsha::~Parsha() { } -QString +TQString Parsha::FindParshaName(int daynumber, int kvia, bool leap_p, bool israel_p) { diff --git a/korganizer/plugins/printing/journal/calprintjournalconfig_base.ui b/korganizer/plugins/printing/journal/calprintjournalconfig_base.ui index 1e41fdb84..ffd6a1e80 100644 --- a/korganizer/plugins/printing/journal/calprintjournalconfig_base.ui +++ b/korganizer/plugins/printing/journal/calprintjournalconfig_base.ui @@ -2,7 +2,7 @@ CalPrintJournalConfig_Base Configuration page for the print journal mode. Reinhold Kainhofer <reinhold@kainhofer.com> - + CalPrintJournal_Base @@ -24,7 +24,7 @@ 0 - + mDateRangeGroup @@ -38,7 +38,7 @@ unnamed - + mAllJournals @@ -49,7 +49,7 @@ 0 - + mRangeJournals @@ -63,7 +63,7 @@ 1 - + tqlayout2 @@ -88,7 +88,7 @@ - + mFromDateLabel @@ -107,7 +107,7 @@ StrongFocus - + mToDateLabel diff --git a/korganizer/plugins/printing/journal/journalprint.cpp b/korganizer/plugins/printing/journal/journalprint.cpp index 93bc51eff..089e8de69 100644 --- a/korganizer/plugins/printing/journal/journalprint.cpp +++ b/korganizer/plugins/printing/journal/journalprint.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef KORG_NOPRINTER diff --git a/korganizer/plugins/printing/journal/journalprint.h b/korganizer/plugins/printing/journal/journalprint.h index f1c0db44c..c84153a47 100644 --- a/korganizer/plugins/printing/journal/journalprint.h +++ b/korganizer/plugins/printing/journal/journalprint.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef JOURNALPRINT_H #define JOURNALPRINT_H diff --git a/korganizer/plugins/printing/list/calprintlistconfig_base.ui b/korganizer/plugins/printing/list/calprintlistconfig_base.ui index 22c6d5771..857e063bb 100644 --- a/korganizer/plugins/printing/list/calprintlistconfig_base.ui +++ b/korganizer/plugins/printing/list/calprintlistconfig_base.ui @@ -2,7 +2,7 @@ CalPrintListConfig_Base Configuration page for the print list mode. Reinhold Kainhofer <reinhold@kainhofer.com> - + CalPrintList_Base @@ -24,7 +24,7 @@ 0 - + mDateRangeGroup @@ -38,7 +38,7 @@ unnamed - + tqlayout2 @@ -63,7 +63,7 @@ - + mFromDateLabel @@ -82,7 +82,7 @@ StrongFocus - + mToDateLabel @@ -122,7 +122,7 @@ - + groupBox1 @@ -133,7 +133,7 @@ unnamed - + mEvents @@ -141,7 +141,7 @@ &Events - + mTodos @@ -149,7 +149,7 @@ &To-dos - + mJournals diff --git a/korganizer/plugins/printing/list/listprint.cpp b/korganizer/plugins/printing/list/listprint.cpp index 4a90bfb5b..c3bd91fad 100644 --- a/korganizer/plugins/printing/list/listprint.cpp +++ b/korganizer/plugins/printing/list/listprint.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef KORG_NOPRINTER diff --git a/korganizer/plugins/printing/list/listprint.h b/korganizer/plugins/printing/list/listprint.h index 561e0d467..db7997272 100644 --- a/korganizer/plugins/printing/list/listprint.h +++ b/korganizer/plugins/printing/list/listprint.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef LISTPRINT_H #define LISTPRINT_H diff --git a/korganizer/plugins/printing/whatsnext/calprintwhatsnextconfig_base.ui b/korganizer/plugins/printing/whatsnext/calprintwhatsnextconfig_base.ui index c855976a3..383074fe7 100644 --- a/korganizer/plugins/printing/whatsnext/calprintwhatsnextconfig_base.ui +++ b/korganizer/plugins/printing/whatsnext/calprintwhatsnextconfig_base.ui @@ -2,7 +2,7 @@ CalPrintWhatsNextConfig_Base Configuration page for the print whatsnext mode. Reinhold Kainhofer <reinhold@kainhofer.com> - + CalPrintWhatsNext_Base @@ -24,7 +24,7 @@ 0 - + mDateRangeGroup @@ -38,7 +38,7 @@ unnamed - + tqlayout2 @@ -63,7 +63,7 @@ - + mFromDateLabel @@ -82,7 +82,7 @@ StrongFocus - + mToDateLabel diff --git a/korganizer/plugins/printing/whatsnext/whatsnextprint.cpp b/korganizer/plugins/printing/whatsnext/whatsnextprint.cpp index b5d43ae97..fdae41d58 100644 --- a/korganizer/plugins/printing/whatsnext/whatsnextprint.cpp +++ b/korganizer/plugins/printing/whatsnext/whatsnextprint.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef KORG_NOPRINTER diff --git a/korganizer/plugins/printing/whatsnext/whatsnextprint.h b/korganizer/plugins/printing/whatsnext/whatsnextprint.h index fb9ee66ee..467e02571 100644 --- a/korganizer/plugins/printing/whatsnext/whatsnextprint.h +++ b/korganizer/plugins/printing/whatsnext/whatsnextprint.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef WHATSNEXTPRINT_H #define WHATSNEXTPRINT_H diff --git a/korganizer/plugins/printing/year/calprintyearconfig_base.ui b/korganizer/plugins/printing/year/calprintyearconfig_base.ui index 38b7822b2..98f905974 100644 --- a/korganizer/plugins/printing/year/calprintyearconfig_base.ui +++ b/korganizer/plugins/printing/year/calprintyearconfig_base.ui @@ -2,7 +2,7 @@ CalPrintYearConfig_Base Configuration page for the yearly print mode. Reinhold Kainhofer <reinhold@kainhofer.com> - + CalPrintYear_Base @@ -24,7 +24,7 @@ 0 - + mDateRangeGroup @@ -38,7 +38,7 @@ unnamed - + mYearLabel @@ -49,7 +49,7 @@ mYear - + mPagesLabel @@ -60,7 +60,7 @@ mPages - + mYear @@ -91,7 +91,7 @@ - + mPages @@ -115,7 +115,7 @@ - + mDisplayOptionsGroup @@ -126,7 +126,7 @@ unnamed - + mSubDaysLabel @@ -134,7 +134,7 @@ Show sub-day events as: - + mHolidaysLabel @@ -142,7 +142,7 @@ Show holidays as: - + Text @@ -160,7 +160,7 @@ 1 - + Text diff --git a/korganizer/plugins/printing/year/yearprint.cpp b/korganizer/plugins/printing/year/yearprint.cpp index 59a43db75..0c124bbeb 100644 --- a/korganizer/plugins/printing/year/yearprint.cpp +++ b/korganizer/plugins/printing/year/yearprint.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef KORG_NOPRINTER @@ -154,7 +154,7 @@ void CalPrintYear::print( TQPainter &p, int width, int height ) int months = calsys->monthsInYear( start ); int maxdays = 1; for ( int i = 1; i< months; ++i ) { - maxdays = QMAX( maxdays, temp.daysInMonth() ); + maxdays = TQMAX( maxdays, temp.daysInMonth() ); temp = calsys->addMonths( temp, 1 ); } diff --git a/korganizer/plugins/printing/year/yearprint.h b/korganizer/plugins/printing/year/yearprint.h index f993e5dab..99c1422e0 100644 --- a/korganizer/plugins/printing/year/yearprint.h +++ b/korganizer/plugins/printing/year/yearprint.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef YEARPRINT_H #define YEARPRINT_H diff --git a/korganizer/plugins/projectview/koprojectview.cpp b/korganizer/plugins/projectview/koprojectview.cpp index d5abb1f42..d0d2db381 100644 --- a/korganizer/plugins/projectview/koprojectview.cpp +++ b/korganizer/plugins/projectview/koprojectview.cpp @@ -45,11 +45,11 @@ using namespace KOrg; -KOProjectViewItem::KOProjectViewItem(Todo *event,KGanttItem* parentTask, +KOProjectViewItem::KOProjectViewItem(Todo *event,KGanttItem* tqparentTask, const TQString& text, const TQDateTime& start, const TQDateTime& end) : - KGanttItem(parentTask,text,start,end) + KGanttItem(tqparentTask,text,start,end) { mEvent = event; } @@ -64,9 +64,9 @@ Todo *KOProjectViewItem::event() } -KOProjectView::KOProjectView(Calendar *calendar,TQWidget* parent, +KOProjectView::KOProjectView(Calendar *calendar,TQWidget* tqparent, const char* name) : - KOrg::BaseView(calendar,parent,name) + KOrg::BaseView(calendar,tqparent,name) { TQBoxLayout *topLayout = new TQVBoxLayout(this); @@ -183,7 +183,7 @@ void KOProjectView::updateView() */ // Put for each Event a KOProjectViewItem in the list view. Don't rely on a - // specific order of events. That means that we have to generate parent items + // specific order of events. That means that we have to generate tqparent items // recursively for proper hierarchical display of Todos. mTodoMap.clear(); Todo::List::ConstIterator it; @@ -202,7 +202,7 @@ TQMap::ConstIterator if (relatedTodo) { // kdDebug(5850) << " has Related" << endl; TQMap::ConstIterator itemIterator; - itemIterator = mTodoMap.find(relatedTodo); + itemIterator = mTodoMap.tqfind(relatedTodo); if (itemIterator == mTodoMap.end()) { // kdDebug(5850) << " related not yet in list" << endl; itemIterator = insertTodoItem (relatedTodo); @@ -216,7 +216,7 @@ TQMap::ConstIterator } } -KGanttItem *KOProjectView::createTask(KGanttItem *parent,Todo *todo) +KGanttItem *KOProjectView::createTask(KGanttItem *tqparent,Todo *todo) { TQDateTime startDt; TQDateTime endDt; @@ -237,7 +237,7 @@ KGanttItem *KOProjectView::createTask(KGanttItem *parent,Todo *todo) endDt = todo->dtDue(); } - KGanttItem *task = new KOProjectViewItem(todo,parent,todo->summary(),startDt, + KGanttItem *task = new KOProjectViewItem(todo,tqparent,todo->summary(),startDt, endDt); connect(task,TQT_SIGNAL(changed(KGanttItem*, KGanttItem::Change)), TQT_SLOT(taskChanged(KGanttItem*,KGanttItem::Change))); diff --git a/korganizer/plugins/projectview/koprojectview.h b/korganizer/plugins/projectview/koprojectview.h index 39062179e..b71afbd0a 100644 --- a/korganizer/plugins/projectview/koprojectview.h +++ b/korganizer/plugins/projectview/koprojectview.h @@ -41,12 +41,12 @@ class TQStrList; class TQListView; /** - This class provides an item of the project view. It is a xQTask with + This class provides an item of the project view. It is a xTQTask with an additional Event attribute. */ class KOProjectViewItem : public KGanttItem { public: - KOProjectViewItem(Todo *,KGanttItem* parentTask, const TQString& text, + KOProjectViewItem(Todo *,KGanttItem* tqparentTask, const TQString& text, const TQDateTime& start, const TQDateTime& end); ~KOProjectViewItem(); @@ -66,8 +66,9 @@ class KOProjectViewItem : public KGanttItem { class KOProjectView : public KOrg::BaseView { Q_OBJECT + TQ_OBJECT public: - KOProjectView(Calendar *, TQWidget* parent=0, const char* name=0 ); + KOProjectView(Calendar *, TQWidget* tqparent=0, const char* name=0 ); ~KOProjectView() {} Incidence::List selectedIncidences(); diff --git a/korganizer/plugins/projectview/projectview.cpp b/korganizer/plugins/projectview/projectview.cpp index 2e7b3dc61..d6a009c8e 100644 --- a/korganizer/plugins/projectview/projectview.cpp +++ b/korganizer/plugins/projectview/projectview.cpp @@ -35,18 +35,18 @@ using namespace KOrg; class ProjectViewFactory : public KOrg::PartFactory { public: - KOrg::Part *create(KOrg::MainWindow *parent, const char *name) + KOrg::Part *create(KOrg::MainWindow *tqparent, const char *name) { KGlobal::locale()->insertCatalogue( "kgantt" ); - return new ProjectView(parent,name); + return new ProjectView(tqparent,name); } }; K_EXPORT_COMPONENT_FACTORY( libkorg_projectview, ProjectViewFactory ) -ProjectView::ProjectView(KOrg::MainWindow *parent, const char *name) : - KOrg::Part(parent,name), mView(0) +ProjectView::ProjectView(KOrg::MainWindow *tqparent, const char *name) : + KOrg::Part(tqparent,name), mView(0) { setInstance( new KInstance( "korganizer" ) ); diff --git a/korganizer/plugins/projectview/projectview.h b/korganizer/plugins/projectview/projectview.h index a3f372a87..c6059650b 100644 --- a/korganizer/plugins/projectview/projectview.h +++ b/korganizer/plugins/projectview/projectview.h @@ -25,6 +25,7 @@ class ProjectView : public KOrg::Part { Q_OBJECT + TQ_OBJECT public: ProjectView(KOrg::MainWindow *, const char *); ~ProjectView(); diff --git a/korganizer/plugins/timespanview/kotimespanview.cpp b/korganizer/plugins/timespanview/kotimespanview.cpp index 01fc0cb40..7f70f12ea 100644 --- a/korganizer/plugins/timespanview/kotimespanview.cpp +++ b/korganizer/plugins/timespanview/kotimespanview.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include @@ -35,9 +35,9 @@ #include "kotimespanview.h" #include "kotimespanview.moc" -KOTimeSpanView::KOTimeSpanView(Calendar *calendar, TQWidget *parent, +KOTimeSpanView::KOTimeSpanView(Calendar *calendar, TQWidget *tqparent, const char *name) : - KOEventView( calendar, parent, name ) + KOEventView( calendar, tqparent, name ) { TQBoxLayout *topLayout = new TQVBoxLayout( this ); diff --git a/korganizer/plugins/timespanview/kotimespanview.h b/korganizer/plugins/timespanview/kotimespanview.h index 49e54ab64..f0d6c6cef 100644 --- a/korganizer/plugins/timespanview/kotimespanview.h +++ b/korganizer/plugins/timespanview/kotimespanview.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef KOTIMESPANVIEW_H #define KOTIMESPANVIEW_H @@ -32,8 +32,9 @@ class TimeSpanWidget; class KOTimeSpanView : public KOEventView { Q_OBJECT + TQ_OBJECT public: - KOTimeSpanView( Calendar *calendar, TQWidget *parent = 0, + KOTimeSpanView( Calendar *calendar, TQWidget *tqparent = 0, const char *name = 0 ); ~KOTimeSpanView(); diff --git a/korganizer/plugins/timespanview/lineview.cpp b/korganizer/plugins/timespanview/lineview.cpp index 93a2f0bfa..fe337f4eb 100644 --- a/korganizer/plugins/timespanview/lineview.cpp +++ b/korganizer/plugins/timespanview/lineview.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include @@ -31,8 +31,8 @@ #include "lineview.h" #include "lineview.moc" -LineView::LineView( TQWidget *parent, const char *name ) : - TQScrollView( parent, name ) +LineView::LineView( TQWidget *tqparent, const char *name ) : + TQScrollView( tqparent, name ) { mPixelWidth = 1000; diff --git a/korganizer/plugins/timespanview/lineview.h b/korganizer/plugins/timespanview/lineview.h index e98d905b0..df028cdb9 100644 --- a/korganizer/plugins/timespanview/lineview.h +++ b/korganizer/plugins/timespanview/lineview.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef LINEVIEW_H #define LINEVIEW_H @@ -27,11 +27,12 @@ #include #include -class LineView : public QScrollView +class LineView : public TQScrollView { Q_OBJECT + TQ_OBJECT public: - LineView( TQWidget *parent = 0, const char *name = 0 ); + LineView( TQWidget *tqparent = 0, const char *name = 0 ); virtual ~LineView(); int pixelWidth(); diff --git a/korganizer/plugins/timespanview/timeline.cpp b/korganizer/plugins/timespanview/timeline.cpp index 19ed75818..513701cd7 100644 --- a/korganizer/plugins/timespanview/timeline.cpp +++ b/korganizer/plugins/timespanview/timeline.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include @@ -29,8 +29,8 @@ #include "timeline.h" #include "timeline.moc" -TimeLine::TimeLine( TQWidget *parent, const char *name ) : - TQScrollView( parent, name ) +TimeLine::TimeLine( TQWidget *tqparent, const char *name ) : + TQScrollView( tqparent, name ) { mPixelWidth = 1000; diff --git a/korganizer/plugins/timespanview/timeline.h b/korganizer/plugins/timespanview/timeline.h index 031763f72..d7718928d 100644 --- a/korganizer/plugins/timespanview/timeline.h +++ b/korganizer/plugins/timespanview/timeline.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef TIMELINE_H #define TIMELINE_H @@ -27,11 +27,12 @@ #include #include -class TimeLine : public QScrollView +class TimeLine : public TQScrollView { Q_OBJECT + TQ_OBJECT public: - TimeLine( TQWidget *parent = 0, const char *name = 0 ); + TimeLine( TQWidget *tqparent = 0, const char *name = 0 ); virtual ~TimeLine(); void setDateRange( const TQDateTime &start, const TQDateTime &end ); diff --git a/korganizer/plugins/timespanview/timespanview.cpp b/korganizer/plugins/timespanview/timespanview.cpp index 24a45abb1..3f9e2ee57 100644 --- a/korganizer/plugins/timespanview/timespanview.cpp +++ b/korganizer/plugins/timespanview/timespanview.cpp @@ -35,17 +35,17 @@ using namespace KOrg; class TimespanViewFactory : public KOrg::PartFactory { public: - KOrg::Part *create( KOrg::MainWindow *parent, const char *name ) + KOrg::Part *create( KOrg::MainWindow *tqparent, const char *name ) { - return new TimespanView( parent, name ); + return new TimespanView( tqparent, name ); } }; K_EXPORT_COMPONENT_FACTORY( libkorg_timespanview, TimespanViewFactory ) -TimespanView::TimespanView(KOrg::MainWindow *parent, const char *name) : - KOrg::Part(parent,name), mView(0) +TimespanView::TimespanView(KOrg::MainWindow *tqparent, const char *name) : + KOrg::Part(tqparent,name), mView(0) { setInstance( new KInstance( "korganizer" ) ); diff --git a/korganizer/plugins/timespanview/timespanview.h b/korganizer/plugins/timespanview/timespanview.h index cb2d17f70..5338e8ff5 100644 --- a/korganizer/plugins/timespanview/timespanview.h +++ b/korganizer/plugins/timespanview/timespanview.h @@ -25,6 +25,7 @@ class TimespanView : public KOrg::Part { Q_OBJECT + TQ_OBJECT public: TimespanView(KOrg::MainWindow *, const char *); ~TimespanView(); diff --git a/korganizer/plugins/timespanview/timespanwidget.cpp b/korganizer/plugins/timespanview/timespanwidget.cpp index 0e8f0c4b9..e208c0881 100644 --- a/korganizer/plugins/timespanview/timespanwidget.cpp +++ b/korganizer/plugins/timespanview/timespanwidget.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include @@ -39,8 +39,8 @@ #include "timespanwidget.h" #include "timespanwidget.moc" -TimeSpanWidget::TimeSpanWidget( TQWidget *parent, const char *name ) : - TQWidget( parent, name ) +TimeSpanWidget::TimeSpanWidget( TQWidget *tqparent, const char *name ) : + TQWidget( tqparent, name ) { TQBoxLayout *topLayout = new TQVBoxLayout( this ); @@ -123,11 +123,8 @@ void TimeSpanWidget::clear() void TimeSpanWidget::updateView() { -#if QT_VERSION >= 300 mLineView->updateContents(); mTimeLine->updateContents(); -#else -#endif } void TimeSpanWidget::setDateRange( const TQDateTime &start, const TQDateTime &end ) diff --git a/korganizer/plugins/timespanview/timespanwidget.h b/korganizer/plugins/timespanview/timespanwidget.h index fa0378721..103efc5f7 100644 --- a/korganizer/plugins/timespanview/timespanwidget.h +++ b/korganizer/plugins/timespanview/timespanwidget.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef TimeSpanWidget_H #define TimeSpanWidget_H @@ -35,11 +35,12 @@ class TQListView; class LineView; class TimeLine; -class TimeSpanWidget : public QWidget +class TimeSpanWidget : public TQWidget { Q_OBJECT + TQ_OBJECT public: - TimeSpanWidget( TQWidget *parent=0, const char *name=0 ); + TimeSpanWidget( TQWidget *tqparent=0, const char *name=0 ); virtual ~TimeSpanWidget(); void addItem( KCal::Event * ); diff --git a/korganizer/previewdialog.cpp b/korganizer/previewdialog.cpp index 23671bd92..8a7c83a36 100644 --- a/korganizer/previewdialog.cpp +++ b/korganizer/previewdialog.cpp @@ -49,8 +49,8 @@ using namespace KCal; -PreviewDialog::PreviewDialog( const KURL &url, TQWidget *parent ) - : KDialogBase( Plain, i18n("Import Calendar/Event"), User1 | User2 | Cancel, User1, parent, +PreviewDialog::PreviewDialog( const KURL &url, TQWidget *tqparent ) + : KDialogBase( Plain, i18n("Import Calendar/Event"), User1 | User2 | Cancel, User1, tqparent, 0, true, true, KGuiItem( i18n("&Merge into existing calendar"), "merge" ) ), mOriginalUrl( url ) { diff --git a/korganizer/previewdialog.h b/korganizer/previewdialog.h index ed32c5f50..16d430890 100644 --- a/korganizer/previewdialog.h +++ b/korganizer/previewdialog.h @@ -41,8 +41,9 @@ namespace KCal { class PreviewDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - PreviewDialog( const KURL &url, TQWidget *parent ); + PreviewDialog( const KURL &url, TQWidget *tqparent ); ~PreviewDialog(); bool loadCalendar(); diff --git a/korganizer/printing/calprintdayconfig_base.ui b/korganizer/printing/calprintdayconfig_base.ui index bb1bfc0be..c16bfe63a 100644 --- a/korganizer/printing/calprintdayconfig_base.ui +++ b/korganizer/printing/calprintdayconfig_base.ui @@ -2,7 +2,7 @@ CalPrintDayConfig_Base Configuration page for the print day mode. Reinhold Kainhofer <reinhold@kainhofer.com> - + CalPrintDay_Base @@ -21,7 +21,7 @@ 0 - + mIncludeTodos @@ -35,7 +35,7 @@ You should check this option if you want to print to-dos which are due on one of the dates which are in the supplied date range. - + mDateRangeGroup @@ -80,7 +80,7 @@ - + mFromDateLabel @@ -94,7 +94,7 @@ If you want to print more days at once, you can define a range of dates with this option and the <i>End date</i> option. This option is used to define the start date. - + mToTimeLabel @@ -108,7 +108,7 @@ It is possible to print only those events which are inside a given timerange. With this time selection box you can define the end of this time range. The start time should be defined with the <i>Start time</i> option. Note you can automatically modify these settings if you check <i>Extend time range to include all events</i>. - + mToTime @@ -126,7 +126,7 @@ It's possible to print only those events which are inside a given timerange. With this time selection box you can define the end of this time range. The start time should be defined with the <i>Start time</i> option. Note you can automatically modify these settings if you check <i>Extend time range to include all events</i>. - + mIncludeAllEvents @@ -148,7 +148,7 @@ If you want to print more days at once, you can define a range of dates with this option and the <i>End date</i> option. This option is used to define the start date. - + mFromTime @@ -166,7 +166,7 @@ It's possible to print only those events which are inside a given timerange. With this time selection box you can define the start of this time range. The end time should be defined with the <i>End time</i> option. Note you can automatically modify these settings if you check <i>Extend time range to include all events</i>. - + mFromTimeLabel @@ -191,7 +191,7 @@ If you want to print more days at once, you can define a range of dates with this option and the <i>Start date</i> option. This option is used to define the end date. - + mToDateLabel @@ -207,7 +207,7 @@ - + mColors diff --git a/korganizer/printing/calprintdefaultplugins.cpp b/korganizer/printing/calprintdefaultplugins.cpp index b62c7adda..c5f69dd09 100644 --- a/korganizer/printing/calprintdefaultplugins.cpp +++ b/korganizer/printing/calprintdefaultplugins.cpp @@ -21,8 +21,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef KORG_NOPRINTER @@ -144,7 +144,7 @@ class TimePrintStringsVisitor : public IncidenceBase::Visitor event->dtStart(), event->doesFloat(), false ); } else { mStartCaption = i18n( "No start date" ); - mStartString = TQString::null; + mStartString = TQString(); } if ( event->hasEndDate() ) { @@ -162,7 +162,7 @@ class TimePrintStringsVisitor : public IncidenceBase::Visitor } } else { mEndCaption = i18n("No end date"); - mEndString = TQString::null; + mEndString = TQString(); } return true; } @@ -173,7 +173,7 @@ class TimePrintStringsVisitor : public IncidenceBase::Visitor todo->dtStart(), todo->doesFloat(), false ); } else { mStartCaption = i18n( "No start date" ); - mStartString = TQString::null; + mStartString = TQString(); } if ( todo->hasDueDate() ) { @@ -182,7 +182,7 @@ class TimePrintStringsVisitor : public IncidenceBase::Visitor todo->dtDue(), todo->doesFloat(), false ); } else { mEndCaption = i18n("No due date"); - mEndString = TQString::null; + mEndString = TQString(); } return true; } @@ -190,8 +190,8 @@ class TimePrintStringsVisitor : public IncidenceBase::Visitor mStartCaption = i18n( "Start date: " ); mStartString = IncidenceFormatter::dateTimeToString( journal->dtStart(), journal->doesFloat(), false ); - mEndCaption = TQString::null; - mEndString = TQString::null; + mEndCaption = TQString(); + mEndString = TQString(); return true; } }; @@ -204,12 +204,12 @@ int CalPrintIncidence::printCaptionAndText( TQPainter &p, const TQRect &box, con TQFont oldFont( p.font() ); p.setFont( captionFont ); - p.drawText( box, Qt::AlignLeft|Qt::AlignTop|Qt::SingleLine, caption ); + p.drawText( box, TQt::AlignLeft|TQt::AlignTop|TQt::SingleLine, caption ); if ( !text.isEmpty() ) { textRect.setLeft( textRect.left() + textWd ); p.setFont( textFont ); - p.drawText( textRect, Qt::AlignLeft|Qt::AlignTop|Qt::SingleLine, text ); + p.drawText( textRect, TQt::AlignLeft|TQt::AlignTop|TQt::SingleLine, text ); } p.setFont( oldFont ); return textRect.bottom(); @@ -283,7 +283,7 @@ void CalPrintIncidence::print( TQPainter &p, int width, int height ) textRect.setLeft( textRect.right() ); textRect.setRight( timesBox.right() - padding() ); - h = QMAX( printCaptionAndText( p, textRect, stringVis.mEndCaption, stringVis.mEndString, captionFont, textFont ), h ); + h = TQMAX( printCaptionAndText( p, textRect, stringVis.mEndCaption, stringVis.mEndString, captionFont, textFont ), h ); } // Convert recurrence to a string @@ -303,7 +303,7 @@ void CalPrintIncidence::print( TQPainter &p, int width, int height ) } } displayString.append(exceptString); - h = QMAX( printCaptionAndText( p, recurBox, i18n( "Repeats: "), displayString, captionFont, textFont ), h ); + h = TQMAX( printCaptionAndText( p, recurBox, i18n( "Repeats: "), displayString, captionFont, textFont ), h ); } // Alarms Printing @@ -359,14 +359,14 @@ void CalPrintIncidence::print( TQPainter &p, int width, int height ) txt = alarmStrings.join( i18n("Spacer for the joined list of categories", ", ") ); } - h = QMAX( printCaptionAndText( p, alarmBox, cap, txt, captionFont, textFont ), h ); + h = TQMAX( printCaptionAndText( p, alarmBox, cap, txt, captionFont, textFont ), h ); TQRect organizerBox( timesBox.left()+padding(), h+padding(), timesBox.right()-padding(), lineHeight ); - h = QMAX( printCaptionAndText( p, organizerBox, i18n("Organizer: "), (*it)->organizer().fullName(), captionFont, textFont ), h ); + h = TQMAX( printCaptionAndText( p, organizerBox, i18n("Organizer: "), (*it)->organizer().fullName(), captionFont, textFont ), h ); // Finally, draw the frame around the time information... - timesBox.setBottom( QMAX( timesBox.bottom(), h+padding() ) ); + timesBox.setBottom( TQMAX( timesBox.bottom(), h+padding() ) ); drawBox( p, BOX_BORDER_WIDTH, timesBox ); @@ -439,10 +439,10 @@ void CalPrintIncidence::print( TQPainter &p, int width, int height ) if ( mShowSubitemsNotes ) { if ( (*it)->relations().isEmpty() || (*it)->type() != "Todo" ) { int notesPosition = drawBoxWithCaption( p, notesBox, i18n("Notes:"), - TQString::null, /*sameLine=*/false, /*expand=*/false, + TQString(), /*sameLine=*/false, /*expand=*/false, captionFont, textFont ); TQPen oldPen( p.pen() ); - p.setPen( Qt::DotLine ); + p.setPen( TQt::DotLine ); while ( (notesPosition += int(1.5*lineHeight)) < notesBox.bottom() ) { p.drawLine( notesBox.left()+padding(), notesPosition, notesBox.right()-padding(), notesPosition ); } @@ -510,8 +510,8 @@ void CalPrintIncidence::print( TQPainter &p, int width, int height ) subitemString += datesString; subitemString += "\n"; } - subitemString += i18n( "subitem Status: statusString", - "Status: %1\n").arg( statusString ); + subitemString += i18n( "subitem tqStatus: statusString", + "tqStatus: %1\n").arg( statusString ); subitemString += IncidenceFormatter::recurrenceString((*rit)) + "\n"; subitemString += i18n( "subitem Priority: N", "Priority: %1\n").arg( (*rit)->priority() ); @@ -559,7 +559,7 @@ void CalPrintIncidence::print( TQPainter &p, int width, int height ) for ( Attendee::List::ConstIterator ait = attendees.begin(); ait != attendees.end(); ++ait ) { if ( !attendeeString.isEmpty() ) attendeeString += "\n"; attendeeString += i18n("Formatting of an attendee: " - "'Name (Role): Status', e.g. 'Reinhold Kainhofer " + "'Name (Role): tqStatus', e.g. 'Reinhold Kainhofer " " (Participant): Awaiting Response'", "%1 (%2): %3") .arg( (*ait)->fullName() ) @@ -572,7 +572,7 @@ void CalPrintIncidence::print( TQPainter &p, int width, int height ) if ( mShowOptions ) { TQString optionsString; if ( !(*it)->statusStr().isEmpty() ) { - optionsString += i18n("Status: %1").arg( (*it)->statusStr() ); + optionsString += i18n("tqStatus: %1").arg( (*it)->statusStr() ); optionsString += "\n"; } if ( !(*it)->secrecyStr().isEmpty() ) { @@ -740,8 +740,8 @@ void CalPrintDay::print( TQPainter &p, int width, int height ) uint lineSpacing = p.fontMetrics().lineSpacing(); uint maxAllDayEvents = 8; // the max we allow to be printed, sorry. - uint allDayHeight = QMIN( alldayEvents.count(), maxAllDayEvents ) * lineSpacing; - allDayHeight = QMAX( allDayHeight, ( 5 * lineSpacing ) ) + ( 2 * padding() ); + uint allDayHeight = TQMIN( alldayEvents.count(), maxAllDayEvents ) * lineSpacing; + allDayHeight = TQMAX( allDayHeight, ( 5 * lineSpacing ) ) + ( 2 * padding() ); TQRect allDayBox( TIMELINE_WIDTH + padding(), headerBox.bottom() + padding(), width - TIMELINE_WIDTH - padding(), allDayHeight ); if ( alldayEvents.count() > 0 ) { diff --git a/korganizer/printing/calprintdefaultplugins.h b/korganizer/printing/calprintdefaultplugins.h index a16526433..162b8a4e8 100644 --- a/korganizer/printing/calprintdefaultplugins.h +++ b/korganizer/printing/calprintdefaultplugins.h @@ -19,8 +19,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef CALPRINTDEFAULTPLUGINS_H #define CALPRINTDEFAULTPLUGINS_H diff --git a/korganizer/printing/calprinter.cpp b/korganizer/printing/calprinter.cpp index 0517dec00..0b2c098cf 100644 --- a/korganizer/printing/calprinter.cpp +++ b/korganizer/printing/calprinter.cpp @@ -19,8 +19,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include @@ -46,10 +46,10 @@ #include "calprintdefaultplugins.h" -CalPrinter::CalPrinter( TQWidget *parent, Calendar *calendar, KOrg::CoreHelper *helper ) - : TQObject( parent, "CalPrinter" ) +CalPrinter::CalPrinter( TQWidget *tqparent, Calendar *calendar, KOrg::CoreHelper *helper ) + : TQObject( tqparent, "CalPrinter" ) { - mParent = parent; + mParent = tqparent; mConfig = new KSimpleConfig( "korganizer_printing.rc" ); mCoreHelper = helper; @@ -168,8 +168,8 @@ void CalPrinter::updateConfig() /****************************************************************************/ CalPrintDialog::CalPrintDialog( KOrg::PrintPlugin::List plugins, - TQWidget *parent, const char *name ) - : KDialogBase( parent, name, /*modal*/true, i18n("Print"), Ok | Cancel ) + TQWidget *tqparent, const char *name ) + : KDialogBase( tqparent, name, /*modal*/true, i18n("Print"), Ok | Cancel ) { TQVBox *page = makeVBoxMainWidget(); diff --git a/korganizer/printing/calprinter.h b/korganizer/printing/calprinter.h index a75d3fc69..f3e2ad2d5 100644 --- a/korganizer/printing/calprinter.h +++ b/korganizer/printing/calprinter.h @@ -19,8 +19,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef _CALPRINTER_H #define _CALPRINTER_H @@ -53,6 +53,7 @@ class TQLabel; class KDE_EXPORT CalPrinter : public TQObject, public KOrg::CalPrinterBase { Q_OBJECT + TQ_OBJECT public: enum ePrintOrientation { @@ -63,7 +64,7 @@ class KDE_EXPORT CalPrinter : public TQObject, public KOrg::CalPrinterBase }; public: /** - \param par parent widget for dialogs + \param par tqparent widget for dialogs \param cal calendar to be printed \param helper is a pointer to the KOrg::CoreHelper object */ @@ -106,9 +107,10 @@ class KDE_EXPORT CalPrinter : public TQObject, public KOrg::CalPrinterBase class CalPrintDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: CalPrintDialog( KOrg::PrintPlugin::List plugins, - TQWidget *parent = 0, const char *name = 0 ); + TQWidget *tqparent = 0, const char *name = 0 ); virtual ~CalPrintDialog(); KOrg::PrintPlugin *selectedPlugin(); void setOrientation( CalPrinter::ePrintOrientation orientation ); diff --git a/korganizer/printing/calprintincidenceconfig_base.ui b/korganizer/printing/calprintincidenceconfig_base.ui index ef238b528..d3fb58d1c 100644 --- a/korganizer/printing/calprintincidenceconfig_base.ui +++ b/korganizer/printing/calprintincidenceconfig_base.ui @@ -2,7 +2,7 @@ CalPrintIncidenceConfig_Base Configuration page for printing incidences. Reinhold Kainhofer <reinhold@kainhofer.com> - + CalPrintIncidence_Base @@ -21,7 +21,7 @@ unnamed - + mComponentsGroup @@ -35,7 +35,7 @@ unnamed - + mShowDetails @@ -43,7 +43,7 @@ Detai&ls (visiblility, secrecy, etc.) - + mShowSubitemsNotes @@ -51,7 +51,7 @@ &Notes, Subitems - + mShowAttendees @@ -59,7 +59,7 @@ &Attendees - + mShowAttachments @@ -69,7 +69,7 @@ - + mColors diff --git a/korganizer/printing/calprintmonthconfig_base.ui b/korganizer/printing/calprintmonthconfig_base.ui index 6fd311ea4..1a4a1b509 100644 --- a/korganizer/printing/calprintmonthconfig_base.ui +++ b/korganizer/printing/calprintmonthconfig_base.ui @@ -2,7 +2,7 @@ CalPrintMonthConfig_Base Configuration page for the print day mode. Reinhold Kainhofer <reinhold@kainhofer.com> - + CalPrintMonth_Base @@ -38,7 +38,7 @@ - + mDateRangeGroup @@ -49,7 +49,7 @@ unnamed - + mFromDateLabel @@ -85,7 +85,7 @@ When you want to print more months at once, you can define a month range. This option defines the first month to be printed. Use the on <i>End month</i> to define the last month in this range. - + mToDateLabel @@ -140,7 +140,7 @@ - + mIncludeTodos @@ -154,7 +154,7 @@ Check this option if you want to have to-dos on the print, placed by their due date. - + mWeekNumbers @@ -165,7 +165,7 @@ Enable this to print week numbers at the left of each row. - + mRecurDaily @@ -176,7 +176,7 @@ With this option it is possible to leave out the daily recurring to-dos and events in the print. They take a lot of space and make the month view needlessly complicated. - + mRecurWeekly diff --git a/korganizer/printing/calprintpluginbase.cpp b/korganizer/printing/calprintpluginbase.cpp index c0e61b922..3d330efe0 100644 --- a/korganizer/printing/calprintpluginbase.cpp +++ b/korganizer/printing/calprintpluginbase.cpp @@ -19,8 +19,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include @@ -156,7 +156,7 @@ void CalPrintPluginBase::doPrint( KPrinter *printer ) p.begin( mPrinter ); // TODO: Fix the margins!!! - // the painter initially begins at 72 dpi per the Qt docs. + // the painter initially begins at 72 dpi per the TQt docs. // we want half-inch margins. int margins = margin(); p.setViewport( margins, margins, @@ -270,7 +270,7 @@ bool CalPrintPluginBase::isWorkingDay( const TQDate &dt ) TQString CalPrintPluginBase::holidayString( const TQDate &dt ) { - return (mCoreHelper)?(mCoreHelper->holidayString(dt)):(TQString::null); + return (mCoreHelper)?(mCoreHelper->holidayString(dt)):(TQString()); } @@ -387,7 +387,7 @@ void CalPrintPluginBase::printEventString( TQPainter &p, const TQRect &box, cons { TQRect newbox( box ); newbox.addCoords( 3, 1, -1, -1 ); - p.drawText( newbox, (flags==-1)?(Qt::AlignTop | Qt::AlignJustify | Qt::BreakAnywhere):flags, str ); + p.drawText( newbox, (flags==-1)?(TQt::AlignTop | TQt::AlignJustify | TQt::BreakAnywhere):flags, str ); } @@ -418,7 +418,7 @@ void CalPrintPluginBase::drawSubHeaderBox(TQPainter &p, const TQString &str, con drawShadedBox( p, BOX_BORDER_WIDTH, TQColor( 232, 232, 232 ), box ); TQFont oldfont( p.font() ); p.setFont( TQFont( "sans-serif", 10, TQFont::Bold ) ); - p.drawText( box, Qt::AlignCenter | Qt::AlignVCenter, str ); + p.drawText( box, TQt::AlignCenter | TQt::AlignVCenter, str ); p.setFont( oldfont ); } @@ -429,7 +429,7 @@ void CalPrintPluginBase::drawVerticalBox( TQPainter &p, int linewidth, const TQR p.rotate( -90 ); TQRect rotatedBox( -box.top()-box.height(), box.left(), box.height(), box.width() ); showEventBox( p, linewidth, rotatedBox, 0, str, - ( flags == -1 ) ? Qt::AlignLeft | Qt::AlignVCenter | Qt::SingleLine : flags ); + ( flags == -1 ) ? TQt::AlignLeft | TQt::AlignVCenter | TQt::SingleLine : flags ); p.restore(); } @@ -455,7 +455,7 @@ int CalPrintPluginBase::drawBoxWithCaption( TQPainter &p, const TQRect &allbox, // Bounding rectangle for caption, single-line, clip on the right TQRect captionBox( box.left() + padding(), box.top() + padding(), 0, 0 ); p.setFont( captionFont ); - captionBox = p.boundingRect( captionBox, Qt::AlignLeft | Qt::AlignTop | Qt::SingleLine, caption ); + captionBox = p.boundingRect( captionBox, TQt::AlignLeft | TQt::AlignTop | TQt::SingleLine, caption ); p.setFont( oldFont ); if ( captionBox.right() > box.right() ) captionBox.setRight( box.right() ); @@ -473,7 +473,7 @@ int CalPrintPluginBase::drawBoxWithCaption( TQPainter &p, const TQRect &allbox, textBox.setRight( box.right() ); textBox.setHeight( 0 ); p.setFont( textFont ); - textBox = p.boundingRect( textBox, Qt::WordBreak | Qt::AlignTop | Qt::AlignLeft, contents ); + textBox = p.boundingRect( textBox, TQt::WordBreak | TQt::AlignTop | TQt::AlignLeft, contents ); p.setFont( oldFont ); if ( textBox.bottom() + padding() > box.bottom() ) { if ( expand ) { @@ -486,10 +486,10 @@ int CalPrintPluginBase::drawBoxWithCaption( TQPainter &p, const TQRect &allbox, drawBox( p, BOX_BORDER_WIDTH, box ); p.setFont( captionFont ); - p.drawText( captionBox, Qt::AlignLeft | Qt::AlignTop | Qt::SingleLine, caption ); + p.drawText( captionBox, TQt::AlignLeft | TQt::AlignTop | TQt::SingleLine, caption ); if ( !contents.isEmpty() ) { p.setFont( textFont ); - p.drawText( textBox, Qt::WordBreak | Qt::AlignTop | Qt::AlignLeft, contents ); + p.drawText( textBox, TQt::WordBreak | TQt::AlignTop | TQt::AlignLeft, contents ); } p.setFont( oldFont ); @@ -523,7 +523,7 @@ int CalPrintPluginBase::drawHeader( TQPainter &p, TQString title, TQFont newFont("sans-serif", (textRect.height()<60)?16:18, TQFont::Bold); if ( expand ) { p.setFont( newFont ); - TQRect boundingR = p.boundingRect( textRect, Qt::AlignLeft | Qt::AlignVCenter | Qt::WordBreak, title ); + TQRect boundingR = p.boundingRect( textRect, TQt::AlignLeft | TQt::AlignVCenter | TQt::WordBreak, title ); p.setFont( oldFont ); int h = boundingR.height(); if ( h > allbox.height() ) { @@ -546,7 +546,7 @@ int CalPrintPluginBase::drawHeader( TQPainter &p, TQString title, // Set the margins p.setFont( newFont ); - p.drawText( textRect, Qt::AlignLeft | Qt::AlignVCenter | Qt::WordBreak, title ); + p.drawText( textRect, TQt::AlignLeft | TQt::AlignVCenter | TQt::WordBreak, title ); p.setFont( oldFont ); return textRect.bottom(); @@ -587,7 +587,7 @@ void CalPrintPluginBase::drawSmallMonth(TQPainter &p, const TQDate &qd, if ( mCalSys ) { TQRect titleBox( box ); titleBox.setHeight( int(cellHeight+1) ); - p.drawText( titleBox, Qt::AlignTop | Qt::AlignHCenter, mCalSys->monthName( qd ) ); + p.drawText( titleBox, TQt::AlignTop | TQt::AlignHCenter, mCalSys->monthName( qd ) ); } // draw days of week @@ -600,7 +600,7 @@ void CalPrintPluginBase::drawSmallMonth(TQPainter &p, const TQDate &qd, TQString tmpStr = mCalSys->weekDayName( monthDate2 )[0].upper(); wdayBox.setLeft( int(box.left() + col*cellWidth) ); wdayBox.setRight( int(box.left() + (col+1)*cellWidth) ); - p.drawText( wdayBox, Qt::AlignCenter, tmpStr ); + p.drawText( wdayBox, TQt::AlignCenter, tmpStr ); monthDate2 = monthDate2.addDays( 1 ); } } @@ -616,7 +616,7 @@ void CalPrintPluginBase::drawSmallMonth(TQPainter &p, const TQDate &qd, TQRect dayRect( int( box.left() + col*cellWidth ), int( calStartY + row*cellHeight ), 0, 0 ); dayRect.setRight( int( box.left() + (col+1)*cellWidth ) ); dayRect.setBottom( int( calStartY + (row+1)*cellHeight ) ); - p.drawText( dayRect, Qt::AlignCenter, TQString::number( monthDate.day() ) ); + p.drawText( dayRect, TQt::AlignCenter, TQString::number( monthDate.day() ) ); } monthDate = monthDate.addDays(1); } @@ -655,7 +655,7 @@ void CalPrintPluginBase::drawDaysOfWeek(TQPainter &p, void CalPrintPluginBase::drawDaysOfWeekBox(TQPainter &p, const TQDate &qd, const TQRect &box ) { - drawSubHeaderBox( p, (mCalSys)?(mCalSys->weekDayName( qd )):(TQString::null), box ); + drawSubHeaderBox( p, (mCalSys)?(mCalSys->weekDayName( qd )):(TQString()), box ); } @@ -699,10 +699,10 @@ void CalPrintPluginBase::drawTimeLine( TQPainter &p, const TQTime &fromTime, p.setFont( TQFont( "sans-serif", 12, TQFont::Bold ) ); } p.drawText( box.left() + 4, (int)currY + 2, box.width() / 2 - 2, (int)cellHeight, - Qt::AlignTop | Qt::AlignRight, numStr ); + TQt::AlignTop | TQt::AlignRight, numStr ); p.setFont( TQFont ( "helvetica", 10, TQFont::Normal ) ); p.drawText( xcenter + 4, (int)currY + 2, box.width() / 2 + 2, (int)(cellHeight / 2 ) - 3, - Qt::AlignTop | Qt::AlignLeft, "00" ); + TQt::AlignTop | TQt::AlignLeft, "00" ); } else { p.drawLine( box.left(), (int)newY, box.right(), (int)newY ); TQTime time( curTime.hour(), 0 ); @@ -713,7 +713,7 @@ void CalPrintPluginBase::drawTimeLine( TQPainter &p, const TQTime &fromTime, p.setFont( TQFont( "sans-serif", 12, TQFont::Bold ) ); // for dayprint } p.drawText( box.left() + 2, (int)currY + 2, box.width() - 4, (int)cellHeight / 2 - 3, - Qt::AlignTop|Qt::AlignLeft, numStr ); + TQt::AlignTop|TQt::AlignLeft, numStr ); } currY += cellHeight; p.setFont( oldFont ); @@ -955,10 +955,10 @@ void CalPrintPluginBase::drawDayBox( TQPainter &p, const TQDate &qd, if (!hstring.isEmpty()) { p.setFont( TQFont( "sans-serif", 8, TQFont::Bold, true ) ); - p.drawText( headerTextBox, Qt::AlignLeft | Qt::AlignVCenter, hstring ); + p.drawText( headerTextBox, TQt::AlignLeft | TQt::AlignVCenter, hstring ); } p.setFont(TQFont("sans-serif", 10, TQFont::Bold)); - p.drawText( headerTextBox, Qt::AlignRight | Qt::AlignVCenter, dayNumStr); + p.drawText( headerTextBox, TQt::AlignRight | TQt::AlignVCenter, dayNumStr); Event::List eventList = mCalendar->events( qd, EventSortStartDate, @@ -1038,7 +1038,7 @@ void CalPrintPluginBase::drawIncidence( TQPainter &p, const TQRect &dayBox, cons { kdDebug(5850) << "summary = " << summary << endl; - int flags = Qt::AlignLeft; + int flags = TQt::AlignLeft; TQFontMetrics fm = p.fontMetrics(); TQRect timeBound = p.boundingRect( dayBox.x() + 5, dayBox.y() + textY, dayBox.width() - 10, fm.lineSpacing(), @@ -1180,7 +1180,7 @@ void CalPrintPluginBase::drawMonth( TQPainter &p, const TQDate &dt, const TQRect if ( daysinmonthevent()->summary() ); - newxstartcont = QMAX( newxstartcont, eventBox.right() ); + newxstartcont = TQMAX( newxstartcont, eventBox.right() ); } xstartcont = newxstartcont; @@ -1330,10 +1330,10 @@ void CalPrintPluginBase::drawMonth( TQPainter &p, const TQDate &dt, const TQRect TQRect dayBox( xstartcont, daysBox.top()+round(dayheight*d), 0, 0 ); dayBox.setRight( box.right() ); dayBox.setBottom( daysBox.top()+round(dayheight*(d+1)) ); - printEventString(p, dayBox, txt, Qt::AlignTop | Qt::AlignLeft | Qt::BreakAnywhere ); + printEventString(p, dayBox, txt, TQt::AlignTop | TQt::AlignLeft | TQt::BreakAnywhere ); } p.setFont( oldfont ); -// p.setBrush( Qt::NoBrush ); +// p.setBrush( TQt::NoBrush ); drawBox( p, BOX_BORDER_WIDTH, borderBox ); p.restore(); } @@ -1379,7 +1379,7 @@ void CalPrintPluginBase::drawMonthTable(TQPainter &p, const TQDate &qd, bool wee for (int row = 0; row startPoints; if ( level < 1 ) { @@ -1442,15 +1442,15 @@ void CalPrintPluginBase::drawTodo( int &count, Todo *todo, TQPainter &p, // size of to-do outStr=todo->summary(); int left = posSummary + ( level*10 ); - rect = p.boundingRect( left, y, ( rhs-left-5 ), -1, Qt::WordBreak, outStr ); + rect = p.boundingRect( left, y, ( rhs-left-5 ), -1, TQt::WordBreak, outStr ); if ( !todo->description().isEmpty() && desc ) { outStr = todo->description(); rect = p.boundingRect( left+20, rect.bottom()+5, width-(left+10-x), -1, - Qt::WordBreak, outStr ); + TQt::WordBreak, outStr ); } // if too big make new page if ( rect.bottom() > pageHeight ) { - // first draw the connection lines from parent to-dos: + // first draw the connection lines from tqparent to-dos: if ( level > 0 && connectSubTodos ) { TodoParentStart *rct; for ( rct = startPoints.first(); rct; rct = startPoints.next() ) { @@ -1458,7 +1458,7 @@ void CalPrintPluginBase::drawTodo( int &count, Todo *todo, TQPainter &p, int center = rct->mRect.left() + (rct->mRect.width()/2); int to = p.viewport().bottom(); - // draw either from start point of parent or from top of the page + // draw either from start point of tqparent or from top of the page if ( rct->mSamePage ) start = rct->mRect.bottom() + 1; else @@ -1473,7 +1473,7 @@ void CalPrintPluginBase::drawTodo( int &count, Todo *todo, TQPainter &p, } // If this is a sub-to-do, r will not be 0, and we want the LH side - // of the priority line up to the RH side of the parent to-do's priority + // of the priority line up to the RH side of the tqparent to-do's priority bool showPriority = posPriority>=0; int lhs = posPriority; if ( r ) { @@ -1481,13 +1481,13 @@ void CalPrintPluginBase::drawTodo( int &count, Todo *todo, TQPainter &p, } outStr.setNum( todo->priority() ); - rect = p.boundingRect( lhs, y + 10, 5, -1, Qt::AlignCenter, outStr ); + rect = p.boundingRect( lhs, y + 10, 5, -1, TQt::AlignCenter, outStr ); // Make it a more reasonable size rect.setWidth(18); rect.setHeight(18); // Draw a checkbox - p.setBrush( TQBrush( Qt::NoBrush ) ); + p.setBrush( TQBrush( TQt::NoBrush ) ); p.drawRect( rect ); if ( todo->isCompleted() ) { // cross out the rectangle for completed to-dos @@ -1498,7 +1498,7 @@ void CalPrintPluginBase::drawTodo( int &count, Todo *todo, TQPainter &p, // Priority if ( todo->priority() > 0 && showPriority ) { - p.drawText( rect, Qt::AlignCenter, outStr ); + p.drawText( rect, TQt::AlignCenter, outStr ); } startpt.mRect = rect; //save for later @@ -1520,7 +1520,7 @@ void CalPrintPluginBase::drawTodo( int &count, Todo *todo, TQPainter &p, // summary outStr=todo->summary(); rect = p.boundingRect( lhs, rect.top(), (rhs-(left + rect.width() + 5)), - -1, Qt::WordBreak, outStr ); + -1, TQt::WordBreak, outStr ); TQRect newrect; //FIXME: the following code prints underline rather than strikeout text @@ -1530,12 +1530,12 @@ void CalPrintPluginBase::drawTodo( int &count, Todo *todo, TQPainter &p, f.setStrikeOut( true ); p.setFont( f ); } - p.drawText( rect, Qt::WordBreak, outStr, -1, &newrect ); + p.drawText( rect, TQt::WordBreak, outStr, -1, &newrect ); f.setStrikeOut( false ); p.setFont( f ); #endif //TODO: Remove this section when the code above is fixed - p.drawText( rect, Qt::WordBreak, outStr, -1, &newrect ); + p.drawText( rect, TQt::WordBreak, outStr, -1, &newrect ); if ( todo->isCompleted() && strikeoutCompleted ) { // strike out the summary text if to-do is complete // Note: we tried to use a strike-out font and for unknown reasons the @@ -1552,8 +1552,8 @@ void CalPrintPluginBase::drawTodo( int &count, Todo *todo, TQPainter &p, if ( todo->hasDueDate() && posDueDt>=0 ) { outStr = local->formatDate( todo->dtDue().date(), true ); rect = p.boundingRect( posDueDt, y, x + width, -1, - Qt::AlignTop | Qt::AlignLeft, outStr ); - p.drawText( rect, Qt::AlignTop | Qt::AlignLeft, outStr ); + TQt::AlignTop | TQt::AlignLeft, outStr ); + p.drawText( rect, TQt::AlignTop | TQt::AlignLeft, outStr ); } // percentage completed @@ -1564,7 +1564,7 @@ void CalPrintPluginBase::drawTodo( int &count, Todo *todo, TQPainter &p, //first, draw the progress bar int progress = (int)(( lwidth*todo->percentComplete())/100.0 + 0.5); - p.setBrush( TQBrush( Qt::NoBrush ) ); + p.setBrush( TQBrush( TQt::NoBrush ) ); p.drawRect( posPercentComplete, y+3, lwidth, lheight ); if ( progress > 0 ) { p.setBrush( TQColor( 128, 128, 128 ) ); @@ -1574,8 +1574,8 @@ void CalPrintPluginBase::drawTodo( int &count, Todo *todo, TQPainter &p, //now, write the percentage outStr = i18n( "%1%" ).arg( todo->percentComplete() ); rect = p.boundingRect( posPercentComplete+lwidth+3, y, x + width, -1, - Qt::AlignTop | Qt::AlignLeft, outStr ); - p.drawText( rect, Qt::AlignTop | Qt::AlignLeft, outStr ); + TQt::AlignTop | TQt::AlignLeft, outStr ); + p.drawText( rect, TQt::AlignTop | TQt::AlignLeft, outStr ); } // description @@ -1583,8 +1583,8 @@ void CalPrintPluginBase::drawTodo( int &count, Todo *todo, TQPainter &p, y = newrect.bottom() + 5; outStr = todo->description(); rect = p.boundingRect( left+20, y, x+width-(left+10), -1, - Qt::WordBreak, outStr ); - p.drawText( rect, Qt::WordBreak, outStr, -1, &newrect ); + TQt::WordBreak, outStr ); + p.drawText( rect, TQt::WordBreak, outStr, -1, &newrect ); } // Set the new line position @@ -1650,17 +1650,17 @@ void CalPrintPluginBase::drawJournalField( TQPainter &p, TQString field, TQStrin TQString entry( field.arg( text ) ); - TQRect rect( p.boundingRect( x, y, width, -1, Qt::WordBreak, entry) ); + TQRect rect( p.boundingRect( x, y, width, -1, TQt::WordBreak, entry) ); if ( rect.bottom() > pageHeight) { // Start new page... // FIXME: If it's a multi-line text, draw a few lines on this page, and the // remaining lines on the next page. y=0; mPrinter->newPage(); - rect = p.boundingRect( x, y, width, -1, Qt::WordBreak, entry); + rect = p.boundingRect( x, y, width, -1, TQt::WordBreak, entry); } TQRect newrect; - p.drawText( rect, Qt::WordBreak, entry, -1, &newrect ); + p.drawText( rect, TQt::WordBreak, entry, -1, &newrect ); y = newrect.bottom() + 7; } @@ -1681,15 +1681,15 @@ void CalPrintPluginBase::drawJournal( Journal * journal, TQPainter &p, int x, in .arg( dateText ); } - TQRect rect( p.boundingRect( x, y, width, -1, Qt::WordBreak, headerText) ); + TQRect rect( p.boundingRect( x, y, width, -1, TQt::WordBreak, headerText) ); if ( rect.bottom() > pageHeight) { // Start new page... y=0; mPrinter->newPage(); - rect = p.boundingRect( x, y, width, -1, Qt::WordBreak, headerText ); + rect = p.boundingRect( x, y, width, -1, TQt::WordBreak, headerText ); } TQRect newrect; - p.drawText( rect, Qt::WordBreak, headerText, -1, &newrect ); + p.drawText( rect, TQt::WordBreak, headerText, -1, &newrect ); p.setFont( oldFont ); y = newrect.bottom() + 4; @@ -1711,7 +1711,7 @@ void CalPrintPluginBase::drawSplitHeaderRight( TQPainter &p, const TQDate &fd, TQFont oldFont( p.font() ); TQPen oldPen( p.pen() ); - TQPen pen( Qt::black, 4 ); + TQPen pen( TQt::black, 4 ); TQString title; if ( mCalSys ) { @@ -1734,7 +1734,7 @@ void CalPrintPluginBase::drawSplitHeaderRight( TQPainter &p, const TQDate &fd, int lineSpacing = p.fontMetrics().lineSpacing(); p.drawText( 0, lineSpacing * 0, width, lineSpacing, - Qt::AlignRight | Qt::AlignTop, title ); + TQt::AlignRight | TQt::AlignTop, title ); title.truncate(0); @@ -1746,7 +1746,7 @@ void CalPrintPluginBase::drawSplitHeaderRight( TQPainter &p, const TQDate &fd, int newlineSpacing = p.fontMetrics().lineSpacing(); title += TQString::number(fd.year()); p.drawText( 0, lineSpacing * 1 + 4, width, newlineSpacing, - Qt::AlignRight | Qt::AlignTop, title ); + TQt::AlignRight | TQt::AlignTop, title ); p.setFont( oldFont ); } diff --git a/korganizer/printing/calprintpluginbase.h b/korganizer/printing/calprintpluginbase.h index 16a1cc2f8..385949622 100644 --- a/korganizer/printing/calprintpluginbase.h +++ b/korganizer/printing/calprintpluginbase.h @@ -19,8 +19,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef CALPRINTPLUGINBASE_H #define CALPRINTPLUGINBASE_H @@ -200,7 +200,7 @@ class KDE_EXPORT CalPrintPluginBase : public KOrg::PrintPlugin /** Print the box for the given event with the given string. - \param p QPainer of the printout + \param p TQPainer of the printout \param linewidth is the width of the line used to draw the box, ignored if less than 1. \param box Coordinates of the event's box \param incidence The incidence (if available), from which the category @@ -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 tqcontains month1 + If month2 is invalid, only the month that contains 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 tqcontains the all-day events (using + The first cell of each column contains 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 tqcontains a list of all events on that day. They are arranged + box (using drawDayBox) that contains 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). @@ -478,7 +478,7 @@ class KDE_EXPORT CalPrintPluginBase : public KOrg::PrintPlugin \param p TQPainter of the printout \param sortField Specifies on which attribute of the todo you want to sort. \param sortDir Specifies if you want to sort ascending or descending. - \param connectSubTodos Whether sub-to-dos shall be connected with their parent by a line (tree-like). + \param connectSubTodos Whether sub-to-dos shall be connected with their tqparent by a line (tree-like). \param strikeoutCompleted Whether completed to-dos should be printed with strike-out summaries. \param desc Whether to print the whole description of the to-do (the summary is always printed). \param posPriority x-coordinate where the priority is supposed to be printed. If <0, no priority will be printed. @@ -491,7 +491,7 @@ class KDE_EXPORT CalPrintPluginBase : public KOrg::PrintPlugin \param width width of the whole to-do list. \param pageHeight Total height allowed for the to-do list on a page. If an to-do would be below that line, a new page is started. \param todoList Contains a list of sub-todos for the specified @p todo . - \param r Internal (used when printing sub-to-dos to give information about its parent) + \param r Internal (used when printing sub-to-dos to give information about its tqparent) */ void drawTodo( int &count, Todo *todo, TQPainter &p, TodoSortField sortField, SortDirection sortDir, diff --git a/korganizer/printing/calprinttodoconfig_base.ui b/korganizer/printing/calprinttodoconfig_base.ui index ea2dcff20..5b330edde 100644 --- a/korganizer/printing/calprinttodoconfig_base.ui +++ b/korganizer/printing/calprinttodoconfig_base.ui @@ -2,7 +2,7 @@ CalPrintTodoConfig_Base Configuration page for the print day mode. Reinhold Kainhofer <reinhold@kainhofer.com> - + CalPrintTodoConfig_Base @@ -21,7 +21,7 @@ 0 - + mTitleLabel @@ -32,7 +32,7 @@ mTitle - + mTitle @@ -40,7 +40,7 @@ To-do List - + mPrintType @@ -51,7 +51,7 @@ unnamed - + mPrintAll @@ -62,7 +62,7 @@ true - + mPrintUnfinished @@ -73,7 +73,7 @@ Print &unfinished to-dos only - + mPrintDueRange @@ -84,7 +84,7 @@ Print only to-dos due in the &range: - + tqlayout2 @@ -109,7 +109,7 @@ - + mFromDateLabel @@ -145,7 +145,7 @@ If you want to print more days at once, you can define a range of dates with this option and the <i>End date</i> option. This option is used to define the start date. - + mToDateLabel @@ -202,7 +202,7 @@ - + includeInfoBox @@ -216,7 +216,7 @@ unnamed - + mPriority @@ -227,7 +227,7 @@ true - + mDescription @@ -238,7 +238,7 @@ true - + mDueDate @@ -252,7 +252,7 @@ true - + mPercentComplete @@ -282,7 +282,7 @@ - + sortingOptionsBox @@ -293,7 +293,7 @@ unnamed - + sortFieldLabel @@ -304,7 +304,7 @@ Sort field: - + mSortField @@ -312,7 +312,7 @@ true - + sortDirectionLabel @@ -323,7 +323,7 @@ Sort direction: - + mSortDirection @@ -367,7 +367,7 @@ - + otherOptionsBox @@ -378,18 +378,18 @@ unnamed - + mConnectSubTodos - Co&nnect sub-to-dos with its parent + Co&nnect sub-to-dos with its tqparent true - + mStrikeOutCompleted diff --git a/korganizer/printing/calprintweekconfig_base.ui b/korganizer/printing/calprintweekconfig_base.ui index 32ea6fb4a..6943de855 100644 --- a/korganizer/printing/calprintweekconfig_base.ui +++ b/korganizer/printing/calprintweekconfig_base.ui @@ -2,7 +2,7 @@ CalPrintWeekConfig_Base Configuration page for the print week mode. Reinhold Kainhofer <reinhold@kainhofer.com> - + CalPrintWeek_Base @@ -41,7 +41,7 @@ - + mDateRangeGroup @@ -69,7 +69,7 @@ - + mFromDateLabel @@ -94,7 +94,7 @@ Here you can choose which events should be printed based on their date. This check enables you to enter the start date of the date range. Use the <i>End date</i> to enter the end date of the daterange. - + mToTimeLabel @@ -125,7 +125,7 @@ - + mToTime @@ -143,7 +143,7 @@ All events which start later than the given time will not be printed. - + mFromTimeLabel @@ -157,7 +157,7 @@ All events which start earlier than the given time will not be printed. - + mFromTime @@ -186,7 +186,7 @@ Here you can choose which events should be printed based on their date. This check enables you to enter the end date of the date range. Use the <i>Start date</i> to enter the start date of the daterange. - + mToDateLabel @@ -202,7 +202,7 @@ - + mColors @@ -213,7 +213,7 @@ The timetable view supports colors. If you want to make use of colors you should check this option. The category colors will be used. - + mPrintType @@ -224,7 +224,7 @@ unnamed - + mPrintTypeButton1 @@ -238,7 +238,7 @@ The Filofax view prints one week per page, so all days have a large surface. - + mPrintTypeButton2 @@ -249,7 +249,7 @@ 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>. - + mPrintTypeButton3 @@ -262,7 +262,7 @@ - + mIncludeTodos diff --git a/korganizer/printing/cellitem.cpp b/korganizer/printing/cellitem.cpp index 73c8aa50b..4dfc882f3 100644 --- a/korganizer/printing/cellitem.cpp +++ b/korganizer/printing/cellitem.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include "cellitem.h" @@ -65,7 +65,7 @@ TQPtrList CellItem::placeItem( TQPtrList cells, int i; for( i = 0; i < maxSubCells; ++i ) { kdDebug(5855) << " Trying subcell " << i << endl; - if ( !subCellDict.find( i ) ) { + if ( !subCellDict.tqfind( i ) ) { kdDebug(5855) << " Use subcell " << i << endl; placeItem->setSubCell( i ); break; diff --git a/korganizer/printing/cellitem.h b/korganizer/printing/cellitem.h index 83759cc8d..4217e8b9e 100644 --- a/korganizer/printing/cellitem.h +++ b/korganizer/printing/cellitem.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef KORG_CELLITEM_H #define KORG_CELLITEM_H diff --git a/korganizer/publishdialog.cpp b/korganizer/publishdialog.cpp index 68d5c6307..33e30e9ba 100644 --- a/korganizer/publishdialog.cpp +++ b/korganizer/publishdialog.cpp @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include @@ -37,9 +37,9 @@ #include "publishdialog.h" #include "publishdialog_base.h" -PublishDialog::PublishDialog( TQWidget* parent, const char* name, +PublishDialog::PublishDialog( TQWidget* tqparent, const char* name, bool modal ) - : KDialogBase( parent, name, modal, + : KDialogBase( tqparent, name, modal, i18n("Select Addresses"), Ok|Cancel|Help, Ok, true ) { mWidget = new PublishDialog_base( this, "PublishFreeBusy" ); diff --git a/korganizer/publishdialog.h b/korganizer/publishdialog.h index d7f642059..832816005 100644 --- a/korganizer/publishdialog.h +++ b/korganizer/publishdialog.h @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef PUBLISHDIALOG_H #define PUBLISHDIALOG_H @@ -34,8 +34,9 @@ class PublishDialog_base; class PublishDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - PublishDialog(TQWidget* parent=0,const char* name=0, + PublishDialog(TQWidget* tqparent=0,const char* name=0, bool modal=true ); ~PublishDialog(); diff --git a/korganizer/publishdialog_base.ui b/korganizer/publishdialog_base.ui index 7e7a5ff1f..e8b3d34dc 100644 --- a/korganizer/publishdialog_base.ui +++ b/korganizer/publishdialog_base.ui @@ -1,6 +1,6 @@ PublishDialog_base - + PublishDialog_base @@ -22,7 +22,7 @@ 6 - + Name @@ -49,7 +49,7 @@ mAddressListView - + TextLabel1 @@ -57,7 +57,7 @@ Name: - + TextLabel2 @@ -65,7 +65,7 @@ Email: - + mEmailLineEdit @@ -73,12 +73,12 @@ - + mNameLineEdit - + mNew @@ -86,7 +86,7 @@ &New - + mSelectAddressee @@ -94,7 +94,7 @@ Select &Addressee... - + mRemove diff --git a/korganizer/resourceview.cpp b/korganizer/resourceview.cpp index 0f2d0e13f..7b00a4611 100644 --- a/korganizer/resourceview.cpp +++ b/korganizer/resourceview.cpp @@ -19,8 +19,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include "resourceview.h" @@ -96,9 +96,9 @@ ResourceViewFactory::ResourceViewFactory( CalendarResources *calendar, CalendarV { } -CalendarViewExtension *ResourceViewFactory::create( TQWidget *parent ) +CalendarViewExtension *ResourceViewFactory::create( TQWidget *tqparent ) { - mResourceView = new ResourceView( mCalendar, mCalendarView, parent ); + mResourceView = new ResourceView( mCalendar, mCalendarView, tqparent ); TQObject::connect( mResourceView, TQT_SIGNAL( resourcesChanged() ), mCalendarView, TQT_SLOT( resourcesChanged() ) ); @@ -127,10 +127,10 @@ ResourceView *ResourceViewFactory::resourceView() const } ResourceItem::ResourceItem( ResourceCalendar *resource, ResourceView *view, - KListView *parent ) - : TQCheckListItem( parent, resource->resourceName(), CheckBox ), + KListView *tqparent ) + : TQCheckListItem( tqparent, resource->resourceName(), CheckBox ), mResource( resource ), mResourceView( view ), mBlockStateChange( false ), - mIsSubresource( false ), mResourceIdentifier( TQString::null ), + mIsSubresource( false ), mResourceIdentifier( TQString() ), mSubItemsCreated( false ), mIsStandardResource( false ) { mResourceColor = TQColor(); @@ -164,8 +164,8 @@ void ResourceItem::createSubresourceItems() } ResourceItem::ResourceItem( ResourceCalendar *resource, const TQString &identifier, - const TQString &label, ResourceView *view, ResourceItem *parent ) - : TQCheckListItem( parent, label, CheckBox ), mResource( resource ), + const TQString &label, ResourceView *view, ResourceItem *tqparent ) + : TQCheckListItem( tqparent, label, CheckBox ), mResource( resource ), mResourceView( view ), mBlockStateChange( false ), mIsSubresource( true ), mSubItemsCreated( false ), mIsStandardResource( false ) { @@ -258,8 +258,8 @@ void ResourceItem::paintCell(TQPainter *p, const TQColorGroup &cg, ResourceView::ResourceView( CalendarResources *calendar, - CalendarView *view, TQWidget *parent, const char *name ) - : CalendarViewExtension( parent, name ), mCalendar( calendar ), mCalendarView( view ) + CalendarView *view, TQWidget *tqparent, const char *name ) + : CalendarViewExtension( tqparent, name ), mCalendar( calendar ), mCalendarView( view ) { TQBoxLayout *topLayout = new TQVBoxLayout( this, 0, KDialog::spacingHint() ); @@ -368,12 +368,12 @@ void ResourceView::addResource() if ( item && ( item->isSubresource() || item->resource()->canHaveSubresources() ) ) { const TQString folderName = KInputDialog::getText( i18n( "Add Subresource" ), - i18n( "Please enter a name for the new subresource" ), TQString::null, + i18n( "Please enter a name for the new subresource" ), TQString(), &ok, this ); if ( !ok ) return; - const TQString parentId = item->isSubresource() ? item->resourceIdentifier() : TQString:: null; - if ( !item->resource()->addSubresource( folderName, parentId ) ) { + const TQString tqparentId = item->isSubresource() ? item->resourceIdentifier() : TQString:: null; + if ( !item->resource()->addSubresource( folderName, tqparentId ) ) { KMessageBox::error( this, i18n( "Unable to create subresource %1." ).arg( folderName ) ); @@ -508,7 +508,7 @@ void ResourceView::slotSubresourceRemoved( ResourceCalendar *resource, void ResourceView::closeResource( ResourceCalendar *resource ) { - if ( mResourcesToClose.find( resource ) >= 0 ) { + if ( mResourcesToClose.tqfind( resource ) >= 0 ) { resource->close(); mResourcesToClose.remove( resource ); } diff --git a/korganizer/resourceview.h b/korganizer/resourceview.h index 304ab8c6f..39606a53e 100644 --- a/korganizer/resourceview.h +++ b/korganizer/resourceview.h @@ -19,8 +19,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef KORG_RESOURCEVIEW_H #define KORG_RESOURCEVIEW_H @@ -54,12 +54,12 @@ class ResourceViewFactory : public CalendarViewExtension::Factory }; -class ResourceItem : public QCheckListItem +class ResourceItem : public TQCheckListItem { public: - ResourceItem( ResourceCalendar *resource, ResourceView *view, KListView *parent ); + ResourceItem( ResourceCalendar *resource, ResourceView *view, KListView *tqparent ); ResourceItem( ResourceCalendar *resource, const TQString &identifier, - const TQString &label, ResourceView *view, ResourceItem *parent ); + const TQString &label, ResourceView *view, ResourceItem *tqparent ); ResourceCalendar *resource() { return mResource; } const TQString& resourceIdentifier() { return mResourceIdentifier; } @@ -95,9 +95,10 @@ class ResourceItem : public QCheckListItem class ResourceView : public CalendarViewExtension { Q_OBJECT + TQ_OBJECT public: ResourceView( CalendarResources *calendar, CalendarView *view, - TQWidget *parent = 0, const char *name = 0 ); + TQWidget *tqparent = 0, const char *name = 0 ); ~ResourceView(); CalendarResources *calendar() const { return mCalendar; } diff --git a/korganizer/searchdialog.cpp b/korganizer/searchdialog.cpp index b8b6ea1ea..8b79bda1c 100644 --- a/korganizer/searchdialog.cpp +++ b/korganizer/searchdialog.cpp @@ -20,8 +20,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include @@ -45,9 +45,9 @@ #include "searchdialog.h" #include "searchdialog.moc" -SearchDialog::SearchDialog(Calendar *calendar,TQWidget *parent) - : KDialogBase(Plain,i18n("Find Events"),User1|Close,User1,parent,0,false,false, - KGuiItem( i18n("&Find"), "find") ) +SearchDialog::SearchDialog(Calendar *calendar,TQWidget *tqparent) + : KDialogBase(Plain,i18n("Find Events"),User1|Close,User1,tqparent,0,false,false, + KGuiItem( i18n("&Find"), "tqfind") ) { mCalendar = calendar; @@ -228,31 +228,19 @@ void SearchDialog::search( const TQRegExp &re ) for( it = allIncidences.begin(); it != allIncidences.end(); ++it ) { Incidence *ev = *it; if ( mSummaryCheck->isChecked() ) { -#if QT_VERSION >= 300 if ( re.search( ev->summary() ) != -1 ) { -#else - if ( re.match( ev->summary() ) != -1 ) { -#endif mMatchedEvents.append( ev ); continue; } } if ( mDescriptionCheck->isChecked() ) { -#if QT_VERSION >= 300 if ( re.search( ev->description() ) != -1 ) { -#else - if ( re.match( ev->description() ) != -1 ) { -#endif mMatchedEvents.append( ev ); continue; } } if ( mCategoryCheck->isChecked() ) { -#if QT_VERSION >= 300 if ( re.search( ev->categoriesStr() ) != -1 ) { -#else - if ( re.match( ev->categoriesStr() ) != -1 ) { -#endif mMatchedEvents.append( ev ); continue; } diff --git a/korganizer/searchdialog.h b/korganizer/searchdialog.h index 53195bc13..33427c258 100644 --- a/korganizer/searchdialog.h +++ b/korganizer/searchdialog.h @@ -20,8 +20,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef SEARCHDIALOG_H #define SEARCHDIALOG_H @@ -46,8 +46,9 @@ using namespace KCal; class SearchDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - SearchDialog(Calendar *calendar,TQWidget *parent=0); + SearchDialog(Calendar *calendar,TQWidget *tqparent=0); virtual ~SearchDialog(); void updateView(); diff --git a/korganizer/statusdialog.cpp b/korganizer/statusdialog.cpp index 29eb04ef2..a90ab28d3 100644 --- a/korganizer/statusdialog.cpp +++ b/korganizer/statusdialog.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include @@ -35,10 +35,10 @@ #include "statusdialog.h" #include "statusdialog.moc" -StatusDialog::StatusDialog(TQWidget* parent, const char* name) : - KDialog(parent,name,true) +StatusDialog::StatusDialog(TQWidget* tqparent, const char* name) : + KDialog(tqparent,name,true) { - setCaption(i18n("Set Your Status")); + setCaption(i18n("Set Your tqStatus")); TQBoxLayout *topLayout = new TQVBoxLayout( this ); topLayout->setSpacing( spacingHint() ); @@ -49,9 +49,9 @@ StatusDialog::StatusDialog(TQWidget* parent, const char* name) : TQLabel *text = new TQLabel(i18n("Set your status"),this); statusLayout->addWidget( text ); - mStatus = new TQComboBox(false,this); - mStatus->insertStringList(Attendee::statusList()); - statusLayout->addWidget( mStatus ); + mtqStatus = new TQComboBox(false,this); + mtqStatus->insertStringList(Attendee::statusList()); + statusLayout->addWidget( mtqStatus ); TQBoxLayout *buttonLayout = new TQHBoxLayout( topLayout ); @@ -70,5 +70,5 @@ StatusDialog::~StatusDialog() Attendee::PartStat StatusDialog::status() { - return Attendee::PartStat( mStatus->currentItem() ) ; + return Attendee::PartStat( mtqStatus->currentItem() ) ; } diff --git a/korganizer/statusdialog.h b/korganizer/statusdialog.h index d97c1ac20..6c1b90f2d 100644 --- a/korganizer/statusdialog.h +++ b/korganizer/statusdialog.h @@ -29,14 +29,15 @@ class TQComboBox; class StatusDialog : public KDialog { Q_OBJECT + TQ_OBJECT public: - StatusDialog(TQWidget* parent=0,const char* name=0); + StatusDialog(TQWidget* tqparent=0,const char* name=0); ~StatusDialog(); Attendee::PartStat status(); private: - TQComboBox *mStatus; + TQComboBox *mtqStatus; }; #endif diff --git a/korganizer/template_management_dialog_base.ui b/korganizer/template_management_dialog_base.ui index 606db9ec7..edcf94482 100644 --- a/korganizer/template_management_dialog_base.ui +++ b/korganizer/template_management_dialog_base.ui @@ -1,6 +1,6 @@ TemplateManagementDialog_base - + TemplateManagementDialog_base @@ -27,7 +27,7 @@ m_listBox - + m_buttonAdd @@ -35,7 +35,7 @@ &New - + m_buttonDelete @@ -46,7 +46,7 @@ Delete - + m_introLabel @@ -57,7 +57,7 @@ Select a template and click <b>Apply Template</b> to apply it to the current event or task. Click <b>New</b> to create a new template based on the current event or task. - + m_buttonApply diff --git a/korganizer/templatemanagementdialog.cpp b/korganizer/templatemanagementdialog.cpp index 18c82214d..e6ee19da2 100644 --- a/korganizer/templatemanagementdialog.cpp +++ b/korganizer/templatemanagementdialog.cpp @@ -25,11 +25,11 @@ ** ** In addition, as a special exception, the copyright holders give ** permission to link the code of this program with any edition of -** the Qt library by Trolltech AS, Norway (or with modified versions -** of Qt that use the same license as Qt), and distribute linked +** the TQt library by Trolltech AS, Norway (or with modified versions +** of TQt that use the same license as TQt), and distribute linked ** combinations including the two. You must obey the GNU General ** Public License in all respects for all of the code used other than -** Qt. If you modify this file, you may extend this exception to +** TQt. If you modify this file, you may extend this exception to ** your version of the file, but you are not obligated to do so. If ** you do not wish to do so, delete this exception statement from ** your version. @@ -45,10 +45,10 @@ #include #include -TemplateManagementDialog::TemplateManagementDialog(TQWidget *parent, const TQStringList &templates ) - :KDialogBase( parent, "template_management_dialog", true, +TemplateManagementDialog::TemplateManagementDialog(TQWidget *tqparent, const TQStringList &templates ) + :KDialogBase( tqparent, "template_management_dialog", true, i18n("Manage Templates"), Ok|Cancel, Ok, true , i18n("Apply Template")), - m_templates( templates ), m_newTemplate( TQString::null ), m_changed( false ) + m_templates( templates ), m_newTemplate( TQString() ), m_changed( false ) { m_base = new TemplateManagementDialog_base( this, "template_management_dialog_base" ); setMainWidget( m_base ); @@ -72,7 +72,7 @@ void TemplateManagementDialog::slotAddTemplate() i18n("Please enter a name for the new template:"), i18n("New Template"), &ok ); if ( newTemplate.isEmpty() || !ok ) return; - if ( m_templates.find( newTemplate) != m_templates.end() ) { + if ( m_templates.tqfind( newTemplate) != m_templates.end() ) { int rc = KMessageBox::warningContinueCancel( this, i18n("A template with that name already exists, do you want to overwrite it?."), i18n("Duplicate Template Name"), i18n("Overwrite")); if ( rc == KMessageBox::Cancel ) { TQTimer::singleShot(0, this, TQT_SLOT( slotAddTemplate() ) ); @@ -102,7 +102,7 @@ void TemplateManagementDialog::slotDeleteTemplate() m_templates.remove( item->text() ); m_base->m_listBox->removeItem( m_base->m_listBox->currentItem() ); m_changed = true; - m_base->m_listBox->setSelected(QMAX(current -1, 0), true); + m_base->m_listBox->setSelected(TQMAX(current -1, 0), true); } void TemplateManagementDialog::slotUpdateDeleteButton( TQListBoxItem *item ) diff --git a/korganizer/templatemanagementdialog.h b/korganizer/templatemanagementdialog.h index 9216108f6..134211c45 100644 --- a/korganizer/templatemanagementdialog.h +++ b/korganizer/templatemanagementdialog.h @@ -25,11 +25,11 @@ ** ** In addition, as a special exception, the copyright holders give ** permission to link the code of this program with any edition of -** the Qt library by Trolltech AS, Norway (or with modified versions -** of Qt that use the same license as Qt), and distribute linked +** the TQt library by Trolltech AS, Norway (or with modified versions +** of TQt that use the same license as TQt), and distribute linked ** combinations including the two. You must obey the GNU General ** Public License in all respects for all of the code used other than -** Qt. If you modify this file, you may extend this exception to +** TQt. If you modify this file, you may extend this exception to ** your version of the file, but you are not obligated to do so. If ** you do not wish to do so, delete this exception statement from ** your version. @@ -46,8 +46,9 @@ class TemplateManagementDialog: public KDialogBase { Q_OBJECT + TQ_OBJECT public: - TemplateManagementDialog( TQWidget *parent, const TQStringList& templates ); + TemplateManagementDialog( TQWidget *tqparent, const TQStringList& templates ); signals: /* Emitted whenever the user hits apply, indicating that the currently selected template diff --git a/korganizer/timelabels.cpp b/korganizer/timelabels.cpp index 53bc34588..5431594a6 100644 --- a/korganizer/timelabels.cpp +++ b/korganizer/timelabels.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include "timelabels.h" @@ -42,8 +42,8 @@ #include "koprefs.h" #include "koagenda.h" -TimeLabels::TimeLabels(int rows,TQWidget *parent,const char *name,WFlags f) : - TQScrollView(parent,name,f) +TimeLabels::TimeLabels(int rows,TQWidget *tqparent,const char *name,WFlags f) : + TQScrollView(tqparent,name,f) { mRows = rows; mMiniWidth = 0; @@ -63,7 +63,7 @@ TimeLabels::TimeLabels(int rows,TQWidget *parent,const char *name,WFlags f) : mMousePos = new TQFrame(this); mMousePos->setLineWidth(0); mMousePos->setMargin(0); - mMousePos->setBackgroundColor(Qt::red); + mMousePos->setBackgroundColor(TQt::red); mMousePos->setFixedSize(width(), 1); addChild(mMousePos, 0, 0); } diff --git a/korganizer/timelabels.h b/korganizer/timelabels.h index 63881c4e1..df555ab59 100644 --- a/korganizer/timelabels.h +++ b/korganizer/timelabels.h @@ -19,8 +19,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef TIMELABELS_H #define TIMELABELS_H @@ -36,11 +36,12 @@ class KOAgenda; class KOAgendaItem; class KConfig; -class TimeLabels : public QScrollView +class TimeLabels : public TQScrollView { Q_OBJECT + TQ_OBJECT public: - TimeLabels( int rows, TQWidget *parent = 0, const char *name = 0, + TimeLabels( int rows, TQWidget *tqparent = 0, const char *name = 0, WFlags f = 0 ); /** Calculates the minimum width */ diff --git a/korganizer/timelineitem.cpp b/korganizer/timelineitem.cpp index 6ebff843f..649bcfa86 100644 --- a/korganizer/timelineitem.cpp +++ b/korganizer/timelineitem.cpp @@ -31,8 +31,8 @@ using namespace KOrg; using namespace KCal; -TimelineItem::TimelineItem( const TQString &label, KCal::Calendar *calendar, KDGanttView * parent) : - KDGanttViewTaskItem( parent ), mCalendar( calendar ) +TimelineItem::TimelineItem( const TQString &label, KCal::Calendar *calendar, KDGanttView * tqparent) : + KDGanttViewTaskItem( tqparent ), mCalendar( calendar ) { setListViewText( 0, label ); setDisplaySubitemsAsGroup( true ); @@ -92,8 +92,8 @@ void TimelineItem::moveItems(KCal::Incidence * incidence, int delta, int duratio TimelineSubItem::TimelineSubItem( KCal::Calendar *calendar, - KCal::Incidence *incidence, TimelineItem *parent) : - KDGanttViewTaskItem( parent ), + KCal::Incidence *incidence, TimelineItem *tqparent) : + KDGanttViewTaskItem( tqparent ), mIncidence( incidence ), mLeft( 0 ), mRight( 0 ), @@ -124,11 +124,11 @@ void TimelineSubItem::showItem(bool show, int coordY) int startX = myGanttView->timeHeaderWidget()->getCoordX(myStartTime); int endX = myGanttView->timeHeaderWidget()->getCoordX(myEndTime); - const int mw = QMAX( 1, QMIN( 4, endX - startX ) ); + const int mw = TQMAX( 1, TQMIN( 4, endX - startX ) ); if ( !mLeft || mw != mMarkerWidth ) { if ( !mLeft ) { mLeft = new KDCanvasPolygon( myGanttView->timeTableWidget(), this, Type_is_KDGanttViewItem ); - mLeft->setBrush( Qt::black ); + mLeft->setBrush( TQt::black ); } TQPointArray a = TQPointArray( 4 ); a.setPoint( 0, 0, -mw -myItemSize/2 - 2 ); @@ -140,7 +140,7 @@ void TimelineSubItem::showItem(bool show, int coordY) if ( !mRight || mw != mMarkerWidth ) { if ( !mRight ) { mRight = new KDCanvasPolygon( myGanttView->timeTableWidget(), this, Type_is_KDGanttViewItem ); - mRight->setBrush( Qt::black ); + mRight->setBrush( TQt::black ); } TQPointArray a = TQPointArray( 4 ); a.setPoint( 0, -mw, -myItemSize/2 - 2 ); diff --git a/korganizer/timelineitem.h b/korganizer/timelineitem.h index a3406f115..7cf451450 100644 --- a/korganizer/timelineitem.h +++ b/korganizer/timelineitem.h @@ -42,7 +42,7 @@ class TimelineSubItem; class TimelineItem : public KDGanttViewTaskItem { public: - TimelineItem( const TQString &label, KCal::Calendar *calendar, KDGanttView* parent ); + TimelineItem( const TQString &label, KCal::Calendar *calendar, KDGanttView* tqparent ); void insertIncidence( KCal::Incidence *incidence, const TQDateTime &start = TQDateTime(), @@ -59,7 +59,7 @@ class TimelineItem : public KDGanttViewTaskItem class TimelineSubItem : public KDGanttViewTaskItem { public: - TimelineSubItem( KCal::Calendar *calendar, KCal::Incidence *incidence, TimelineItem *parent ); + TimelineSubItem( KCal::Calendar *calendar, KCal::Incidence *incidence, TimelineItem *tqparent ); ~TimelineSubItem(); KCal::Incidence* incidence() const { return mIncidence; } diff --git a/korganizer/timezone.cpp b/korganizer/timezone.cpp index d95ae3cf6..3b751b6ab 100644 --- a/korganizer/timezone.cpp +++ b/korganizer/timezone.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include @@ -56,7 +56,7 @@ int main(int argc,char **argv) TQTime qtime = TQTime::currentTime(); kdDebug(5850) << "TQDateTime::currentTime(): " - << qtime.toString( Qt::ISODate ) << endl; + << qtime.toString( TQt::ISODate ) << endl; kdDebug(5850) << "KLocale::formatTime(): " << KGlobal::locale()->formatTime( qtime ) << endl; diff --git a/korganizer/urihandler.cpp b/korganizer/urihandler.cpp index 0c406318e..7caad0e34 100644 --- a/korganizer/urihandler.cpp +++ b/korganizer/urihandler.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include "urihandler.h" @@ -69,7 +69,7 @@ TQString UriHandler::uidFromUri( const TQString &uri ) return tmp; } -bool UriHandler::process( TQWidget *parent, const TQString &uri ) +bool UriHandler::process( TQWidget *tqparent, const TQString &uri ) { kdDebug(5850) << "UriHandler::process(): " << uri << endl; @@ -80,10 +80,10 @@ bool UriHandler::process( TQWidget *parent, const TQString &uri ) kapp->startServiceByDesktopPath("kmail"); // parse string, show - int colon = uri.find( ':' ); + int colon = uri.tqfind( ':' ); // extract 'number' from 'kmail:/' TQString serialNumberStr = uri.mid( colon + 1 ); - serialNumberStr = serialNumberStr.left( serialNumberStr.find( '/' ) ); + serialNumberStr = serialNumberStr.left( serialNumberStr.tqfind( '/' ) ); KMailIface_stub kmailIface( "kmail", "KMailIface" ); kmailIface.showMail( serialNumberStr.toUInt(), TQString() ); @@ -91,7 +91,7 @@ bool UriHandler::process( TQWidget *parent, const TQString &uri ) } else if ( uri.startsWith( "mailto:" ) ) { - KApplication::kApplication()->invokeMailer( uri.mid(7), TQString::null ); + KApplication::kApplication()->invokeMailer( uri.mid(7), TQString() ); return true; } else if ( uri.startsWith( "uid:" ) ) { @@ -127,7 +127,7 @@ bool UriHandler::process( TQWidget *parent, const TQString &uri ) } else if ( uri.startsWith( "ATTACH:" ) ) { // a calendar incidence attachment - return AttachmentHandler::view( parent, attachmentNameFromUri( uri ), uidFromUri( uri ) ); + return AttachmentHandler::view( tqparent, attachmentNameFromUri( uri ), uidFromUri( uri ) ); } else { // no special URI, let KDE handle it new KRun( KURL( uri ) ); diff --git a/korganizer/urihandler.h b/korganizer/urihandler.h index 1dc9264ca..360e58e3a 100644 --- a/korganizer/urihandler.h +++ b/korganizer/urihandler.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef URIHANDLER_H #define URIHANDLER_H @@ -35,7 +35,7 @@ class KDE_EXPORT UriHandler /** Process URI. Return true if handler handled the URI, otherwise false. */ - static bool process( TQWidget *parent, const TQString &uri ); + static bool process( TQWidget *tqparent, const TQString &uri ); static TQString attachmentNameFromUri( const TQString &uri ); static TQString uidFromUri( const TQString &uri ); diff --git a/korganizer/version.h b/korganizer/version.h index a25f926f2..2ab3ba546 100644 --- a/korganizer/version.h +++ b/korganizer/version.h @@ -19,8 +19,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef KORG_VERSION_H #define KORG_VERSION_H -- cgit v1.2.1