From 7a712e6185fe1086345a4ad970291444548f60a2 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Thu, 9 Nov 2023 10:37:12 +0900 Subject: [PATCH] Replace Qt with TQt Signed-off-by: Michele Calgaro (cherry picked from commit 98876ba8c52c0fc2f38c258476bc9637f055d576) --- akregator/src/akregator_view.cpp | 10 +- akregator/src/pageviewer.cpp | 2 +- akregator/src/trayicon.cpp | 2 +- akregator/src/viewer.cpp | 4 +- .../kwatchgnupg/kwatchgnupgmainwin.cpp | 6 +- certmanager/lib/ui/keyapprovaldialog.cpp | 2 +- doc/kalarm/index.docbook | 24 ++--- kaddressbook/addresseditwidget.cpp | 2 +- kaddressbook/addresseeeditorwidget.cpp | 4 +- kaddressbook/addviewdialog.cpp | 2 +- kaddressbook/customfieldswidget.cpp | 12 +-- kaddressbook/extensionmanager.cpp | 2 +- kaddressbook/filtereditdialog.cpp | 2 +- kaddressbook/geowidget.cpp | 2 +- kaddressbook/imagewidget.cpp | 4 +- kaddressbook/jumpbuttonbar.cpp | 2 +- kaddressbook/kabcore.cpp | 2 +- kaddressbook/kcmconfigs/addresseewidget.cpp | 4 +- kaddressbook/kcmconfigs/kabconfigwidget.cpp | 6 +- kaddressbook/ldapsearchdialog.cpp | 4 +- kaddressbook/phoneeditwidget.cpp | 2 +- kaddressbook/printing/selectionpage.cpp | 2 +- kaddressbook/printing/stylepage.cpp | 4 +- kaddressbook/views/cardview.cpp | 10 +- .../views/configurecardviewdialog.cpp | 4 +- .../views/configuretableviewdialog.cpp | 2 +- kaddressbook/views/contactlistview.cpp | 2 +- kaddressbook/xxport/csvimportdialog.cpp | 2 +- kaddressbook/xxportselectdialog.cpp | 4 +- kalarm/alarmlistview.cpp | 2 +- kalarm/birthdaydlg.cpp | 4 +- kalarm/dcophandler.cpp | 10 +- kalarm/editdlg.cpp | 2 +- kalarm/emailidcombo.cpp | 2 +- kalarm/find.cpp | 2 +- kalarm/lib/buttongroup.cpp | 4 +- kalarm/lib/buttongroup.h | 4 +- kalarm/lib/checkbox.cpp | 4 +- kalarm/lib/colourcombo.cpp | 2 +- kalarm/lib/combobox.cpp | 2 +- kalarm/lib/dateedit.cpp | 2 +- kalarm/lib/datetime.h | 2 +- kalarm/lib/pushbutton.cpp | 4 +- kalarm/lib/radiobutton.cpp | 4 +- kalarm/lib/slider.cpp | 6 +- kalarm/lib/slider.h | 4 +- kalarm/lib/spinbox.cpp | 8 +- kalarm/mainwindow.cpp | 2 +- kalarm/recurrenceedit.cpp | 4 +- kalarm/sounddlg.cpp | 4 +- kalarm/traywindow.cpp | 6 +- kandy/src/kandyview.cpp | 4 +- karm/edittaskdialog.cpp | 2 +- karm/karm_part.cpp | 4 +- karm/mainwindow.cpp | 8 +- karm/printdialog.cpp | 2 +- karm/taskview.cpp | 2 +- kdgantt/KDGanttMinimizeSplitter.cpp | 56 +++++----- kdgantt/KDGanttMinimizeSplitter.h | 24 ++--- kdgantt/KDGanttSemiSizingControl.cpp | 24 ++--- kdgantt/KDGanttSemiSizingControl.h | 10 +- kdgantt/KDGanttView.cpp | 6 +- kdgantt/KDGanttViewItem.cpp | 12 +-- kdgantt/KDGanttViewSubwidgets.cpp | 58 +++++----- kdgantt/KDGanttViewTaskLink.cpp | 4 +- kdgantt/KDGanttXMLTools.cpp | 100 +++++++++--------- kdgantt/KDGanttXMLTools.h | 8 +- kgantt/kgantt/xQGanttBarViewPort_Events.cpp | 18 ++-- kgantt/kgantt/xQGanttListViewPort.h | 2 +- kitchensync/src/configguipalm.cpp | 2 +- kitchensync/src/kwidgetlist.cpp | 2 +- kmail/accountdialog.cpp | 10 +- kmail/archivefolderdialog.cpp | 2 +- kmail/configuredialog.cpp | 2 +- kmail/headerstyle.cpp | 2 +- kmail/kmcomposewin.cpp | 6 +- kmail/kmedit.cpp | 4 +- kmail/kmfilterdlg.cpp | 6 +- kmail/kmfoldertree.cpp | 4 +- kmail/kmheaders.cpp | 8 +- kmail/kmmainwidget.cpp | 10 +- kmail/kmreaderwin.cpp | 10 +- kmail/kmsearchpatternedit.cpp | 4 +- kmail/kmsystemtray.cpp | 4 +- kmail/kmtransport.cpp | 4 +- kmail/mailinglistpropertiesdialog.cpp | 2 +- kmail/searchwindow.cpp | 2 +- kmail/urlhandlermanager.cpp | 2 +- knode/headerview.cpp | 2 +- knode/kncollectionview.cpp | 2 +- knode/kncomposer.cpp | 4 +- knode/knconfigwidgets.cpp | 6 +- knotes/knote.cpp | 8 +- knotes/knotealarmdlg.cpp | 2 +- knotes/knotesapp.cpp | 6 +- konsolekalendar/konsolekalendar.cpp | 10 +- konsolekalendar/konsolekalendaradd.cpp | 4 +- konsolekalendar/konsolekalendarchange.cpp | 8 +- konsolekalendar/konsolekalendardelete.cpp | 4 +- konsolekalendar/konsolekalendarepoch.cpp | 6 +- konsolekalendar/main.cpp | 12 +-- kontact/interfaces/summary.cpp | 2 +- kontact/plugins/korganizer/kcmkorgsummary.cpp | 4 +- kontact/plugins/newsticker/kcmkontactknt.cpp | 2 +- kontact/plugins/specialdates/kcmsdsummary.cpp | 6 +- .../plugins/specialdates/sdsummarywidget.cpp | 2 +- korganizer/calendarview.cpp | 4 +- korganizer/importdialog.cpp | 2 +- korganizer/koagenda.cpp | 8 +- korganizer/koagenda.h | 2 +- korganizer/koagendaview.cpp | 12 +-- korganizer/koagendaview.h | 2 +- korganizer/koeditorattachments.cpp | 2 +- korganizer/koeditorfreebusy.cpp | 2 +- korganizer/koeditorgeneralevent.cpp | 2 +- korganizer/koeditorgeneraltodo.cpp | 2 +- korganizer/koeditorrecurrence.cpp | 14 +-- korganizer/kolistview.cpp | 10 +- korganizer/komonthview.cpp | 2 +- korganizer/koprefsdialog.cpp | 18 ++-- korganizer/korgac/alarmdialog.cpp | 2 +- korganizer/korgac/alarmdockwindow.cpp | 2 +- korganizer/kotodoview.cpp | 2 +- korganizer/multiagendaview.cpp | 16 +-- korganizer/multiagendaview.h | 2 +- korganizer/printing/calprinter.cpp | 2 +- korganizer/searchdialog.cpp | 2 +- korn/boxcontaineritem.cpp | 6 +- korn/hvcontainer.cpp | 4 +- korn/hvcontainer.h | 2 +- korn/kornshell.cpp | 4 +- korn/mailsubject.cpp | 2 +- ktnef/gui/qwmf.cpp | 54 +++++----- libkcal/resourcecachedconfig.cpp | 4 +- libkcal/resourcelocalconfig.cpp | 2 +- libkpgp/kpgpui.cpp | 4 +- libkpimexchange/core/exchangedownload.cpp | 10 +- libkpimexchange/core/exchangeupload.cpp | 8 +- libtdepim/addresseelineedit.cpp | 6 +- libtdepim/designerfields.cpp | 12 +-- libtdepim/kcmdesignerfields.cpp | 2 +- libtdepim/kdateedit.cpp | 2 +- libtdepim/kincidencechooser.cpp | 2 +- libtdepim/kpixmapregionselectorwidget.cpp | 2 +- libtdepim/kprefsdialog.cpp | 2 +- libtdepim/ldapsearchdialog.cpp | 2 +- libtdepim/statusbarprogresswidget.cpp | 2 +- tderesources/birthdays/resourcetdeabc.cpp | 6 +- tderesources/caldav/configwidgets.cpp | 4 +- tderesources/carddav/configwidgets.cpp | 4 +- tderesources/egroupware/xmlrpciface.cpp | 4 +- tderesources/groupwise/soap/gwconverter.cpp | 12 +-- .../groupwise/soap/incidenceconverter.cpp | 6 +- tderesources/kolab/shared/kolabbase.cpp | 10 +- tderesources/lib/folderconfig.cpp | 2 +- tderesources/lib/folderlistview.cpp | 4 +- tderesources/lib/webdavhandler.cpp | 2 +- .../newexchange/exchangeconvertercalendar.cpp | 12 +-- .../scalix/scalixadmin/outofofficepage.cpp | 2 +- tderesources/scalix/shared/scalixbase.cpp | 8 +- tderesources/scalix/tdeabc/contact.cpp | 8 +- tderesources/slox/tdeabcresourceslox.cpp | 4 +- tderesources/slox/webdavhandler.cpp | 4 +- wizards/groupwisewizard.cpp | 2 +- 164 files changed, 535 insertions(+), 535 deletions(-) diff --git a/akregator/src/akregator_view.cpp b/akregator/src/akregator_view.cpp index 1e866bda..3f516315 100644 --- a/akregator/src/akregator_view.cpp +++ b/akregator/src/akregator_view.cpp @@ -228,7 +228,7 @@ View::View( Part *part, TQWidget *parent, ActionManagerImpl* actionManager, cons TQVBoxLayout *lt = new TQVBoxLayout( this ); - m_horizontalSplitter = new TQSplitter(Qt::Horizontal, this); + m_horizontalSplitter = new TQSplitter(TQt::Horizontal, this); m_horizontalSplitter->setOpaqueResize(true); lt->addWidget(m_horizontalSplitter); @@ -287,7 +287,7 @@ View::View( Part *part, TQWidget *parent, ActionManagerImpl* actionManager, cons mainTabLayout->addWidget(m_searchBar); - m_articleSplitter = new TQSplitter(Qt::Vertical, m_mainTab, "panner2"); + m_articleSplitter = new TQSplitter(TQt::Vertical, m_mainTab, "panner2"); m_articleList = new ArticleListView( m_articleSplitter, "articles" ); m_actionManager->initArticleListView(m_articleList); @@ -647,7 +647,7 @@ void View::slotNormalView() m_articleViewer->slotShowSummary(m_listTabWidget->activeView()->selectedNode()); } - m_articleSplitter->setOrientation(Qt::Vertical); + m_articleSplitter->setOrientation(TQt::Vertical); m_viewMode = NormalView; Settings::setViewMode( m_viewMode ); @@ -671,7 +671,7 @@ void View::slotWidescreenView() m_articleViewer->slotShowSummary(m_listTabWidget->activeView()->selectedNode()); } - m_articleSplitter->setOrientation(Qt::Horizontal); + m_articleSplitter->setOrientation(TQt::Horizontal); m_viewMode = WidescreenView; Settings::setViewMode( m_viewMode ); @@ -1109,7 +1109,7 @@ void View::slotFeedFetched(Feed *feed) void View::slotMouseButtonPressed(int button, const Article& article, const TQPoint &, int) { - if (button == Qt::MidButton) + if (button == TQt::MidButton) { KURL link = article.link(); switch (Settings::mMBBehaviour()) diff --git a/akregator/src/pageviewer.cpp b/akregator/src/pageviewer.cpp index f818043b..859bb1a3 100644 --- a/akregator/src/pageviewer.cpp +++ b/akregator/src/pageviewer.cpp @@ -362,7 +362,7 @@ void PageViewer::urlSelected(const TQString &url, int button, int state, const T } else { - if (button == Qt::LeftButton) + if (button == TQt::LeftButton) { m_url = completeURL(url); browserExtension()->setURLArgs(args); diff --git a/akregator/src/trayicon.cpp b/akregator/src/trayicon.cpp index 9cab8b3b..bbf0d990 100644 --- a/akregator/src/trayicon.cpp +++ b/akregator/src/trayicon.cpp @@ -74,7 +74,7 @@ TrayIcon::~TrayIcon() void TrayIcon::mousePressEvent(TQMouseEvent *e) { - if (e->button() == Qt::LeftButton) { + if (e->button() == TQt::LeftButton) { emit showPart(); } diff --git a/akregator/src/viewer.cpp b/akregator/src/viewer.cpp index 02bba26c..202175dc 100644 --- a/akregator/src/viewer.cpp +++ b/akregator/src/viewer.cpp @@ -130,7 +130,7 @@ void Viewer::urlSelected(const TQString &url, int button, int state, const TQStr { m_url = completeURL(url); browserExtension()->setURLArgs(args); - if (button == Qt::LeftButton) + if (button == TQt::LeftButton) { switch (Settings::lMBBehaviour()) { @@ -146,7 +146,7 @@ void Viewer::urlSelected(const TQString &url, int button, int state, const TQStr } return; } - else if (button == Qt::MidButton) + else if (button == TQt::MidButton) { switch (Settings::mMBBehaviour()) { diff --git a/certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp b/certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp index d02a2fad..6aeab99c 100644 --- a/certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp +++ b/certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp @@ -90,7 +90,7 @@ KWatchGnuPGMainWindow::~KWatchGnuPGMainWindow() void KWatchGnuPGMainWindow::slotClear() { mCentralWidget->clear(); - mCentralWidget->append( tqtr("[%1] Log cleared").arg( TQDateTime::currentDateTime().toString(Qt::ISODate) ) ); + mCentralWidget->append( tqtr("[%1] Log cleared").arg( TQDateTime::currentDateTime().toString(TQt::ISODate) ) ); } void KWatchGnuPGMainWindow::createActions() @@ -135,7 +135,7 @@ void KWatchGnuPGMainWindow::startWatcher() kapp->eventLoop()->processEvents(TQEventLoop::ExcludeUserInput); } mCentralWidget->append(tqtr("[%1] Log stopped") - .arg( TQDateTime::currentDateTime().toString(Qt::ISODate))); + .arg( TQDateTime::currentDateTime().toString(TQt::ISODate))); } mWatcher->clearArguments(); TDEConfig* config = kapp->config(); @@ -148,7 +148,7 @@ void KWatchGnuPGMainWindow::startWatcher() KMessageBox::sorry( this, i18n("The watchgnupg logging process could not be started.\nPlease install watchgnupg somewhere in your $PATH.\nThis log window is now completely useless." ) ); } else { mCentralWidget->append( tqtr("[%1] Log started") - .arg( TQDateTime::currentDateTime().toString(Qt::ISODate) ) ); + .arg( TQDateTime::currentDateTime().toString(TQt::ISODate) ) ); } connect( mWatcher, TQT_SIGNAL( processExited(TDEProcess*) ), this, TQT_SLOT( slotWatcherExited() ) ); diff --git a/certmanager/lib/ui/keyapprovaldialog.cpp b/certmanager/lib/ui/keyapprovaldialog.cpp index 900605ae..6b873c0b 100644 --- a/certmanager/lib/ui/keyapprovaldialog.cpp +++ b/certmanager/lib/ui/keyapprovaldialog.cpp @@ -139,7 +139,7 @@ Kleo::KeyApprovalDialog::KeyApprovalDialog( const std::vector & recipients d->selfRequester->setKeys( sender ); glay->addWidget( d->selfRequester, row, 1 ); ++row; - glay->addMultiCellWidget( new KSeparator( Qt::Horizontal, view ), row, row, 0, 1 ); + glay->addMultiCellWidget( new KSeparator( TQt::Horizontal, view ), row, row, 0, 1 ); } const TQStringList prefs = preferencesStrings(); diff --git a/doc/kalarm/index.docbook b/doc/kalarm/index.docbook index 48b283f9..a85022ff 100644 --- a/doc/kalarm/index.docbook +++ b/doc/kalarm/index.docbook @@ -2933,12 +2933,12 @@ bool scheduleMessage(const TQString& message, Specifies the scheduled date, or date and time, at which the message should be displayed. For a date-only alarm, the string should be in the format YYYY-MM-DD (as returned by -QDate::toString(Qt::ISODate)). For an alarm +QDate::toString(TQt::ISODate)). For an alarm with a date and time, the string should be in the format YYYY-MM-DDTHH:MM[:SS] (as returned by -QDateTime::toString(Qt::ISODate)) or +QDateTime::toString(TQt::ISODate)) or HH:MM[:SS] (as returned by -QTime::toString(Qt::ISODate)). If no date is +QTime::toString(TQt::ISODate)). If no date is specified, today's date is used. Note that any seconds value is ignored. @@ -3176,12 +3176,12 @@ displayed in the message to be scheduled. Specifies the scheduled date, or date and time, at which the file should be displayed. For a date-only alarm, the string should be in the format YYYY-MM-DD (as returned by -QDate::toString(Qt::ISODate)). For an alarm +QDate::toString(TQt::ISODate)). For an alarm with a date and time, the string should be in the format YYYY-MM-DDTHH:MM[:SS] (as returned by -QDateTime::toString(Qt::ISODate)) or +QDateTime::toString(TQt::ISODate)) or HH:MM[:SS] (as returned by -QTime::toString(Qt::ISODate)). If no date is +QTime::toString(TQt::ISODate)). If no date is specified, today's date is used. Note that any seconds value is ignored. @@ -3383,12 +3383,12 @@ parameter contains a shell command line or a command script. Specifies the scheduled date, or date and time, at which the command should be executed. For a date-only alarm, the string should be in the format YYYY-MM-DD (as returned by -QDate::toString(Qt::ISODate)). For an alarm +QDate::toString(TQt::ISODate)). For an alarm with a date and time, the string should be in the format YYYY-MM-DDTHH:MM[:SS] (as returned by -QDateTime::toString(Qt::ISODate)) or +QDateTime::toString(TQt::ISODate)) or HH:MM[:SS] (as returned by -QTime::toString(Qt::ISODate)). If no date is +QTime::toString(TQt::ISODate)). If no date is specified, today's date is used. Note that any seconds value is ignored. @@ -3599,12 +3599,12 @@ email attachments. Specifies the scheduled date, or date and time, at which the email should be sent. For a date-only alarm, the string should be in the format YYYY-MM-DD (as returned by -QDate::toString(Qt::ISODate)). For an alarm +QDate::toString(TQt::ISODate)). For an alarm with a date and time, the string should be in the format YYYY-MM-DDTHH:MM[:SS] (as returned by -QDateTime::toString(Qt::ISODate)) or +QDateTime::toString(TQt::ISODate)) or HH:MM[:SS] (as returned by -QTime::toString(Qt::ISODate)). If no date is +QTime::toString(TQt::ISODate)). If no date is specified, today's date is used. Note that any seconds value is ignored. diff --git a/kaddressbook/addresseditwidget.cpp b/kaddressbook/addresseditwidget.cpp index 83f27874..bfe47132 100644 --- a/kaddressbook/addresseditwidget.cpp +++ b/kaddressbook/addresseditwidget.cpp @@ -606,7 +606,7 @@ AddressTypeDialog::AddressTypeDialog( int type, TQWidget *parent ) TQWidget *page = plainPage(); TQVBoxLayout *layout = new TQVBoxLayout( page ); - mGroup = new TQButtonGroup( 2, Qt::Horizontal, i18n( "street/postal", "Address Types" ), page ); + mGroup = new TQButtonGroup( 2, TQt::Horizontal, i18n( "street/postal", "Address Types" ), page ); layout->addWidget( mGroup ); mTypeList = TDEABC::Address::typeList(); diff --git a/kaddressbook/addresseeeditorwidget.cpp b/kaddressbook/addresseeeditorwidget.cpp index c3e2e6fb..b83e0ad7 100644 --- a/kaddressbook/addresseeeditorwidget.cpp +++ b/kaddressbook/addresseeeditorwidget.cpp @@ -558,7 +558,7 @@ void AddresseeEditorWidget::load() mBirthdayPicker->setDate( mAddressee.birthday().date() ); TQString anniversaryStr = mAddressee.custom( "KADDRESSBOOK", "X-Anniversary" ); - TQDate anniversary = (anniversaryStr.isEmpty() ? TQDate() : TQDate::fromString( anniversaryStr, Qt::ISODate )); + TQDate anniversary = (anniversaryStr.isEmpty() ? TQDate() : TQDate::fromString( anniversaryStr, TQt::ISODate )); mAnniversaryPicker->setDate( anniversary ); mNicknameEdit->setText( mAddressee.nickName() ); mCategoryEdit->setText( mAddressee.categories().join( "," ) ); @@ -652,7 +652,7 @@ void AddresseeEditorWidget::save() if ( mAnniversaryPicker->date().isValid() ) mAddressee.insertCustom( "KADDRESSBOOK", "X-Anniversary", - mAnniversaryPicker->date().toString( Qt::ISODate ) ); + mAnniversaryPicker->date().toString( TQt::ISODate ) ); else mAddressee.removeCustom( "KADDRESSBOOK", "X-Anniversary" ); diff --git a/kaddressbook/addviewdialog.cpp b/kaddressbook/addviewdialog.cpp index dbec842d..010ac72f 100644 --- a/kaddressbook/addviewdialog.cpp +++ b/kaddressbook/addviewdialog.cpp @@ -57,7 +57,7 @@ AddViewDialog::AddViewDialog( TQDict *viewFactoryDict, TQT_SLOT( textChanged( const TQString& ) ) ); layout->addWidget( mViewNameEdit, 0, 1 ); - mTypeGroup = new TQButtonGroup( 0, Qt::Horizontal, i18n( "View Type" ), page ); + mTypeGroup = new TQButtonGroup( 0, TQt::Horizontal, i18n( "View Type" ), page ); connect( mTypeGroup, TQT_SIGNAL( clicked( int ) ), this, TQT_SLOT( clicked( int ) ) ); layout->addMultiCellWidget( mTypeGroup, 1, 1, 0, 1 ); TQGridLayout *groupLayout = new TQGridLayout( mTypeGroup->layout(), 3, 2 ); diff --git a/kaddressbook/customfieldswidget.cpp b/kaddressbook/customfieldswidget.cpp index baad0c67..f597c065 100644 --- a/kaddressbook/customfieldswidget.cpp +++ b/kaddressbook/customfieldswidget.cpp @@ -276,13 +276,13 @@ void FieldWidget::loadContact( TDEABC::Addressee *addr ) wdg->setChecked( value == "true" || value == "1" ); } else if ( (*fieldIt).mWidget->isA( "TQDateEdit" ) ) { TQDateEdit *wdg = static_cast( (*fieldIt).mWidget ); - wdg->setDate( TQDate::fromString( value, Qt::ISODate ) ); + wdg->setDate( TQDate::fromString( value, TQt::ISODate ) ); } else if ( (*fieldIt).mWidget->isA( "TQTimeEdit" ) ) { TQTimeEdit *wdg = static_cast( (*fieldIt).mWidget ); - wdg->setTime( TQTime::fromString( value, Qt::ISODate ) ); + wdg->setTime( TQTime::fromString( value, TQt::ISODate ) ); } else if ( (*fieldIt).mWidget->isA( "TQDateTimeEdit" ) ) { TQDateTimeEdit *wdg = static_cast( (*fieldIt).mWidget ); - wdg->setDateTime( TQDateTime::fromString( value, Qt::ISODate ) ); + wdg->setDateTime( TQDateTime::fromString( value, TQt::ISODate ) ); } } } @@ -332,13 +332,13 @@ void FieldWidget::storeContact( TDEABC::Addressee *addr ) value = ( wdg->isChecked() ? "true" : "false" ); } else if ( (*it).mWidget->isA( "TQDateEdit" ) ) { TQDateEdit *wdg = static_cast( (*it).mWidget ); - value = wdg->date().toString( Qt::ISODate ); + value = wdg->date().toString( TQt::ISODate ); } else if ( (*it).mWidget->isA( "TQTimeEdit" ) ) { TQTimeEdit *wdg = static_cast( (*it).mWidget ); - value = wdg->time().toString( Qt::ISODate ); + value = wdg->time().toString( TQt::ISODate ); } else if ( (*it).mWidget->isA( "TQDateTimeEdit" ) ) { TQDateTimeEdit *wdg = static_cast( (*it).mWidget ); - value = wdg->dateTime().toString( Qt::ISODate ); + value = wdg->dateTime().toString( TQt::ISODate ); } if ( value.isEmpty() ) diff --git a/kaddressbook/extensionmanager.cpp b/kaddressbook/extensionmanager.cpp index 0e88486c..735ebe0c 100644 --- a/kaddressbook/extensionmanager.cpp +++ b/kaddressbook/extensionmanager.cpp @@ -52,7 +52,7 @@ ExtensionManager::ExtensionManager( TQWidget* extensionBar, TQWidgetStack* detai Q_ASSERT( mExtensionBar ); TQVBoxLayout* layout = new TQVBoxLayout( mExtensionBar ); mSplitter = new TQSplitter( mExtensionBar ); - mSplitter->setOrientation( Qt::Vertical ); + mSplitter->setOrientation( TQt::Vertical ); layout->addWidget( mSplitter ); createExtensionWidgets(); diff --git a/kaddressbook/filtereditdialog.cpp b/kaddressbook/filtereditdialog.cpp index 09c06ae4..a42cc94c 100644 --- a/kaddressbook/filtereditdialog.cpp +++ b/kaddressbook/filtereditdialog.cpp @@ -265,7 +265,7 @@ void FilterDialog::initGUI() connect( mFilterListBox, TQT_SIGNAL( doubleClicked ( TQListBoxItem * ) ), TQT_SLOT( edit() ) ); - KButtonBox *buttonBox = new KButtonBox( page, Qt::Vertical ); + KButtonBox *buttonBox = new KButtonBox( page, TQt::Vertical ); buttonBox->addButton( i18n( "&Add..." ), TQT_TQOBJECT(this), TQT_SLOT( add() ) ); mEditButton = buttonBox->addButton( i18n( "&Edit..." ), TQT_TQOBJECT(this), TQT_SLOT( edit() ) ); mEditButton->setEnabled( false ); diff --git a/kaddressbook/geowidget.cpp b/kaddressbook/geowidget.cpp index 8e9726c5..b77a34f9 100644 --- a/kaddressbook/geowidget.cpp +++ b/kaddressbook/geowidget.cpp @@ -174,7 +174,7 @@ GeoDialog::GeoDialog( TQWidget *parent, const char *name ) mCityCombo = new KComboBox( page ); topLayout->addWidget( mCityCombo, 0, 1 ); - TQGroupBox *sexagesimalGroup = new TQGroupBox( 0, Qt::Vertical, i18n( "Sexagesimal" ), page ); + TQGroupBox *sexagesimalGroup = new TQGroupBox( 0, TQt::Vertical, i18n( "Sexagesimal" ), page ); TQGridLayout *sexagesimalLayout = new TQGridLayout( sexagesimalGroup->layout(), 2, 5, spacingHint() ); diff --git a/kaddressbook/imagewidget.cpp b/kaddressbook/imagewidget.cpp index f10bf7b2..b20fbfd4 100644 --- a/kaddressbook/imagewidget.cpp +++ b/kaddressbook/imagewidget.cpp @@ -206,7 +206,7 @@ void ImageButton::mousePressEvent( TQMouseEvent *event ) void ImageButton::mouseMoveEvent( TQMouseEvent *event ) { - if ( (event->state() & Qt::LeftButton) && + if ( (event->state() & TQt::LeftButton) && (event->pos() - mDragStartPos).manhattanLength() > TDEGlobalSettings::dndEventDelay() ) { startDrag(); @@ -254,7 +254,7 @@ ImageBaseWidget::ImageBaseWidget( const TQString &title, TQVBoxLayout *topLayout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() ); - TQGroupBox *box = new TQGroupBox( 0, Qt::Vertical, title, this ); + TQGroupBox *box = new TQGroupBox( 0, TQt::Vertical, title, this ); TQVBoxLayout *layout = new TQVBoxLayout( box->layout(), KDialog::spacingHint() ); mImageButton = new ImageButton( i18n( "Picture" ), box ); diff --git a/kaddressbook/jumpbuttonbar.cpp b/kaddressbook/jumpbuttonbar.cpp index 878fff5d..def1896f 100644 --- a/kaddressbook/jumpbuttonbar.cpp +++ b/kaddressbook/jumpbuttonbar.cpp @@ -72,7 +72,7 @@ JumpButtonBar::JumpButtonBar( KAB::Core *core, TQWidget *parent, const char *nam layout->setAutoAdd( true ); layout->setResizeMode( TQLayout::FreeResize ); - mGroupBox = new TQButtonGroup( 1, Qt::Horizontal, this ); + mGroupBox = new TQButtonGroup( 1, TQt::Horizontal, this ); mGroupBox->setExclusive( true ); mGroupBox->layout()->setSpacing( 0 ); mGroupBox->layout()->setMargin( 0 ); diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index 2f60f046..cdd0a7c7 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp @@ -1205,7 +1205,7 @@ void KABCore::initGUI() mDetailsSplitter = new TQSplitter( mWidget ); mLeftSplitter = new TQSplitter( mDetailsSplitter ); - mLeftSplitter->setOrientation( KABPrefs::instance()->contactListAboveExtensions() ? Qt::Vertical : Qt::Horizontal ); + mLeftSplitter->setOrientation( KABPrefs::instance()->contactListAboveExtensions() ? TQt::Vertical : TQt::Horizontal ); topLayout->addWidget( searchTB ); topLayout->addWidget( mDetailsSplitter ); diff --git a/kaddressbook/kcmconfigs/addresseewidget.cpp b/kaddressbook/kcmconfigs/addresseewidget.cpp index ad1364f5..b446d56e 100644 --- a/kaddressbook/kcmconfigs/addresseewidget.cpp +++ b/kaddressbook/kcmconfigs/addresseewidget.cpp @@ -46,7 +46,7 @@ NamePartWidget::NamePartWidget( const TQString &title, const TQString &label, { TQHBoxLayout *layout = new TQHBoxLayout( this ); - TQGroupBox *group = new TQGroupBox( 0, Qt::Vertical, title, this ); + TQGroupBox *group = new TQGroupBox( 0, TQt::Vertical, title, this ); TQGridLayout *groupLayout = new TQGridLayout( group->layout(), 2, 2, KDialog::spacingHint() ); @@ -55,7 +55,7 @@ NamePartWidget::NamePartWidget( const TQString &title, const TQString &label, TQT_SLOT( selectionChanged( TQListBoxItem* ) ) ); groupLayout->addWidget( mBox, 0, 0 ); - KButtonBox *bbox = new KButtonBox( group, Qt::Vertical ); + KButtonBox *bbox = new KButtonBox( group, TQt::Vertical ); mAddButton = bbox->addButton( i18n( "Add..." ), TQT_TQOBJECT(this), TQT_SLOT( add() ) ); mEditButton = bbox->addButton( i18n( "Edit..." ), TQT_TQOBJECT(this), TQT_SLOT( edit() ) ); mEditButton->setEnabled( false ); diff --git a/kaddressbook/kcmconfigs/kabconfigwidget.cpp b/kaddressbook/kcmconfigs/kabconfigwidget.cpp index b41bdf84..97e5c119 100644 --- a/kaddressbook/kcmconfigs/kabconfigwidget.cpp +++ b/kaddressbook/kcmconfigs/kabconfigwidget.cpp @@ -59,7 +59,7 @@ KABConfigWidget::KABConfigWidget( TQWidget *parent, const char *name ) TQVBoxLayout *layout = new TQVBoxLayout( generalPage, KDialog::marginHint(), KDialog::spacingHint() ); - TQGroupBox *groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "General" ), generalPage ); + TQGroupBox *groupBox = new TQGroupBox( 0, TQt::Vertical, i18n( "General" ), generalPage ); TQBoxLayout *boxLayout = new TQVBoxLayout( groupBox->layout() ); boxLayout->setAlignment( TQt::AlignTop ); @@ -96,7 +96,7 @@ KABConfigWidget::KABConfigWidget( TQWidget *parent, const char *name ) layout->addWidget( groupBox ); - groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Script-Hooks" ), generalPage ); + groupBox = new TQGroupBox( 0, TQt::Vertical, i18n( "Script-Hooks" ), generalPage ); TQGridLayout *grid = new TQGridLayout( groupBox->layout(), 3, 2, KDialog::spacingHint() ); label = new TQLabel( i18n( "Phone:" ), groupBox ); @@ -126,7 +126,7 @@ KABConfigWidget::KABConfigWidget( TQWidget *parent, const char *name ) layout->addWidget( groupBox ); - groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Location Map" ), generalPage ); + groupBox = new TQGroupBox( 0, TQt::Vertical, i18n( "Location Map" ), generalPage ); boxLayout = new TQVBoxLayout( groupBox->layout(), KDialog::spacingHint() ); boxLayout->setAlignment( TQt::AlignTop ); diff --git a/kaddressbook/ldapsearchdialog.cpp b/kaddressbook/ldapsearchdialog.cpp index 4b01cf6f..8c2c7c6b 100644 --- a/kaddressbook/ldapsearchdialog.cpp +++ b/kaddressbook/ldapsearchdialog.cpp @@ -152,7 +152,7 @@ LDAPSearchDialog::LDAPSearchDialog( TDEABC::AddressBook *ab, KABCore *core, page ); groupBox->setFrameShape( TQGroupBox::Box ); groupBox->setFrameShadow( TQGroupBox::Sunken ); - groupBox->setColumnLayout( 0, Qt::Vertical ); + groupBox->setColumnLayout( 0, TQt::Vertical ); TQGridLayout *boxLayout = new TQGridLayout( groupBox->layout(), 2, 5, spacingHint() ); boxLayout->setColStretch( 1, 1 ); @@ -202,7 +202,7 @@ LDAPSearchDialog::LDAPSearchDialog( TDEABC::AddressBook *ab, KABCore *core, mResultListView->setShowSortIndicator( true ); topLayout->addWidget( mResultListView ); - KButtonBox *buttons = new KButtonBox( page, Qt::Horizontal ); + KButtonBox *buttons = new KButtonBox( page, TQt::Horizontal ); buttons->addButton( i18n( "Select All" ), TQT_TQOBJECT(this), TQT_SLOT( slotSelectAll() ) ); buttons->addButton( i18n( "Unselect All" ), TQT_TQOBJECT(this), TQT_SLOT( slotUnselectAll() ) ); diff --git a/kaddressbook/phoneeditwidget.cpp b/kaddressbook/phoneeditwidget.cpp index 80f45cff..963af05a 100644 --- a/kaddressbook/phoneeditwidget.cpp +++ b/kaddressbook/phoneeditwidget.cpp @@ -303,7 +303,7 @@ PhoneTypeDialog::PhoneTypeDialog( int type, TQWidget *parent ) mPreferredBox = new TQCheckBox( i18n( "This is the preferred phone number" ), page ); layout->addWidget( mPreferredBox ); - mGroup = new TQButtonGroup( 2, Qt::Horizontal, i18n( "Types" ), page ); + mGroup = new TQButtonGroup( 2, TQt::Horizontal, i18n( "Types" ), page ); layout->addWidget( mGroup ); // fill widgets diff --git a/kaddressbook/printing/selectionpage.cpp b/kaddressbook/printing/selectionpage.cpp index 39b1c4a8..060f839c 100644 --- a/kaddressbook/printing/selectionpage.cpp +++ b/kaddressbook/printing/selectionpage.cpp @@ -51,7 +51,7 @@ SelectionPage::SelectionPage( TQWidget* parent, const char* name ) mButtonGroup = new TQButtonGroup( this ); mButtonGroup->setFrameShape( TQButtonGroup::NoFrame ); - mButtonGroup->setColumnLayout( 0, Qt::Vertical ); + mButtonGroup->setColumnLayout( 0, TQt::Vertical ); mButtonGroup->layout()->setSpacing( KDialog::spacingHint() ); mButtonGroup->layout()->setMargin( KDialog::marginHint() ); diff --git a/kaddressbook/printing/stylepage.cpp b/kaddressbook/printing/stylepage.cpp index 0df14931..fc66e147 100644 --- a/kaddressbook/printing/stylepage.cpp +++ b/kaddressbook/printing/stylepage.cpp @@ -121,7 +121,7 @@ void StylePage::initGUI() topLayout->addMultiCellWidget( label, 0, 0, 0, 1 ); TQButtonGroup *group = new TQButtonGroup( i18n( "Sorting" ), this ); - group->setColumnLayout( 0, Qt::Vertical ); + group->setColumnLayout( 0, TQt::Vertical ); TQGridLayout *sortLayout = new TQGridLayout( group->layout(), 2, 2, KDialog::spacingHint() ); sortLayout->setAlignment( TQt::AlignTop ); @@ -141,7 +141,7 @@ void StylePage::initGUI() topLayout->addWidget( group, 1, 0 ); group = new TQButtonGroup( i18n( "Print Style" ), this ); - group->setColumnLayout( 0, Qt::Vertical ); + group->setColumnLayout( 0, TQt::Vertical ); TQVBoxLayout *styleLayout = new TQVBoxLayout( group->layout(), KDialog::spacingHint() ); diff --git a/kaddressbook/views/cardview.cpp b/kaddressbook/views/cardview.cpp index ecff8414..47181557 100644 --- a/kaddressbook/views/cardview.cpp +++ b/kaddressbook/views/cardview.cpp @@ -1022,7 +1022,7 @@ void CardView::contentsMousePressEvent( TQMouseEvent *e ) emit clicked( item ); // The RMB click - if ( e->button() & Qt::RightButton ) { + if ( e->button() & TQt::RightButton ) { // clear previous selection bool blocked = signalsBlocked(); blockSignals( true ); @@ -1056,7 +1056,7 @@ void CardView::contentsMousePressEvent( TQMouseEvent *e ) item->repaintCard(); emit selectionChanged(); } else if ( d->mSelectionMode == CardView::Extended ) { - if ( (e->button() & Qt::LeftButton) && (e->state() & TQt::ShiftButton) ) { + if ( (e->button() & TQt::LeftButton) && (e->state() & TQt::ShiftButton) ) { if ( item == other ) return; @@ -1083,11 +1083,11 @@ void CardView::contentsMousePressEvent( TQMouseEvent *e ) } emit selectionChanged(); - } else if ( (e->button() & Qt::LeftButton) && (e->state() & TQt::ControlButton) ) { + } else if ( (e->button() & TQt::LeftButton) && (e->state() & TQt::ControlButton) ) { item->setSelected( !item->isSelected() ); item->repaintCard(); emit selectionChanged(); - } else if ( e->button() & Qt::LeftButton ) { + } else if ( e->button() & TQt::LeftButton ) { bool b = signalsBlocked(); blockSignals( true ); selectAll( false ); @@ -1158,7 +1158,7 @@ void CardView::contentsMouseMoveEvent( TQMouseEvent *e ) return; } - if ( d->mLastClickOnItem && (e->state() & Qt::LeftButton) && + if ( d->mLastClickOnItem && (e->state() & TQt::LeftButton) && ((e->pos() - d->mLastClickPos).manhattanLength() > 4)) { startDrag(); diff --git a/kaddressbook/views/configurecardviewdialog.cpp b/kaddressbook/views/configurecardviewdialog.cpp index 2fe22f8c..30925303 100644 --- a/kaddressbook/views/configurecardviewdialog.cpp +++ b/kaddressbook/views/configurecardviewdialog.cpp @@ -201,7 +201,7 @@ void CardViewLookNFeelPage::initGUI() loTab->setSpacing( spacing ); loTab->setMargin( margin ); - TQGroupBox *gbGeneral = new TQGroupBox( 1, Qt::Horizontal, i18n("General"), loTab ); + TQGroupBox *gbGeneral = new TQGroupBox( 1, TQt::Horizontal, i18n("General"), loTab ); cbDrawSeps = new TQCheckBox( i18n("Draw &separators"), gbGeneral ); @@ -215,7 +215,7 @@ void CardViewLookNFeelPage::initGUI() sbSpacing = new TQSpinBox( 0, 100, 1, hbPadding ); lSpacing->setBuddy( sbSpacing ); - TQGroupBox *gbCards = new TQGroupBox( 1, Qt::Horizontal, i18n("Cards"), loTab ); + TQGroupBox *gbCards = new TQGroupBox( 1, TQt::Horizontal, i18n("Cards"), loTab ); TQHBox *hbMargin = new TQHBox( gbCards ); TQLabel *lMargin = new TQLabel( i18n("&Margin:"), hbMargin ); diff --git a/kaddressbook/views/configuretableviewdialog.cpp b/kaddressbook/views/configuretableviewdialog.cpp index 1bd70c29..c4e6cf7b 100644 --- a/kaddressbook/views/configuretableviewdialog.cpp +++ b/kaddressbook/views/configuretableviewdialog.cpp @@ -113,7 +113,7 @@ void LookAndFeelPage::initGUI() { TQVBoxLayout *layout = new TQVBoxLayout(this, 0, KDialogBase::spacingHint()); - TQButtonGroup *group = new TQButtonGroup(1, Qt::Horizontal, + TQButtonGroup *group = new TQButtonGroup(1, TQt::Horizontal, i18n("Row Separator"), this); layout->addWidget(group); diff --git a/kaddressbook/views/contactlistview.cpp b/kaddressbook/views/contactlistview.cpp index 3a01974b..715757e8 100644 --- a/kaddressbook/views/contactlistview.cpp +++ b/kaddressbook/views/contactlistview.cpp @@ -314,7 +314,7 @@ void ContactListView::contentsMousePressEvent(TQMouseEvent* e) // To initiate a drag operation void ContactListView::contentsMouseMoveEvent( TQMouseEvent *e ) { - if ((e->state() & Qt::LeftButton) && (e->pos() - presspos).manhattanLength() > 4 ) { + if ((e->state() & TQt::LeftButton) && (e->pos() - presspos).manhattanLength() > 4 ) { emit startAddresseeDrag(); } else diff --git a/kaddressbook/xxport/csvimportdialog.cpp b/kaddressbook/xxport/csvimportdialog.cpp index 091d277f..63989199 100644 --- a/kaddressbook/xxport/csvimportdialog.cpp +++ b/kaddressbook/xxport/csvimportdialog.cpp @@ -383,7 +383,7 @@ void CSVImportDialog::initGUI() // Delimiter: comma, semicolon, tab, space, other mDelimiterBox = new TQButtonGroup( i18n( "Delimiter" ), mPage ); - mDelimiterBox->setColumnLayout( 0, Qt::Vertical ); + mDelimiterBox->setColumnLayout( 0, TQt::Vertical ); mDelimiterBox->layout()->setSpacing( spacingHint() ); mDelimiterBox->layout()->setMargin( marginHint() ); TQGridLayout *delimiterLayout = new TQGridLayout( mDelimiterBox->layout() ); diff --git a/kaddressbook/xxportselectdialog.cpp b/kaddressbook/xxportselectdialog.cpp index b6849aac..b52b41ad 100644 --- a/kaddressbook/xxportselectdialog.cpp +++ b/kaddressbook/xxportselectdialog.cpp @@ -186,7 +186,7 @@ void XXPortSelectDialog::initGUI() topLayout->addWidget( label ); mButtonGroup = new TQButtonGroup( i18n( "Selection" ), page ); - mButtonGroup->setColumnLayout( 0, Qt::Vertical ); + mButtonGroup->setColumnLayout( 0, TQt::Vertical ); mButtonGroup->layout()->setSpacing( KDialog::spacingHint() ); mButtonGroup->layout()->setMargin( KDialog::marginHint() ); @@ -225,7 +225,7 @@ void XXPortSelectDialog::initGUI() topLayout->addWidget( mButtonGroup ); TQButtonGroup *sortingGroup = new TQButtonGroup( i18n( "Sorting" ), page ); - sortingGroup->setColumnLayout( 0, Qt::Vertical ); + sortingGroup->setColumnLayout( 0, TQt::Vertical ); TQGridLayout *sortLayout = new TQGridLayout( sortingGroup->layout(), 2, 2, KDialog::spacingHint() ); sortLayout->setAlignment( TQt::AlignTop ); diff --git a/kalarm/alarmlistview.cpp b/kalarm/alarmlistview.cpp index 6d7e5f9e..a436e3d0 100644 --- a/kalarm/alarmlistview.cpp +++ b/kalarm/alarmlistview.cpp @@ -348,7 +348,7 @@ TQString AlarmListView::whatsThisText(int column) const void AlarmListView::contentsMousePressEvent(TQMouseEvent* e) { TQListView::contentsMousePressEvent(e); - if (e->button() == Qt::LeftButton) + if (e->button() == TQt::LeftButton) { TQPoint p(contentsToViewport(e->pos())); if (itemAt(p)) diff --git a/kalarm/birthdaydlg.cpp b/kalarm/birthdaydlg.cpp index c98a9987..322d6fb3 100644 --- a/kalarm/birthdaydlg.cpp +++ b/kalarm/birthdaydlg.cpp @@ -85,7 +85,7 @@ BirthdayDlg::BirthdayDlg(TQWidget* parent) mPrefixText = config->readEntry(TQString::fromLatin1("BirthdayPrefix"), i18n("Birthday: ")); mSuffixText = config->readEntry(TQString::fromLatin1("BirthdaySuffix")); - TQGroupBox* textGroup = new TQGroupBox(2, Qt::Horizontal, i18n("Alarm Text"), topWidget); + TQGroupBox* textGroup = new TQGroupBox(2, TQt::Horizontal, i18n("Alarm Text"), topWidget); topLayout->addWidget(textGroup); TQLabel* label = new TQLabel(i18n("Pre&fix:"), textGroup); mPrefix = new BLineEdit(mPrefixText, textGroup); @@ -105,7 +105,7 @@ BirthdayDlg::BirthdayDlg(TQWidget* parent) i18n("Enter text to appear after the person's name in the alarm message, " "including any necessary leading spaces.")); - TQGroupBox* group = new TQGroupBox(1, Qt::Horizontal, i18n("Select Birthdays"), topWidget); + TQGroupBox* group = new TQGroupBox(1, TQt::Horizontal, i18n("Select Birthdays"), topWidget); topLayout->addWidget(group); mAddresseeList = new BListView(group); mAddresseeList->setMultiSelection(true); diff --git a/kalarm/dcophandler.cpp b/kalarm/dcophandler.cpp index 5fa716e1..45eddac6 100644 --- a/kalarm/dcophandler.cpp +++ b/kalarm/dcophandler.cpp @@ -323,7 +323,7 @@ DateTime DcopHandler::convertStartDateTime(const TQString& startDateTime) if (startDateTime.length() > 10) { // Both a date and a time are specified - start = TQDateTime::fromString(startDateTime, Qt::ISODate); + start = TQDateTime::fromString(startDateTime, TQt::ISODate); } else { @@ -337,12 +337,12 @@ DateTime DcopHandler::convertStartDateTime(const TQString& startDateTime) if (t.isEmpty()) { // It's a date - start = TQDate::fromString(startDateTime, Qt::ISODate); + start = TQDate::fromString(startDateTime, TQt::ISODate); } else { // It's a time, so use today as the date - start.set(TQDate::currentDate(), TQTime::fromString(t, Qt::ISODate)); + start.set(TQDate::currentDate(), TQTime::fromString(t, TQt::ISODate)); } } if (!start.isValid()) @@ -424,7 +424,7 @@ bool DcopHandler::convertRecurrence(DateTime& start, KARecurrence& recurrence, c kdError(5950) << "DCOP call: alarm is date-only, but recurrence end is date/time" << endl; return false; } - end.setDate(TQDate::fromString(endDateTime, Qt::ISODate)); + end.setDate(TQDate::fromString(endDateTime, TQt::ISODate)); } else { @@ -433,7 +433,7 @@ bool DcopHandler::convertRecurrence(DateTime& start, KARecurrence& recurrence, c kdError(5950) << "DCOP call: alarm is timed, but recurrence end is date-only" << endl; return false; } - end = TQDateTime::fromString(endDateTime, Qt::ISODate); + end = TQDateTime::fromString(endDateTime, TQt::ISODate); } if (!end.isValid()) { diff --git a/kalarm/editdlg.cpp b/kalarm/editdlg.cpp index ff35e918..5ceb16e1 100644 --- a/kalarm/editdlg.cpp +++ b/kalarm/editdlg.cpp @@ -273,7 +273,7 @@ EditAlarmDlg::EditAlarmDlg(bool Template, const TQString& caption, TQWidget* par layout->addWidget(mEmailFrame); // Deferred date/time: visible only for a deferred recurring event. - mDeferGroup = new TQGroupBox(1, Qt::Vertical, i18n("Deferred Alarm"), mainPage, "deferGroup"); + mDeferGroup = new TQGroupBox(1, TQt::Vertical, i18n("Deferred Alarm"), mainPage, "deferGroup"); topLayout->addWidget(mDeferGroup); TQLabel* label = new TQLabel(i18n("Deferred to:"), mDeferGroup); label->setFixedSize(label->sizeHint()); diff --git a/kalarm/emailidcombo.cpp b/kalarm/emailidcombo.cpp index 99f754c8..88cf3900 100644 --- a/kalarm/emailidcombo.cpp +++ b/kalarm/emailidcombo.cpp @@ -31,7 +31,7 @@ void EmailIdCombo::mousePressEvent(TQMouseEvent* e) if (mReadOnly) { // Swallow up the event if it's the left button - if (e->button() == Qt::LeftButton) + if (e->button() == TQt::LeftButton) return; } KPIM::IdentityCombo::mousePressEvent(e); diff --git a/kalarm/find.cpp b/kalarm/find.cpp index 8e35cbe9..8882b6b2 100644 --- a/kalarm/find.cpp +++ b/kalarm/find.cpp @@ -113,7 +113,7 @@ void Find::display() "This option is only available if expired alarms are currently being displayed.")); grid->addWidget(mExpired, 1, 2, TQt::AlignAuto); - mActiveExpiredSep = new KSeparator(Qt::Horizontal, kalarmWidgets); + mActiveExpiredSep = new KSeparator(TQt::Horizontal, kalarmWidgets); grid->addMultiCellWidget(mActiveExpiredSep, 2, 2, 0, 2); // Alarm actions diff --git a/kalarm/lib/buttongroup.cpp b/kalarm/lib/buttongroup.cpp index 01864012..e3d47e41 100644 --- a/kalarm/lib/buttongroup.cpp +++ b/kalarm/lib/buttongroup.cpp @@ -38,13 +38,13 @@ ButtonGroup::ButtonGroup(const TQString& title, TQWidget* parent, const char* na connect(this, TQT_SIGNAL(clicked(int)), TQT_SIGNAL(buttonSet(int))); } -ButtonGroup::ButtonGroup(int strips, Qt::Orientation orient, TQWidget* parent, const char* name) +ButtonGroup::ButtonGroup(int strips, TQt::Orientation orient, TQWidget* parent, const char* name) : TQButtonGroup(strips, orient, parent, name) { connect(this, TQT_SIGNAL(clicked(int)), TQT_SIGNAL(buttonSet(int))); } -ButtonGroup::ButtonGroup(int strips, Qt::Orientation orient, const TQString& title, TQWidget* parent, const char* name) +ButtonGroup::ButtonGroup(int strips, TQt::Orientation orient, const TQString& title, TQWidget* parent, const char* name) : TQButtonGroup(strips, orient, title, parent, name) { connect(this, TQT_SIGNAL(clicked(int)), TQT_SIGNAL(buttonSet(int))); diff --git a/kalarm/lib/buttongroup.h b/kalarm/lib/buttongroup.h index 1f72bda7..f26ab26d 100644 --- a/kalarm/lib/buttongroup.h +++ b/kalarm/lib/buttongroup.h @@ -57,7 +57,7 @@ class ButtonGroup : public TQButtonGroup * @param parent The parent object of this widget. * @param name The name of this widget. */ - ButtonGroup(int strips, Qt::Orientation orient, TQWidget* parent, const char* name = 0); + ButtonGroup(int strips, TQt::Orientation orient, TQWidget* parent, const char* name = 0); /** Constructor. * @param strips The number of rows or columns of buttons. * @param orient The orientation (TQt::Horizontal or TQt::Vertical) of the button group. @@ -65,7 +65,7 @@ class ButtonGroup : public TQButtonGroup * @param parent The parent object of this widget. * @param name The name of this widget. */ - ButtonGroup(int strips, Qt::Orientation orient, const TQString& title, TQWidget* parent, const char* name = 0); + ButtonGroup(int strips, TQt::Orientation orient, const TQString& title, TQWidget* parent, const char* name = 0); /** Inserts a button in the group. * This overrides the insert() method of TQButtonGroup, which should really be a virtual method... * @param button The button to insert. diff --git a/kalarm/lib/checkbox.cpp b/kalarm/lib/checkbox.cpp index b4b56bc1..a1f594bc 100644 --- a/kalarm/lib/checkbox.cpp +++ b/kalarm/lib/checkbox.cpp @@ -86,7 +86,7 @@ void CheckBox::mousePressEvent(TQMouseEvent* e) if (mReadOnly) { // Swallow up the event if it's the left button - if (e->button() == Qt::LeftButton) + if (e->button() == TQt::LeftButton) return; } TQCheckBox::mousePressEvent(e); @@ -97,7 +97,7 @@ void CheckBox::mouseReleaseEvent(TQMouseEvent* e) if (mReadOnly) { // Swallow up the event if it's the left button - if (e->button() == Qt::LeftButton) + if (e->button() == TQt::LeftButton) return; } TQCheckBox::mouseReleaseEvent(e); diff --git a/kalarm/lib/colourcombo.cpp b/kalarm/lib/colourcombo.cpp index 625933c7..c859ac6c 100644 --- a/kalarm/lib/colourcombo.cpp +++ b/kalarm/lib/colourcombo.cpp @@ -208,7 +208,7 @@ void ColourCombo::mousePressEvent(TQMouseEvent* e) if (mReadOnly) { // Swallow up the event if it's the left button - if (e->button() == Qt::LeftButton) + if (e->button() == TQt::LeftButton) return; } TQComboBox::mousePressEvent(e); diff --git a/kalarm/lib/combobox.cpp b/kalarm/lib/combobox.cpp index 99577506..253881f5 100644 --- a/kalarm/lib/combobox.cpp +++ b/kalarm/lib/combobox.cpp @@ -47,7 +47,7 @@ void ComboBox::mousePressEvent(TQMouseEvent* e) if (mReadOnly) { // Swallow up the event if it's the left button - if (e->button() == Qt::LeftButton) + if (e->button() == TQt::LeftButton) return; } TQComboBox::mousePressEvent(e); diff --git a/kalarm/lib/dateedit.cpp b/kalarm/lib/dateedit.cpp index 29475f71..051e3a64 100644 --- a/kalarm/lib/dateedit.cpp +++ b/kalarm/lib/dateedit.cpp @@ -91,7 +91,7 @@ void DateEdit::mousePressEvent(TQMouseEvent *e) if (isReadOnly()) { // Swallow up the event if it's the left button - if (e->button() == Qt::LeftButton) + if (e->button() == TQt::LeftButton) return; } KDateEdit::mousePressEvent(e); diff --git a/kalarm/lib/datetime.h b/kalarm/lib/datetime.h index d75aa94d..6b620494 100644 --- a/kalarm/lib/datetime.h +++ b/kalarm/lib/datetime.h @@ -169,7 +169,7 @@ class DateTime * If it is a date-time, both time and date are included in the output. * If it is date-only, only the date is included in the output. */ - TQString toString(Qt::DateFormat f = Qt::TextDate) const + TQString toString(TQt::DateFormat f = TQt::TextDate) const { if (mDateOnly) return mDateTime.date().toString(f); diff --git a/kalarm/lib/pushbutton.cpp b/kalarm/lib/pushbutton.cpp index be39e801..d47c1d9f 100644 --- a/kalarm/lib/pushbutton.cpp +++ b/kalarm/lib/pushbutton.cpp @@ -55,7 +55,7 @@ void PushButton::mousePressEvent(TQMouseEvent* e) if (mReadOnly) { // Swallow up the event if it's the left button - if (e->button() == Qt::LeftButton) + if (e->button() == TQt::LeftButton) return; } TQPushButton::mousePressEvent(e); @@ -66,7 +66,7 @@ void PushButton::mouseReleaseEvent(TQMouseEvent* e) if (mReadOnly) { // Swallow up the event if it's the left button - if (e->button() == Qt::LeftButton) + if (e->button() == TQt::LeftButton) return; } TQPushButton::mouseReleaseEvent(e); diff --git a/kalarm/lib/radiobutton.cpp b/kalarm/lib/radiobutton.cpp index 8eae0825..e9f60430 100644 --- a/kalarm/lib/radiobutton.cpp +++ b/kalarm/lib/radiobutton.cpp @@ -86,7 +86,7 @@ void RadioButton::mousePressEvent(TQMouseEvent* e) if (mReadOnly) { // Swallow up the event if it's the left button - if (e->button() == Qt::LeftButton) + if (e->button() == TQt::LeftButton) return; } TQRadioButton::mousePressEvent(e); @@ -97,7 +97,7 @@ void RadioButton::mouseReleaseEvent(TQMouseEvent* e) if (mReadOnly) { // Swallow up the event if it's the left button - if (e->button() == Qt::LeftButton) + if (e->button() == TQt::LeftButton) return; } TQRadioButton::mouseReleaseEvent(e); diff --git a/kalarm/lib/slider.cpp b/kalarm/lib/slider.cpp index 189c8941..5ee7a65a 100644 --- a/kalarm/lib/slider.cpp +++ b/kalarm/lib/slider.cpp @@ -26,12 +26,12 @@ Slider::Slider(TQWidget* parent, const char* name) mReadOnly(false) { } -Slider::Slider(Qt::Orientation o, TQWidget* parent, const char* name) +Slider::Slider(TQt::Orientation o, TQWidget* parent, const char* name) : TQSlider(o, parent, name), mReadOnly(false) { } -Slider::Slider(int minval, int maxval, int pageStep, int value, Qt::Orientation o, TQWidget* parent, const char* name) +Slider::Slider(int minval, int maxval, int pageStep, int value, TQt::Orientation o, TQWidget* parent, const char* name) : TQSlider(minval, maxval, pageStep, value, o, parent, name), mReadOnly(false) { } @@ -54,7 +54,7 @@ void Slider::mousePressEvent(TQMouseEvent* e) if (mReadOnly) { // Swallow up the event if it's the left button - if (e->button() == Qt::LeftButton) + if (e->button() == TQt::LeftButton) return; } TQSlider::mousePressEvent(e); diff --git a/kalarm/lib/slider.h b/kalarm/lib/slider.h index bb13dc76..dc36e3ce 100644 --- a/kalarm/lib/slider.h +++ b/kalarm/lib/slider.h @@ -50,7 +50,7 @@ class Slider : public TQSlider * @param parent The parent object of this widget. * @param name The name of this widget. */ - explicit Slider(Qt::Orientation orient, TQWidget* parent = 0, const char* name = 0); + explicit Slider(TQt::Orientation orient, TQWidget* parent = 0, const char* name = 0); /** Constructor. * @param minValue The minimum value which the slider can have. * @param maxValue The maximum value which the slider can have. @@ -60,7 +60,7 @@ class Slider : public TQSlider * @param parent The parent object of this widget. * @param name The name of this widget. */ - Slider(int minValue, int maxValue, int pageStep, int value, Qt::Orientation orient, + Slider(int minValue, int maxValue, int pageStep, int value, TQt::Orientation orient, TQWidget* parent = 0, const char* name = 0); /** Returns true if the slider is read only. */ bool isReadOnly() const { return mReadOnly; } diff --git a/kalarm/lib/spinbox.cpp b/kalarm/lib/spinbox.cpp index b250b9aa..80adc6d8 100644 --- a/kalarm/lib/spinbox.cpp +++ b/kalarm/lib/spinbox.cpp @@ -263,7 +263,7 @@ bool SpinBox::eventFilter(TQObject* obj, TQEvent* e) case TQEvent::MouseButtonDblClick: { TQMouseEvent* me = (TQMouseEvent*)e; - if (me->button() == Qt::LeftButton) + if (me->button() == TQt::LeftButton) { // It's a left button press. Set normal or shift stepping as appropriate. if (mReadOnly) @@ -281,7 +281,7 @@ bool SpinBox::eventFilter(TQObject* obj, TQEvent* e) case TQEvent::MouseButtonRelease: { TQMouseEvent* me = (TQMouseEvent*)e; - if (me->button() == Qt::LeftButton && mShiftMouse) + if (me->button() == TQt::LeftButton && mShiftMouse) { setShiftStepping(false, mCurrentButton); // cancel shift stepping return false; // forward event to the destination widget @@ -291,7 +291,7 @@ bool SpinBox::eventFilter(TQObject* obj, TQEvent* e) case TQEvent::MouseMove: { TQMouseEvent* me = (TQMouseEvent*)e; - if (me->state() & Qt::LeftButton) + if (me->state() & TQt::LeftButton) { // The left button is down. Track which spin button it's in. if (mReadOnly) @@ -325,7 +325,7 @@ bool SpinBox::eventFilter(TQObject* obj, TQEvent* e) TQKeyEvent* ke = (TQKeyEvent*)e; int key = ke->key(); int state = ke->state(); - if ((state & Qt::LeftButton) + if ((state & TQt::LeftButton) && (key == TQt::Key_Shift || key == TQt::Key_Alt)) { // The left mouse button is down, and the Shift or Alt key has changed diff --git a/kalarm/mainwindow.cpp b/kalarm/mainwindow.cpp index d0791216..b2f6d420 100644 --- a/kalarm/mainwindow.cpp +++ b/kalarm/mainwindow.cpp @@ -1350,7 +1350,7 @@ void MainWindow::slotContextMenuRequested(TQListViewItem* item, const TQPoint& p */ void MainWindow::slotMouseClicked(int button, TQListViewItem* item, const TQPoint& pt, int) { - if (button != Qt::RightButton && !item) + if (button != TQt::RightButton && !item) { kdDebug(5950) << "MainWindow::slotMouseClicked(left)" << endl; mListView->clearSelection(); diff --git a/kalarm/recurrenceedit.cpp b/kalarm/recurrenceedit.cpp index 11133253..7c04c1db 100644 --- a/kalarm/recurrenceedit.cpp +++ b/kalarm/recurrenceedit.cpp @@ -103,7 +103,7 @@ RecurrenceEdit::RecurrenceEdit(bool readOnly, TQWidget* parent, const char* name * selection of its corresponding radio button. */ - TQGroupBox* recurGroup = new TQGroupBox(1, Qt::Vertical, i18n("Recurrence Rule"), this, "recurGroup"); + TQGroupBox* recurGroup = new TQGroupBox(1, TQt::Vertical, i18n("Recurrence Rule"), this, "recurGroup"); topLayout->addWidget(recurGroup); TQFrame* ruleFrame = new TQFrame(recurGroup, "ruleFrame"); layout = new TQVBoxLayout(ruleFrame, 0); @@ -111,7 +111,7 @@ RecurrenceEdit::RecurrenceEdit(bool readOnly, TQWidget* parent, const char* name layout = new TQHBoxLayout(layout, 0); TQBoxLayout* lay = new TQVBoxLayout(layout, 0); - mRuleButtonGroup = new ButtonGroup(1, Qt::Horizontal, ruleFrame); + mRuleButtonGroup = new ButtonGroup(1, TQt::Horizontal, ruleFrame); mRuleButtonGroup->setInsideMargin(0); mRuleButtonGroup->setFrameStyle(TQFrame::NoFrame); lay->addWidget(mRuleButtonGroup); diff --git a/kalarm/sounddlg.cpp b/kalarm/sounddlg.cpp index cb539512..d7dc7738 100644 --- a/kalarm/sounddlg.cpp +++ b/kalarm/sounddlg.cpp @@ -133,7 +133,7 @@ SoundDlg::SoundDlg(const TQString& file, float volume, float fadeVolume, int fad i18n("Select to choose the volume for playing the sound file.")); // Volume slider - mVolumeSlider = new Slider(0, 100, 10, 0, Qt::Horizontal, box); + mVolumeSlider = new Slider(0, 100, 10, 0, TQt::Horizontal, box); mVolumeSlider->setTickmarks(TQSlider::Below); mVolumeSlider->setTickInterval(10); mVolumeSlider->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed)); @@ -168,7 +168,7 @@ SoundDlg::SoundDlg(const TQString& file, float volume, float fadeVolume, int fad grid->addWidget(mFadeVolumeBox, 4, 2); label = new TQLabel(i18n("Initial volume:"), mFadeVolumeBox); label->setFixedSize(label->sizeHint()); - mFadeSlider = new Slider(0, 100, 10, 0, Qt::Horizontal, mFadeVolumeBox); + mFadeSlider = new Slider(0, 100, 10, 0, TQt::Horizontal, mFadeVolumeBox); mFadeSlider->setTickmarks(TQSlider::Below); mFadeSlider->setTickInterval(10); mFadeSlider->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed)); diff --git a/kalarm/traywindow.cpp b/kalarm/traywindow.cpp index 93afa2e5..9e06c44c 100644 --- a/kalarm/traywindow.cpp +++ b/kalarm/traywindow.cpp @@ -173,12 +173,12 @@ void TrayWindow::setEnabledStatus(bool status) */ void TrayWindow::mousePressEvent(TQMouseEvent* e) { - if (e->button() == Qt::LeftButton && !theApp()->wantRunInSystemTray()) + if (e->button() == TQt::LeftButton && !theApp()->wantRunInSystemTray()) { // Left click: display/hide the first main window mAssocMainWindow = MainWindow::toggleWindow(mAssocMainWindow); } - else if (e->button() == Qt::MidButton) + else if (e->button() == TQt::MidButton) MainWindow::executeNew(); // display a New Alarm dialog else KSystemTray::mousePressEvent(e); @@ -191,7 +191,7 @@ void TrayWindow::mousePressEvent(TQMouseEvent* e) */ void TrayWindow::mouseReleaseEvent(TQMouseEvent* e) { - if (e->button() == Qt::LeftButton && mAssocMainWindow && mAssocMainWindow->isVisible()) + if (e->button() == TQt::LeftButton && mAssocMainWindow && mAssocMainWindow->isVisible()) { mAssocMainWindow->raise(); mAssocMainWindow->setActiveWindow(); diff --git a/kandy/src/kandyview.cpp b/kandy/src/kandyview.cpp index 52e9de0a..7f11adc9 100644 --- a/kandy/src/kandyview.cpp +++ b/kandy/src/kandyview.cpp @@ -65,7 +65,7 @@ KandyView::KandyView(CommandScheduler *scheduler,TQWidget *parent) TQBoxLayout *topLayout = new TQVBoxLayout( this ); - TQSplitter *mainSplitter = new TQSplitter( Qt::Horizontal, this ); + TQSplitter *mainSplitter = new TQSplitter( TQt::Horizontal, this ); topLayout->addWidget( mainSplitter ); TQWidget *commandBox = new TQWidget( mainSplitter ); @@ -99,7 +99,7 @@ KandyView::KandyView(CommandScheduler *scheduler,TQWidget *parent) commandLayout->addWidget( buttonExecute ); connect( buttonExecute, TQT_SIGNAL( clicked() ), TQT_SLOT( executeCommand() ) ); - TQSplitter *ioSplitter = new TQSplitter( Qt::Vertical, mainSplitter ); + TQSplitter *ioSplitter = new TQSplitter( TQt::Vertical, mainSplitter ); TQWidget *inBox = new TQWidget( ioSplitter ); diff --git a/karm/edittaskdialog.cpp b/karm/edittaskdialog.cpp index 3f18faa1..d63a339a 100644 --- a/karm/edittaskdialog.cpp +++ b/karm/edittaskdialog.cpp @@ -173,7 +173,7 @@ EditTaskDialog::EditTaskDialog( TQString caption, bool editDlg, { int lines = (int)(desktopCount/2); if (lines*2 != desktopCount) lines++; - groupBox = new TQButtonGroup( lines, Qt::Horizontal, + groupBox = new TQButtonGroup( lines, TQt::Horizontal, i18n("In Desktop"), page, "_desktopsGB"); } lay1->addWidget(groupBox); diff --git a/karm/karm_part.cpp b/karm/karm_part.cpp index d1d6e509..157222d2 100644 --- a/karm/karm_part.cpp +++ b/karm/karm_part.cpp @@ -544,10 +544,10 @@ int karmPart::bookTime // Parse datetime if ( !rval ) { - startDate = TQDate::fromString( datetime, Qt::ISODate ); + startDate = TQDate::fromString( datetime, TQt::ISODate ); if ( datetime.length() > 10 ) // "YYYY-MM-DD".length() = 10 { - startTime = TQTime::fromString( datetime, Qt::ISODate ); + startTime = TQTime::fromString( datetime, TQt::ISODate ); } else startTime = TQTime( 12, 0 ); if ( startDate.isValid() && startTime.isValid() ) diff --git a/karm/mainwindow.cpp b/karm/mainwindow.cpp index 9c892f18..8265db05 100644 --- a/karm/mainwindow.cpp +++ b/karm/mainwindow.cpp @@ -578,10 +578,10 @@ int MainWindow::bookTime // Parse datetime if ( !rval ) { - startDate = TQDate::fromString( datetime, Qt::ISODate ); + startDate = TQDate::fromString( datetime, TQt::ISODate ); if ( datetime.length() > 10 ) // "YYYY-MM-DD".length() = 10 { - startTime = TQTime::fromString( datetime, Qt::ISODate ); + startTime = TQTime::fromString( datetime, TQt::ISODate ); } else startTime = TQTime( 12, 0 ); if ( startDate.isValid() && startTime.isValid() ) @@ -718,10 +718,10 @@ TQString MainWindow::exportcsvfile( TQString filename, TQString from, TQString t ReportCriteria rc; rc.url=filename; rc.from=TQDate::fromString( from ); - if ( rc.from.isNull() ) rc.from=TQDate::fromString( from, Qt::ISODate ); + if ( rc.from.isNull() ) rc.from=TQDate::fromString( from, TQt::ISODate ); kdDebug(5970) << "rc.from " << rc.from << endl; rc.to=TQDate::fromString( to ); - if ( rc.to.isNull() ) rc.to=TQDate::fromString( to, Qt::ISODate ); + if ( rc.to.isNull() ) rc.to=TQDate::fromString( to, TQt::ISODate ); kdDebug(5970) << "rc.to " << rc.to << endl; rc.reportType=(ReportCriteria::REPORTTYPE) type; // history report or totals report rc.decimalMinutes=decimalMinutes; diff --git a/karm/printdialog.cpp b/karm/printdialog.cpp index 9b4e3b78..128c892a 100644 --- a/karm/printdialog.cpp +++ b/karm/printdialog.cpp @@ -53,7 +53,7 @@ PrintDialog::PrintDialog() layout->addStretch(1); // Date Range - TQGroupBox *rangeGroup = new TQGroupBox(1, Qt::Horizontal, i18n("Date Range"), + TQGroupBox *rangeGroup = new TQGroupBox(1, TQt::Horizontal, i18n("Date Range"), page); layout->addWidget(rangeGroup); diff --git a/karm/taskview.cpp b/karm/taskview.cpp index 796e46d2..d1b80bf8 100644 --- a/karm/taskview.cpp +++ b/karm/taskview.cpp @@ -131,7 +131,7 @@ void TaskView::contentsMousePressEvent ( TQMouseEvent * e ) int leftborder = treeStepSize() * ( task->depth() + ( rootIsDecorated() ? 1 : 0)) + itemMargin(); if ((leftborder < e->x()) && (e->x() < 19 + leftborder )) { - if ( e->button() == Qt::LeftButton ) + if ( e->button() == TQt::LeftButton ) if ( task->isComplete() ) task->setPercentComplete( 0, _storage ); else task->setPercentComplete( 100, _storage ); } diff --git a/kdgantt/KDGanttMinimizeSplitter.cpp b/kdgantt/KDGanttMinimizeSplitter.cpp index ef40a626..22eace45 100644 --- a/kdgantt/KDGanttMinimizeSplitter.cpp +++ b/kdgantt/KDGanttMinimizeSplitter.cpp @@ -55,7 +55,7 @@ static int mouseOffset; static int opaqueOldPos = -1; //### there's only one mouse, but this is a bit risky -KDGanttSplitterHandle::KDGanttSplitterHandle( Qt::Orientation o, +KDGanttSplitterHandle::KDGanttSplitterHandle( TQt::Orientation o, KDGanttMinimizeSplitter *parent, const char * name ) : TQWidget( parent, name ), _activeButton( 0 ), _collapsed( false ) { @@ -69,11 +69,11 @@ TQSize KDGanttSplitterHandle::sizeHint() const return TQSize(8,8); } -void KDGanttSplitterHandle::setOrientation( Qt::Orientation o ) +void KDGanttSplitterHandle::setOrientation( TQt::Orientation o ) { orient = o; #ifndef TQT_NO_CURSOR - if ( o == Qt::Horizontal ) + if ( o == TQt::Horizontal ) setCursor( splitHCursor ); else setCursor( splitVCursor ); @@ -84,7 +84,7 @@ void KDGanttSplitterHandle::setOrientation( Qt::Orientation o ) void KDGanttSplitterHandle::mouseMoveEvent( TQMouseEvent *e ) { updateCursor( e->pos() ); - if ( !(e->state()&Qt::LeftButton) ) + if ( !(e->state()&TQt::LeftButton) ) return; if ( _activeButton != 0) @@ -104,7 +104,7 @@ void KDGanttSplitterHandle::mouseMoveEvent( TQMouseEvent *e ) void KDGanttSplitterHandle::mousePressEvent( TQMouseEvent *e ) { - if ( e->button() == Qt::LeftButton ) { + if ( e->button() == TQt::LeftButton ) { _activeButton = onButton( e->pos() ); mouseOffset = s->pick(e->pos()); if ( _activeButton != 0) @@ -119,7 +119,7 @@ void KDGanttSplitterHandle::updateCursor( const TQPoint& p) setCursor( arrowCursor ); } else { - if ( orient == Qt::Horizontal ) + if ( orient == TQt::Horizontal ) setCursor( splitHCursor ); else setCursor( splitVCursor ); @@ -158,7 +158,7 @@ void KDGanttSplitterHandle::mouseReleaseEvent( TQMouseEvent *e ) updateCursor( e->pos() ); } else { - if ( !opaque() && e->button() == Qt::LeftButton ) { + if ( !opaque() && e->button() == TQt::LeftButton ) { TQCOORD pos = s->pick(parentWidget()->mapFromGlobal(e->globalPos())) - mouseOffset; s->setRubberband( -1 ); @@ -384,7 +384,7 @@ static TQSize minSizeHint( const TQWidget* w ) KDGanttMinimizeSplitter::KDGanttMinimizeSplitter( TQWidget *parent, const char *name ) :TQFrame(parent,name,WPaintUnclipped) { - orient = Qt::Horizontal; + orient = TQt::Horizontal; init(); } @@ -392,7 +392,7 @@ KDGanttMinimizeSplitter::KDGanttMinimizeSplitter( TQWidget *parent, const char * Constructs a splitter with orientation \a o with the \a parent and \a name arguments being passed on to the TQFrame constructor. */ -KDGanttMinimizeSplitter::KDGanttMinimizeSplitter( Qt::Orientation o, TQWidget *parent, const char *name ) +KDGanttMinimizeSplitter::KDGanttMinimizeSplitter( TQt::Orientation o, TQWidget *parent, const char *name ) :TQFrame(parent,name,WPaintUnclipped) { orient = o; @@ -412,7 +412,7 @@ KDGanttMinimizeSplitter::~KDGanttMinimizeSplitter() void KDGanttMinimizeSplitter::init() { data = new TQSplitterData; - if ( orient == Qt::Horizontal ) + if ( orient == TQt::Horizontal ) setSizePolicy( TQSizePolicy(TQSizePolicy::Expanding,TQSizePolicy::Minimum) ); else setSizePolicy( TQSizePolicy(TQSizePolicy::Minimum,TQSizePolicy::Expanding) ); @@ -424,15 +424,15 @@ void KDGanttMinimizeSplitter::init() \brief the orientation of the splitter By default the orientation is horizontal (the widgets are side by side). - The possible orientations are TQt:Vertical and Qt::Horizontal (the default). + The possible orientations are TQt:Vertical and TQt::Horizontal (the default). */ -void KDGanttMinimizeSplitter::setOrientation( Qt::Orientation o ) +void KDGanttMinimizeSplitter::setOrientation( TQt::Orientation o ) { if ( orient == o ) return; orient = o; - if ( orient == Qt::Horizontal ) + if ( orient == TQt::Horizontal ) setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Minimum ) ); else setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Expanding ) ); @@ -562,7 +562,7 @@ void KDGanttMinimizeSplitter::setRubberband( int p ) TQRect r = contentsRect(); const int rBord = 3; //Themable???? int sw = style().pixelMetric(TQStyle::PM_SplitterWidth, this); - if ( orient == Qt::Horizontal ) { + if ( orient == TQt::Horizontal ) { if ( opaqueOldPos >= 0 ) paint.drawRect( opaqueOldPos + sw/2 - rBord , r.y(), 2*rBord, r.height() ); @@ -602,7 +602,7 @@ void KDGanttMinimizeSplitter::drawSplitter( TQPainter *p, TQCOORD x, TQCOORD y, TQCOORD w, TQCOORD h ) { style().tqdrawPrimitive(TQStyle::PE_Splitter, p, TQRect(x, y, w, h), colorGroup(), - (orientation() == Qt::Horizontal ? + (orientation() == TQt::Horizontal ? TQStyle::Style_Horizontal : 0)); } @@ -644,9 +644,9 @@ void KDGanttMinimizeSplitter::moveSplitter( TQCOORD p, int id ) p = adjustPos( p, id ); TQSplitterLayoutStruct *s = data->list.at(id); - int oldP = orient == Qt::Horizontal ? s->wid->x() : s->wid->y(); + int oldP = orient == TQt::Horizontal ? s->wid->x() : s->wid->y(); bool upLeft; - if ( TQApplication::reverseLayout() && orient == Qt::Horizontal ) { + if ( TQApplication::reverseLayout() && orient == TQt::Horizontal ) { p += s->wid->width(); upLeft = p > oldP; } else @@ -661,8 +661,8 @@ void KDGanttMinimizeSplitter::moveSplitter( TQCOORD p, int id ) void KDGanttMinimizeSplitter::setG( TQWidget *w, int p, int s, bool isSplitter ) { - if ( orient == Qt::Horizontal ) { - if ( TQApplication::reverseLayout() && orient == Qt::Horizontal && !isSplitter ) + if ( orient == TQt::Horizontal ) { + if ( TQApplication::reverseLayout() && orient == TQt::Horizontal && !isSplitter ) p = contentsRect().width() - p - s; w->setGeometry( p, contentsRect().y(), s, contentsRect().height() ); } else @@ -688,7 +688,7 @@ void KDGanttMinimizeSplitter::moveBefore( int pos, int id, bool upLeft ) } else if ( s->isSplitter ) { int pos1, pos2; int dd = s->sizer; - if( TQApplication::reverseLayout() && orient == Qt::Horizontal ) { + if( TQApplication::reverseLayout() && orient == TQt::Horizontal ) { pos1 = pos; pos2 = pos + dd; } else { @@ -704,7 +704,7 @@ void KDGanttMinimizeSplitter::moveBefore( int pos, int id, bool upLeft ) } } else { int dd, newLeft, nextPos; - if( TQApplication::reverseLayout() && orient == Qt::Horizontal ) { + if( TQApplication::reverseLayout() && orient == TQt::Horizontal ) { dd = w->geometry().right() - pos; dd = TQMAX( pick(minSize(w)), TQMIN(dd, pick(w->maximumSize()))); newLeft = pos+1; @@ -741,7 +741,7 @@ void KDGanttMinimizeSplitter::moveAfter( int pos, int id, bool upLeft ) } else if ( s->isSplitter ) { int dd = s->sizer; int pos1, pos2; - if( TQApplication::reverseLayout() && orient == Qt::Horizontal ) { + if( TQApplication::reverseLayout() && orient == TQt::Horizontal ) { pos2 = pos - dd; pos1 = pos2 + 1; } else { @@ -758,7 +758,7 @@ void KDGanttMinimizeSplitter::moveAfter( int pos, int id, bool upLeft ) } else { int left = pick( w->pos() ); int right, dd,/* newRight,*/ newLeft, nextPos; - if ( TQApplication::reverseLayout() && orient == Qt::Horizontal ) { + if ( TQApplication::reverseLayout() && orient == TQt::Horizontal ) { dd = pos - left + 1; dd = TQMAX( pick(minSize(w)), TQMIN(dd, pick(w->maximumSize()))); newLeft = pos-dd+1; @@ -836,7 +836,7 @@ void KDGanttMinimizeSplitter::getRange( int id, int *min, int *max ) } } TQRect r = contentsRect(); - if ( orient == Qt::Horizontal && TQApplication::reverseLayout() ) { + if ( orient == TQt::Horizontal && TQApplication::reverseLayout() ) { int splitterWidth = style().pixelMetric(TQStyle::PM_SplitterWidth, this); if ( min ) *min = pick(r.topRight()) - TQMIN( maxB, pick(r.size())-minA ) - splitterWidth; @@ -975,7 +975,7 @@ void KDGanttMinimizeSplitter::recalc( bool update ) if ( maxt < mint ) maxt = mint; - if ( orient == Qt::Horizontal ) { + if ( orient == TQt::Horizontal ) { setMaximumSize( maxl, maxt ); setMinimumSize( minl, mint ); } else { @@ -1127,7 +1127,7 @@ TQSize KDGanttMinimizeSplitter::sizeHint() const } } } - return orientation() == Qt::Horizontal ? TQSize( l, t ) : TQSize( t, l ); + return orientation() == TQt::Horizontal ? TQSize( l, t ) : TQSize( t, l ); } @@ -1157,7 +1157,7 @@ TQSize KDGanttMinimizeSplitter::minimumSizeHint() const } } } - return orientation() == Qt::Horizontal ? TQSize( l, t ) : TQSize( t, l ); + return orientation() == TQt::Horizontal ? TQSize( l, t ) : TQSize( t, l ); } @@ -1531,7 +1531,7 @@ void kdganttGeomCalc( TQMemArray &chain, int start, int count, i */ /*! - \fn Qt::Orientation KDGanttMinimizeSplitter::orientation() const + \fn TQt::Orientation KDGanttMinimizeSplitter::orientation() const Returns the orientation of the splitter. */ diff --git a/kdgantt/KDGanttMinimizeSplitter.h b/kdgantt/KDGanttMinimizeSplitter.h index e9e993fa..3dfa659a 100644 --- a/kdgantt/KDGanttMinimizeSplitter.h +++ b/kdgantt/KDGanttMinimizeSplitter.h @@ -53,11 +53,11 @@ public: enum Direction { Left, Right, Up, Down }; KDGanttMinimizeSplitter( TQWidget* parent=0, const char* name=0 ); - KDGanttMinimizeSplitter( Qt::Orientation, TQWidget* parent=0, const char* name=0 ); + KDGanttMinimizeSplitter( TQt::Orientation, TQWidget* parent=0, const char* name=0 ); ~KDGanttMinimizeSplitter(); - virtual void setOrientation( Qt::Orientation ); - Qt::Orientation orientation() const { return orient; } + virtual void setOrientation( TQt::Orientation ); + TQt::Orientation orientation() const { return orient; } void setMinimizeDirection( Direction ); Direction minimizeDirection() const; @@ -106,19 +106,19 @@ private: void setG( TQWidget *w, int p, int s, bool isSplitter = FALSE ); TQCOORD pick( const TQPoint &p ) const - { return orient == Qt::Horizontal ? p.x() : p.y(); } + { return orient == TQt::Horizontal ? p.x() : p.y(); } TQCOORD pick( const TQSize &s ) const - { return orient == Qt::Horizontal ? s.width() : s.height(); } + { return orient == TQt::Horizontal ? s.width() : s.height(); } TQCOORD trans( const TQPoint &p ) const - { return orient == Qt::Vertical ? p.x() : p.y(); } + { return orient == TQt::Vertical ? p.x() : p.y(); } TQCOORD trans( const TQSize &s ) const - { return orient == Qt::Vertical ? s.width() : s.height(); } + { return orient == TQt::Vertical ? s.width() : s.height(); } TQSplitterData *data; private: - Qt::Orientation orient; + TQt::Orientation orient; Direction _direction; #ifndef DOXYGEN_SKIP_INTERNAL friend class KDGanttSplitterHandle; @@ -140,10 +140,10 @@ class KDGanttSplitterHandle : public TQWidget TQ_OBJECT public: - KDGanttSplitterHandle( Qt::Orientation o, + KDGanttSplitterHandle( TQt::Orientation o, KDGanttMinimizeSplitter *parent, const char* name=0 ); - void setOrientation( Qt::Orientation o ); - Qt::Orientation orientation() const { return orient; } + void setOrientation( TQt::Orientation o ); + TQt::Orientation orientation() const { return orient; } bool opaque() const { return s->opaqueResize(); } @@ -162,7 +162,7 @@ protected: void updateCursor( const TQPoint& p ); private: - Qt::Orientation orient; + TQt::Orientation orient; bool opaq; int myId; diff --git a/kdgantt/KDGanttSemiSizingControl.cpp b/kdgantt/KDGanttSemiSizingControl.cpp index 879d25e5..86268e87 100644 --- a/kdgantt/KDGanttSemiSizingControl.cpp +++ b/kdgantt/KDGanttSemiSizingControl.cpp @@ -65,7 +65,7 @@ KDGanttSemiSizingControl::KDGanttSemiSizingControl( TQWidget* parent, const char* name ) : - KDGanttSizingControl( parent, name ), _orient( Qt::Horizontal ), + KDGanttSizingControl( parent, name ), _orient( TQt::Horizontal ), _arrowPos( Before ), _minimizedWidget(0), _maximizedWidget(0) { init(); @@ -84,7 +84,7 @@ KDGanttSemiSizingControl::KDGanttSemiSizingControl( TQWidget* parent, the base class. */ -KDGanttSemiSizingControl::KDGanttSemiSizingControl( Qt::Orientation orientation, +KDGanttSemiSizingControl::KDGanttSemiSizingControl( TQt::Orientation orientation, TQWidget* parent, const char* name ) : KDGanttSizingControl( parent, name ), _orient( orientation ), @@ -108,7 +108,7 @@ KDGanttSemiSizingControl::KDGanttSemiSizingControl( Qt::Orientation orientation, */ KDGanttSemiSizingControl::KDGanttSemiSizingControl( ArrowPosition arrowPosition, - Qt::Orientation orientation, + TQt::Orientation orientation, TQWidget* parent, const char* name ) : KDGanttSizingControl( parent, name ), _orient( orientation ), @@ -186,7 +186,7 @@ TQWidget* KDGanttSemiSizingControl::maximizedWidget() const \sa orientation() */ -void KDGanttSemiSizingControl::setOrientation( Qt::Orientation orientation ) +void KDGanttSemiSizingControl::setOrientation( TQt::Orientation orientation ) { if ( _orient != orientation ) { _orient = orientation; @@ -201,7 +201,7 @@ void KDGanttSemiSizingControl::setOrientation( Qt::Orientation orientation ) \sa setOrientation() */ -Qt::Orientation KDGanttSemiSizingControl::orientation() const +TQt::Orientation KDGanttSemiSizingControl::orientation() const { return _orient; } @@ -262,12 +262,12 @@ void KDGanttSemiSizingControl::setup() delete _layout; TQBoxLayout* butLayout; // _layout will delete me - if ( _orient == Qt::Horizontal || isMinimized() ) + if ( _orient == TQt::Horizontal || isMinimized() ) _layout = new TQHBoxLayout( this ); else _layout = new TQVBoxLayout( this ); - if ( _orient == Qt::Vertical && !isMinimized() ) + if ( _orient == TQt::Vertical && !isMinimized() ) butLayout = new TQHBoxLayout( _layout ); else butLayout = new TQVBoxLayout( _layout ); @@ -288,7 +288,7 @@ void KDGanttSemiSizingControl::setup() } //------------------------------ Setup the button at the correct possition - if ( _arrowPos == After && _orient == Qt::Vertical && !isMinimized() ) { + if ( _arrowPos == After && _orient == TQt::Vertical && !isMinimized() ) { butLayout->addStretch( 1 ); butLayout->addWidget( _but, 0, TQt::AlignLeft ); } @@ -305,7 +305,7 @@ void KDGanttSemiSizingControl::setup() else widget = _maximizedWidget; if( widget ) { - if ( _arrowPos == Before || _orient == Qt::Vertical && !isMinimized() ) + if ( _arrowPos == Before || _orient == TQt::Vertical && !isMinimized() ) _layout->addWidget( widget, 1 ); else _layout->insertWidget( 0, widget, 1 ); @@ -318,20 +318,20 @@ void KDGanttSemiSizingControl::setup() if ( isMinimized() ) { widget = _minimizedWidget; if( widget ) { - if ( _arrowPos == Before || _orient == Qt::Vertical && !isMinimized() ) + if ( _arrowPos == Before || _orient == TQt::Vertical && !isMinimized() ) _layout->addWidget( widget, 1 ); else _layout->insertWidget( 0, widget, 1 ); } } else { - if ( _arrowPos == Before || _orient == Qt::Vertical && !isMinimized() ) + if ( _arrowPos == Before || _orient == TQt::Vertical && !isMinimized() ) _layout->addStretch( 1 ); else _layout->insertStretch( 0, 1 ); widget = _maximizedWidget; // the following is only the special case - // arrowPos == Before and _orient == Qt::Vertical + // arrowPos == Before and _orient == TQt::Vertical //widget->move( 0+x(), _but->height()+y()); } } diff --git a/kdgantt/KDGanttSemiSizingControl.h b/kdgantt/KDGanttSemiSizingControl.h index d5a09b46..a6d29e54 100644 --- a/kdgantt/KDGanttSemiSizingControl.h +++ b/kdgantt/KDGanttSemiSizingControl.h @@ -51,10 +51,10 @@ public: enum ArrowPosition { Before, After }; KDGanttSemiSizingControl( TQWidget* parent = 0, const char* name = 0 ); - KDGanttSemiSizingControl( Qt::Orientation orientation, TQWidget* parent = 0, + KDGanttSemiSizingControl( TQt::Orientation orientation, TQWidget* parent = 0, const char* name = 0 ); KDGanttSemiSizingControl( ArrowPosition arrowPosition, - Qt::Orientation orientation, TQWidget* parent = 0, + TQt::Orientation orientation, TQWidget* parent = 0, const char* name = 0 ); void setMinimizedWidget( TQWidget* widget ); @@ -62,8 +62,8 @@ public: TQWidget* minimizedWidget() const; TQWidget* maximizedWidget() const; - void setOrientation( Qt::Orientation orientation ); - Qt::Orientation orientation() const; + void setOrientation( TQt::Orientation orientation ); + TQt::Orientation orientation() const; void setArrowPosition( ArrowPosition arrowPosition ); ArrowPosition arrowPosition() const; @@ -79,7 +79,7 @@ protected: TQPixmap pixmap( Direction ); private: - Qt::Orientation _orient; + TQt::Orientation _orient; ArrowPosition _arrowPos; TQWidget* _minimizedWidget; TQWidget* _maximizedWidget; diff --git a/kdgantt/KDGanttView.cpp b/kdgantt/KDGanttView.cpp index d490da85..5df5248b 100644 --- a/kdgantt/KDGanttView.cpp +++ b/kdgantt/KDGanttView.cpp @@ -81,7 +81,7 @@ */ KDGanttView::KDGanttView( TQWidget* parent, const char* name ) - : KDGanttMinimizeSplitter( Qt::Vertical, parent, name ), + : KDGanttMinimizeSplitter( TQt::Vertical, parent, name ), myCanvasView(0), myTimeHeaderScroll(0), mFixedHorizon( false ) @@ -458,11 +458,11 @@ void KDGanttView::slotmouseButtonClicked ( int button, TQListViewItem * item, //emit mouseButtonClicked ( button , gItem, pos, c ); { switch ( button ) { - case Qt::LeftButton: + case TQt::LeftButton: emit lvItemLeftClicked( gItem ); emit itemLeftClicked( gItem ); break; - case Qt::MidButton: + case TQt::MidButton: emit lvItemMidClicked( gItem ); emit itemMidClicked( gItem ); break; diff --git a/kdgantt/KDGanttViewItem.cpp b/kdgantt/KDGanttViewItem.cpp index 70cfcedf..a3648a64 100644 --- a/kdgantt/KDGanttViewItem.cpp +++ b/kdgantt/KDGanttViewItem.cpp @@ -916,10 +916,10 @@ void KDGanttViewItem::createShape( KDCanvasPolygonItem* &itemShape, // items which don't have any shapes return; } - item->setBrush(Qt::SolidPattern); + item->setBrush(TQt::SolidPattern); item->setZ(5); itemShape = (KDCanvasPolygonItem*) item; - itemBack->setBrush(Qt::SolidPattern); + itemBack->setBrush(TQt::SolidPattern); itemBack->setZ(3); itemShapeBack = (KDCanvasPolygonItem*) itemBack; @@ -1306,11 +1306,11 @@ void KDGanttViewItem::updateCanvasItems() if (blockUpdating) return; TQPen p,pBack; TQBrush b; - b.setStyle(Qt::SolidPattern); + b.setStyle(TQt::SolidPattern); if ( enabled() ) { textCanvas->setColor(myTextColor); if (isHighlighted) { - b.setStyle(Qt::SolidPattern); + b.setStyle(TQt::SolidPattern); b.setColor(myStartColorHL); startShape->setBrush(b); b.setColor(myMiddleColorHL); @@ -1323,7 +1323,7 @@ void KDGanttViewItem::updateCanvasItems() p.setColor(myEndColorHL); endLine->setPen(p); } else { - b.setStyle(Qt::SolidPattern); + b.setStyle(TQt::SolidPattern); b.setColor(myStartColor); // tqDebug("update color %s %s", listViewText().latin1(),myStartColor.name().latin1() ); startShape->setBrush(b); @@ -1341,7 +1341,7 @@ void KDGanttViewItem::updateCanvasItems() //TQColor discol = TQt::lightGray; TQColor discol = TQColor(232,232,232); textCanvas->setColor( TQColor(150,150,150) ); - b.setStyle(Qt::SolidPattern); + b.setStyle(TQt::SolidPattern); b.setColor(discol); startShape->setBrush(b); midShape->setBrush(b); diff --git a/kdgantt/KDGanttViewSubwidgets.cpp b/kdgantt/KDGanttViewSubwidgets.cpp index 2ad05c10..f3dd9c40 100644 --- a/kdgantt/KDGanttViewSubwidgets.cpp +++ b/kdgantt/KDGanttViewSubwidgets.cpp @@ -65,7 +65,7 @@ KDTimeTableWidget:: KDTimeTableWidget( TQWidget* parent,KDGanttView* myGantt) taskLinksVisible = true; flag_blockUpdating = false; int_blockUpdating = 0; - gridPen.setStyle(Qt::DotLine); + gridPen.setStyle(TQt::DotLine); gridPen.setColor(TQColor(100,100,100)); maximumComputedGridHeight = 0; denseLineCount = 0; @@ -230,7 +230,7 @@ void KDTimeTableWidget::computeVerticalGrid() */ itcol.current()->setPen( TQPen(TQPen::NoPen) ); - itcol.current()->setBrush( TQBrush( colcol, Qt::SolidPattern) ); + itcol.current()->setBrush( TQBrush( colcol, TQt::SolidPattern) ); itcol.current()->setSize(cw ,h ); itcol.current()->move( i, 0 ); itcol.current()->show(); @@ -244,7 +244,7 @@ void KDTimeTableWidget::computeVerticalGrid() */ temprect = new KDCanvasRectangle(this,0,Type_is_KDGanttGridItem); temprect->setPen( TQPen(TQPen::NoPen) ); - temprect->setBrush( TQBrush( colcol, Qt::SolidPattern) ); + temprect->setBrush( TQBrush( colcol, TQt::SolidPattern) ); temprect->setSize(cw ,h ); temprect->move( i, 0 ); temprect->setZ(-20); @@ -276,7 +276,7 @@ void KDTimeTableWidget::computeVerticalGrid() itcol.current()->setPoints(i+(cw/2),0,i+(cw/2),h); */ itcol.current()->setPen( TQPen(TQPen::NoPen) ); - itcol.current()->setBrush( TQBrush( colcol, Qt::SolidPattern) ); + itcol.current()->setBrush( TQBrush( colcol, TQt::SolidPattern) ); itcol.current()->setSize(cw ,h ); itcol.current()->move( i, 0 ); itcol.current()->show(); @@ -284,7 +284,7 @@ void KDTimeTableWidget::computeVerticalGrid() } else { temprect = new KDCanvasRectangle(this,0,Type_is_KDGanttGridItem); temprect->setPen( TQPen(TQPen::NoPen) ); - temprect->setBrush( TQBrush( colcol, Qt::SolidPattern) ); + temprect->setBrush( TQBrush( colcol, TQt::SolidPattern) ); temprect->setSize(cw ,h ); temprect->move( i, 0 ); temprect->setZ(-20); @@ -332,7 +332,7 @@ void KDTimeTableWidget::computeVerticalGrid() itcol.current()->setPoints(i+mid,0,mid,h); */ itcol.current()->setPen( TQPen(TQPen::NoPen) ); - itcol.current()->setBrush( TQBrush( colcol, Qt::SolidPattern) ); + itcol.current()->setBrush( TQBrush( colcol, TQt::SolidPattern) ); itcol.current()->setSize(mid ,h ); itcol.current()->move( left, 0 ); itcol.current()->show(); @@ -340,7 +340,7 @@ void KDTimeTableWidget::computeVerticalGrid() } else { temprect = new KDCanvasRectangle(this,0,Type_is_KDGanttGridItem); temprect->setPen( TQPen(TQPen::NoPen) ); - temprect->setBrush( TQBrush( colcol, Qt::SolidPattern) ); + temprect->setBrush( TQBrush( colcol, TQt::SolidPattern) ); temprect->setSize(mid,h ); temprect->move( left, 0 ); temprect->setZ(-20); @@ -386,7 +386,7 @@ void KDTimeTableWidget::computeVerticalGrid() itcol.current()->setPoints(i+mid,0,mid,h); */ itcol.current()->setPen( TQPen(TQPen::NoPen) ); - itcol.current()->setBrush( TQBrush( colcol, Qt::SolidPattern) ); + itcol.current()->setBrush( TQBrush( colcol, TQt::SolidPattern) ); itcol.current()->setSize(mid ,h ); itcol.current()->move( left, 0 ); itcol.current()->show(); @@ -394,7 +394,7 @@ void KDTimeTableWidget::computeVerticalGrid() } else { temprect = new KDCanvasRectangle(this,0,Type_is_KDGanttGridItem); temprect->setPen( TQPen(TQPen::NoPen) ); - temprect->setBrush( TQBrush( colcol, Qt::SolidPattern) ); + temprect->setBrush( TQBrush( colcol, TQt::SolidPattern) ); temprect->setSize(mid ,h ); temprect->move( left, 0 ); temprect->setZ(-20); @@ -2447,16 +2447,16 @@ void KDTimeHeaderWidget::mousePressEvent ( TQMouseEvent * e ) { mouseDown = false; switch ( e->button() ) { - case Qt::LeftButton: + case TQt::LeftButton: mouseDown = true; beginMouseDown = e->pos().x(); endMouseDown = e->pos().x(); break; - case Qt::RightButton: + case TQt::RightButton: if (flagShowPopupMenu) myPopupMenu->popup(e->globalPos()); break; - case Qt::MidButton: + case TQt::MidButton: break; default: break; @@ -2539,7 +2539,7 @@ void KDTimeHeaderWidget::mouseMoveEvent ( TQMouseEvent * e ) ***************************************************************** */ KDLegendWidget:: KDLegendWidget( TQWidget* parent, KDGanttMinimizeSplitter* legendParent ) : - KDGanttSemiSizingControl ( KDGanttSemiSizingControl::Before, Qt::Vertical, + KDGanttSemiSizingControl ( KDGanttSemiSizingControl::Before, TQt::Vertical, parent) { myLegendParent = legendParent; @@ -2645,9 +2645,9 @@ void KDLegendWidget::clearLegend ( ) { if ( myLegend ) delete myLegend; if ( dock ) - myLegend = new TQGroupBox( 1, Qt::Horizontal, scroll->viewport() ); + myLegend = new TQGroupBox( 1, TQt::Horizontal, scroll->viewport() ); else - myLegend = new TQGroupBox( 1, Qt::Horizontal, i18n( "Legend" ), scroll->viewport() ); + myLegend = new TQGroupBox( 1, TQt::Horizontal, i18n( "Legend" ), scroll->viewport() ); myLegend->setBackgroundColor( TQt::white ); myLegend->setFont( font() ); scroll->addChild( myLegend ); @@ -3516,7 +3516,7 @@ void KDGanttCanvasView::contentsMousePressEvent ( TQMouseEvent * e ) currentItem = 0; movingItem = 0; mouseDown = true; - if (e->button() == Qt::RightButton && mySignalSender->editable()) { + if (e->button() == TQt::RightButton && mySignalSender->editable()) { lastClickedItem = (KDGanttViewItem*) mySignalSender->myListView->itemAt( TQPoint(2,e->pos().y())); if ( lastClickedItem ) { if ( lastClickedItem->displaySubitemsAsGroup() && ! lastClickedItem->isOpen() ) { @@ -3537,7 +3537,7 @@ void KDGanttCanvasView::contentsMousePressEvent ( TQMouseEvent * e ) TQCanvasItemList::Iterator it; for ( it = il.begin(); it != il.end(); ++it ) { switch ( e->button() ) { - case Qt::LeftButton: + case TQt::LeftButton: switch (getType(*it)) { case Type_is_KDGanttViewItem: currentItem = getItem(*it); @@ -3590,7 +3590,7 @@ void KDGanttCanvasView::contentsMousePressEvent ( TQMouseEvent * e ) break; } break; - case Qt::RightButton: + case TQt::RightButton: switch (getType(*it)) { case Type_is_KDGanttViewItem: currentItem = getItem(*it); @@ -3602,7 +3602,7 @@ void KDGanttCanvasView::contentsMousePressEvent ( TQMouseEvent * e ) break; } break; - case Qt::MidButton: + case TQt::MidButton: switch (getType(*it)) { case Type_is_KDGanttViewItem: currentItem = getItem(*it); @@ -3618,10 +3618,10 @@ void KDGanttCanvasView::contentsMousePressEvent ( TQMouseEvent * e ) break; } } - if (e->button() == Qt::RightButton ) { + if (e->button() == TQt::RightButton ) { mySignalSender->gvContextMenuRequested( currentItem, e->globalPos() ); } - if (autoScrollEnabled && e->button() == Qt::LeftButton) { + if (autoScrollEnabled && e->button() == TQt::LeftButton) { myScrollTimer->start(50); } } @@ -3643,7 +3643,7 @@ void KDGanttCanvasView::contentsMouseReleaseEvent ( TQMouseEvent * e ) // if ( currentLink || currentItem ) { switch ( e->button() ) { - case Qt::LeftButton: + case TQt::LeftButton: myScrollTimer->stop(); { mySignalSender->itemLeftClicked( currentItem ); @@ -3675,7 +3675,7 @@ void KDGanttCanvasView::contentsMouseReleaseEvent ( TQMouseEvent * e ) movingGVItem = 0; } break; - case Qt::RightButton: + case TQt::RightButton: { mySignalSender->itemRightClicked( currentItem ); mySignalSender->gvItemRightClicked( currentItem ); @@ -3684,7 +3684,7 @@ void KDGanttCanvasView::contentsMouseReleaseEvent ( TQMouseEvent * e ) if ( currentLink ) mySignalSender->taskLinkRightClicked( currentLink ); break; - case Qt::MidButton: + case TQt::MidButton: { mySignalSender->itemMidClicked( currentItem ); mySignalSender->gvItemMidClicked( currentItem ); @@ -3713,7 +3713,7 @@ void KDGanttCanvasView::contentsMouseDoubleClickEvent ( TQMouseEvent * e ) { TQCanvasItemList il = canvas() ->collisions ( e->pos() ); - if ( il.isEmpty() && e->button() == Qt::LeftButton ) { + if ( il.isEmpty() && e->button() == TQt::LeftButton ) { //not directly sending a signal here (encapsulation and whatnot) mySignalSender->emptySpaceDoubleClicked(e); return; @@ -3722,7 +3722,7 @@ void KDGanttCanvasView::contentsMouseDoubleClickEvent ( TQMouseEvent * e ) TQCanvasItemList::Iterator it; for ( it = il.begin(); it != il.end(); ++it ) { switch ( e->button() ) { - case Qt::LeftButton: + case TQt::LeftButton: switch (getType(*it)) { case Type_is_KDGanttViewItem: if ( getItem(*it)->enabled() ) @@ -3739,7 +3739,7 @@ void KDGanttCanvasView::contentsMouseDoubleClickEvent ( TQMouseEvent * e ) } break; /* - case Qt::RightButton: + case TQt::RightButton: switch (getType(*it)) { case Type_is_KDGanttViewItem: mySignalSender->itemRightClicked(getItem(*it)); @@ -3751,7 +3751,7 @@ void KDGanttCanvasView::contentsMouseDoubleClickEvent ( TQMouseEvent * e ) break; } break; - case Qt::MidButton: + case TQt::MidButton: switch (getType(*it)) { case Type_is_KDGanttViewItem: mySignalSender->itemMidClicked(getItem(*it)); @@ -4025,7 +4025,7 @@ void KDIntervalColorRectangle::layout( KDTimeHeaderWidget* timeHeader, int heigh if ( right == left ) ++right; setPen( TQPen(TQPen::NoPen) ); - setBrush( TQBrush(mColor, Qt::SolidPattern) ); + setBrush( TQBrush(mColor, TQt::SolidPattern) ); setSize( right - left, height ); move( left, 0 ); show(); diff --git a/kdgantt/KDGanttViewTaskLink.cpp b/kdgantt/KDGanttViewTaskLink.cpp index f6fa6883..9b044fc4 100644 --- a/kdgantt/KDGanttViewTaskLink.cpp +++ b/kdgantt/KDGanttViewTaskLink.cpp @@ -268,7 +268,7 @@ void KDGanttViewTaskLink::showMe( bool visible ) TQPen p; TQBrush b; p.setWidth(wid); - b.setStyle(Qt::SolidPattern); + b.setStyle(TQt::SolidPattern); if (ishighlighted) { b.setColor(myColorHL); p.setColor(myColorHL); @@ -333,7 +333,7 @@ void KDGanttViewTaskLink::showMeType( bool visible ) TQPen p; TQBrush b; p.setWidth(wid); - b.setStyle(Qt::SolidPattern); + b.setStyle(TQt::SolidPattern); if (ishighlighted) { b.setColor(myColorHL); p.setColor(myColorHL); diff --git a/kdgantt/KDGanttXMLTools.cpp b/kdgantt/KDGanttXMLTools.cpp index 5f181934..02c3537a 100644 --- a/kdgantt/KDGanttXMLTools.cpp +++ b/kdgantt/KDGanttXMLTools.cpp @@ -266,20 +266,20 @@ void createTimeNode( TQDomDocument& doc, TQDomNode& parent, } -TQString penStyleToString( Qt::PenStyle style ) +TQString penStyleToString( TQt::PenStyle style ) { switch( style ) { - case Qt::NoPen: + case TQt::NoPen: return "NoPen"; - case Qt::SolidLine: + case TQt::SolidLine: return "SolidLine"; - case Qt::DashLine: + case TQt::DashLine: return "DashLine"; - case Qt::DotLine: + case TQt::DotLine: return "DotLine"; - case Qt::DashDotLine: + case TQt::DashDotLine: return "DashDotLine"; - case Qt::DashDotDotLine: + case TQt::DashDotDotLine: return "DashDotDotLine"; default: // should not happen return "SolidLine"; @@ -288,39 +288,39 @@ TQString penStyleToString( Qt::PenStyle style ) -TQString brushStyleToString( Qt::BrushStyle style ) +TQString brushStyleToString( TQt::BrushStyle style ) { // PENDING(kalle) Support custom patterns switch( style ) { - case Qt::NoBrush: + case TQt::NoBrush: return "NoBrush"; - case Qt::SolidPattern: + case TQt::SolidPattern: return "SolidPattern"; - case Qt::Dense1Pattern: + case TQt::Dense1Pattern: return "Dense1Pattern"; - case Qt::Dense2Pattern: + case TQt::Dense2Pattern: return "Dense2Pattern"; - case Qt::Dense3Pattern: + case TQt::Dense3Pattern: return "Dense3Pattern"; - case Qt::Dense4Pattern: + case TQt::Dense4Pattern: return "Dense4Pattern"; - case Qt::Dense5Pattern: + case TQt::Dense5Pattern: return "Dense5Pattern"; - case Qt::Dense6Pattern: + case TQt::Dense6Pattern: return "Dense6Pattern"; - case Qt::Dense7Pattern: + case TQt::Dense7Pattern: return "Dense7Pattern"; - case Qt::HorPattern: + case TQt::HorPattern: return "HorPattern"; - case Qt::VerPattern: + case TQt::VerPattern: return "VerPattern"; - case Qt::CrossPattern: + case TQt::CrossPattern: return "CrossPattern"; - case Qt::BDiagPattern: + case TQt::BDiagPattern: return "BDiagPattern"; - case Qt::FDiagPattern: + case TQt::FDiagPattern: return "FDiagPattern"; - case Qt::DiagCrossPattern: + case TQt::DiagCrossPattern: return "DiagCrossPattern"; default: // should not happen (but can for a custom pattern) return "SolidPattern"; @@ -399,7 +399,7 @@ bool readBrushNode( const TQDomElement& element, TQBrush& brush ) { bool ok = true; TQColor tempColor; - Qt::BrushStyle tempStyle; + TQt::BrushStyle tempStyle; TQPixmap tempPixmap; TQDomNode node = element.firstChild(); while( !node.isNull() ) { @@ -506,7 +506,7 @@ bool readPenNode( const TQDomElement& element, TQPen& pen ) bool ok = true; int tempWidth; TQColor tempColor; - Qt::PenStyle tempStyle; + TQt::PenStyle tempStyle; TQDomNode node = element.firstChild(); while( !node.isNull() ) { TQDomElement element = node.toElement(); @@ -705,60 +705,60 @@ bool readTimeNode( const TQDomElement& element, TQTime& value ) -Qt::PenStyle stringToPenStyle( const TQString& style ) +TQt::PenStyle stringToPenStyle( const TQString& style ) { if( style == "NoPen" ) - return Qt::NoPen; + return TQt::NoPen; else if( style == "SolidLine" ) - return Qt::SolidLine; + return TQt::SolidLine; else if( style == "DashLine" ) - return Qt::DashLine; + return TQt::DashLine; else if( style == "DotLine" ) - return Qt::DotLine; + return TQt::DotLine; else if( style == "DashDotLine" ) - return Qt::DashDotLine; + return TQt::DashDotLine; else if( style == "DashDotDotLine" ) - return Qt::DashDotDotLine; + return TQt::DashDotDotLine; else // should not happen - return Qt::SolidLine; + return TQt::SolidLine; } -Qt::BrushStyle stringToBrushStyle( const TQString& style ) +TQt::BrushStyle stringToBrushStyle( const TQString& style ) { // PENDING(kalle) Support custom patterns if( style == "NoBrush" ) - return Qt::NoBrush; + return TQt::NoBrush; else if( style == "SolidPattern" ) - return Qt::SolidPattern; + return TQt::SolidPattern; else if( style == "Dense1Pattern" ) - return Qt::Dense1Pattern; + return TQt::Dense1Pattern; else if( style == "Dense2Pattern" ) - return Qt::Dense2Pattern; + return TQt::Dense2Pattern; else if( style == "Dense3Pattern" ) - return Qt::Dense3Pattern; + return TQt::Dense3Pattern; else if( style == "Dense4Pattern" ) - return Qt::Dense4Pattern; + return TQt::Dense4Pattern; else if( style == "Dense5Pattern" ) - return Qt::Dense5Pattern; + return TQt::Dense5Pattern; else if( style == "Dense6Pattern" ) - return Qt::Dense6Pattern; + return TQt::Dense6Pattern; else if( style == "Dense7Pattern" ) - return Qt::Dense7Pattern; + return TQt::Dense7Pattern; else if( style == "HorPattern" ) - return Qt::HorPattern; + return TQt::HorPattern; else if( style == "VerPattern" ) - return Qt::VerPattern; + return TQt::VerPattern; else if( style == "CrossPattern" ) - return Qt::CrossPattern; + return TQt::CrossPattern; else if( style == "BDiagPattern" ) - return Qt::BDiagPattern; + return TQt::BDiagPattern; else if( style == "FDiagPattern" ) - return Qt::FDiagPattern; + return TQt::FDiagPattern; else if( style == "DiagCrossPattern" ) - return Qt::DiagCrossPattern; + return TQt::DiagCrossPattern; else // should not happen (but can with custom patterns) - return Qt::SolidPattern; + return TQt::SolidPattern; } } diff --git a/kdgantt/KDGanttXMLTools.h b/kdgantt/KDGanttXMLTools.h index 8a7067c0..a7a61c1d 100644 --- a/kdgantt/KDGanttXMLTools.h +++ b/kdgantt/KDGanttXMLTools.h @@ -45,10 +45,10 @@ #include namespace KDGanttXML { - TQString penStyleToString( Qt::PenStyle style ); - Qt::PenStyle stringToPenStyle( const TQString& style ); - TQString brushStyleToString( Qt::BrushStyle style ); - Qt::BrushStyle stringToBrushStyle( const TQString& style ); + TQString penStyleToString( TQt::PenStyle style ); + TQt::PenStyle stringToPenStyle( const TQString& style ); + TQString brushStyleToString( TQt::BrushStyle style ); + TQt::BrushStyle stringToBrushStyle( const TQString& style ); void createBoolNode( TQDomDocument& doc, TQDomNode& parent, const TQString& elementName, bool value ); diff --git a/kgantt/kgantt/xQGanttBarViewPort_Events.cpp b/kgantt/kgantt/xQGanttBarViewPort_Events.cpp index 52f017e2..94b59726 100644 --- a/kgantt/kgantt/xQGanttBarViewPort_Events.cpp +++ b/kgantt/kgantt/xQGanttBarViewPort_Events.cpp @@ -43,7 +43,7 @@ xQGanttBarViewPort::mousePressEvent(TQMouseEvent* e) _itemTextEdit->hide(); // right mousebutton & control -> popup menu - if(e->button() == Qt::RightButton && e->state() == ControlButton ) { + if(e->button() == TQt::RightButton && e->state() == ControlButton ) { _menu->popup(e->globalPos()); return; } @@ -64,7 +64,7 @@ xQGanttBarViewPort::mousePressEvent(TQMouseEvent* e) /* * edit text */ - if(e->button() == Qt::MidButton && _mode == Select) { + if(e->button() == TQt::MidButton && _mode == Select) { xTQTaskPosition* tp = _gItemList.find(_currentItem); TQPainter p(this); @@ -91,7 +91,7 @@ xQGanttBarViewPort::mousePressEvent(TQMouseEvent* e) /* * open/close item, move start, end, item */ - if(e->button() == Qt::LeftButton && _mode == Select) { + if(e->button() == TQt::LeftButton && _mode == Select) { _timediff = 0; @@ -210,21 +210,21 @@ xQGanttBarViewPort::mouseReleaseEvent(TQMouseEvent* e) if(!_Mousemoved) { - if(e->button() == Qt::LeftButton) + if(e->button() == TQt::LeftButton) zoom(1.4, e->x(), e->y() ); - if(e->button() == Qt::RightButton) + if(e->button() == TQt::RightButton) zoom(0.7, e->x(), e->y() ); - if(e->button() == Qt::MidButton) + if(e->button() == TQt::MidButton) zoomAll(); } else { - if(_currentMButton == Qt::LeftButton) { + if(_currentMButton == TQt::LeftButton) { TQPainter p(this); TQPen pen(DashLine); @@ -284,7 +284,7 @@ xQGanttBarViewPort::mouseMoveEvent(TQMouseEvent* e) case Select: { - if(_currentMButton == Qt::LeftButton && _currentItem) { + if(_currentMButton == TQt::LeftButton && _currentItem) { TQPainter p(this); p.setRasterOp(XorROP); @@ -442,7 +442,7 @@ xQGanttBarViewPort::mouseMoveEvent(TQMouseEvent* e) case Zoom: { - if(_currentMButton == Qt::LeftButton) { + if(_currentMButton == TQt::LeftButton) { static TQString strpos; diff --git a/kgantt/kgantt/xQGanttListViewPort.h b/kgantt/kgantt/xQGanttListViewPort.h index 21f3f02f..1f937521 100644 --- a/kgantt/kgantt/xQGanttListViewPort.h +++ b/kgantt/kgantt/xQGanttListViewPort.h @@ -114,7 +114,7 @@ protected: void mousePressEvent(TQMouseEvent* e) { - if(e->button() == Qt::RightButton && e->state() == ControlButton ) { + if(e->button() == TQt::RightButton && e->state() == ControlButton ) { _menu->popup(e->globalPos()); return; } diff --git a/kitchensync/src/configguipalm.cpp b/kitchensync/src/configguipalm.cpp index ee85ba29..124700ca 100644 --- a/kitchensync/src/configguipalm.cpp +++ b/kitchensync/src/configguipalm.cpp @@ -167,7 +167,7 @@ void ConfigGuiPalm::initGUI() gridLayout = new TQGridLayout( connectionLayout, 1, 2, KDialog::spacingHint() ); gridLayout->setMargin( KDialog::marginHint() ); - TQButtonGroup *buttonGroup = new TQButtonGroup( 1, Qt::Horizontal, connectionWidget ); + TQButtonGroup *buttonGroup = new TQButtonGroup( 1, TQt::Horizontal, connectionWidget ); buttonGroup->setExclusive( true ); buttonGroup->setFrameStyle( TQFrame::NoFrame ); mSyncAlways = new TQRadioButton( i18n( "Sync Anyway" ), buttonGroup ); diff --git a/kitchensync/src/kwidgetlist.cpp b/kitchensync/src/kwidgetlist.cpp index f26f8d68..059b0c19 100644 --- a/kitchensync/src/kwidgetlist.cpp +++ b/kitchensync/src/kwidgetlist.cpp @@ -192,7 +192,7 @@ bool KWidgetList::eventFilter( TQObject *object, TQEvent *event ) { if ( event->type() == TQEvent::MouseButtonPress ) { TQMouseEvent *mouseEvent = TQT_TQMOUSEEVENT( event ); - if ( mouseEvent->button() & Qt::LeftButton ) { + if ( mouseEvent->button() & TQt::LeftButton ) { TQValueList::Iterator it; for ( it = d->mItems.begin(); it != d->mItems.end(); ++it ) { if ( TQT_BASE_OBJECT(*it) == TQT_BASE_OBJECT(object) ) { diff --git a/kmail/accountdialog.cpp b/kmail/accountdialog.cpp index 3c6265e7..657624f7 100644 --- a/kmail/accountdialog.cpp +++ b/kmail/accountdialog.cpp @@ -357,7 +357,7 @@ void AccountDialog::makeLocalAccountPage() topLayout->addWidget( choose, 3, 2 ); TQButtonGroup *group = new TQButtonGroup(i18n("Locking Method"), page ); - group->setColumnLayout(0, Qt::Horizontal); + group->setColumnLayout(0, TQt::Horizontal); group->layout()->setSpacing( 0 ); group->layout()->setMargin( 0 ); TQGridLayout *groupLayout = new TQGridLayout( group->layout() ); @@ -778,7 +778,7 @@ void AccountDialog::makePopAccountPage() vlay->addSpacing( KDialog::spacingHint() ); - mPop.encryptionGroup = new TQButtonGroup( 1, Qt::Horizontal, + mPop.encryptionGroup = new TQButtonGroup( 1, TQt::Horizontal, i18n("Encryption"), page2 ); mPop.encryptionNone = new TQRadioButton( i18n("&None"), mPop.encryptionGroup ); @@ -792,7 +792,7 @@ void AccountDialog::makePopAccountPage() TQT_SLOT(slotPopEncryptionChanged(int))); vlay->addWidget( mPop.encryptionGroup ); - mPop.authGroup = new TQButtonGroup( 1, Qt::Horizontal, + mPop.authGroup = new TQButtonGroup( 1, TQt::Horizontal, i18n("Authentication Method"), page2 ); mPop.authUser = new TQRadioButton( i18n("Clear te&xt") , mPop.authGroup, "auth clear text" ); @@ -1093,7 +1093,7 @@ void AccountDialog::makeImapAccountPage( bool connected ) vlay->addSpacing( KDialog::spacingHint() ); - mImap.encryptionGroup = new TQButtonGroup( 1, Qt::Horizontal, + mImap.encryptionGroup = new TQButtonGroup( 1, TQt::Horizontal, i18n("Encryption"), page2 ); mImap.encryptionNone = new TQRadioButton( i18n("&None"), mImap.encryptionGroup ); @@ -1107,7 +1107,7 @@ void AccountDialog::makeImapAccountPage( bool connected ) TQT_SLOT(slotImapEncryptionChanged(int))); vlay->addWidget( mImap.encryptionGroup ); - mImap.authGroup = new TQButtonGroup( 1, Qt::Horizontal, + mImap.authGroup = new TQButtonGroup( 1, TQt::Horizontal, i18n("Authentication Method"), page2 ); mImap.authUser = new TQRadioButton( i18n("Clear te&xt"), mImap.authGroup ); mImap.authLogin = new TQRadioButton( i18n("Please translate this " diff --git a/kmail/archivefolderdialog.cpp b/kmail/archivefolderdialog.cpp index 435752c6..58db524c 100644 --- a/kmail/archivefolderdialog.cpp +++ b/kmail/archivefolderdialog.cpp @@ -46,7 +46,7 @@ static TQString standardArchivePath( const TQString &folderName ) } return currentPath + i18n( "Start of the filename for a mail archive file" , "Archive" ) + "_" + folderName + - "_" + TQDate::currentDate().toString( Qt::ISODate ) + ".tar.bz2"; + "_" + TQDate::currentDate().toString( TQt::ISODate ) + ".tar.bz2"; } ArchiveFolderDialog::ArchiveFolderDialog( TQWidget *parent ) diff --git a/kmail/configuredialog.cpp b/kmail/configuredialog.cpp index 3f5d3fa5..040dba3b 100644 --- a/kmail/configuredialog.cpp +++ b/kmail/configuredialog.cpp @@ -649,7 +649,7 @@ AccountsPageSendingTab::AccountsPageSendingTab( TQWidget * parent, const char * btn_vlay->addStretch( 1 ); // spacer // "Common options" groupbox: - group = new TQGroupBox( 0, Qt::Vertical, + group = new TQGroupBox( 0, TQt::Vertical, i18n("Common Options"), this ); vlay->addWidget(group); diff --git a/kmail/headerstyle.cpp b/kmail/headerstyle.cpp index 44f12b38..6ad867a9 100644 --- a/kmail/headerstyle.cpp +++ b/kmail/headerstyle.cpp @@ -645,7 +645,7 @@ namespace KMail { // kdDebug() << "FancyHeaderStyle::format() local zone offset (in minutes): " << lzone << endl; - TQTime currTime = TQTime::currentTime( Qt::UTC ); + TQTime currTime = TQTime::currentTime( TQt::UTC ); // kdDebug() << "FancyHeaderStyle::format() current time: " << currTime << endl; diff --git a/kmail/kmcomposewin.cpp b/kmail/kmcomposewin.cpp index f9b3a884..dc48dcbb 100644 --- a/kmail/kmcomposewin.cpp +++ b/kmail/kmcomposewin.cpp @@ -195,7 +195,7 @@ KMComposeWin::KMComposeWin( KMMessage *aMsg, uint id ) setInstance( kmkernel->xmlGuiInstance() ); mMainWidget = new TQWidget(this); // splitter between the headers area and the actual editor - mHeadersToEditorSplitter = new TQSplitter( Qt::Vertical, mMainWidget, "mHeadersToEditorSplitter" ); + mHeadersToEditorSplitter = new TQSplitter( TQt::Vertical, mMainWidget, "mHeadersToEditorSplitter" ); mHeadersToEditorSplitter->setChildrenCollapsible( false ); mHeadersArea = new TQWidget( mHeadersToEditorSplitter ); mHeadersArea->setSizePolicy( mHeadersToEditorSplitter->sizePolicy().horData(), TQSizePolicy::Maximum ); @@ -330,9 +330,9 @@ KMComposeWin::KMComposeWin( KMMessage *aMsg, uint id ) mFixedFontAction = 0; mTempDir = 0; // the attachment view is separated from the editor by a splitter - mSplitter = new TQSplitter( Qt::Vertical, mHeadersToEditorSplitter, "mSplitter" ); + mSplitter = new TQSplitter( TQt::Vertical, mHeadersToEditorSplitter, "mSplitter" ); mSplitter->setChildrenCollapsible( false ); - mSnippetSplitter = new TQSplitter( Qt::Horizontal, mSplitter, "mSnippetSplitter"); + mSnippetSplitter = new TQSplitter( TQt::Horizontal, mSplitter, "mSnippetSplitter"); mSnippetSplitter->setChildrenCollapsible( false ); TQWidget *editorAndCryptoStateIndicators = new TQWidget( mSnippetSplitter ); diff --git a/kmail/kmedit.cpp b/kmail/kmedit.cpp index 62cbf6d5..1d01782d 100644 --- a/kmail/kmedit.cpp +++ b/kmail/kmedit.cpp @@ -708,7 +708,7 @@ void KMEdit::paste() // Roll our own internal flag. void KMEdit::contentsMouseReleaseEvent( TQMouseEvent * e ) { - if( e->button() != Qt::MidButton ) + if( e->button() != TQt::MidButton ) return KEdit::contentsMouseReleaseEvent( e ); mPasteMode = TQClipboard::Selection; KEdit::contentsMouseReleaseEvent( e ); @@ -718,7 +718,7 @@ void KMEdit::contentsMouseReleaseEvent( TQMouseEvent * e ) void KMEdit::contentsMouseDoubleClickEvent( TQMouseEvent *e ) { bool handled = false; - if ( e->button() == Qt::LeftButton ) { + if ( e->button() == TQt::LeftButton ) { // Get the cursor position for the place where the user clicked to int paragraphPos; diff --git a/kmail/kmfilterdlg.cpp b/kmail/kmfilterdlg.cpp index b1bbb9ab..32eb1492 100644 --- a/kmail/kmfilterdlg.cpp +++ b/kmail/kmfilterdlg.cpp @@ -184,11 +184,11 @@ KMFilterDlg::KMFilterDlg(TQWidget* parent, const char* name, bool popFilter, boo vbl->addWidget( mGlobalsBox, 0, TQt::AlignTop ); } else { - TQGroupBox *agb = new TQGroupBox( 1 /*column*/, Qt::Vertical, i18n("Filter Actions"), page1 ); + TQGroupBox *agb = new TQGroupBox( 1 /*column*/, TQt::Vertical, i18n("Filter Actions"), page1 ); mActionLister = new KMFilterActionWidgetLister( agb ); vbl->addWidget( agb, 0, TQt::AlignTop ); - mAdvOptsGroup = new TQGroupBox ( 1 /*columns*/, Qt::Vertical, + mAdvOptsGroup = new TQGroupBox ( 1 /*columns*/, TQt::Vertical, i18n("Advanced Options"), page2); { TQWidget *adv_w = new TQWidget( mAdvOptsGroup ); @@ -577,7 +577,7 @@ void KMFilterDlg::slotUpdateAccountList() //============================================================================= KMFilterListBox::KMFilterListBox( const TQString & title, TQWidget *parent, const char* name, bool popFilter ) - : TQGroupBox( 1, Qt::Horizontal, title, parent, name ), + : TQGroupBox( 1, TQt::Horizontal, title, parent, name ), bPopFilter(popFilter) { mFilterList.setAutoDelete( true ); diff --git a/kmail/kmfoldertree.cpp b/kmail/kmfoldertree.cpp index b683980e..21a2eb0f 100644 --- a/kmail/kmfoldertree.cpp +++ b/kmail/kmfoldertree.cpp @@ -1230,7 +1230,7 @@ void KMFolderTree::contentsMouseReleaseEvent(TQMouseEvent* me) } // react on middle-button only - if (btn != Qt::MidButton) { + if (btn != TQt::MidButton) { KFolderTree::contentsMouseReleaseEvent(me); return; } @@ -1753,7 +1753,7 @@ void KMFolderTree::slotToggleSizeColumn() bool KMFolderTree::eventFilter( TQObject *o, TQEvent *e ) { if ( e->type() == TQEvent::MouseButtonPress && - TQT_TQMOUSEEVENT(e)->button() == Qt::RightButton && + TQT_TQMOUSEEVENT(e)->button() == TQt::RightButton && o->isA("TQHeader") ) { mPopup->popup( TQT_TQMOUSEEVENT(e)->globalPos() ); diff --git a/kmail/kmheaders.cpp b/kmail/kmheaders.cpp index 116b2e57..66231ae2 100644 --- a/kmail/kmheaders.cpp +++ b/kmail/kmheaders.cpp @@ -235,7 +235,7 @@ KMHeaders::~KMHeaders () bool KMHeaders::eventFilter ( TQObject *o, TQEvent *e ) { if ( e->type() == TQEvent::MouseButtonPress && - TQT_TQMOUSEEVENT(e)->button() == Qt::RightButton && + TQT_TQMOUSEEVENT(e)->button() == TQt::RightButton && o->isA("TQHeader") ) { // if we currently only show one of either sender/receiver column @@ -2332,12 +2332,12 @@ void KMHeaders::contentsMousePressEvent(TQMouseEvent* e) if ( e->state() & ControlButton ) setSelected( lvi, !wasSelected ); - if ((e->button() == Qt::LeftButton) ) + if ((e->button() == TQt::LeftButton) ) mMousePressed = true; } // check if we are on a status column and toggle it - if ( lvi && e->button() == Qt::LeftButton && !( e->state() & (ShiftButton | ControlButton | AltButton | MetaButton) ) ) { + if ( lvi && e->button() == TQt::LeftButton && !( e->state() & (ShiftButton | ControlButton | AltButton | MetaButton) ) ) { bool flagsToggleable = GlobalSettings::self()->allowLocalFlags() || !(mFolder ? mFolder->isReadOnly() : true); int section = header()->sectionAt( e->pos().x() ); HeaderItem *item = static_cast( lvi ); @@ -2365,7 +2365,7 @@ void KMHeaders::contentsMousePressEvent(TQMouseEvent* e) //----------------------------------------------------------------------------- void KMHeaders::contentsMouseReleaseEvent(TQMouseEvent* e) { - if (e->button() != Qt::RightButton) + if (e->button() != TQt::RightButton) TDEListView::contentsMouseReleaseEvent(e); mMousePressed = false; diff --git a/kmail/kmmainwidget.cpp b/kmail/kmmainwidget.cpp index 6240a19b..0b5c6d6f 100644 --- a/kmail/kmmainwidget.cpp +++ b/kmail/kmmainwidget.cpp @@ -558,9 +558,9 @@ void KMMainWidget::createWidgets(void) if ( mLongFolderList ) { // superior splitter: folder tree vs. rest // inferior splitter: headers vs. message vs. mime tree - mPanner1 = new TQSplitter( Qt::Horizontal, this, "panner 1" ); + mPanner1 = new TQSplitter( TQt::Horizontal, this, "panner 1" ); mPanner1->setOpaqueResize( opaqueResize ); - Qt::Orientation orientation = mReaderWindowBelow ? Qt::Vertical : Qt::Horizontal; + TQt::Orientation orientation = mReaderWindowBelow ? TQt::Vertical : TQt::Horizontal; mPanner2 = new TQSplitter( orientation, mPanner1, "panner 2" ); mPanner2->setOpaqueResize( opaqueResize ); mPanner2->setChildrenCollapsible( false ); @@ -569,10 +569,10 @@ void KMMainWidget::createWidgets(void) } else /* !mLongFolderList */ { // superior splitter: ( folder tree + headers ) vs. message vs. mime // inferior splitter: folder tree vs. headers - mPanner1 = new TQSplitter( Qt::Vertical, this, "panner 1" ); + mPanner1 = new TQSplitter( TQt::Vertical, this, "panner 1" ); mPanner1->setOpaqueResize( opaqueResize ); mPanner1->setChildrenCollapsible( false ); - mPanner2 = new TQSplitter( Qt::Horizontal, mPanner1, "panner 2" ); + mPanner2 = new TQSplitter( TQt::Horizontal, mPanner1, "panner 2" ); mPanner2->setOpaqueResize( opaqueResize ); headerParent = mFolderViewParent = mPanner2; mimeParent = messageParent = mPanner1; @@ -676,7 +676,7 @@ void KMMainWidget::createWidgets(void) action->plugAccel( actionCollection()->tdeaccel() ); // create list of folders - mFolderViewSplitter = new TQSplitter( Qt::Vertical, mFolderViewParent ); + mFolderViewSplitter = new TQSplitter( TQt::Vertical, mFolderViewParent ); mFolderViewSplitter->setOpaqueResize( TDEGlobalSettings::opaqueResize() ); mFavoriteFolderView = new KMail::FavoriteFolderView( this, mFolderViewSplitter ); if ( mFavoritesCheckMailAction ) diff --git a/kmail/kmreaderwin.cpp b/kmail/kmreaderwin.cpp index f0ae76c5..1e4eab6d 100644 --- a/kmail/kmreaderwin.cpp +++ b/kmail/kmreaderwin.cpp @@ -385,7 +385,7 @@ kdDebug(5006) << " Root node will NOT be replaced." << endl void KMReaderWin::createWidgets() { TQVBoxLayout * vlay = new TQVBoxLayout( this ); - mSplitter = new TQSplitter( Qt::Vertical, this, "mSplitter" ); + mSplitter = new TQSplitter( TQt::Vertical, this, "mSplitter" ); vlay->addWidget( mSplitter ); mMimePartTree = new KMMimePartTree( this, mSplitter, "mMimePartTree" ); mBox = new TQHBox( mSplitter, "mBox" ); @@ -1994,7 +1994,7 @@ void KMReaderWin::slotUrlOpen(const KURL &aUrl, const KParts::URLArgs &) return; kdWarning( 5006 ) << "KMReaderWin::slotOpenUrl(): Unhandled URL click!" << endl; - emit urlClicked( aUrl, Qt::LeftButton ); + emit urlClicked( aUrl, TQt::LeftButton ); } //----------------------------------------------------------------------------- @@ -2755,13 +2755,13 @@ bool KMReaderWin::eventFilter( TQObject *, TQEvent *e ) { if ( e->type() == TQEvent::MouseButtonPress ) { TQMouseEvent* me = TQT_TQMOUSEEVENT(e); - if ( me->button() == Qt::LeftButton && ( me->state() & ShiftButton ) ) { + if ( me->button() == TQt::LeftButton && ( me->state() & ShiftButton ) ) { // special processing for shift+click URLHandlerManager::instance()->handleShiftClick( mHoveredUrl, this ); return true; } - if ( me->button() == Qt::LeftButton ) { + if ( me->button() == TQt::LeftButton ) { TQString imagePath; const DOM::Node nodeUnderMouse = mViewer->nodeUnderMouse(); @@ -2801,7 +2801,7 @@ bool KMReaderWin::eventFilter( TQObject *, TQEvent *e ) // HACK: Send a mouse release event to the TDEHTMLView, as otherwise that will be missed in // case we started a drag. If the event is missed, the HTML view gets into a wrong // state, in which funny things like unsolicited drags start to happen. - TQMouseEvent mouseEvent( TQEvent::MouseButtonRelease, me->pos(), Qt::NoButton, Qt::NoButton ); + TQMouseEvent mouseEvent( TQEvent::MouseButtonRelease, me->pos(), TQt::NoButton, TQt::NoButton ); TQT_TQOBJECT( mViewer->view() )->eventFilter( mViewer->view()->viewport(), &mouseEvent ); return true; diff --git a/kmail/kmsearchpatternedit.cpp b/kmail/kmsearchpatternedit.cpp index 21ade7b2..ffc96841 100644 --- a/kmail/kmsearchpatternedit.cpp +++ b/kmail/kmsearchpatternedit.cpp @@ -391,14 +391,14 @@ void KMSearchRuleWidgetLister::regenerateRuleListFromWidgets() //============================================================================= KMSearchPatternEdit::KMSearchPatternEdit(TQWidget *parent, const char *name, bool headersOnly, bool absoluteDates ) - : TQGroupBox( 1/*columns*/, Qt::Horizontal, parent, name ) + : TQGroupBox( 1/*columns*/, TQt::Horizontal, parent, name ) { setTitle( i18n("Search Criteria") ); initLayout( headersOnly, absoluteDates ); } KMSearchPatternEdit::KMSearchPatternEdit(const TQString & title, TQWidget *parent, const char *name, bool headersOnly, bool absoluteDates) - : TQGroupBox( 1/*column*/, Qt::Horizontal, title, parent, name ) + : TQGroupBox( 1/*column*/, TQt::Horizontal, title, parent, name ) { initLayout( headersOnly, absoluteDates ); } diff --git a/kmail/kmsystemtray.cpp b/kmail/kmsystemtray.cpp index 1d1ce933..f9041222 100644 --- a/kmail/kmsystemtray.cpp +++ b/kmail/kmsystemtray.cpp @@ -316,7 +316,7 @@ void KMSystemTray::foldersChanged() void KMSystemTray::mousePressEvent(TQMouseEvent *e) { // switch to kmail on left mouse button - if( e->button() == Qt::LeftButton ) + if( e->button() == TQt::LeftButton ) { if( mParentVisible && mainWindowIsOnCurrentDesktop() ) hideKMail(); @@ -325,7 +325,7 @@ void KMSystemTray::mousePressEvent(TQMouseEvent *e) } // open popup menu on right mouse button - if( e->button() == Qt::RightButton ) + if( e->button() == TQt::RightButton ) { mPopupFolders.clear(); mPopupFolders.reserve( mFoldersWithUnread.count() ); diff --git a/kmail/kmtransport.cpp b/kmail/kmtransport.cpp index 4f991f94..5d6ee830 100644 --- a/kmail/kmtransport.cpp +++ b/kmail/kmtransport.cpp @@ -498,7 +498,7 @@ void KMTransportDialog::makeSmtpPage() TQWidget *page2 = new TQWidget( tabWidget ); tabWidget->addTab( page2, i18n("S&ecurity") ); TQVBoxLayout *vlay = new TQVBoxLayout( page2, spacingHint() ); - mSmtp.encryptionGroup = new TQButtonGroup( 1, Qt::Horizontal, + mSmtp.encryptionGroup = new TQButtonGroup( 1, TQt::Horizontal, i18n("Encryption"), page2 ); mSmtp.encryptionNone = new TQRadioButton( i18n("&None"), mSmtp.encryptionGroup ); @@ -510,7 +510,7 @@ void KMTransportDialog::makeSmtpPage() TQT_SLOT(slotSmtpEncryptionChanged(int))); vlay->addWidget( mSmtp.encryptionGroup ); - mSmtp.authGroup = new TQButtonGroup( 1, Qt::Horizontal, + mSmtp.authGroup = new TQButtonGroup( 1, TQt::Horizontal, i18n("Authentication Method"), page2 ); mSmtp.authLogin = new TQRadioButton( i18n("Please translate this " "authentication method only if you have a good reason", "&LOGIN"), diff --git a/kmail/mailinglistpropertiesdialog.cpp b/kmail/mailinglistpropertiesdialog.cpp index 0bfb2cc1..08d76a58 100644 --- a/kmail/mailinglistpropertiesdialog.cpp +++ b/kmail/mailinglistpropertiesdialog.cpp @@ -59,7 +59,7 @@ MailingListFolderPropertiesDialog::MailingListFolderPropertiesDialog( TQWidget* "topLayout" ); TQGroupBox *mlGroup = new TQGroupBox( i18n("Associated Mailing List" ), this ); - mlGroup->setColumnLayout( 0, Qt::Vertical ); + mlGroup->setColumnLayout( 0, TQt::Vertical ); TQGridLayout *groupLayout = new TQGridLayout( mlGroup->layout(), 6, 3, spacingHint() ); topLayout->addWidget( mlGroup ); setMainWidget( mlGroup ); diff --git a/kmail/searchwindow.cpp b/kmail/searchwindow.cpp index 68d64a82..f5ecf155 100644 --- a/kmail/searchwindow.cpp +++ b/kmail/searchwindow.cpp @@ -286,7 +286,7 @@ SearchWindow::SearchWindow(KMMainWidget* w, const char* name, resize(mainWidth, mainHeight); setMainWidget(searchWidget); - setButtonBoxOrientation(Qt::Vertical); + setButtonBoxOrientation(TQt::Vertical); mBtnSearch = actionButton(KDialogBase::User1); mBtnStop = actionButton(KDialogBase::User2); diff --git a/kmail/urlhandlermanager.cpp b/kmail/urlhandlermanager.cpp index 32469118..dde2944e 100644 --- a/kmail/urlhandlermanager.cpp +++ b/kmail/urlhandlermanager.cpp @@ -752,7 +752,7 @@ namespace { namespace { bool FallBackURLHandler::handleClick( const KURL & url, KMReaderWin * w ) const { if ( w ) - w->emitUrlClicked( url, Qt::LeftButton ); + w->emitUrlClicked( url, TQt::LeftButton ); return true; } diff --git a/knode/headerview.cpp b/knode/headerview.cpp index fbc34c38..31d85fda 100644 --- a/knode/headerview.cpp +++ b/knode/headerview.cpp @@ -548,7 +548,7 @@ bool KNHeaderView::eventFilter(TQObject *o, TQEvent *e) // right click on header if ( e->type() == TQEvent::MouseButtonPress && - TQT_TQMOUSEEVENT(e)->button() == Qt::RightButton && + TQT_TQMOUSEEVENT(e)->button() == TQt::RightButton && o->isA("TQHeader") ) { mPopup->popup( TQT_TQMOUSEEVENT(e)->globalPos() ); diff --git a/knode/kncollectionview.cpp b/knode/kncollectionview.cpp index 0b51fd0b..7a8e6840 100644 --- a/knode/kncollectionview.cpp +++ b/knode/kncollectionview.cpp @@ -429,7 +429,7 @@ bool KNCollectionView::eventFilter(TQObject *o, TQEvent *e) // header popup menu if ( e->type() == TQEvent::MouseButtonPress && - TQT_TQMOUSEEVENT(e)->button() == Qt::RightButton && + TQT_TQMOUSEEVENT(e)->button() == TQt::RightButton && o->isA("TQHeader") ) { mPopup->popup( TQT_TQMOUSEEVENT(e)->globalPos() ); diff --git a/knode/kncomposer.cpp b/knode/kncomposer.cpp index 43b772e5..b478f909 100644 --- a/knode/kncomposer.cpp +++ b/knode/kncomposer.cpp @@ -1725,7 +1725,7 @@ TQPopupMenu * KNComposer::popupMenu( const TQString& name ) KNComposer::ComposerView::ComposerView(KNComposer *composer, const char *n) - : TQSplitter(Qt::Vertical, composer, n), a_ttWidget(0), a_ttView(0), v_iewOpen(false) + : TQSplitter(TQt::Vertical, composer, n), a_ttWidget(0), a_ttView(0), v_iewOpen(false) { TQWidget *main=new TQWidget(this); @@ -1798,7 +1798,7 @@ KNComposer::ComposerView::ComposerView(KNComposer *composer, const char *n) TQVBoxLayout *notL=new TQVBoxLayout(e_dit); notL->addStretch(1); - n_otification=new TQGroupBox(2, Qt::Horizontal, e_dit); + n_otification=new TQGroupBox(2, TQt::Horizontal, e_dit); l=new TQLabel(i18n("You are currently editing the article body\nin an external editor. To continue, you have\nto close the external editor."), n_otification); c_ancelEditorBtn=new TQPushButton(i18n("&Kill External Editor"), n_otification); n_otification->setFrameStyle(TQFrame::Panel | TQFrame::Raised); diff --git a/knode/knconfigwidgets.cpp b/knode/knconfigwidgets.cpp index 68b474a1..ea2d77a2 100644 --- a/knode/knconfigwidgets.cpp +++ b/knode/knconfigwidgets.cpp @@ -294,7 +294,7 @@ KNConfig::NntpAccountListWidget::NntpAccountListWidget(TQWidget *p, const char * topL->addMultiCellWidget(l_box, 0,4, 0,0); // info box - TQGroupBox *gb = new TQGroupBox(2,Qt::Vertical,TQString(),this); + TQGroupBox *gb = new TQGroupBox(2,TQt::Vertical,TQString(),this); topL->addWidget(gb,5,0); s_erverInfo = new TQLabel(gb); @@ -2372,7 +2372,7 @@ KNConfig::GroupCleanupWidget::GroupCleanupWidget( Cleanup *data, TQWidget *paren } mExpGroup = new TQGroupBox( i18n("Newsgroup Cleanup Settings"), this ); - mExpGroup->setColumnLayout(0, Qt::Vertical ); + mExpGroup->setColumnLayout(0, TQt::Vertical ); mExpGroup->layout()->setSpacing( KDialog::spacingHint() ); mExpGroup->layout()->setMargin( KDialog::marginHint() ); top->addWidget( mExpGroup ); @@ -2481,7 +2481,7 @@ KNConfig::CleanupWidget::CleanupWidget( TQWidget *p, const char *n ) : // === folders ========================================================= TQGroupBox *foldersB=new TQGroupBox(i18n("Folders"), this); - foldersB->setColumnLayout(0, Qt::Vertical ); + foldersB->setColumnLayout(0, TQt::Vertical ); foldersB->layout()->setSpacing( KDialog::spacingHint() ); foldersB->layout()->setMargin( KDialog::marginHint() ); diff --git a/knotes/knote.cpp b/knotes/knote.cpp index b73ce29e..f5afc227 100644 --- a/knotes/knote.cpp +++ b/knotes/knote.cpp @@ -1349,9 +1349,9 @@ bool KNote::eventFilter( TQObject *o, TQEvent *ev ) slotRename(); } if ( ev->type() == TQEvent::MouseButtonPress && - (e->button() == Qt::LeftButton || e->button() == Qt::MidButton)) + (e->button() == TQt::LeftButton || e->button() == TQt::MidButton)) { - e->button() == Qt::LeftButton ? KWin::raiseWindow( winId() ) + e->button() == TQt::LeftButton ? KWin::raiseWindow( winId() ) : KWin::lowerWindow( winId() ); XUngrabPointer( tqt_xdisplay(), GET_QT_X_TIME() ); @@ -1370,7 +1370,7 @@ bool KNote::eventFilter( TQObject *o, TQEvent *ev ) #endif if ( m_menu && ( ev->type() == TQEvent::MouseButtonPress ) - && ( e->button() == Qt::RightButton ) ) + && ( e->button() == TQt::RightButton ) ) { m_menu->popup( TQCursor::pos() ); return true; @@ -1402,7 +1402,7 @@ bool KNote::eventFilter( TQObject *o, TQEvent *ev ) { if ( m_edit_menu && ev->type() == TQEvent::MouseButtonPress && - ((TQMouseEvent *)ev)->button() == Qt::RightButton ) + ((TQMouseEvent *)ev)->button() == TQt::RightButton ) { m_edit_menu->popup( TQCursor::pos() ); return true; diff --git a/knotes/knotealarmdlg.cpp b/knotes/knotealarmdlg.cpp index 4496da26..0a3236a2 100644 --- a/knotes/knotealarmdlg.cpp +++ b/knotes/knotealarmdlg.cpp @@ -49,7 +49,7 @@ KNoteAlarmDlg::KNoteAlarmDlg( const TQString& caption, TQWidget *parent, const c : KDialogBase( parent, name, true, caption, Ok|Cancel, Ok ) { TQVBox *page = makeVBoxMainWidget(); - TQGroupBox *group = new TQGroupBox( 3, Qt::Vertical, i18n("Scheduled Alarm"), page ); + TQGroupBox *group = new TQGroupBox( 3, TQt::Vertical, i18n("Scheduled Alarm"), page ); m_buttons = new TQButtonGroup( page ); m_buttons->hide(); diff --git a/knotes/knotesapp.cpp b/knotes/knotesapp.cpp index 9ad877ff..beaa3c22 100644 --- a/knotes/knotesapp.cpp +++ b/knotes/knotesapp.cpp @@ -486,7 +486,7 @@ void KNotesApp::mousePressEvent( TQMouseEvent* e ) switch ( e->button() ) { - case Qt::LeftButton: + case TQt::LeftButton: if ( m_noteList.count() == 1 ) { TQDictIterator it( m_noteList ); @@ -495,10 +495,10 @@ void KNotesApp::mousePressEvent( TQMouseEvent* e ) else if ( m_note_menu->count() > 0 ) m_note_menu->popup( e->globalPos() ); break; - case Qt::MidButton: + case TQt::MidButton: newNote(); break; - case Qt::RightButton: + case TQt::RightButton: m_context_menu->popup( e->globalPos() ); default: break; } diff --git a/konsolekalendar/konsolekalendar.cpp b/konsolekalendar/konsolekalendar.cpp index 535478cf..775f7b2d 100644 --- a/konsolekalendar/konsolekalendar.cpp +++ b/konsolekalendar/konsolekalendar.cpp @@ -272,11 +272,11 @@ bool KonsoleKalendar::showInstance() } else { if ( firstdate == lastdate ) { title = i18n( "Events: %1" ) - .arg( firstdate.toString( Qt::TextDate ) ); + .arg( firstdate.toString( TQt::TextDate ) ); } else { title = i18n( "Events: %1 - %2" ) - .arg( firstdate.toString( Qt::TextDate ) ) - .arg( lastdate.toString( Qt::TextDate ) ); + .arg( firstdate.toString( TQt::TextDate ) ) + .arg( lastdate.toString( TQt::TextDate ) ); } htmlSettings.setEventView( true ); } @@ -439,11 +439,11 @@ void KonsoleKalendar::printSpecs() << endl; cout << i18n( " Begin: %1" ). - arg( m_variables->getStartDateTime().toString( Qt::TextDate ) ).local8Bit().data() + arg( m_variables->getStartDateTime().toString( TQt::TextDate ) ).local8Bit().data() << endl; cout << i18n( " End: %1" ). - arg( m_variables->getEndDateTime().toString( Qt::TextDate ) ).local8Bit().data() + arg( m_variables->getEndDateTime().toString( TQt::TextDate ) ).local8Bit().data() << endl; if ( m_variables->getFloating() == true ) { diff --git a/konsolekalendar/konsolekalendaradd.cpp b/konsolekalendar/konsolekalendaradd.cpp index d7b2774b..75828ed3 100644 --- a/konsolekalendar/konsolekalendaradd.cpp +++ b/konsolekalendar/konsolekalendaradd.cpp @@ -146,11 +146,11 @@ void KonsoleKalendarAdd::printSpecs() << endl; cout << i18n( " Begin: %1" ). - arg( m_variables->getStartDateTime().toString( Qt::TextDate ) ).local8Bit().data() + arg( m_variables->getStartDateTime().toString( TQt::TextDate ) ).local8Bit().data() << endl; cout << i18n( " End: %1" ). - arg( m_variables->getEndDateTime().toString( Qt::TextDate ) ).local8Bit().data() + arg( m_variables->getEndDateTime().toString( TQt::TextDate ) ).local8Bit().data() << endl; if ( m_variables->getFloating() == true ) { diff --git a/konsolekalendar/konsolekalendarchange.cpp b/konsolekalendar/konsolekalendarchange.cpp index 7c9e3b5e..820f11b4 100644 --- a/konsolekalendar/konsolekalendarchange.cpp +++ b/konsolekalendar/konsolekalendarchange.cpp @@ -136,11 +136,11 @@ void KonsoleKalendarChange::printSpecs( Event *event ) << endl; cout << i18n( " Begin: %1" ). - arg( event->dtStart().toString( Qt::TextDate ) ).local8Bit().data() + arg( event->dtStart().toString( TQt::TextDate ) ).local8Bit().data() << endl; cout << i18n( " End: %1" ). - arg( event->dtEnd().toString( Qt::TextDate ) ).local8Bit().data() + arg( event->dtEnd().toString( TQt::TextDate ) ).local8Bit().data() << endl; cout << i18n( " Desc: %1" ). @@ -163,11 +163,11 @@ void KonsoleKalendarChange::printSpecs() << endl; cout << i18n( " Begin: %1" ). - arg( m_variables->getStartDateTime().toString( Qt::TextDate ) ).local8Bit().data() + arg( m_variables->getStartDateTime().toString( TQt::TextDate ) ).local8Bit().data() << endl; cout << i18n( " End: %1" ). - arg( m_variables->getEndDateTime().toString( Qt::TextDate ) ).local8Bit().data() + arg( m_variables->getEndDateTime().toString( TQt::TextDate ) ).local8Bit().data() << endl; cout << i18n( " Desc: %1" ). diff --git a/konsolekalendar/konsolekalendardelete.cpp b/konsolekalendar/konsolekalendardelete.cpp index 4da76100..1a274d36 100644 --- a/konsolekalendar/konsolekalendardelete.cpp +++ b/konsolekalendar/konsolekalendardelete.cpp @@ -101,11 +101,11 @@ void KonsoleKalendarDelete::printSpecs( Event *event ) << endl; cout << i18n( " Begin: %1" ). - arg( event->dtStart().toString( Qt::TextDate ) ).local8Bit().data() + arg( event->dtStart().toString( TQt::TextDate ) ).local8Bit().data() << endl; cout << i18n( " End: %1" ). - arg( event->dtEnd().toString( Qt::TextDate ) ).local8Bit().data() + arg( event->dtEnd().toString( TQt::TextDate ) ).local8Bit().data() << endl; cout << i18n( " Desc: %1" ). diff --git a/konsolekalendar/konsolekalendarepoch.cpp b/konsolekalendar/konsolekalendarepoch.cpp index 6aebd9a9..a58ad3a5 100644 --- a/konsolekalendar/konsolekalendarepoch.cpp +++ b/konsolekalendar/konsolekalendarepoch.cpp @@ -53,7 +53,7 @@ KonsoleKalendarEpoch::~KonsoleKalendarEpoch() TQDateTime KonsoleKalendarEpoch::epoch2TQDateTime( uint epoch ) { TQDateTime dt; - dt.setTime_t( epoch, Qt::UTC ); + dt.setTime_t( epoch, TQt::UTC ); return( dt ); } @@ -64,8 +64,8 @@ uint KonsoleKalendarEpoch::TQDateTime2epoch( TQDateTime dt ) // SORRY QT DOESN'T HANDLE DAYLIGHT SAVINGS TIME. // Compute #seconds to subtract for local timezone difference from UTC. - int offset = TQDateTime::currentDateTime( Qt::UTC ).toTime_t() - - TQDateTime::currentDateTime( Qt::LocalTime ).toTime_t(); + int offset = TQDateTime::currentDateTime( TQt::UTC ).toTime_t() + - TQDateTime::currentDateTime( TQt::LocalTime ).toTime_t(); return( dt.toTime_t() - offset ); } diff --git a/konsolekalendar/main.cpp b/konsolekalendar/main.cpp index fc805764..a68af033 100644 --- a/konsolekalendar/main.cpp +++ b/konsolekalendar/main.cpp @@ -472,7 +472,7 @@ int main( int argc, char *argv[] ) << "(" << option << ")" << endl; - startdate = TQDate::fromString( option, Qt::ISODate ); + startdate = TQDate::fromString( option, TQt::ISODate ); if ( !startdate.isValid() ) { cout << i18n( "Invalid Start Date Specified: %1" ). arg( option ).local8Bit().data() @@ -497,7 +497,7 @@ int main( int argc, char *argv[] ) << endl; if ( option.upper() != "FLOAT" ) { - starttime = TQTime::fromString( option, Qt::ISODate ); + starttime = TQTime::fromString( option, TQt::ISODate ); if ( !starttime.isValid() ) { cout << i18n( "Invalid Start Time Specified: %1" ). arg( option ).local8Bit().data() @@ -527,7 +527,7 @@ int main( int argc, char *argv[] ) << "(" << option << ")" << endl; - enddate = TQDate::fromString( option, Qt::ISODate ); + enddate = TQDate::fromString( option, TQt::ISODate ); if ( !enddate.isValid() ) { cout << i18n( "Invalid End Date Specified: %1" ). arg( option ).local8Bit().data() @@ -579,7 +579,7 @@ int main( int argc, char *argv[] ) << endl; if ( option.upper() != "FLOAT" ) { - endtime = TQTime::fromString( option, Qt::ISODate ); + endtime = TQTime::fromString( option, TQt::ISODate ); if ( !endtime.isValid() ) { cout << i18n( "Invalid End Time Specified: %1" ). arg( option ).local8Bit().data() @@ -854,10 +854,10 @@ int main( int argc, char *argv[] ) // Some more debug prints kdDebug() << "main | datetimestamp | StartDate=" - << startdatetime.toString( Qt::TextDate ) + << startdatetime.toString( TQt::TextDate ) << endl; kdDebug() << "main | datetimestamp | EndDate=" - << enddatetime.toString( Qt::TextDate ) + << enddatetime.toString( TQt::TextDate ) << endl; /*************************************************************************** diff --git a/kontact/interfaces/summary.cpp b/kontact/interfaces/summary.cpp index 0238647e..c48e7889 100644 --- a/kontact/interfaces/summary.cpp +++ b/kontact/interfaces/summary.cpp @@ -82,7 +82,7 @@ void Summary::mousePressEvent( TQMouseEvent *event ) void Summary::mouseMoveEvent( TQMouseEvent *event ) { - if ( (event->state() & Qt::LeftButton) && + if ( (event->state() & TQt::LeftButton) && (event->pos() - mDragStartPoint).manhattanLength() > 4 ) { TQDragObject *drag = new TQTextDrag( "", this, "SummaryWidgetDrag" ); diff --git a/kontact/plugins/korganizer/kcmkorgsummary.cpp b/kontact/plugins/korganizer/kcmkorgsummary.cpp index b8c7a0cd..eda11019 100644 --- a/kontact/plugins/korganizer/kcmkorgsummary.cpp +++ b/kontact/plugins/korganizer/kcmkorgsummary.cpp @@ -92,7 +92,7 @@ void KCMKOrgSummary::initGUI() { TQVBoxLayout *layout = new TQVBoxLayout( this, 0, KDialog::spacingHint() ); - mCalendarGroup = new TQButtonGroup( 0, Qt::Vertical, i18n( "Appointments" ), this ); + mCalendarGroup = new TQButtonGroup( 0, TQt::Vertical, i18n( "Appointments" ), this ); TQVBoxLayout *boxLayout = new TQVBoxLayout( mCalendarGroup->layout(), KDialog::spacingHint() ); @@ -124,7 +124,7 @@ void KCMKOrgSummary::initGUI() layout->addWidget( mCalendarGroup ); - mTodoGroup = new TQButtonGroup( 2, Qt::Horizontal, i18n( "To-dos" ), this ); + mTodoGroup = new TQButtonGroup( 2, TQt::Horizontal, i18n( "To-dos" ), this ); new TQRadioButton( i18n( "Show all to-dos" ), mTodoGroup ); new TQRadioButton( i18n( "Show today's to-dos only" ), mTodoGroup ); diff --git a/kontact/plugins/newsticker/kcmkontactknt.cpp b/kontact/plugins/newsticker/kcmkontactknt.cpp index 179baed3..2eee85ea 100644 --- a/kontact/plugins/newsticker/kcmkontactknt.cpp +++ b/kontact/plugins/newsticker/kcmkontactknt.cpp @@ -356,7 +356,7 @@ void KCMKontactKNT::initGUI() mSelectedNews->setFullWidth( true ); layout->addWidget( mSelectedNews, 0, 2 ); - TQGroupBox *box = new TQGroupBox( 0, Qt::Vertical, + TQGroupBox *box = new TQGroupBox( 0, TQt::Vertical, i18n( "News Feed Settings" ), this ); TQGridLayout *boxLayout = new TQGridLayout( box->layout(), 2, 3, diff --git a/kontact/plugins/specialdates/kcmsdsummary.cpp b/kontact/plugins/specialdates/kcmsdsummary.cpp index b2d1a45d..c0512fae 100644 --- a/kontact/plugins/specialdates/kcmsdsummary.cpp +++ b/kontact/plugins/specialdates/kcmsdsummary.cpp @@ -87,7 +87,7 @@ void KCMSDSummary::initGUI() { TQGridLayout *layout = new TQGridLayout( this, 3, 2, KDialog::spacingHint() ); - mDaysGroup = new TQButtonGroup( 0, Qt::Vertical, i18n( "Special Dates Summary" ), this ); + mDaysGroup = new TQButtonGroup( 0, TQt::Vertical, i18n( "Special Dates Summary" ), this ); TQVBoxLayout *boxLayout = new TQVBoxLayout( mDaysGroup->layout(), KDialog::spacingHint() ); @@ -119,7 +119,7 @@ void KCMSDSummary::initGUI() layout->addMultiCellWidget( mDaysGroup, 0, 0, 0, 1 ); - mCalendarGroup = new TQButtonGroup( 1, Qt::Horizontal, i18n( "Special Dates From Calendar" ), this ); + mCalendarGroup = new TQButtonGroup( 1, TQt::Horizontal, i18n( "Special Dates From Calendar" ), this ); mShowBirthdaysFromCal = new TQCheckBox( i18n( "Show birthdays" ), mCalendarGroup ); mShowAnniversariesFromCal = new TQCheckBox( i18n( "Show anniversaries" ), mCalendarGroup ); @@ -127,7 +127,7 @@ void KCMSDSummary::initGUI() mShowSpecialsFromCal = new TQCheckBox( i18n( "Show special occasions" ), mCalendarGroup ); - mContactGroup = new TQButtonGroup( 1, Qt::Horizontal, i18n( "Special Dates From Contact List" ), this ); + mContactGroup = new TQButtonGroup( 1, TQt::Horizontal, i18n( "Special Dates From Contact List" ), this ); mShowBirthdaysFromKAB = new TQCheckBox( i18n( "Show birthdays" ), mContactGroup ); mShowAnniversariesFromKAB = new TQCheckBox( i18n( "Show anniversaries" ), mContactGroup ); diff --git a/kontact/plugins/specialdates/sdsummarywidget.cpp b/kontact/plugins/specialdates/sdsummarywidget.cpp index 376389f9..e4f86278 100644 --- a/kontact/plugins/specialdates/sdsummarywidget.cpp +++ b/kontact/plugins/specialdates/sdsummarywidget.cpp @@ -250,7 +250,7 @@ void SDSummaryWidget::updateView() TQString anniversaryAsString = (*it).custom( "KADDRESSBOOK" , "X-Anniversary" ); if ( !anniversaryAsString.isEmpty() ) { - TQDate anniversary = TQDate::fromString( anniversaryAsString, Qt::ISODate ); + TQDate anniversary = TQDate::fromString( anniversaryAsString, TQt::ISODate ); if ( anniversary.isValid() && mShowAnniversariesFromKAB ) { SDEntry entry; entry.type = IncidenceTypeContact; diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index 907603a9..28a128a0 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp @@ -138,11 +138,11 @@ CalendarView::CalendarView( TQWidget *parent, const char *name ) #ifndef KORG_NOSPLITTER // create the main layout frames. - mPanner = new TQSplitter( Qt::Horizontal, this, + mPanner = new TQSplitter( TQt::Horizontal, this, "CalendarView::Panner" ); topLayout->addWidget( mPanner ); - mLeftSplitter = new TQSplitter( Qt::Vertical, mPanner, + mLeftSplitter = new TQSplitter( TQt::Vertical, mPanner, "CalendarView::LeftFrame" ); // mPanner->setResizeMode( mLeftSplitter, TQSplitter::Stretch ); diff --git a/korganizer/importdialog.cpp b/korganizer/importdialog.cpp index 4272f5da..6edc9f71 100644 --- a/korganizer/importdialog.cpp +++ b/korganizer/importdialog.cpp @@ -50,7 +50,7 @@ ImportDialog::ImportDialog( const KURL &url, TQWidget *parent, bool isPart ) topLayout->addWidget( new TQLabel( txt, topFrame ) ); - TQButtonGroup *radioBox = new TQButtonGroup( 1, Qt::Horizontal, topFrame ); + TQButtonGroup *radioBox = new TQButtonGroup( 1, TQt::Horizontal, topFrame ); radioBox->setFlat( true ); topLayout->addWidget( radioBox ); diff --git a/korganizer/koagenda.cpp b/korganizer/koagenda.cpp index e7d4ea3b..87239801 100644 --- a/korganizer/koagenda.cpp +++ b/korganizer/koagenda.cpp @@ -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; } @@ -607,7 +607,7 @@ bool KOAgenda::eventFilter_mouse(TQObject *object, TQMouseEvent *me) case TQEvent::MouseButtonPress: // kdDebug(5850) << "koagenda: filtered button press" << endl; if (object != viewport()) { - if (me->button() == Qt::RightButton) { + if (me->button() == TQt::RightButton) { mClickedItem = dynamic_cast(object); if (mClickedItem) { selectItem(mClickedItem); @@ -639,7 +639,7 @@ bool KOAgenda::eventFilter_mouse(TQObject *object, TQMouseEvent *me) } } } else { - if ( me->button() == Qt::RightButton ) { + if ( me->button() == TQt::RightButton ) { // if mouse pointer is not in selection, select the cell below the cursor TQPoint gpos = contentsToGrid( viewportToContents( viewportPos ) ); if ( !ptInSelection( gpos ) ) { diff --git a/korganizer/koagenda.h b/korganizer/koagenda.h index d4a5fb29..d123f463 100644 --- a/korganizer/koagenda.h +++ b/korganizer/koagenda.h @@ -198,7 +198,7 @@ class KOAgenda : public TQScrollView void droppedToDo( Todo*todo, const TQPoint &gpos, bool allDay ); void enableAgendaUpdate( bool enable ); - void zoomView( const int delta, const TQPoint &pos, const Qt::Orientation ); + void zoomView( const int delta, const TQPoint &pos, const TQt::Orientation ); void mousePosSignal(const TQPoint &pos); void enterAgenda(); diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp index 7e68deeb..3e47ad63 100644 --- a/korganizer/koagendaview.cpp +++ b/korganizer/koagendaview.cpp @@ -284,7 +284,7 @@ KOAgendaView::KOAgendaView( Calendar *cal, // Create agenda splitter #ifndef KORG_NOSPLITTER - mSplitterAgenda = new TQSplitter(Qt::Vertical,this); + mSplitterAgenda = new TQSplitter(TQt::Vertical,this); topLayout->addWidget(mSplitterAgenda); #if KDE_IS_VERSION( 3, 1, 93 ) @@ -377,8 +377,8 @@ KOAgendaView::KOAgendaView( Calendar *cal, mTimeLabels, TQT_SLOT(positionChanged())); connect( mAgenda, - TQT_SIGNAL( zoomView( const int, const TQPoint & ,const Qt::Orientation ) ), - TQT_SLOT( zoomView( const int, const TQPoint &, const Qt::Orientation ) ) ); + TQT_SIGNAL( zoomView( const int, const TQPoint & ,const TQt::Orientation ) ), + TQT_SLOT( zoomView( const int, const TQPoint &, const TQt::Orientation ) ) ); connect(mTimeLabels->verticalScrollBar(),TQT_SIGNAL(valueChanged(int)), TQT_SLOT(setContentsPos(int))); @@ -561,7 +561,7 @@ void KOAgendaView::zoomOutHorizontally( const TQDate &date ) } void KOAgendaView::zoomView( const int delta, const TQPoint &pos, - const Qt::Orientation orient ) + const TQt::Orientation orient ) { static TQDate zoomDate; static TQTimer *t = new TQTimer( this ); @@ -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; @@ -584,7 +584,7 @@ void KOAgendaView::zoomView( const int delta, const TQPoint &pos, else zoomInHorizontally( zoomDate ); } else { - // Qt::Vertical zoom + // Vertical zoom TQPoint posConstentsOld = mAgenda->gridToContents(pos); if ( delta > 0 ) { zoomOutVertically(); diff --git a/korganizer/koagendaview.h b/korganizer/koagendaview.h index 6ac11d15..bbc9c235 100644 --- a/korganizer/koagendaview.h +++ b/korganizer/koagendaview.h @@ -197,7 +197,7 @@ class KOAgendaView : public KOrg::AgendaView, public KCal::Calendar::Observer void zoomView( const int delta, const TQPoint &pos, - const Qt::Orientation orient=Qt::Horizontal ); + const TQt::Orientation orient=TQt::Horizontal ); void clearTimeSpanSelection(); diff --git a/korganizer/koeditorattachments.cpp b/korganizer/koeditorattachments.cpp index 48b9acdd..6f46ac5f 100644 --- a/korganizer/koeditorattachments.cpp +++ b/korganizer/koeditorattachments.cpp @@ -189,7 +189,7 @@ AttachmentEditDialog::AttachmentEditDialog( AttachmentListItem *item, i18n( "Type any string you desire here for the name of the attachment" ) ); grid->addMultiCellWidget( mLabelEdit, 0, 0, 1, 2 ); - KSeparator *sep = new KSeparator( Qt::Horizontal, topFrame ); + KSeparator *sep = new KSeparator( TQt::Horizontal, topFrame ); grid->addMultiCellWidget( sep, 1, 1, 0, 2 ); TQLabel *label = new TQLabel( i18n( "Type:" ), topFrame ); diff --git a/korganizer/koeditorfreebusy.cpp b/korganizer/koeditorfreebusy.cpp index 7eec3b71..62d874dd 100644 --- a/korganizer/koeditorfreebusy.cpp +++ b/korganizer/koeditorfreebusy.cpp @@ -923,7 +923,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/koeditorgeneralevent.cpp b/korganizer/koeditorgeneralevent.cpp index 49b4d969..a5835ae3 100644 --- a/korganizer/koeditorgeneralevent.cpp +++ b/korganizer/koeditorgeneralevent.cpp @@ -95,7 +95,7 @@ void KOEditorGeneralEvent::initTime(TQWidget *parent,TQBoxLayout *topLayout) { TQBoxLayout *timeLayout = new TQVBoxLayout(topLayout); - TQGroupBox *timeGroupBox = new TQGroupBox(1,Qt::Horizontal, + TQGroupBox *timeGroupBox = new TQGroupBox(1,TQt::Horizontal, i18n("Date && Time"),parent); TQWhatsThis::add( timeGroupBox, i18n("Sets options related to the date and time of the " diff --git a/korganizer/koeditorgeneraltodo.cpp b/korganizer/koeditorgeneraltodo.cpp index 5af7fd60..e46e450d 100644 --- a/korganizer/koeditorgeneraltodo.cpp +++ b/korganizer/koeditorgeneraltodo.cpp @@ -96,7 +96,7 @@ void KOEditorGeneralTodo::initTime(TQWidget *parent,TQBoxLayout *topLayout) kdDebug(5850) << k_funcinfo << endl; TQBoxLayout *timeLayout = new TQVBoxLayout(topLayout); - TQGroupBox *timeGroupBox = new TQGroupBox(1,Qt::Horizontal, + TQGroupBox *timeGroupBox = new TQGroupBox(1,TQt::Horizontal, i18n("Date && Time"),parent); timeLayout->addWidget(timeGroupBox); diff --git a/korganizer/koeditorrecurrence.cpp b/korganizer/koeditorrecurrence.cpp index ac372db7..ea73d2fb 100644 --- a/korganizer/koeditorrecurrence.cpp +++ b/korganizer/koeditorrecurrence.cpp @@ -578,7 +578,7 @@ ExceptionsWidget::ExceptionsWidget( TQWidget *parent, const char *name ) : { TQBoxLayout *topLayout = new TQVBoxLayout( this ); - TQGroupBox *groupBox = new TQGroupBox( 1, Qt::Horizontal, i18n("E&xceptions"), + TQGroupBox *groupBox = new TQGroupBox( 1, TQt::Horizontal, i18n("E&xceptions"), this ); topLayout->addWidget( groupBox ); @@ -700,7 +700,7 @@ RecurrenceRangeWidget::RecurrenceRangeWidget( TQWidget *parent, { TQBoxLayout *topLayout = new TQVBoxLayout( this ); - mRangeGroupBox = new TQGroupBox( 1, Qt::Horizontal, i18n("Recurrence Range"), + mRangeGroupBox = new TQGroupBox( 1, TQt::Horizontal, i18n("Recurrence Range"), this ); TQWhatsThis::add( mRangeGroupBox, i18n("Sets a range for which these recurrence rules will " @@ -891,7 +891,7 @@ RecurrenceChooser::RecurrenceChooser( TQWidget *parent, const char *name ) : } else { mTypeCombo = 0; - TQButtonGroup *ruleButtonGroup = new TQButtonGroup( 1, Qt::Horizontal, this ); + TQButtonGroup *ruleButtonGroup = new TQButtonGroup( 1, TQt::Horizontal, this ); ruleButtonGroup->setFrameStyle( TQFrame::NoFrame ); topLayout->addWidget( ruleButtonGroup ); @@ -980,7 +980,7 @@ KOEditorRecurrence::KOEditorRecurrence( TQWidget* parent, const char *name ) : topLayout->addMultiCellWidget( mEnabledCheck, 0, 0, 0, 1 ); - mTimeGroupBox = new TQGroupBox( 1, Qt::Horizontal, i18n("Appointment Time "), + mTimeGroupBox = new TQGroupBox( 1, TQt::Horizontal, i18n("Appointment Time "), this ); TQWhatsThis::add( mTimeGroupBox, i18n("Displays appointment time information.") ); @@ -998,9 +998,9 @@ KOEditorRecurrence::KOEditorRecurrence( TQWidget* parent, const char *name ) : // mDateTimeLabel = new TQLabel( timeFrame ); // layoutTimeFrame->addWidget( mDateTimeLabel ); - Qt::Orientation orientation; - if ( KOPrefs::instance()->mCompactDialogs ) orientation = Qt::Horizontal; - else orientation = Qt::Vertical; + TQt::Orientation orientation; + if ( KOPrefs::instance()->mCompactDialogs ) orientation = TQt::Horizontal; + else orientation = TQt::Vertical; mRuleBox = new TQGroupBox( 1, orientation, i18n("Recurrence Rule"), this ); TQWhatsThis::add( mRuleBox, diff --git a/korganizer/kolistview.cpp b/korganizer/kolistview.cpp index aa97348c..a43e61ac 100644 --- a/korganizer/kolistview.cpp +++ b/korganizer/kolistview.cpp @@ -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,7 +190,7 @@ 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; } diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp index ab61181c..0d230783 100644 --- a/korganizer/komonthview.cpp +++ b/korganizer/komonthview.cpp @@ -168,7 +168,7 @@ void KNoScrollListBox::mousePressEvent( TQMouseEvent *e ) { TQListBox::mousePressEvent( e ); - if ( e->button() == Qt::RightButton ) { + if ( e->button() == TQt::RightButton ) { emit rightClick(); } } diff --git a/korganizer/koprefsdialog.cpp b/korganizer/koprefsdialog.cpp index 3e4f98bf..498c8cf8 100644 --- a/korganizer/koprefsdialog.cpp +++ b/korganizer/koprefsdialog.cpp @@ -100,7 +100,7 @@ KOPrefsDialogMain::KOPrefsDialogMain( TQWidget *parent, const char *name ) addWidString( KOPrefs::instance()->userNameItem(), mUserEmailSettings ); addWidString( KOPrefs::instance()->userEmailItem(), mUserEmailSettings ); - TQGroupBox *saveGroup = new TQGroupBox(1,Qt::Horizontal,i18n("Saving Calendar"), + TQGroupBox *saveGroup = new TQGroupBox(1,TQt::Horizontal,i18n("Saving Calendar"), topFrame); addWidBool( KOPrefs::instance()->htmlWithSaveItem(), saveGroup ); @@ -319,7 +319,7 @@ class KOPrefsDialogTime : public KPrefsModule topLayout->addWidget( defaultDuration->label(), 4, 0 ); topLayout->addWidget( defaultDuration->timeEdit(), 4, 1 ); - TQGroupBox *remindersGroupBox = new TQGroupBox( 1, Qt::Horizontal, + TQGroupBox *remindersGroupBox = new TQGroupBox( 1, TQt::Horizontal, i18n( "Reminders" ), topFrame ); topLayout->addMultiCellWidget( remindersGroupBox, 5, 5, 0, 1 ); @@ -367,7 +367,7 @@ class KOPrefsDialogTime : public KPrefsModule connect( mAlarmTimeDefaultCheckBox, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( slotWidChanged() ) ); - TQGroupBox *workingHoursGroup = new TQGroupBox(1,Qt::Horizontal, + TQGroupBox *workingHoursGroup = new TQGroupBox(1,TQt::Horizontal, i18n("Working Hours"), topFrame); topLayout->addMultiCellWidget( workingHoursGroup, 7, 7, 0, 1 ); @@ -510,7 +510,7 @@ class KOPrefsDialogViews : public KPrefsModule topLayout->addWidget( showTodosAgenda->checkBox() ); /*** Date Navigator Group ***/ - TQGroupBox *dateNavGroup = new TQGroupBox( 1, Qt::Horizontal, + TQGroupBox *dateNavGroup = new TQGroupBox( 1, TQt::Horizontal, i18n("Date Navigator"), topFrame ); addWidBool( KOPrefs::instance()->dailyRecurItem(), dateNavGroup ); @@ -520,7 +520,7 @@ class KOPrefsDialogViews : public KPrefsModule /*** Agenda View Group ***/ - TQGroupBox *agendaGroup = new TQGroupBox( 1, Qt::Horizontal, + TQGroupBox *agendaGroup = new TQGroupBox( 1, TQt::Horizontal, i18n("Agenda View"), topFrame ); @@ -554,7 +554,7 @@ class KOPrefsDialogViews : public KPrefsModule topLayout->addWidget( agendaGroup ); /*** Month View Group ***/ - TQGroupBox *monthGroup = new TQGroupBox( 1, Qt::Horizontal, + TQGroupBox *monthGroup = new TQGroupBox( 1, TQt::Horizontal, i18n("Month View"), topFrame ); addWidBool( KOPrefs::instance()->enableMonthScrollItem(), monthGroup ); @@ -564,7 +564,7 @@ class KOPrefsDialogViews : public KPrefsModule /*** Todo View Group ***/ - TQGroupBox *todoGroup = new TQGroupBox( 1, Qt::Horizontal, + TQGroupBox *todoGroup = new TQGroupBox( 1, TQt::Horizontal, i18n("To-do View"), topFrame ); addWidBool( KOPrefs::instance()->fullViewTodoItem(), todoGroup ); @@ -700,7 +700,7 @@ KOPrefsDialogColors::KOPrefsDialogColors( TQWidget *parent, const char *name ) topLayout->addWidget( unsetCategoryColor->button(), 6, 1 ); // categories colors - TQGroupBox *categoryGroup = new TQGroupBox(1,Qt::Horizontal,i18n("Categories"), + TQGroupBox *categoryGroup = new TQGroupBox(1,TQt::Horizontal,i18n("Categories"), topFrame); topLayout->addMultiCellWidget(categoryGroup,7,7,0,1); @@ -721,7 +721,7 @@ KOPrefsDialogColors::KOPrefsDialogColors( TQWidget *parent, const char *name ) updateCategoryColor(); // resources colors - TQGroupBox *resourceGroup = new TQGroupBox(1,Qt::Horizontal,i18n("Resources"), + TQGroupBox *resourceGroup = new TQGroupBox(1,TQt::Horizontal,i18n("Resources"), topFrame); topLayout->addMultiCellWidget(resourceGroup,8,8,0,1); diff --git a/korganizer/korgac/alarmdialog.cpp b/korganizer/korgac/alarmdialog.cpp index b38e6a79..3cc29582 100644 --- a/korganizer/korgac/alarmdialog.cpp +++ b/korganizer/korgac/alarmdialog.cpp @@ -122,7 +122,7 @@ AlarmDialog::AlarmDialog( KCal::CalendarResources *calendar, TQWidget *parent, c TQLabel *label = new TQLabel( i18n("The following items triggered reminders:"), topBox ); topLayout->addWidget( label ); - mSplitter = new TQSplitter( Qt::Vertical, topBox ); + mSplitter = new TQSplitter( TQt::Vertical, topBox ); mSplitter->setOpaqueResize( TDEGlobalSettings::opaqueResize() ); topLayout->addWidget( mSplitter ); diff --git a/korganizer/korgac/alarmdockwindow.cpp b/korganizer/korgac/alarmdockwindow.cpp index 081d91ca..92b8002c 100644 --- a/korganizer/korgac/alarmdockwindow.cpp +++ b/korganizer/korgac/alarmdockwindow.cpp @@ -188,7 +188,7 @@ void AlarmDockWindow::enableAutostart( bool enable ) void AlarmDockWindow::mousePressEvent( TQMouseEvent *e ) { - if ( e->button() == Qt::LeftButton ) { + if ( e->button() == TQt::LeftButton ) { kapp->startServiceByDesktopName( "korganizer", TQString() ); } else { KSystemTray::mousePressEvent( e ); diff --git a/korganizer/kotodoview.cpp b/korganizer/kotodoview.cpp index 8ae2703f..dbae5ceb 100644 --- a/korganizer/kotodoview.cpp +++ b/korganizer/kotodoview.cpp @@ -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; } diff --git a/korganizer/multiagendaview.cpp b/korganizer/multiagendaview.cpp index 63c559bf..cc21b249 100644 --- a/korganizer/multiagendaview.cpp +++ b/korganizer/multiagendaview.cpp @@ -57,7 +57,7 @@ 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( TDEGlobalSettings::opaqueResize() ); TQLabel *label = new TQLabel( i18n("All Day"), mLeftSplitter ); label->setAlignment( TQt::AlignRight | TQt::AlignVCenter | TQt::WordBreak ); @@ -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( TDEGlobalSettings::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 ); @@ -249,11 +249,11 @@ void MultiAgendaView::setupViews() TQT_SLOT(slotClearTimeSpanSelection()) ); disconnect( agenda->agenda(), - TQT_SIGNAL(zoomView(const int,const TQPoint&,const Qt::Orientation)), + TQT_SIGNAL(zoomView(const int,const TQPoint&,const TQt::Orientation)), agenda, 0 ); connect( agenda->agenda(), - TQT_SIGNAL(zoomView(const int,const TQPoint&,const Qt::Orientation)), - TQT_SLOT(zoomView(const int,const TQPoint&,const Qt::Orientation)) ); + TQT_SIGNAL(zoomView(const int,const TQPoint&,const TQt::Orientation)), + TQT_SLOT(zoomView(const int,const TQPoint&,const TQt::Orientation)) ); } KOAgenda *anAgenda = mAgendaViews.first()->agenda(); @@ -520,9 +520,9 @@ void MultiAgendaView::resizeSpacers( int newY ) mRightTopSpacer->setFixedHeight( topLabelHeight ); } -void MultiAgendaView::zoomView( const int delta, const TQPoint & pos, const Qt::Orientation ori ) +void MultiAgendaView::zoomView( const int delta, const TQPoint & pos, const TQt::Orientation ori ) { - if ( ori == Qt::Vertical ) { + if ( ori == TQt::Vertical ) { if ( delta > 0 ) { if ( KOPrefs::instance()->mHourSize > 4 ) KOPrefs::instance()->mHourSize--; diff --git a/korganizer/multiagendaview.h b/korganizer/multiagendaview.h index 44dd1e35..a3dba886 100644 --- a/korganizer/multiagendaview.h +++ b/korganizer/multiagendaview.h @@ -91,7 +91,7 @@ class MultiAgendaView : public AgendaView void resizeSplitters(); void resizeSpacers( int ); void setupScrollBar(); - void zoomView( const int delta, const TQPoint &pos, const Qt::Orientation ori ); + void zoomView( const int delta, const TQPoint &pos, const TQt::Orientation ori ); void slotResizeScrollView(); private: diff --git a/korganizer/printing/calprinter.cpp b/korganizer/printing/calprinter.cpp index 65d1bc08..b202cb6d 100644 --- a/korganizer/printing/calprinter.cpp +++ b/korganizer/printing/calprinter.cpp @@ -174,7 +174,7 @@ CalPrintDialog::CalPrintDialog( KOrg::PrintPlugin::List plugins, TQVBox *page = makeVBoxMainWidget(); TQSplitter *splitter = new TQSplitter( page ); - splitter->setOrientation( Qt::Horizontal ); + splitter->setOrientation( TQt::Horizontal ); mTypeGroup = new TQVButtonGroup( i18n("Print Style"), splitter, "buttonGroup" ); // use the minimal width possible = max width of the radio buttons, not extensible diff --git a/korganizer/searchdialog.cpp b/korganizer/searchdialog.cpp index c9e5f886..f2ddb4a8 100644 --- a/korganizer/searchdialog.cpp +++ b/korganizer/searchdialog.cpp @@ -76,7 +76,7 @@ SearchDialog::SearchDialog(Calendar *calendar,TQWidget *parent) mTodosCheck->setChecked( true ); // Date range - TQGroupBox *rangeGroup = new TQGroupBox( 1, Qt::Horizontal, i18n( "Date Range" ), + TQGroupBox *rangeGroup = new TQGroupBox( 1, TQt::Horizontal, i18n( "Date Range" ), topFrame ); layout->addWidget( rangeGroup ); diff --git a/korn/boxcontaineritem.cpp b/korn/boxcontaineritem.cpp index e67296d5..386baaef 100644 --- a/korn/boxcontaineritem.cpp +++ b/korn/boxcontaineritem.cpp @@ -171,11 +171,11 @@ void BoxContainerItem::runCommand( const TQString& cmd ) void BoxContainerItem::mouseButtonPressed( TQt::ButtonState state ) { int button; - if( state & Qt::LeftButton ) + if( state & TQt::LeftButton ) button = 0; - else if( state & Qt::RightButton ) + else if( state & TQt::RightButton ) button = 2; - else if( state & Qt::MidButton ) + else if( state & TQt::MidButton ) button = 1; else return; //Invalid mouse button diff --git a/korn/hvcontainer.cpp b/korn/hvcontainer.cpp index fa815179..cb2aef72 100644 --- a/korn/hvcontainer.cpp +++ b/korn/hvcontainer.cpp @@ -24,11 +24,11 @@ #include -HVContainer::HVContainer( Qt::Orientation orientation, TQObject * parent, const char * name ) +HVContainer::HVContainer( TQt::Orientation orientation, TQObject * parent, const char * name ) : BoxContainer( parent, name ), box( 0 ) { - if( orientation == Qt::Horizontal ) + if( orientation == TQt::Horizontal ) box = new TQHBox( 0, "hbox" ); else box = new TQVBox( 0, "vbox" ); diff --git a/korn/hvcontainer.h b/korn/hvcontainer.h index 023adcd7..ccb469fb 100644 --- a/korn/hvcontainer.h +++ b/korn/hvcontainer.h @@ -38,7 +38,7 @@ public: * * @param orientation The orientation of the box: it is a vertical or horizontal box? */ - HVContainer( Qt::Orientation orientation, TQObject * parent = 0 , const char * name = 0 ); + HVContainer( TQt::Orientation orientation, TQObject * parent = 0 , const char * name = 0 ); ~HVContainer(); /** diff --git a/korn/kornshell.cpp b/korn/kornshell.cpp index 7f5587bc..20533de3 100644 --- a/korn/kornshell.cpp +++ b/korn/kornshell.cpp @@ -99,9 +99,9 @@ void KornShell::readConfig() KOrnPassword::setUseWallet( _config->readBoolEntry( "usewallet", false ) ); if( layout == 'H' ) - _box = new HVContainer( Qt::Horizontal, TQT_TQOBJECT(this), "horizontal container" ); + _box = new HVContainer( TQt::Horizontal, TQT_TQOBJECT(this), "horizontal container" ); else if( layout == 'V' ) - _box = new HVContainer( Qt::Vertical, TQT_TQOBJECT(this), "vertical container" ); + _box = new HVContainer( TQt::Vertical, TQT_TQOBJECT(this), "vertical container" ); else _box = new DockedContainer( TQT_TQOBJECT(this), "docked container" ); diff --git a/korn/mailsubject.cpp b/korn/mailsubject.cpp index 0b7a2e3a..841e183b 100644 --- a/korn/mailsubject.cpp +++ b/korn/mailsubject.cpp @@ -54,7 +54,7 @@ TQString KornMailSubject::toString() const date.setTime_t(_date); return TQString("KornMailSubject, Id: ") + (_id?_id->toString():TQString("NULL")) + ", " + i18n("Subject:") + " " + _subject + ", " + i18n("Sender:") + " " + _sender + ", " + i18n("Size:") + " " + TQString::number(_size) - + ", " + i18n("Date:") + " " + date.toString(Qt::ISODate); + + ", " + i18n("Date:") + " " + date.toString(TQt::ISODate); } TQString KornMailSubject::decodeRFC2047String(const TQCString& aStr) diff --git a/ktnef/gui/qwmf.cpp b/ktnef/gui/qwmf.cpp index e4baf41d..5719eda2 100644 --- a/ktnef/gui/qwmf.cpp +++ b/ktnef/gui/qwmf.cpp @@ -624,8 +624,8 @@ void TQWinMetaFile::setBkColor( long, short* parm ) //----------------------------------------------------------------------------- void TQWinMetaFile::setBkMode( long, short* parm ) { - if ( parm[ 0 ]==1 ) mPainter.setBackgroundMode( Qt::TransparentMode ); - else mPainter.setBackgroundMode( Qt::OpaqueMode ); + if ( parm[ 0 ]==1 ) mPainter.setBackgroundMode( TQt::TransparentMode ); + else mPainter.setBackgroundMode( TQt::OpaqueMode ); } @@ -929,26 +929,26 @@ void TQWinMetaFile::createEmptyObject( long, short* ) //----------------------------------------------------------------------------- void TQWinMetaFile::createBrushIndirect( long, short* parm ) { - static Qt::BrushStyle hatchedStyleTab[] = + static TQt::BrushStyle hatchedStyleTab[] = { - Qt::HorPattern, - Qt::FDiagPattern, - Qt::BDiagPattern, - Qt::CrossPattern, - Qt::DiagCrossPattern + TQt::HorPattern, + TQt::FDiagPattern, + TQt::BDiagPattern, + TQt::CrossPattern, + TQt::DiagCrossPattern }; - static Qt::BrushStyle styleTab[] = - { Qt::SolidPattern, - Qt::NoBrush, - Qt::FDiagPattern, /* hatched */ - Qt::Dense4Pattern, /* should be custom bitmap pattern */ - Qt::HorPattern, /* should be BS_INDEXED (?) */ - Qt::VerPattern, /* should be device-independent bitmap */ - Qt::Dense6Pattern, /* should be device-independent packed-bitmap */ - Qt::Dense2Pattern, /* should be BS_PATTERN8x8 */ - Qt::Dense3Pattern /* should be device-independent BS_DIBPATTERN8x8 */ + static TQt::BrushStyle styleTab[] = + { TQt::SolidPattern, + TQt::NoBrush, + TQt::FDiagPattern, /* hatched */ + TQt::Dense4Pattern, /* should be custom bitmap pattern */ + TQt::HorPattern, /* should be BS_INDEXED (?) */ + TQt::VerPattern, /* should be device-independent bitmap */ + TQt::Dense6Pattern, /* should be device-independent packed-bitmap */ + TQt::Dense2Pattern, /* should be BS_PATTERN8x8 */ + TQt::Dense3Pattern /* should be device-independent BS_DIBPATTERN8x8 */ }; - Qt::BrushStyle style; + TQt::BrushStyle style; short arg; WinObjBrushHandle* handle = new WinObjBrushHandle; addHandle( handle ); @@ -961,7 +961,7 @@ void TQWinMetaFile::createBrushIndirect( long, short* parm ) else { kdDebug() << "TQWinMetaFile::createBrushIndirect: invalid hatched brush " << arg << endl; - style = Qt::SolidPattern; + style = TQt::SolidPattern; } } else if ( arg>=0 && arg<9 ) @@ -969,7 +969,7 @@ void TQWinMetaFile::createBrushIndirect( long, short* parm ) else { kdDebug() << "TQWinMetaFile::createBrushIndirect: invalid brush " << arg << endl; - style = Qt::SolidPattern; + style = TQt::SolidPattern; } handle->brush.setStyle( style ); handle->brush.setColor( color( parm+1 ) ); @@ -979,10 +979,10 @@ void TQWinMetaFile::createBrushIndirect( long, short* parm ) //----------------------------------------------------------------------------- void TQWinMetaFile::createPenIndirect( long, short* parm ) { - static Qt::PenStyle styleTab[] = - { Qt::SolidLine, Qt::DashLine, Qt::DotLine, Qt::DashDotLine, Qt::DashDotDotLine, - Qt::NoPen, Qt::SolidLine }; - Qt::PenStyle style; + static TQt::PenStyle styleTab[] = + { TQt::SolidLine, TQt::DashLine, TQt::DotLine, TQt::DashDotLine, TQt::DashDotDotLine, + TQt::NoPen, TQt::SolidLine }; + TQt::PenStyle style; WinObjPenHandle* handle = new WinObjPenHandle; addHandle( handle ); @@ -990,12 +990,12 @@ void TQWinMetaFile::createPenIndirect( long, short* parm ) else { kdDebug() << "TQWinMetaFile::createPenIndirect: invalid pen " << parm[ 0 ] << endl; - style = Qt::SolidLine; + style = TQt::SolidLine; } handle->pen.setStyle( style ); handle->pen.setColor( color( parm+3 ) ); - handle->pen.setCapStyle( Qt::RoundCap ); + handle->pen.setCapStyle( TQt::RoundCap ); //int width = 0; // TODO : width of pen proportional to device context width diff --git a/libkcal/resourcecachedconfig.cpp b/libkcal/resourcecachedconfig.cpp index ee43f711..a1940e99 100644 --- a/libkcal/resourcecachedconfig.cpp +++ b/libkcal/resourcecachedconfig.cpp @@ -41,7 +41,7 @@ ResourceCachedReloadConfig::ResourceCachedReloadConfig( TQWidget *parent, { TQBoxLayout *topLayout = new TQVBoxLayout( this ); - mGroup = new TQButtonGroup( 1, Qt::Horizontal, i18n("Automatic Reload"), this ); + mGroup = new TQButtonGroup( 1, TQt::Horizontal, i18n("Automatic Reload"), this ); topLayout->addWidget( mGroup ); new TQRadioButton( i18n("Never"), mGroup ); new TQRadioButton( i18n("On startup"), mGroup ); @@ -81,7 +81,7 @@ ResourceCachedSaveConfig::ResourceCachedSaveConfig( TQWidget *parent, { TQBoxLayout *topLayout = new TQVBoxLayout( this ); - mGroup = new TQButtonGroup( 1, Qt::Horizontal, i18n("Automatic Save"), this ); + mGroup = new TQButtonGroup( 1, TQt::Horizontal, i18n("Automatic Save"), this ); topLayout->addWidget( mGroup ); new TQRadioButton( i18n("Never"), mGroup ); new TQRadioButton( i18n("On exit"), mGroup ); diff --git a/libkcal/resourcelocalconfig.cpp b/libkcal/resourcelocalconfig.cpp index ccba0328..0999aaae 100644 --- a/libkcal/resourcelocalconfig.cpp +++ b/libkcal/resourcelocalconfig.cpp @@ -51,7 +51,7 @@ ResourceLocalConfig::ResourceLocalConfig( TQWidget* parent, const char* name ) mainLayout->addWidget( label, 1, 0 ); mainLayout->addWidget( mURL, 1, 1 ); - formatGroup = new TQButtonGroup( 1, Qt::Horizontal, i18n( "Calendar Format" ), this ); + formatGroup = new TQButtonGroup( 1, TQt::Horizontal, i18n( "Calendar Format" ), this ); icalButton = new TQRadioButton( i18n("iCalendar"), formatGroup ); vcalButton = new TQRadioButton( i18n("vCalendar"), formatGroup ); diff --git a/libkpgp/kpgpui.cpp b/libkpgp/kpgpui.cpp index 3ad786ab..08b2652a 100644 --- a/libkpgp/kpgpui.cpp +++ b/libkpgp/kpgpui.cpp @@ -1383,7 +1383,7 @@ KeyApprovalDialog::KeyApprovalDialog( const TQStringList& addresses, //hbox->setStretchFactor( keyidLB, 10 ); //mKeyIdListBoxes.insert( 0, keyidLB ); - new KSeparator( Qt::Horizontal, bigvbox ); + new KSeparator( TQt::Horizontal, bigvbox ); } else { mEncryptToSelf = 0; @@ -1402,7 +1402,7 @@ KeyApprovalDialog::KeyApprovalDialog( const TQStringList& addresses, ++kit; // skip the sender's key id } else { - new KSeparator( Qt::Horizontal, bigvbox ); + new KSeparator( TQt::Horizontal, bigvbox ); } TQHBox *hbox = new TQHBox( bigvbox ); diff --git a/libkpimexchange/core/exchangedownload.cpp b/libkpimexchange/core/exchangedownload.cpp index de7da39b..f3210d7c 100644 --- a/libkpimexchange/core/exchangedownload.cpp +++ b/libkpimexchange/core/exchangedownload.cpp @@ -401,7 +401,7 @@ void ExchangeDownload::slotPropFindResult( TDEIO::Job *job ) TQString lastModified = prop.namedItem( "lastmodified" ).toElement().text(); if ( !lastModified.isEmpty() ) { - TQDateTime dt = utcAsZone( TQDateTime::fromString( lastModified, Qt::ISODate ), localTimeZoneId ); + TQDateTime dt = utcAsZone( TQDateTime::fromString( lastModified, TQt::ISODate ), localTimeZoneId ); event->setLastModified( dt ); kdDebug() << "Got lastModified:" << lastModified << ", " << dt.toString() << endl; } @@ -436,7 +436,7 @@ void ExchangeDownload::slotPropFindResult( TDEIO::Job *job ) TQString created = prop.namedItem( "created" ).toElement().text(); if ( !created.isEmpty() ) { - TQDateTime dt = utcAsZone( TQDateTime::fromString( created, Qt::ISODate ), + TQDateTime dt = utcAsZone( TQDateTime::fromString( created, TQt::ISODate ), localTimeZoneId ); event->setCreated( dt ); kdDebug() << "got created: " << dt.toString() << endl; @@ -444,7 +444,7 @@ void ExchangeDownload::slotPropFindResult( TDEIO::Job *job ) TQString dtstart = prop.namedItem( "dtstart" ).toElement().text(); if ( !dtstart.isEmpty() ) { - TQDateTime dt = utcAsZone( TQDateTime::fromString( dtstart, Qt::ISODate ), + TQDateTime dt = utcAsZone( TQDateTime::fromString( dtstart, TQt::ISODate ), localTimeZoneId ); event->setDtStart( dt ); kdDebug() << "got dtstart: " << dtstart << " becomes in timezone " << dt.toString() << endl; @@ -457,7 +457,7 @@ void ExchangeDownload::slotPropFindResult( TDEIO::Job *job ) TQString dtend = prop.namedItem( "dtend" ).toElement().text(); if ( !dtend.isEmpty() ) { - TQDateTime dt = utcAsZone( TQDateTime::fromString( dtend, Qt::ISODate ), + TQDateTime dt = utcAsZone( TQDateTime::fromString( dtend, TQt::ISODate ), localTimeZoneId ); // Outlook thinks differently about floating event timing than libkcal if ( floats ) dt = dt.addDays( -1 ); @@ -510,7 +510,7 @@ void ExchangeDownload::slotPropFindResult( TDEIO::Job *job ) list = exdate.elementsByTagNameNS( "xml:", "v" ); for( uint i=0; i < list.count(); i++ ) { TQDomElement item = list.item(i).toElement(); - TQDate date = utcAsZone( TQDateTime::fromString( item.text(), Qt::ISODate ), localTimeZoneId ).date(); + TQDate date = utcAsZone( TQDateTime::fromString( item.text(), TQt::ISODate ), localTimeZoneId ).date(); exdates.append( date ); // kdDebug() << "Got exdate: " << date.toString() << endl; } diff --git a/libkpimexchange/core/exchangeupload.cpp b/libkpimexchange/core/exchangeupload.cpp index f134868f..226202c5 100644 --- a/libkpimexchange/core/exchangeupload.cpp +++ b/libkpimexchange/core/exchangeupload.cpp @@ -262,11 +262,11 @@ void ExchangeUpload::startUpload( const KURL &url ) kdDebug() << "ExchangeUpload::mTimeZoneId=" << mTimeZoneId << endl; addElement( doc, prop, "urn:schemas:calendar:", "dtstart", - zoneAsUtc( event->dtStart(), mTimeZoneId ).toString( Qt::ISODate ) + "Z" ); + zoneAsUtc( event->dtStart(), mTimeZoneId ).toString( TQt::ISODate ) + "Z" ); // event->dtStart().toString( "yyyy-MM-ddThh:mm:ss.zzzZ" ) ); // 2002-06-04T08:00:00.000Z" ); addElement( doc, prop, "urn:schemas:calendar:", "dtend", - zoneAsUtc( event->dtEnd(), mTimeZoneId ).toString( Qt::ISODate ) + "Z" ); + zoneAsUtc( event->dtEnd(), mTimeZoneId ).toString( TQt::ISODate ) + "Z" ); #if 0 addElement( doc, prop, "urn:schemas:calendar:", "dtstart", event->dtStart().toString( "yyyy-MM-ddThh:mm:ss.zzz" )+ offsetString ); @@ -275,7 +275,7 @@ void ExchangeUpload::startUpload( const KURL &url ) addElement( doc, prop, "urn:schemas:calendar:", "dtend", event->dtEnd().toString( "yyyy-MM-ddThh:mm:ss.zzz" ) + offsetString ); #endif - addElement( doc, prop, "urn:schemas:calendar:", "lastmodified", zoneAsUtc( event->lastModified(), mTimeZoneId ).toString( Qt::ISODate )+"Z" ); + addElement( doc, prop, "urn:schemas:calendar:", "lastmodified", zoneAsUtc( event->lastModified(), mTimeZoneId ).toString( TQt::ISODate )+"Z" ); // addElement( doc, prop, "urn:schemas:calendar:", "meetingstatus", "confirmed" ); addElement( doc, prop, "urn:schemas:httpmail:", "textdescription", event->description() ); @@ -308,7 +308,7 @@ void ExchangeUpload::startUpload( const KURL &url ) KCal::DateList::iterator it; for ( it = exdates.begin(); it != exdates.end(); ++it ) { TQString date = (*it).toString( "yyyy-MM-ddT00:00:00.000" )+ offsetString; -// TQString date = zoneAsUtc( (*it), mTimeZoneId ).toString( Qt::ISODate ); +// TQString date = zoneAsUtc( (*it), mTimeZoneId ).toString( TQt::ISODate ); addElement( doc, exdate, "xml:", "v", date ); } } diff --git a/libtdepim/addresseelineedit.cpp b/libtdepim/addresseelineedit.cpp index 06efda39..68a16e11 100644 --- a/libtdepim/addresseelineedit.cpp +++ b/libtdepim/addresseelineedit.cpp @@ -346,7 +346,7 @@ void AddresseeLineEdit::mouseReleaseEvent( TQMouseEvent *e ) if ( m_useCompletion && TQApplication::clipboard()->supportsSelection() && !isReadOnly() - && e->button() == Qt::MidButton ) { + && e->button() == TQt::MidButton ) { m_smartPaste = true; } @@ -1054,8 +1054,8 @@ bool KPIM::AddresseeLineEdit::eventFilter(TQObject *obj, TQEvent *e) // avoid selection of headers on button press, or move or release while // a button is pressed if ( e->type() == TQEvent::MouseButtonPress - || me->state() & Qt::LeftButton || me->state() & Qt::MidButton - || me->state() & Qt::RightButton ) { + || me->state() & TQt::LeftButton || me->state() & TQt::MidButton + || me->state() & TQt::RightButton ) { if ( itemIsHeader(item) ) { return true; // eat the event, we don't want anything to happen } else { diff --git a/libtdepim/designerfields.cpp b/libtdepim/designerfields.cpp index 71089c91..8e67e55d 100644 --- a/libtdepim/designerfields.cpp +++ b/libtdepim/designerfields.cpp @@ -187,13 +187,13 @@ void DesignerFields::load( DesignerFields::Storage *storage ) wdg->setChecked( value == "true" || value == "1" ); } else if ( it.data()->inherits( "TQDateTimeEdit" ) ) { TQDateTimeEdit *wdg = static_cast( it.data() ); - wdg->setDateTime( TQDateTime::fromString( value, Qt::ISODate ) ); + wdg->setDateTime( TQDateTime::fromString( value, TQt::ISODate ) ); } else if ( it.data()->inherits( "KDateTimeWidget" ) ) { KDateTimeWidget *wdg = static_cast( it.data() ); - wdg->setDateTime( TQDateTime::fromString( value, Qt::ISODate ) ); + wdg->setDateTime( TQDateTime::fromString( value, TQt::ISODate ) ); } else if ( it.data()->inherits( "KDatePicker" ) ) { KDatePicker *wdg = static_cast( it.data() ); - wdg->setDate( TQDate::fromString( value, Qt::ISODate ) ); + wdg->setDate( TQDate::fromString( value, TQt::ISODate ) ); } else if ( it.data()->inherits( "TQComboBox" ) ) { TQComboBox *wdg = static_cast( it.data() ); wdg->setCurrentText( value ); @@ -221,13 +221,13 @@ void DesignerFields::save( DesignerFields::Storage *storage ) value = ( wdg->isChecked() ? "true" : "false" ); } else if ( it.data()->inherits( "TQDateTimeEdit" ) ) { TQDateTimeEdit *wdg = static_cast( it.data() ); - value = wdg->dateTime().toString( Qt::ISODate ); + value = wdg->dateTime().toString( TQt::ISODate ); } else if ( it.data()->inherits( "KDateTimeWidget" ) ) { KDateTimeWidget *wdg = static_cast( it.data() ); - value = wdg->dateTime().toString( Qt::ISODate ); + value = wdg->dateTime().toString( TQt::ISODate ); } else if ( it.data()->inherits( "KDatePicker" ) ) { KDatePicker *wdg = static_cast( it.data() ); - value = wdg->date().toString( Qt::ISODate ); + value = wdg->date().toString( TQt::ISODate ); } else if ( it.data()->inherits( "TQComboBox" ) ) { TQComboBox *wdg = static_cast( it.data() ); value = wdg->currentText(); diff --git a/libtdepim/kcmdesignerfields.cpp b/libtdepim/kcmdesignerfields.cpp index 050202b6..64ef02db 100644 --- a/libtdepim/kcmdesignerfields.cpp +++ b/libtdepim/kcmdesignerfields.cpp @@ -284,7 +284,7 @@ void KCMDesignerFields::initGUI() mPageView->setFullWidth( true ); hbox->addWidget( mPageView ); - TQGroupBox *box = new TQGroupBox(1, Qt::Horizontal, i18n("Preview of Selected Page"), this ); + TQGroupBox *box = new TQGroupBox(1, TQt::Horizontal, i18n("Preview of Selected Page"), this ); mPagePreview = new TQLabel( box ); mPagePreview->setMinimumWidth( 300 ); diff --git a/libtdepim/kdateedit.cpp b/libtdepim/kdateedit.cpp index e76a8907..16c5e9f8 100644 --- a/libtdepim/kdateedit.cpp +++ b/libtdepim/kdateedit.cpp @@ -307,7 +307,7 @@ bool KDateEdit::eventFilter( TQObject *object, TQEvent *event ) void KDateEdit::mousePressEvent( TQMouseEvent *event ) { - if ( event->button() == Qt::LeftButton && mDiscardNextMousePress ) { + if ( event->button() == TQt::LeftButton && mDiscardNextMousePress ) { mDiscardNextMousePress = false; return; } diff --git a/libtdepim/kincidencechooser.cpp b/libtdepim/kincidencechooser.cpp index 19d8355b..84fede01 100644 --- a/libtdepim/kincidencechooser.cpp +++ b/libtdepim/kincidencechooser.cpp @@ -104,7 +104,7 @@ KIncidenceChooser::KIncidenceChooser(TQWidget *parent, char *name) : #else mDiffBut = 0; #endif - mBg = new TQButtonGroup ( 1, Qt::Horizontal, i18n("Sync Preferences"), topFrame); + mBg = new TQButtonGroup ( 1, TQt::Horizontal, i18n("Sync Preferences"), topFrame); topLayout->addMultiCellWidget(mBg, iii,iii,0,2); ++iii; mBg->insert( new TQRadioButton ( i18n("Take local entry on conflict"), mBg ), KIncidenceChooser::local); diff --git a/libtdepim/kpixmapregionselectorwidget.cpp b/libtdepim/kpixmapregionselectorwidget.cpp index b407ea6e..c83003a5 100644 --- a/libtdepim/kpixmapregionselectorwidget.cpp +++ b/libtdepim/kpixmapregionselectorwidget.cpp @@ -218,7 +218,7 @@ bool KPixmapRegionSelectorWidget::eventFilter(TQObject *obj, TQEvent *ev) TQMouseEvent *mev= (TQMouseEvent *)(ev); //kdDebug() << TQString("click at %1,%2").arg( mev->x() ).arg( mev->y() ) << endl; - if ( mev->button() == Qt::RightButton ) + if ( mev->button() == TQt::RightButton ) { TDEPopupMenu *popup = createPopupMenu( ); popup->exec( mev->globalPos() ); diff --git a/libtdepim/kprefsdialog.cpp b/libtdepim/kprefsdialog.cpp index ae24bc22..6c313a98 100644 --- a/libtdepim/kprefsdialog.cpp +++ b/libtdepim/kprefsdialog.cpp @@ -401,7 +401,7 @@ KPrefsWidRadios::KPrefsWidRadios( TDEConfigSkeleton::ItemEnum *item, TQWidget *parent ) : mItem( item ) { - mBox = new TQButtonGroup( 1, Qt::Horizontal, mItem->label(), parent ); + mBox = new TQButtonGroup( 1, TQt::Horizontal, mItem->label(), parent ); connect( mBox, TQT_SIGNAL( clicked( int ) ), TQT_SIGNAL( changed() ) ); } diff --git a/libtdepim/ldapsearchdialog.cpp b/libtdepim/ldapsearchdialog.cpp index 17f1d984..c06da514 100644 --- a/libtdepim/ldapsearchdialog.cpp +++ b/libtdepim/ldapsearchdialog.cpp @@ -136,7 +136,7 @@ LDAPSearchDialog::LDAPSearchDialog( TQWidget* parent, const char* name ) page ); groupBox->setFrameShape( TQGroupBox::Box ); groupBox->setFrameShadow( TQGroupBox::Sunken ); - groupBox->setColumnLayout( 0, Qt::Vertical ); + groupBox->setColumnLayout( 0, TQt::Vertical ); TQGridLayout *boxLayout = new TQGridLayout( groupBox->layout(), 2, 5, spacingHint() ); boxLayout->setColStretch( 1, 1 ); diff --git a/libtdepim/statusbarprogresswidget.cpp b/libtdepim/statusbarprogresswidget.cpp index 34f68703..e196bcf8 100644 --- a/libtdepim/statusbarprogresswidget.cpp +++ b/libtdepim/statusbarprogresswidget.cpp @@ -268,7 +268,7 @@ bool StatusbarProgressWidget::eventFilter( TQObject *, TQEvent *ev ) if ( ev->type() == TQEvent::MouseButtonPress ) { TQMouseEvent *e = (TQMouseEvent*)ev; - if ( e->button() == Qt::LeftButton && mode != None ) { // toggle view on left mouse button + if ( e->button() == TQt::LeftButton && mode != None ) { // toggle view on left mouse button // Consensus seems to be that we should show/hide the fancy dialog when the user // clicks anywhere in the small one. mProgressDialog->slotToggleVisibility(); diff --git a/tderesources/birthdays/resourcetdeabc.cpp b/tderesources/birthdays/resourcetdeabc.cpp index d36ebddd..f5271ac7 100644 --- a/tderesources/birthdays/resourcetdeabc.cpp +++ b/tderesources/birthdays/resourcetdeabc.cpp @@ -220,7 +220,7 @@ bool ResourceTDEABC::doLoad() TQString anniversary_string = (*it).custom( "KADDRESSBOOK", "X-Anniversary" ); if (anniversary_string.isEmpty() ) continue; - TQDateTime anniversary = TQDate::fromString( anniversary_string, Qt::ISODate ); + TQDateTime anniversary = TQDate::fromString( anniversary_string, TQt::ISODate ); if ( !anniversary.isValid() ) continue; @@ -232,7 +232,7 @@ bool ResourceTDEABC::doLoad() for ( addrIt = anniversaries.begin(); addrIt != anniversaries.end(); ++addrIt ) { if ( name == (*addrIt).realName() ) { TQDate spouseAnniversary = - TQDate::fromString( (*addrIt).custom( "KADDRESSBOOK", "X-Anniversary" ), Qt::ISODate ); + TQDate::fromString( (*addrIt).custom( "KADDRESSBOOK", "X-Anniversary" ), TQt::ISODate ); if ( anniversary == TQDateTime(spouseAnniversary) ) { found = true; break; @@ -247,7 +247,7 @@ bool ResourceTDEABC::doLoad() } for ( addrIt = anniversaries.begin(); addrIt != anniversaries.end(); ++addrIt ) { - TQDate anniversary = TQDate::fromString( (*addrIt).custom( "KADDRESSBOOK", "X-Anniversary" ), Qt::ISODate ); + TQDate anniversary = TQDate::fromString( (*addrIt).custom( "KADDRESSBOOK", "X-Anniversary" ), TQt::ISODate ); kdDebug(5800) << "found a anniversary " << TQString(anniversary.toString()) << endl; TQString name; TQString name_1 = (*addrIt).nickName(); diff --git a/tderesources/caldav/configwidgets.cpp b/tderesources/caldav/configwidgets.cpp index db620741..7e003dcd 100644 --- a/tderesources/caldav/configwidgets.cpp +++ b/tderesources/caldav/configwidgets.cpp @@ -113,7 +113,7 @@ CalDavReloadConfig::CalDavReloadConfig( TQWidget *parent ) d->mIntervalSpin->setRange( 1, 900 ); d->mIntervalSpin->setEnabled( false ); - groupBox->setColumnLayout(1, Qt::Vertical); + groupBox->setColumnLayout(1, TQt::Vertical); TQVBoxLayout *vbox = new TQVBoxLayout(groupBox->layout()); vbox->addWidget(intervalRadio); vbox->addWidget(intervalBox); @@ -206,7 +206,7 @@ CalDavSaveConfig::CalDavSaveConfig( TQWidget *parent ) intervalRadio->hide(); intervalBox->hide(); - groupBox->setColumnLayout(1, Qt::Vertical); + groupBox->setColumnLayout(1, TQt::Vertical); TQVBoxLayout *vbox = new TQVBoxLayout(groupBox->layout()); vbox->addWidget(delay); vbox->addWidget(every); diff --git a/tderesources/carddav/configwidgets.cpp b/tderesources/carddav/configwidgets.cpp index d0e55a5f..3d747513 100644 --- a/tderesources/carddav/configwidgets.cpp +++ b/tderesources/carddav/configwidgets.cpp @@ -112,7 +112,7 @@ CardDavReloadConfig::CardDavReloadConfig( TQWidget *parent ) d->mIntervalSpin->setRange( 1, 900 ); d->mIntervalSpin->setEnabled( false ); - groupBox->setColumnLayout(1, Qt::Vertical); + groupBox->setColumnLayout(1, TQt::Vertical); TQVBoxLayout *vbox = new TQVBoxLayout(groupBox->layout()); vbox->addWidget(intervalRadio); vbox->addWidget(intervalBox); @@ -205,7 +205,7 @@ CardDavSaveConfig::CardDavSaveConfig( TQWidget *parent ) intervalRadio->hide(); intervalBox->hide(); - groupBox->setColumnLayout(1, Qt::Vertical); + groupBox->setColumnLayout(1, TQt::Vertical); TQVBoxLayout *vbox = new TQVBoxLayout(groupBox->layout()); vbox->addWidget(delay); vbox->addWidget(every); diff --git a/tderesources/egroupware/xmlrpciface.cpp b/tderesources/egroupware/xmlrpciface.cpp index 4afb0b84..3f4b9aa4 100644 --- a/tderesources/egroupware/xmlrpciface.cpp +++ b/tderesources/egroupware/xmlrpciface.cpp @@ -222,7 +222,7 @@ TQString Query::marshal( const TQVariant &arg ) const case TQVariant::ByteArray: return "" + KCodecs::base64Encode( arg.toByteArray() ) + "\r\n"; case TQVariant::DateTime: - return "" + arg.toDateTime().toString( Qt::ISODate ) + "\r\n"; + return "" + arg.toDateTime().toString( TQt::ISODate ) + "\r\n"; case TQVariant::List: { TQString markup = "\r\n"; @@ -279,7 +279,7 @@ TQVariant Query::demarshal( const TQDomElement &elem ) const else if ( typeName == "base64" ) return TQVariant( KCodecs::base64Decode( TQCString(typeElement.text().latin1()) ) ); else if ( typeName == "datetime" || typeName == "datetime.iso8601" ) - return TQVariant( TQDateTime::fromString( typeElement.text(), Qt::ISODate ) ); + return TQVariant( TQDateTime::fromString( typeElement.text(), TQt::ISODate ) ); else if ( typeName == "array" ) { TQValueList values; diff --git a/tderesources/groupwise/soap/gwconverter.cpp b/tderesources/groupwise/soap/gwconverter.cpp index bda455f7..b842f15b 100644 --- a/tderesources/groupwise/soap/gwconverter.cpp +++ b/tderesources/groupwise/soap/gwconverter.cpp @@ -67,8 +67,8 @@ char* GWConverter::qStringToChar( const TQString &string ) TQDate GWConverter::charToTQDate( const char *str ) { - if ( !str ) return TQDate(); // FIXME: Qt::ISODate is probably no good here because it expects yyyy-MM-dd not yyyyMMdd - return TQDate::fromString( TQString::fromUtf8( str ), Qt::ISODate ); + if ( !str ) return TQDate(); // FIXME: TQt::ISODate is probably no good here because it expects yyyy-MM-dd not yyyyMMdd + return TQDate::fromString( TQString::fromUtf8( str ), TQt::ISODate ); } char *GWConverter::qDateTimeToChar( const TQDateTime &dt, @@ -94,7 +94,7 @@ std::string* GWConverter::qDateTimeToString( const TQDateTime &dt ) TQDateTime GWConverter::stringToTQDateTime( const std::string* str ) { - TQDateTime dt = TQDateTime::fromString( TQString::fromUtf8( str->c_str() ), Qt::ISODate ); + TQDateTime dt = TQDateTime::fromString( TQString::fromUtf8( str->c_str() ), TQt::ISODate ); return dt; } @@ -111,15 +111,15 @@ std::string* GWConverter::qDateToString( const TQDate &date ) TQDate GWConverter::stringToTQDate( std::string* str ) { //NB this ISODate may become unnecessary, if GW stops sending in yyyy-mm-dd format again - return TQDate::fromString( TQString::fromLatin1( str->c_str() ), Qt::ISODate ); + return TQDate::fromString( TQString::fromLatin1( str->c_str() ), TQt::ISODate ); } TQDateTime GWConverter::charToTQDateTime( const char *str ) { if ( !str ) return TQDateTime(); // kdDebug() << "charToTQDateTime(): " << str << endl; - // as above re Qt::ISODate - TQDateTime dt = TQDateTime::fromString( TQString::fromUtf8( str ), Qt::ISODate ); + // as above re TQt::ISODate + TQDateTime dt = TQDateTime::fromString( TQString::fromUtf8( str ), TQt::ISODate ); // kdDebug() << " " << dt.toString() << endl; return dt; } diff --git a/tderesources/groupwise/soap/incidenceconverter.cpp b/tderesources/groupwise/soap/incidenceconverter.cpp index 84e28e69..5491f3db 100644 --- a/tderesources/groupwise/soap/incidenceconverter.cpp +++ b/tderesources/groupwise/soap/incidenceconverter.cpp @@ -543,7 +543,7 @@ bool IncidenceConverter::convertFromCalendarItem( ngwt__CalendarItem* item, std::vector::const_iterator it; for ( it = dateList->begin(); it != dateList->end(); ++it ) { - TQDate date = TQDate::fromString( s2q( *it ), Qt::ISODate ); + TQDate date = TQDate::fromString( s2q( *it ), TQt::ISODate ); if ( date.isValid() ) } } @@ -689,7 +689,7 @@ void IncidenceConverter::setRecurrence( KCal::Incidence * incidence, ngwt__Calen // recurrence date - try setting it using the recurrence start date - didn't help /* std::string startDate; - startDate.append( recur->recurStart().date().toString( Qt::ISODate ).utf8() ); + startDate.append( recur->recurStart().date().toString( TQt::ISODate ).utf8() ); item->rdate = soap_new_ngwt__RecurrenceDateType( soap(), -1 ); item->rdate->date.push_back( startDate );*/ // exceptions list - try sending empty list even if no exceptions @@ -704,7 +704,7 @@ void IncidenceConverter::setRecurrence( KCal::Incidence * incidence, ngwt__Calen for ( KCal::DateList::ConstIterator it = exceptions.begin(); it != exceptions.end(); ++it ) { std::string startDate; - startDate.append( TQString((*it).toString( Qt::ISODate )).utf8() ); + startDate.append( TQString((*it).toString( TQt::ISODate )).utf8() ); item->exdate->date.push_back( startDate ); } } diff --git a/tderesources/kolab/shared/kolabbase.cpp b/tderesources/kolab/shared/kolabbase.cpp index 1dc5418b..5834fd1f 100644 --- a/tderesources/kolab/shared/kolabbase.cpp +++ b/tderesources/kolab/shared/kolabbase.cpp @@ -409,12 +409,12 @@ TQDomDocument KolabBase::domTree() TQString KolabBase::dateTimeToString( const TQDateTime& time ) { - return time.toString( Qt::ISODate ) + 'Z'; + return time.toString( TQt::ISODate ) + 'Z'; } TQString KolabBase::dateToString( const TQDate& date ) { - return date.toString( Qt::ISODate ); + return date.toString( TQt::ISODate ); } TQDateTime KolabBase::stringToDateTime( const TQString& _date ) @@ -423,15 +423,15 @@ TQDateTime KolabBase::stringToDateTime( const TQString& _date ) //Deal with data from some clients that always append a Z to dates. if ( date.endsWith( "ZZ" ) ) date.truncate( date.length() - 2 ); - //In TQt3, Qt::ISODate cannot handle a trailing Z for UTC, so remove if found. + //In TQt3, TQt::ISODate cannot handle a trailing Z for UTC, so remove if found. else if ( date.endsWith( "Z" ) ) date.truncate( date.length() - 1 ); - return TQDateTime::fromString( date, Qt::ISODate ); + return TQDateTime::fromString( date, TQt::ISODate ); } TQDate KolabBase::stringToDate( const TQString& date ) { - return TQDate::fromString( date, Qt::ISODate ); + return TQDate::fromString( date, TQt::ISODate ); } TQString KolabBase::sensitivityToString( Sensitivity s ) diff --git a/tderesources/lib/folderconfig.cpp b/tderesources/lib/folderconfig.cpp index e400c02f..bbae1346 100644 --- a/tderesources/lib/folderconfig.cpp +++ b/tderesources/lib/folderconfig.cpp @@ -47,7 +47,7 @@ FolderConfig::FolderConfig( TQWidget *parent ) TQBoxLayout *topLayout = new TQVBoxLayout( this ); topLayout->addSpacing( KDialog::spacingHint() ); - TQGroupBox *topBox = new TQGroupBox( 1, Qt::Horizontal, i18n("Folder Selection"), + TQGroupBox *topBox = new TQGroupBox( 1, TQt::Horizontal, i18n("Folder Selection"), this ); topLayout->addWidget( topBox ); diff --git a/tderesources/lib/folderlistview.cpp b/tderesources/lib/folderlistview.cpp index c9e03daa..d43d77ce 100644 --- a/tderesources/lib/folderlistview.cpp +++ b/tderesources/lib/folderlistview.cpp @@ -147,10 +147,10 @@ void FolderListView::slotPopupHandler( int z ) void FolderListView::slotMousePressed(int btn, TQListViewItem* i, const TQPoint& pos, int c) { if ( dynamic_cast(i) ) { - if ( btn == Qt::RightButton ) { + if ( btn == TQt::RightButton ) { showPopupMenu( (FolderListItem*)i, /*mapToGlobal(*/pos/*)*/ ); } - else if ( btn == Qt::LeftButton && c > 0 ) { + else if ( btn == TQt::LeftButton && c > 0 ) { // map pos to item/column and call FolderListItem::activate(col, pos) ((FolderListItem*)i)->activate( c, viewport()->mapFromGlobal( pos ) - TQPoint( 0, itemRect(i).top() ) ); // } else { diff --git a/tderesources/lib/webdavhandler.cpp b/tderesources/lib/webdavhandler.cpp index af5eb276..d3255c36 100644 --- a/tderesources/lib/webdavhandler.cpp +++ b/tderesources/lib/webdavhandler.cpp @@ -120,7 +120,7 @@ bool WebdavHandler::extractDateTime( const TQDomElement &node, const TQString &e { TQDomElement element = node.namedItem( entry ).toElement(); if ( !element.isNull() && !element.text().isEmpty() ) { - value = TQDateTime::fromString( element.text(), Qt::ISODate ); + value = TQDateTime::fromString( element.text(), TQt::ISODate ); return true; } return false; diff --git a/tderesources/newexchange/exchangeconvertercalendar.cpp b/tderesources/newexchange/exchangeconvertercalendar.cpp index 85baf974..e67acdeb 100644 --- a/tderesources/newexchange/exchangeconvertercalendar.cpp +++ b/tderesources/newexchange/exchangeconvertercalendar.cpp @@ -410,7 +410,7 @@ kdDebug()<<"ExchangeConverterCalendar::readIncidence: ERROR: No UID given"<recurrence()->setExDates( exdates ); @@ -593,7 +593,7 @@ class ExchangeConverterCalendar::createWebDAVVisitor : public IncidenceBase::Vis void addDateProp( TQDomElement &el ) { el.setAttribute( "b:dt", "dateTime.tz" ); } void addFloatProp( TQDomElement &el ) { el.setAttribute( "b:dt", "float" ); } void addIntProp( TQDomElement &el ) { el.setAttribute( "b:dt", "int" ); } - TQString timePropString( const TQDateTime &dt ) { return dt.toString( Qt::ISODate )+"Z"; } + TQString timePropString( const TQDateTime &dt ) { return dt.toString( TQt::ISODate )+"Z"; } bool visitIncidence( Incidence *incidence ) { @@ -730,8 +730,8 @@ class ExchangeConverterCalendar::createWebDAVVisitor : public IncidenceBase::Vis /* FIXME: domCalendarProperty( "uid", todo->uid() ); - domCalendarProperty( "created", todo->created().toString( Qt::ISODate ) ); - domCalendarProperty( "lastmodified", todo->lastModified().toString( Qt::ISODate ) );*/ + domCalendarProperty( "created", todo->created().toString( TQt::ISODate ) ); + domCalendarProperty( "lastmodified", todo->lastModified().toString( TQt::ISODate ) );*/ // TODO /*propertyTask1( TaskProp_Owner ); propertyTask2( TaskProp_ContactNames ); @@ -758,8 +758,8 @@ class ExchangeConverterCalendar::createWebDAVVisitor : public IncidenceBase::Vis "outlookmessageclass", "IPM.Journal" ); /* FIXME: domCalendarProperty( "uid", todo->uid() ); - domCalendarProperty( "created", todo->created().toString( Qt::ISODate ) ); - domCalendarProperty( "lastmodified", todo->lastModified().toString( Qt::ISODate ) );*/ + domCalendarProperty( "created", todo->created().toString( TQt::ISODate ) ); + domCalendarProperty( "lastmodified", todo->lastModified().toString( TQt::ISODate ) );*/ // TODO return true; } diff --git a/tderesources/scalix/scalixadmin/outofofficepage.cpp b/tderesources/scalix/scalixadmin/outofofficepage.cpp index e807379a..557772d8 100644 --- a/tderesources/scalix/scalixadmin/outofofficepage.cpp +++ b/tderesources/scalix/scalixadmin/outofofficepage.cpp @@ -38,7 +38,7 @@ OutOfOfficePage::OutOfOfficePage( TQWidget *parent ) { TQGridLayout *layout = new TQGridLayout( this, 4, 2, 11, 6 ); - TQButtonGroup *group = new TQButtonGroup( 1, Qt::Vertical, this ); + TQButtonGroup *group = new TQButtonGroup( 1, TQt::Vertical, this ); mDisabled = new TQRadioButton( i18n( "I am in the office" ), group ); mDisabled->setChecked( true ); diff --git a/tderesources/scalix/shared/scalixbase.cpp b/tderesources/scalix/shared/scalixbase.cpp index f07a6983..51ef8798 100644 --- a/tderesources/scalix/shared/scalixbase.cpp +++ b/tderesources/scalix/shared/scalixbase.cpp @@ -372,12 +372,12 @@ TQDomDocument ScalixBase::domTree() TQString ScalixBase::dateTimeToString( const TQDateTime& time ) { - return time.toString( Qt::ISODate ) + 'Z'; + return time.toString( TQt::ISODate ) + 'Z'; } TQString ScalixBase::dateToString( const TQDate& date ) { - return date.toString( Qt::ISODate ); + return date.toString( TQt::ISODate ); } TQDateTime ScalixBase::stringToDateTime( const TQString& _date ) @@ -385,12 +385,12 @@ TQDateTime ScalixBase::stringToDateTime( const TQString& _date ) TQString date( _date ); if ( date.endsWith( "Z" ) ) date.truncate( date.length() - 1 ); - return TQDateTime::fromString( date, Qt::ISODate ); + return TQDateTime::fromString( date, TQt::ISODate ); } TQDate ScalixBase::stringToDate( const TQString& date ) { - return TQDate::fromString( date, Qt::ISODate ); + return TQDate::fromString( date, TQt::ISODate ); } TQString ScalixBase::sensitivityToString( Sensitivity s ) diff --git a/tderesources/scalix/tdeabc/contact.cpp b/tderesources/scalix/tdeabc/contact.cpp index 190837a0..6d4cc2bf 100644 --- a/tderesources/scalix/tdeabc/contact.cpp +++ b/tderesources/scalix/tdeabc/contact.cpp @@ -71,7 +71,7 @@ TQString Contact::toXml( const TDEABC::Addressee &addr ) xml += "" + custom( "reminder_set", addr, "false" ) + "\n"; xml += "" + custom( "send_rich_info", addr, "false" ) + "\n"; xml += "" + addr.formattedName() + "\n"; - xml += "" + addr.revision().toString( Qt::ISODate ) + "\n"; + xml += "" + addr.revision().toString( TQt::ISODate ) + "\n"; xml += "" + addr.prefix() + "\n"; xml += "" + addr.givenName() + "\n"; @@ -166,7 +166,7 @@ TQString Contact::toXml( const TDEABC::Addressee &addr ) xml += "" + addr.custom( "KADDRESSBOOK", "X-Office" ) + "\n"; xml += "" + addr.custom( "KADDRESSBOOK", "X-SpousesName" ) + "\n"; - xml += "" + addr.birthday().toString( Qt::ISODate ) + "\n"; + xml += "" + addr.birthday().toString( TQt::ISODate ) + "\n"; xml += "" + addr.custom( "KADDRESSBOOK", "X-Anniversary" ) + "\n"; xml += "" + custom( "mapi_charset", addr, "UTF8" ) + ""; @@ -235,7 +235,7 @@ TDEABC::Addressee Contact::fromXml( const TQString &xml ) else if ( element.tagName() == "send_rich_info" ) setCustom( "send_rich_info", element.text(), addr ); else if ( element.tagName() == "last_modification_time" ) - addr.setRevision( TQDateTime::fromString( element.text(), Qt::ISODate ) ); + addr.setRevision( TQDateTime::fromString( element.text(), TQt::ISODate ) ); // name else if ( element.tagName() == "display_name_prefix" ) @@ -352,7 +352,7 @@ TDEABC::Addressee Contact::fromXml( const TQString &xml ) addr.insertCustom( "KADDRESSBOOK", "X-SpousesName", element.text() ); else if ( element.tagName() == "bday" ) - addr.setBirthday( TQDateTime::fromString( element.text(), Qt::ISODate ) ); + addr.setBirthday( TQDateTime::fromString( element.text(), TQt::ISODate ) ); else if ( element.tagName() == "anniversary" ) addr.insertCustom( "KADDRESSBOOK", "X-Anniversary", element.text() ); else diff --git a/tderesources/slox/tdeabcresourceslox.cpp b/tderesources/slox/tdeabcresourceslox.cpp index 79036abd..5b0b6515 100644 --- a/tderesources/slox/tdeabcresourceslox.cpp +++ b/tderesources/slox/tdeabcresourceslox.cpp @@ -402,7 +402,7 @@ void ResourceSlox::parseContactAttribute( const TQDomElement &e, Addressee &a ) a.insertCustom( "KADDRESSBOOK", "X-SpousesName", text ); } else if ( tag == fieldName( Anniversary ) ) { TQDateTime dt = WebdavHandler::sloxToTQDateTime( text ); - a.insertCustom( "KADDRESSBOOK", "X-Anniversary", dt.toString( Qt::ISODate ) ); + a.insertCustom( "KADDRESSBOOK", "X-Anniversary", dt.toString( TQt::ISODate ) ); } else if ( tag == fieldName( Categories ) ) { a.setCategories( TQStringList::split( TQRegExp(",\\s*"), text ) ); } else if ( type() == "ox" ) { // FIXME: Address reading is missing for SLOX @@ -577,7 +577,7 @@ void ResourceSlox::createAddresseeFields( TQDomDocument &doc, TQDomElement &prop TQString anniversary = a.custom( "KADDRESSBOOK", "X-Anniversary" ); if ( !anniversary.isEmpty() ) WebdavHandler::addSloxElement( this, doc, prop, fieldName( Anniversary ), - WebdavHandler::qDateTimeToSlox( TQDateTime::fromString( anniversary, Qt::ISODate ).date() ) ); + WebdavHandler::qDateTimeToSlox( TQDateTime::fromString( anniversary, TQt::ISODate ).date() ) ); else WebdavHandler::addSloxElement( this, doc, prop, fieldName( Anniversary ) ); } diff --git a/tderesources/slox/webdavhandler.cpp b/tderesources/slox/webdavhandler.cpp index 4b57e1de..8d677bd0 100644 --- a/tderesources/slox/webdavhandler.cpp +++ b/tderesources/slox/webdavhandler.cpp @@ -199,7 +199,7 @@ TQDateTime WebdavHandler::sloxToTQDateTime( const TQString &str ) TQDateTime dt; if (preEpoch) { - dt.setTime_t( 0, Qt::UTC ); + dt.setTime_t( 0, TQt::UTC ); if (ticks > INT_MAX) { dt = dt.addSecs(-INT_MAX); ticks -= INT_MAX; @@ -208,7 +208,7 @@ TQDateTime WebdavHandler::sloxToTQDateTime( const TQString &str ) } else { - dt.setTime_t( ticks, Qt::UTC ); + dt.setTime_t( ticks, TQt::UTC ); } return dt; diff --git a/wizards/groupwisewizard.cpp b/wizards/groupwisewizard.cpp index 4e828291..6081bb00 100644 --- a/wizards/groupwisewizard.cpp +++ b/wizards/groupwisewizard.cpp @@ -314,7 +314,7 @@ GroupwiseWizard::GroupwiseWizard() : TDEConfigWizard( new GroupwisePropagator ) topLayout = new TQGridLayout( mEmailPage ); topLayout->setSpacing( spacingHint() ); - mEmailBox = new TQGroupBox( 1, Qt::Horizontal, + mEmailBox = new TQGroupBox( 1, TQt::Horizontal, i18n("Create Mail Account"), mEmailPage ); mEmailBox->setCheckable( true ); topLayout->addWidget( mEmailBox, 0, 0 );