diff options
Diffstat (limited to 'kaddressbook')
206 files changed, 1401 insertions, 1305 deletions
diff --git a/kaddressbook/TODO b/kaddressbook/TODO index df0db82b0..83f335873 100644 --- a/kaddressbook/TODO +++ b/kaddressbook/TODO @@ -22,7 +22,7 @@ Improvements (things that just need to be improved/rewritten) file to get a list of views) - DONE - Redo and move the DCOP interface - 50% - Cleanup the tableview more - DONE -- Relayout the edit contact dialog - DONE +- Retqlayout the edit contact dialog - DONE - Remove ContactEntry*. Impelement supporting classes required for this. - DONE - Update the way the ConfigureView dialog gets the view config page - DONE diff --git a/kaddressbook/addresseditwidget.cpp b/kaddressbook/addresseditwidget.cpp index ac70cbaa9..4f6168446 100644 --- a/kaddressbook/addresseditwidget.cpp +++ b/kaddressbook/addresseditwidget.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include <tqbuttongroup.h> @@ -54,11 +54,11 @@ #include "addresseditwidget.h" -class TabPressEater : public QObject +class TabPressEater : public TQObject { public: - TabPressEater( TQObject *parent ) - : TQObject( parent, "TabPressEater" ) + TabPressEater( TQObject *tqparent ) + : TQObject( tqparent, "TabPressEater" ) { } @@ -67,8 +67,8 @@ class TabPressEater : public QObject { if ( event->type() == TQEvent::KeyPress ) { TQKeyEvent *keyEvent = (TQKeyEvent*)event; - if ( keyEvent->key() == Qt::Key_Tab ) { - TQApplication::sendEvent( parent(), event ); + if ( keyEvent->key() == TQt::Key_Tab ) { + TQApplication::sendEvent( tqparent(), event ); return true; } else return false; @@ -79,8 +79,8 @@ class TabPressEater : public QObject }; -AddressEditWidget::AddressEditWidget( TQWidget *parent, const char *name ) - : TQWidget( parent, name ) +AddressEditWidget::AddressEditWidget( TQWidget *tqparent, const char *name ) + : TQWidget( tqparent, name ) { TQBoxLayout *tqlayout = new TQVBoxLayout( this, 4, 2 ); tqlayout->setSpacing( KDialog::spacingHint() ); @@ -93,8 +93,8 @@ AddressEditWidget::AddressEditWidget( TQWidget *parent, const char *name ) mAddressField = new KActiveLabel( this ); mAddressField->setFrameStyle( TQFrame::Panel | TQFrame::Sunken ); mAddressField->setMinimumHeight( 20 ); - mAddressField->tqsetAlignment( Qt::AlignTop ); - mAddressField->setTextFormat( Qt::PlainText ); + mAddressField->tqsetAlignment( TQt::AlignTop ); + mAddressField->setTextFormat( TQt::PlainText ); tqlayout->addWidget( mAddressField ); mEditButton = new TQPushButton( i18n( "street/postal", "&Edit Addresses..." ), this ); @@ -257,10 +257,10 @@ void AddressEditWidget::updateAddressEdit() } AddressEditDialog::AddressEditDialog( const KABC::Address::List &list, - int selected, TQWidget *parent, + int selected, TQWidget *tqparent, const char *name ) : KDialogBase( Plain, i18n( "street/postal", "Edit Address" ), Ok | Cancel, Ok, - parent, name, true, true ), + tqparent, name, true, true ), mPreviousAddress( 0 ) { mAddressList = list; @@ -274,10 +274,10 @@ AddressEditDialog::AddressEditDialog( const KABC::Address::List &list, topLayout->addMultiCellWidget( mTypeCombo, 0, 0, 0, 1 ); TQLabel *label = new TQLabel( i18n( "<streetLabel>:", "%1:" ).arg( KABC::Address::streetLabel() ), page ); - label->tqsetAlignment( Qt::AlignTop | Qt::AlignLeft ); + label->tqsetAlignment( TQt::AlignTop | TQt::AlignLeft ); topLayout->addWidget( label, 1, 0 ); mStreetTextEdit = new TQTextEdit( page ); - mStreetTextEdit->setTextFormat( Qt::PlainText ); + mStreetTextEdit->setTextFormat( TQt::PlainText ); label->setBuddy( mStreetTextEdit ); topLayout->addWidget( mStreetTextEdit, 1, 1 ); @@ -599,9 +599,9 @@ void AddressEditDialog::fillCountryCombo() } -AddressTypeDialog::AddressTypeDialog( int type, TQWidget *parent ) +AddressTypeDialog::AddressTypeDialog( int type, TQWidget *tqparent ) : KDialogBase( Plain, i18n( "street/postal", "Edit Address Type" ), Ok | Cancel, Ok, - parent, "AddressTypeDialog" ) + tqparent, "AddressTypeDialog" ) { TQWidget *page = plainPage(); TQVBoxLayout *tqlayout = new TQVBoxLayout( page ); @@ -617,7 +617,7 @@ AddressTypeDialog::AddressTypeDialog( int type, TQWidget *parent ) new TQCheckBox( KABC::Address::typeLabel( *it ), mGroup ); for ( int i = 0; i < mGroup->count(); ++i ) { - TQCheckBox *box = (TQCheckBox*)mGroup->find( i ); + TQCheckBox *box = (TQCheckBox*)mGroup->tqfind( i ); box->setChecked( type & mTypeList[ i ] ); } } @@ -630,7 +630,7 @@ int AddressTypeDialog::type() const { int type = 0; for ( int i = 0; i < mGroup->count(); ++i ) { - TQCheckBox *box = (TQCheckBox*)mGroup->find( i ); + TQCheckBox *box = (TQCheckBox*)mGroup->tqfind( i ); if ( box->isChecked() ) type += mTypeList[ i ]; } @@ -642,7 +642,7 @@ int AddressTypeDialog::type() const Small helper class, I hope we can remove it as soon as a general solution has been committed to kdelibs */ -class LocaleAwareString : public QString +class LocaleAwareString : public TQString { public: LocaleAwareString() : TQString() diff --git a/kaddressbook/addresseditwidget.h b/kaddressbook/addresseditwidget.h index 1fccc604a..40465d373 100644 --- a/kaddressbook/addresseditwidget.h +++ b/kaddressbook/addresseditwidget.h @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef ADDRESSEDITWIDGET_H @@ -49,12 +49,13 @@ typedef TypeCombo<KABC::Address> AddressTypeCombo; /** Editor widget for addresses. */ -class AddressEditWidget : public QWidget +class AddressEditWidget : public TQWidget { Q_OBJECT + TQ_OBJECT public: - AddressEditWidget( TQWidget *parent, const char *name = 0 ); + AddressEditWidget( TQWidget *tqparent, const char *name = 0 ); ~AddressEditWidget(); KABC::Address::List addresses(); @@ -92,10 +93,11 @@ class AddressEditWidget : public QWidget class AddressEditDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: AddressEditDialog( const KABC::Address::List &list, int selected, - TQWidget *parent, const char *name = 0 ); + TQWidget *tqparent, const char *name = 0 ); ~AddressEditDialog(); KABC::Address::List addresses(); @@ -140,7 +142,7 @@ class AddressEditDialog : public KDialogBase class AddressTypeDialog : public KDialogBase { public: - AddressTypeDialog( int type, TQWidget *parent ); + AddressTypeDialog( int type, TQWidget *tqparent ); ~AddressTypeDialog(); int type() const; diff --git a/kaddressbook/addresseeconfig.cpp b/kaddressbook/addresseeconfig.cpp index 9d5f1cf9b..98495c41e 100644 --- a/kaddressbook/addresseeconfig.cpp +++ b/kaddressbook/addresseeconfig.cpp @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include "addresseeconfig.h" diff --git a/kaddressbook/addresseeconfig.h b/kaddressbook/addresseeconfig.h index b9d22589c..a0dcd45af 100644 --- a/kaddressbook/addresseeconfig.h +++ b/kaddressbook/addresseeconfig.h @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef ADDRESSEECONFIG_H diff --git a/kaddressbook/addresseeeditorbase.cpp b/kaddressbook/addresseeeditorbase.cpp index f0352a707..21e562640 100644 --- a/kaddressbook/addresseeeditorbase.cpp +++ b/kaddressbook/addresseeeditorbase.cpp @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include "addresseeeditorbase.moc" diff --git a/kaddressbook/addresseeeditorbase.h b/kaddressbook/addresseeeditorbase.h index 25d5c1abe..3dc670b4f 100644 --- a/kaddressbook/addresseeeditorbase.h +++ b/kaddressbook/addresseeeditorbase.h @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef ADDRESSEEEDITORBASE_H @@ -28,13 +28,14 @@ #include <tqwidget.h> -class AddresseeEditorBase : public QWidget +class AddresseeEditorBase : public TQWidget { Q_OBJECT + TQ_OBJECT public: - AddresseeEditorBase( TQWidget *parent, const char *name = 0 ) - : TQWidget( parent, name ) + AddresseeEditorBase( TQWidget *tqparent, const char *name = 0 ) + : TQWidget( tqparent, name ) { } diff --git a/kaddressbook/addresseeeditordialog.cpp b/kaddressbook/addresseeeditordialog.cpp index 7e6bab403..9fe487312 100644 --- a/kaddressbook/addresseeeditordialog.cpp +++ b/kaddressbook/addresseeeditordialog.cpp @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include <tqapplication.h> @@ -35,10 +35,10 @@ #include "addresseeeditordialog.h" AddresseeEditorDialog::AddresseeEditorDialog( KAB::Core *core, - TQWidget *parent, const char *name ) + TQWidget *tqparent, const char *name ) : KDialogBase( KDialogBase::Plain, i18n( "Edit Contact" ), KDialogBase::Ok | KDialogBase::Cancel | KDialogBase::Apply, - KDialogBase::Ok, parent, name, false ) + KDialogBase::Ok, tqparent, name, false ) { // Set this to be the group leader for all subdialogs - this means // modal subdialogs will only affect this dialog, not the other windows @@ -103,7 +103,7 @@ void AddresseeEditorDialog::slotApply() return; if ( mEditorWidget->dirty() ) { - TQApplication::setOverrideCursor( Qt::waitCursor ); + TQApplication::setOverrideCursor( TQt::waitCursor ); mEditorWidget->save(); emit contactModified( mEditorWidget->addressee() ); TQApplication::restoreOverrideCursor(); diff --git a/kaddressbook/addresseeeditordialog.h b/kaddressbook/addresseeeditordialog.h index 0cd093977..7d0258e97 100644 --- a/kaddressbook/addresseeeditordialog.h +++ b/kaddressbook/addresseeeditordialog.h @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef ADDRESSEEEDITORDIALOG_H @@ -35,10 +35,11 @@ namespace KAB { class Core; } class AddresseeEditorDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: AddresseeEditorDialog( KAB::Core *core, - TQWidget *parent, const char *name = 0 ); + TQWidget *tqparent, const char *name = 0 ); ~AddresseeEditorDialog(); void setAddressee( const KABC::Addressee& ); diff --git a/kaddressbook/addresseeeditorextension.cpp b/kaddressbook/addresseeeditorextension.cpp index ab8572ce8..61ba5c18e 100644 --- a/kaddressbook/addresseeeditorextension.cpp +++ b/kaddressbook/addresseeeditorextension.cpp @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include <tqlayout.h> @@ -33,8 +33,8 @@ #include "addresseeeditorextension.h" -AddresseeEditorExtension::AddresseeEditorExtension( KAB::Core *core, TQWidget *parent, const char *name ) - : KAB::ExtensionWidget( core, parent, name ) +AddresseeEditorExtension::AddresseeEditorExtension( KAB::Core *core, TQWidget *tqparent, const char *name ) + : KAB::ExtensionWidget( core, tqparent, name ) { TQVBoxLayout *tqlayout = new TQVBoxLayout( this ); diff --git a/kaddressbook/addresseeeditorextension.h b/kaddressbook/addresseeeditorextension.h index d3368248a..0c1a735b0 100644 --- a/kaddressbook/addresseeeditorextension.h +++ b/kaddressbook/addresseeeditorextension.h @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef ADDRESSEEEDITOREXTENSION_H @@ -30,9 +30,10 @@ class AddresseeEditorExtension : public KAB::ExtensionWidget { Q_OBJECT + TQ_OBJECT public: - AddresseeEditorExtension( KAB::Core *core, TQWidget *parent, const char *name = 0 ); + AddresseeEditorExtension( KAB::Core *core, TQWidget *tqparent, const char *name = 0 ); ~AddresseeEditorExtension(); /** diff --git a/kaddressbook/addresseeeditorwidget.cpp b/kaddressbook/addresseeeditorwidget.cpp index 519a817f1..097f513b5 100644 --- a/kaddressbook/addresseeeditorwidget.cpp +++ b/kaddressbook/addresseeeditorwidget.cpp @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include <tqcheckbox.h> @@ -67,8 +67,8 @@ #include "addresseeeditorwidget.h" -AddresseeEditorWidget::AddresseeEditorWidget( TQWidget *parent, const char *name ) - : AddresseeEditorBase( parent, name ), +AddresseeEditorWidget::AddresseeEditorWidget( TQWidget *tqparent, const char *name ) + : AddresseeEditorBase( tqparent, name ), mBlockSignals( false ), mReadOnly( false ) { kdDebug(5720) << "AddresseeEditorWidget()" << endl; @@ -430,7 +430,7 @@ void AddresseeEditorWidget::setupTab2() ////////////////////////////////////// // Notes label = new TQLabel( i18n( "Note:" ), tab2 ); - label->tqsetAlignment( Qt::AlignTop | Qt::AlignLeft ); + label->tqsetAlignment( TQt::AlignTop | TQt::AlignLeft ); tqlayout->addWidget( label, 7, 0 ); mNoteEdit = new TQTextEdit( tab2 ); mNoteEdit->setWordWrap( TQTextEdit::WidgetWidth ); @@ -486,7 +486,7 @@ void AddresseeEditorWidget::setupCustomFieldsTabs() const TQStringList list = KGlobal::dirs()->findAllResources( "data", "kaddressbook/contacteditorpages/*.ui", true, true ); for ( TQStringList::ConstIterator it = list.begin(); it != list.end(); ++it ) { - if ( activePages.find( (*it).mid( (*it).findRev('/') + 1 ) ) == activePages.end() ) + if ( activePages.tqfind( (*it).mid( (*it).findRev('/') + 1 ) ) == activePages.end() ) continue; ContactEditorTabPage *page = new ContactEditorTabPage( mTabWidget ); @@ -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/addresseeeditorwidget.h b/kaddressbook/addresseeeditorwidget.h index f3e6dc595..3e04dcd7b 100644 --- a/kaddressbook/addresseeeditorwidget.h +++ b/kaddressbook/addresseeeditorwidget.h @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef ADDRESSEEEDITORWIDGET_H @@ -66,9 +66,10 @@ namespace KABC { class AddressBook; } class AddresseeEditorWidget : public AddresseeEditorBase { Q_OBJECT + TQ_OBJECT public: - AddresseeEditorWidget( TQWidget *parent, const char *name = 0 ); + AddresseeEditorWidget( TQWidget *tqparent, const char *name = 0 ); ~AddresseeEditorWidget(); void setAddressee( const KABC::Addressee& ); diff --git a/kaddressbook/addresseeutil.cpp b/kaddressbook/addresseeutil.cpp index 7e5980176..e99677c19 100644 --- a/kaddressbook/addresseeutil.cpp +++ b/kaddressbook/addresseeutil.cpp @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include <kabc/stdaddressbook.h> diff --git a/kaddressbook/addresseeutil.h b/kaddressbook/addresseeutil.h index 5bcac3136..11ccf653e 100644 --- a/kaddressbook/addresseeutil.h +++ b/kaddressbook/addresseeutil.h @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef ADDRESSEEUTIL_H diff --git a/kaddressbook/addviewdialog.cpp b/kaddressbook/addviewdialog.cpp index c936e5fa8..4f3a58078 100644 --- a/kaddressbook/addviewdialog.cpp +++ b/kaddressbook/addviewdialog.cpp @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include <tqbuttongroup.h> @@ -34,10 +34,10 @@ #include "addviewdialog.h" AddViewDialog::AddViewDialog( TQDict<ViewFactory> *viewFactoryDict, - TQWidget *parent, const char *name ) + TQWidget *tqparent, const char *name ) : KDialogBase( KDialogBase::Plain, i18n( "Add View" ), KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok, - parent, name ), + tqparent, name ), mViewFactoryDict( viewFactoryDict ) { mTypeId = 0; @@ -57,7 +57,7 @@ AddViewDialog::AddViewDialog( TQDict<ViewFactory> *viewFactoryDict, TQT_SLOT( textChanged( const TQString& ) ) ); tqlayout->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 ) ) ); tqlayout->addMultiCellWidget( mTypeGroup, 1, 1, 0, 1 ); TQGridLayout *groupLayout = new TQGridLayout( mTypeGroup->tqlayout(), 3, 2 ); @@ -69,10 +69,10 @@ AddViewDialog::AddViewDialog( TQDict<ViewFactory> *viewFactoryDict, TQRadioButton *button = new TQRadioButton( i18n((*iter)->type().utf8()), mTypeGroup, (*iter)->type().latin1() ); label = new TQLabel( (*iter)->description(), mTypeGroup ); - label->tqsetAlignment( Qt::WordBreak ); + label->tqsetAlignment( TQt::WordBreak ); - groupLayout->addWidget( button, row, 0, Qt::AlignTop ); - groupLayout->addWidget( label, row, 1, Qt::AlignTop ); + groupLayout->addWidget( button, row, 0, TQt::AlignTop ); + groupLayout->addWidget( label, row, 1, TQt::AlignTop ); row++; } @@ -94,7 +94,7 @@ TQString AddViewDialog::viewName()const TQString AddViewDialog::viewType()const { // we missuse the name property for storing the type - return mTypeGroup->find( mTypeId )->name(); + return mTypeGroup->tqfind( mTypeId )->name(); } void AddViewDialog::clicked( int id ) diff --git a/kaddressbook/addviewdialog.h b/kaddressbook/addviewdialog.h index 13cf2ef89..6e1fcd446 100644 --- a/kaddressbook/addviewdialog.h +++ b/kaddressbook/addviewdialog.h @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef ADDVIEWDIALOG_H @@ -41,9 +41,10 @@ class ViewFactory; class AddViewDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - AddViewDialog( TQDict<ViewFactory> *viewFactoryDict, TQWidget *parent, + AddViewDialog( TQDict<ViewFactory> *viewFactoryDict, TQWidget *tqparent, const char *name = 0 ); ~AddViewDialog(); diff --git a/kaddressbook/advancedcustomfields.cpp b/kaddressbook/advancedcustomfields.cpp index c2f5dc404..3606fdac3 100644 --- a/kaddressbook/advancedcustomfields.cpp +++ b/kaddressbook/advancedcustomfields.cpp @@ -19,8 +19,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include <tqcheckbox.h> @@ -85,8 +85,8 @@ class KABCStorage : public KPIM::DesignerFields::Storage AdvancedCustomFields::AdvancedCustomFields( const TQString &uiFile, KABC::AddressBook *ab, - TQWidget *parent, const char *name ) - : KAB::ContactEditorWidget( ab, parent, name ) + TQWidget *tqparent, const char *name ) + : KAB::ContactEditorWidget( ab, tqparent, name ) { initGUI( uiFile ); } diff --git a/kaddressbook/advancedcustomfields.h b/kaddressbook/advancedcustomfields.h index 26b462274..fd00b58e1 100644 --- a/kaddressbook/advancedcustomfields.h +++ b/kaddressbook/advancedcustomfields.h @@ -19,8 +19,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef ADVANCEDCUSTOMFIELDS_H @@ -39,10 +39,11 @@ class AdvancedCustomFields : public KAB::ContactEditorWidget { Q_OBJECT + TQ_OBJECT public: AdvancedCustomFields( const TQString &uiFile, KABC::AddressBook *ab, - TQWidget *parent, const char *name = 0 ); + TQWidget *tqparent, const char *name = 0 ); void loadContact( KABC::Addressee *addr ); void storeContact( KABC::Addressee *addr ); diff --git a/kaddressbook/common/filter.cpp b/kaddressbook/common/filter.cpp index 13e5f5fc7..932f6f108 100644 --- a/kaddressbook/common/filter.cpp +++ b/kaddressbook/common/filter.cpp @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include <kconfig.h> @@ -29,7 +29,7 @@ #include "filter.h" Filter::Filter() - : mName( TQString::null ), mMatchRule( Matching ), mEnabled( true ), + : mName( TQString() ), mMatchRule( Matching ), mEnabled( true ), mInternal( false ), mIsEmpty( true ) { } diff --git a/kaddressbook/common/filter.h b/kaddressbook/common/filter.h index 9f66699e0..cb13ce536 100644 --- a/kaddressbook/common/filter.h +++ b/kaddressbook/common/filter.h @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef FILTER_H diff --git a/kaddressbook/common/kabprefs.cpp b/kaddressbook/common/kabprefs.cpp index cacb2dfd1..18180b801 100644 --- a/kaddressbook/common/kabprefs.cpp +++ b/kaddressbook/common/kabprefs.cpp @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include <kconfig.h> diff --git a/kaddressbook/common/kabprefs.h b/kaddressbook/common/kabprefs.h index 5c7c8c0c7..bab2cb70b 100644 --- a/kaddressbook/common/kabprefs.h +++ b/kaddressbook/common/kabprefs.h @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef KABPREFS_H diff --git a/kaddressbook/common/locationmap.cpp b/kaddressbook/common/locationmap.cpp index 5788e6fcd..716e1764b 100644 --- a/kaddressbook/common/locationmap.cpp +++ b/kaddressbook/common/locationmap.cpp @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include <kapplication.h> @@ -75,7 +75,7 @@ TQString LocationMap::createUrl( const KABC::Address &addr ) TQString urlTemplate = KABPrefs::instance()->locationMapURL().arg( KGlobal::locale()->country() ); if ( urlTemplate.isEmpty() ) { KMessageBox::error( 0, i18n( "No service provider available for map lookup!\nPlease add one in the configuration dialog." ) ); - return TQString::null; + return TQString(); } #if KDE_VERSION >= 319 diff --git a/kaddressbook/common/locationmap.h b/kaddressbook/common/locationmap.h index e8a790360..c244ce720 100644 --- a/kaddressbook/common/locationmap.h +++ b/kaddressbook/common/locationmap.h @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef LOCATIONMAP_H @@ -28,9 +28,10 @@ #include <tqobject.h> #include <tqstring.h> -class LocationMap : public QObject +class LocationMap : public TQObject { Q_OBJECT + TQ_OBJECT public: static LocationMap *instance(); diff --git a/kaddressbook/contacteditorwidgetmanager.cpp b/kaddressbook/contacteditorwidgetmanager.cpp index d48be3d93..8cee7a9bb 100644 --- a/kaddressbook/contacteditorwidgetmanager.cpp +++ b/kaddressbook/contacteditorwidgetmanager.cpp @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include <tqlayout.h> @@ -107,8 +107,8 @@ void ContactEditorWidgetManager::reload() /////////////////////////////////////////////////////////////////////////////// -ContactEditorTabPage::ContactEditorTabPage( TQWidget *parent, const char *name ) - : TQWidget( parent, name ) +ContactEditorTabPage::ContactEditorTabPage( TQWidget *tqparent, const char *name ) + : TQWidget( tqparent, name ) { mLayout = new TQGridLayout( this, 0, 2, KDialog::marginHint(), KDialog::spacingHint() ); diff --git a/kaddressbook/contacteditorwidgetmanager.h b/kaddressbook/contacteditorwidgetmanager.h index 4b78b17f3..ae9c69b93 100644 --- a/kaddressbook/contacteditorwidgetmanager.h +++ b/kaddressbook/contacteditorwidgetmanager.h @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef CONTACTEDITORWIDGETMANAGER_H @@ -34,9 +34,10 @@ class Addressee; class TQGridLayout; -class ContactEditorWidgetManager : public QObject +class ContactEditorWidgetManager : public TQObject { Q_OBJECT + TQ_OBJECT public: static ContactEditorWidgetManager *self(); @@ -63,12 +64,13 @@ class ContactEditorWidgetManager : public QObject static ContactEditorWidgetManager *mSelf; }; -class ContactEditorTabPage : public QWidget +class ContactEditorTabPage : public TQWidget { Q_OBJECT + TQ_OBJECT public: - ContactEditorTabPage( TQWidget *parent, const char *name = 0 ); + ContactEditorTabPage( TQWidget *tqparent, const char *name = 0 ); /** Adds a widget to the tab. diff --git a/kaddressbook/customfieldswidget.cpp b/kaddressbook/customfieldswidget.cpp index 44b0294ac..5ceac5dbe 100644 --- a/kaddressbook/customfieldswidget.cpp +++ b/kaddressbook/customfieldswidget.cpp @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include <tqcheckbox.h> @@ -42,9 +42,9 @@ #include "customfieldswidget.h" -AddFieldDialog::AddFieldDialog( TQWidget *parent, const char *name ) +AddFieldDialog::AddFieldDialog( TQWidget *tqparent, const char *name ) : KDialogBase( Plain, i18n( "Add Field" ), Ok | Cancel, - Ok, parent, name, true, true ) + Ok, tqparent, name, true, true ) { TQWidget *page = plainPage(); @@ -121,14 +121,14 @@ void AddFieldDialog::nameChanged( const TQString &name ) enableButton( Ok, !name.isEmpty() ); } -FieldWidget::FieldWidget( TQWidget *parent, const char *name ) - : TQWidget( parent, name ) +FieldWidget::FieldWidget( TQWidget *tqparent, const char *name ) + : TQWidget( tqparent, name ) { TQVBoxLayout *tqlayout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() ); mGlobalLayout = new TQVBoxLayout( tqlayout, KDialog::spacingHint() ); - mGlobalLayout->tqsetAlignment( Qt::AlignTop ); + mGlobalLayout->tqsetAlignment( TQt::AlignTop ); mSeparator = new TQFrame( this ); mSeparator->setFrameStyle( TQFrame::HLine | TQFrame::Sunken ); @@ -136,7 +136,7 @@ FieldWidget::FieldWidget( TQWidget *parent, const char *name ) tqlayout->addWidget( mSeparator ); mLocalLayout = new TQVBoxLayout( tqlayout, KDialog::spacingHint() ); - mLocalLayout->tqsetAlignment( Qt::AlignTop ); + mLocalLayout->tqsetAlignment( TQt::AlignTop ); } void FieldWidget::addField( const TQString &identifier, const TQString &title, @@ -159,17 +159,17 @@ void FieldWidget::addField( const TQString &identifier, const TQString &title, connect( wdg, TQT_SIGNAL( toggled( bool ) ), this, TQT_SIGNAL( changed() ) ); } else if ( type == "date" ) { - QDateEdit *wdg = new QDateEdit( this ); + TQDateEdit *wdg = new TQDateEdit( this ); record.mWidget = wdg; connect( wdg, TQT_SIGNAL( valueChanged( const TQDate& ) ), this, TQT_SIGNAL( changed() ) ); } else if ( type == "time" ) { - QTimeEdit *wdg = new QTimeEdit( this ); + TQTimeEdit *wdg = new TQTimeEdit( this ); record.mWidget = wdg; connect( wdg, TQT_SIGNAL( valueChanged( const TQTime& ) ), this, TQT_SIGNAL( changed() ) ); } else if ( type == "datetime" ) { - QDateTimeEdit *wdg = new QDateTimeEdit( this ); + TQDateTimeEdit *wdg = new TQDateTimeEdit( this ); record.mWidget = wdg; connect( wdg, TQT_SIGNAL( valueChanged( const TQDateTime& ) ), this, TQT_SIGNAL( changed() ) ); @@ -186,11 +186,11 @@ void FieldWidget::addField( const TQString &identifier, const TQString &title, if ( isGlobal ) { record.mLayout = new TQHBoxLayout( mGlobalLayout ); record.mLayout->addWidget( record.mLabel ); - record.mLayout->addWidget( record.mWidget, Qt::AlignLeft ); + record.mLayout->addWidget( record.mWidget, TQt::AlignLeft ); } else { record.mLayout = new TQHBoxLayout( mLocalLayout ); record.mLayout->addWidget( record.mLabel ); - record.mLayout->addWidget( record.mWidget, Qt::AlignLeft ); + record.mLayout->addWidget( record.mWidget, TQt::AlignLeft ); mSeparator->show(); } @@ -236,14 +236,14 @@ void FieldWidget::clearFields() } else if ( (*fieldIt).mWidget->isA( TQCHECKBOX_OBJECT_NAME_STRING ) ) { TQCheckBox *wdg = static_cast<TQCheckBox*>( (*fieldIt).mWidget ); wdg->setChecked( true ); - } else if ( (*fieldIt).mWidget->isA( "QDateEdit" ) ) { - QDateEdit *wdg = static_cast<QDateEdit*>( (*fieldIt).mWidget ); + } else if ( (*fieldIt).mWidget->isA( TQDATEEDIT_OBJECT_NAME_STRING ) ) { + TQDateEdit *wdg = static_cast<TQDateEdit*>( (*fieldIt).mWidget ); wdg->setDate( TQDate::tqcurrentDate() ); - } else if ( (*fieldIt).mWidget->isA( "QTimeEdit" ) ) { - QTimeEdit *wdg = static_cast<QTimeEdit*>( (*fieldIt).mWidget ); + } else if ( (*fieldIt).mWidget->isA( TQTIMEEDIT_OBJECT_NAME_STRING ) ) { + TQTimeEdit *wdg = static_cast<TQTimeEdit*>( (*fieldIt).mWidget ); wdg->setTime( TQTime::currentTime() ); - } else if ( (*fieldIt).mWidget->isA( "QDateTimeEdit" ) ) { - QDateTimeEdit *wdg = static_cast<QDateTimeEdit*>( (*fieldIt).mWidget ); + } else if ( (*fieldIt).mWidget->isA( TQDATETIMEEDIT_OBJECT_NAME_STRING ) ) { + TQDateTimeEdit *wdg = static_cast<TQDateTimeEdit*>( (*fieldIt).mWidget ); wdg->setDateTime( TQDateTime::tqcurrentDateTime() ); } } @@ -274,15 +274,15 @@ void FieldWidget::loadContact( KABC::Addressee *addr ) } else if ( (*fieldIt).mWidget->isA( TQCHECKBOX_OBJECT_NAME_STRING ) ) { TQCheckBox *wdg = static_cast<TQCheckBox*>( (*fieldIt).mWidget ); wdg->setChecked( value == "true" || value == "1" ); - } else if ( (*fieldIt).mWidget->isA( "QDateEdit" ) ) { - QDateEdit *wdg = static_cast<QDateEdit*>( (*fieldIt).mWidget ); - wdg->setDate( TQDate::fromString( value, Qt::ISODate ) ); - } else if ( (*fieldIt).mWidget->isA( "QTimeEdit" ) ) { - QTimeEdit *wdg = static_cast<QTimeEdit*>( (*fieldIt).mWidget ); - wdg->setTime( TQTime::fromString( value, Qt::ISODate ) ); - } else if ( (*fieldIt).mWidget->isA( "QDateTimeEdit" ) ) { - QDateTimeEdit *wdg = static_cast<QDateTimeEdit*>( (*fieldIt).mWidget ); - wdg->setDateTime( TQDateTime::fromString( value, Qt::ISODate ) ); + } else if ( (*fieldIt).mWidget->isA( TQDATEEDIT_OBJECT_NAME_STRING ) ) { + TQDateEdit *wdg = static_cast<TQDateEdit*>( (*fieldIt).mWidget ); + wdg->setDate( TQDate::fromString( value, TQt::ISODate ) ); + } else if ( (*fieldIt).mWidget->isA( TQTIMEEDIT_OBJECT_NAME_STRING ) ) { + TQTimeEdit *wdg = static_cast<TQTimeEdit*>( (*fieldIt).mWidget ); + wdg->setTime( TQTime::fromString( value, TQt::ISODate ) ); + } else if ( (*fieldIt).mWidget->isA( TQDATETIMEEDIT_OBJECT_NAME_STRING ) ) { + TQDateTimeEdit *wdg = static_cast<TQDateTimeEdit*>( (*fieldIt).mWidget ); + wdg->setDateTime( TQDateTime::fromString( value, TQt::ISODate ) ); } } } @@ -330,15 +330,15 @@ void FieldWidget::storeContact( KABC::Addressee *addr ) } else if ( (*it).mWidget->isA( TQCHECKBOX_OBJECT_NAME_STRING ) ) { TQCheckBox *wdg = static_cast<TQCheckBox*>( (*it).mWidget ); value = ( wdg->isChecked() ? "true" : "false" ); - } else if ( (*it).mWidget->isA( "QDateEdit" ) ) { - QDateEdit *wdg = static_cast<QDateEdit*>( (*it).mWidget ); - value = wdg->date().toString( Qt::ISODate ); - } else if ( (*it).mWidget->isA( "QTimeEdit" ) ) { - QTimeEdit *wdg = static_cast<QTimeEdit*>( (*it).mWidget ); - value = wdg->time().toString( Qt::ISODate ); - } else if ( (*it).mWidget->isA( "QDateTimeEdit" ) ) { - QDateTimeEdit *wdg = static_cast<QDateTimeEdit*>( (*it).mWidget ); - value = wdg->dateTime().toString( Qt::ISODate ); + } else if ( (*it).mWidget->isA( TQDATEEDIT_OBJECT_NAME_STRING ) ) { + TQDateEdit *wdg = static_cast<TQDateEdit*>( (*it).mWidget ); + value = wdg->date().toString( TQt::ISODate ); + } else if ( (*it).mWidget->isA( TQTIMEEDIT_OBJECT_NAME_STRING ) ) { + TQTimeEdit *wdg = static_cast<TQTimeEdit*>( (*it).mWidget ); + value = wdg->time().toString( TQt::ISODate ); + } else if ( (*it).mWidget->isA( TQDATETIMEEDIT_OBJECT_NAME_STRING ) ) { + TQDateTimeEdit *wdg = static_cast<TQDateTimeEdit*>( (*it).mWidget ); + value = wdg->dateTime().toString( TQt::ISODate ); } if ( value.isEmpty() ) @@ -370,15 +370,15 @@ void FieldWidget::recalculateLayout() FieldRecordList::ConstIterator it; for ( it = mFieldList.begin(); it != mFieldList.end(); ++it ) - maxWidth = QMAX( maxWidth, (*it).mLabel->tqminimumSizeHint().width() ); + maxWidth = TQMAX( maxWidth, (*it).mLabel->tqminimumSizeHint().width() ); for ( it = mFieldList.begin(); it != mFieldList.end(); ++it ) (*it).mLabel->setMinimumWidth( maxWidth ); } CustomFieldsWidget::CustomFieldsWidget( KABC::AddressBook *ab, - TQWidget *parent, const char *name ) - : KAB::ContactEditorWidget( ab, parent, name ) + TQWidget *tqparent, const char *name ) + : KAB::ContactEditorWidget( ab, tqparent, name ) { initGUI(); @@ -492,11 +492,11 @@ void CustomFieldsWidget::initGUI() tqlayout->addMultiCellWidget( mFieldWidget, 0, 0, 0, 2 ); mAddButton = new TQPushButton( i18n( "Add Field..." ), this ); - tqlayout->addWidget( mAddButton, 1, 1, Qt::AlignRight ); + tqlayout->addWidget( mAddButton, 1, 1, TQt::AlignRight ); mRemoveButton = new TQPushButton( i18n( "Remove Field..." ), this ); mRemoveButton->setEnabled( false ); - tqlayout->addWidget( mRemoveButton, 1, 2, Qt::AlignRight ); + tqlayout->addWidget( mRemoveButton, 1, 2, TQt::AlignRight ); // load global fields TQStringList globalFields = KABPrefs::instance()->globalCustomFields(); @@ -527,11 +527,11 @@ TQStringList CustomFieldsWidget::marshallFields( bool global ) const type = "integer"; } else if ( (*it).mWidget->isA( TQCHECKBOX_OBJECT_NAME_STRING ) ) { type = "boolean"; - } else if ( (*it).mWidget->isA( "QDateEdit" ) ) { + } else if ( (*it).mWidget->isA( TQDATEEDIT_OBJECT_NAME_STRING ) ) { type = "date"; - } else if ( (*it).mWidget->isA( "QTimeEdit" ) ) { + } else if ( (*it).mWidget->isA( TQTIMEEDIT_OBJECT_NAME_STRING ) ) { type = "time"; - } else if ( (*it).mWidget->isA( "QDateTimeEdit" ) ) { + } else if ( (*it).mWidget->isA( TQDATETIMEEDIT_OBJECT_NAME_STRING ) ) { type = "datetime"; } else if ( (*it).mWidget->isA( TQLINEEDIT_OBJECT_NAME_STRING ) ) { type = "text"; @@ -547,12 +547,12 @@ TQStringList CustomFieldsWidget::marshallFields( bool global ) const void splitField( const TQString &str, TQString &app, TQString &name, TQString &value ) { - int colon = str.find( ':' ); + int colon = str.tqfind( ':' ); if ( colon != -1 ) { TQString tmp = str.left( colon ); value = str.mid( colon + 1 ); - int dash = tmp.find( '-' ); + int dash = tmp.tqfind( '-' ); if ( dash != -1 ) { app = tmp.left( dash ); name = tmp.mid( dash + 1 ); diff --git a/kaddressbook/customfieldswidget.h b/kaddressbook/customfieldswidget.h index b4c113264..c1dc6b8c8 100644 --- a/kaddressbook/customfieldswidget.h +++ b/kaddressbook/customfieldswidget.h @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef CUSTOMFIELDSWIDGET_H @@ -61,9 +61,10 @@ typedef TQValueList<FieldRecord> FieldRecordList; class AddFieldDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - AddFieldDialog( TQWidget *parent, const char *name = 0 ); + AddFieldDialog( TQWidget *tqparent, const char *name = 0 ); TQString title() const; TQString identifier() const; @@ -82,12 +83,13 @@ class AddFieldDialog : public KDialogBase TQValueVector<TQString> mTypeName; }; -class FieldWidget : public QWidget +class FieldWidget : public TQWidget { Q_OBJECT + TQ_OBJECT public: - FieldWidget( TQWidget *parent, const char *name = 0 ); + FieldWidget( TQWidget *tqparent, const char *name = 0 ); void addField( const TQString &identifier, const TQString &title, const TQString &type, bool isGlobal ); @@ -119,9 +121,10 @@ class FieldWidget : public QWidget class CustomFieldsWidget : public KAB::ContactEditorWidget { Q_OBJECT + TQ_OBJECT public: - CustomFieldsWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 ); + CustomFieldsWidget( KABC::AddressBook *ab, TQWidget *tqparent, const char *name = 0 ); void loadContact( KABC::Addressee *addr ); void storeContact( KABC::Addressee *addr ); @@ -148,9 +151,9 @@ class CustomFieldsWidget : public KAB::ContactEditorWidget class CustomFieldsWidgetFactory : public KAB::ContactEditorWidgetFactory { public: - KAB::ContactEditorWidget *createWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name ) + KAB::ContactEditorWidget *createWidget( KABC::AddressBook *ab, TQWidget *tqparent, const char *name ) { - return new CustomFieldsWidget( ab, parent, name ); + return new CustomFieldsWidget( ab, tqparent, name ); } TQString pageTitle() const { return i18n( "Custom Fields" ); } diff --git a/kaddressbook/distributionlisteditor.cpp b/kaddressbook/distributionlisteditor.cpp index ac0115fe4..485b77975 100644 --- a/kaddressbook/distributionlisteditor.cpp +++ b/kaddressbook/distributionlisteditor.cpp @@ -16,8 +16,8 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include "distributionlisteditor.h" @@ -64,7 +64,7 @@ public: }; -KPIM::DistributionListEditor::Line::Line( KABC::AddressBook* book, TQWidget* parent ) : TQWidget( parent ), m_addressBook( book ) +KPIM::DistributionListEditor::Line::Line( KABC::AddressBook* book, TQWidget* tqparent ) : TQWidget( tqparent ), m_addressBook( book ) { Q_ASSERT( m_addressBook ); TQBoxLayout* tqlayout = new TQHBoxLayout( this ); @@ -106,7 +106,7 @@ KABC::Addressee KPIM::DistributionListEditor::Line::findAddressee( const TQStrin return KABC::Addressee(); typedef KABC::Addressee::List List; - const List byEmail = m_addressBook->tqfindByEmail( email ); + const List byEmail = m_addressBook->findByEmail( email ); if ( !byEmail.isEmpty() ) { const List::ConstIterator end = byEmail.end(); @@ -136,7 +136,7 @@ KPIM::DistributionList::Entry KPIM::DistributionListEditor::Line::entry() const KPIM::DistributionList::Entry res; if ( !m_uid.isNull() ) { - const KABC::Addressee addr = m_addressBook->tqfindByUid( m_uid ); + const KABC::Addressee addr = m_addressBook->findByUid( m_uid ); if ( m_initialText == text || addr.formattedName() == name ) res.addressee = addr; } @@ -147,14 +147,14 @@ KPIM::DistributionList::Entry KPIM::DistributionListEditor::Line::entry() const } -KPIM::DistributionListEditor::LineEdit::LineEdit( TQWidget* parent ) : KPIM::AddresseeLineEdit( parent ) +KPIM::DistributionListEditor::LineEdit::LineEdit( TQWidget* tqparent ) : KPIM::AddresseeLineEdit( tqparent ) { allowDistributionLists( false ); } -KPIM::DistributionListEditor::EditorWidget::EditorWidget( KABC::AddressBook* book, TQWidget* parent ) - : KDialogBase( parent, /*name=*/0, /*modal=*/ true, /*caption=*/TQString(), KDialogBase::Ok|KDialogBase::Cancel ), d( new DistributionListEditor::EditorWidgetPrivate ) +KPIM::DistributionListEditor::EditorWidget::EditorWidget( KABC::AddressBook* book, TQWidget* tqparent ) + : KDialogBase( tqparent, /*name=*/0, /*modal=*/ true, /*caption=*/TQString(), KDialogBase::Ok|KDialogBase::Cancel ), d( new DistributionListEditor::EditorWidgetPrivate ) { d->addressBook = book; Q_ASSERT( d->addressBook ); diff --git a/kaddressbook/distributionlisteditor.h b/kaddressbook/distributionlisteditor.h index 7c5121094..448221ce4 100644 --- a/kaddressbook/distributionlisteditor.h +++ b/kaddressbook/distributionlisteditor.h @@ -16,8 +16,8 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef KPIM_DISTRIBUTIONLISTEDITOR_H @@ -39,8 +39,9 @@ class EditorWidgetPrivate; class EditorWidget : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - explicit EditorWidget( KABC::AddressBook* book, TQWidget* parent = 0 ); + explicit EditorWidget( KABC::AddressBook* book, TQWidget* tqparent = 0 ); ~EditorWidget(); void setDistributionList( const KPIM::DistributionList& list ); diff --git a/kaddressbook/distributionlisteditor_p.h b/kaddressbook/distributionlisteditor_p.h index 6deb2d004..e4754e5a9 100644 --- a/kaddressbook/distributionlisteditor_p.h +++ b/kaddressbook/distributionlisteditor_p.h @@ -16,8 +16,8 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef KPIM_DISTRIBUTIONLISTEDITOR_P_H @@ -42,16 +42,18 @@ namespace DistributionListEditor { class LineEdit : public KPIM::AddresseeLineEdit { Q_OBJECT + TQ_OBJECT public: - explicit LineEdit( TQWidget* parent = 0 ); + explicit LineEdit( TQWidget* tqparent = 0 ); }; -class Line : public QWidget +class Line : public TQWidget { Q_OBJECT + TQ_OBJECT public: - explicit Line( KABC::AddressBook* book, TQWidget* parent = 0 ); + explicit Line( KABC::AddressBook* book, TQWidget* tqparent = 0 ); void setEntry( const KPIM::DistributionList::Entry& entry ); KPIM::DistributionList::Entry entry() const; diff --git a/kaddressbook/distributionlistentryview.cpp b/kaddressbook/distributionlistentryview.cpp index 42e90a3b2..9ea49c3a0 100644 --- a/kaddressbook/distributionlistentryview.cpp +++ b/kaddressbook/distributionlistentryview.cpp @@ -20,7 +20,7 @@ #include <tqstringlist.h> #include <tqvbuttongroup.h> -KAB::DistributionListEntryView::DistributionListEntryView( KAB::Core* core, TQWidget* parent ) : TQWidget( parent ), m_core( core ), m_emailGroup( 0 ) +KAB::DistributionListEntryView::DistributionListEntryView( KAB::Core* core, TQWidget* tqparent ) : TQWidget( tqparent ), m_core( core ), m_emailGroup( 0 ) { m_mainLayout = new TQVBoxLayout( this ); m_mainLayout->setSpacing( KDialog::spacingHint() ); @@ -31,10 +31,10 @@ KAB::DistributionListEntryView::DistributionListEntryView( KAB::Core* core, TQWi m_imageLabel = new TQLabel( this ); m_imageLabel->setAutoResize( true ); - headerLayout->addWidget( m_imageLabel, 0, Qt::AlignTop ); + headerLayout->addWidget( m_imageLabel, 0, TQt::AlignTop ); m_addresseeLabel = new TQLabel( this ); - headerLayout->addWidget( m_addresseeLabel, 0, Qt::AlignTop ); + headerLayout->addWidget( m_addresseeLabel, 0, TQt::AlignTop ); headerLayout->addStretch(); m_mainLayout->addItem( headerLayout ); @@ -44,7 +44,7 @@ KAB::DistributionListEntryView::DistributionListEntryView( KAB::Core* core, TQWi TQLabel* distLabel = new TQLabel( this ); distLabel->setText( i18n( "<b>Distribution list:</b>" ) ); - distLabel->tqsetAlignment( Qt::SingleLine ); + distLabel->tqsetAlignment( TQt::SingleLine ); distLayout->addWidget( distLabel ); m_distListLabel = new KURLLabel( this ); @@ -57,7 +57,7 @@ KAB::DistributionListEntryView::DistributionListEntryView( KAB::Core* core, TQWi TQLabel* emailLabel = new TQLabel( this ); emailLabel->setText( i18n( "<b>Email address to use in this list:</b>" ) ); - emailLabel->tqsetAlignment( Qt::SingleLine ); + emailLabel->tqsetAlignment( TQt::SingleLine ); m_mainLayout->addWidget( emailLabel ); TQBoxLayout* emailLayout = new TQHBoxLayout; @@ -110,7 +110,7 @@ void KAB::DistributionListEntryView::setEntry( const KPIM::DistributionList& lis m_distListLabel->setURL( m_list.name() ); m_distListLabel->setText( m_list.name() ); m_resourceLabel->setText( i18n( "<b>Address book:</b> %1" ).arg( m_entry.addressee.resource() ? m_entry.addressee.resource()->resourceName() : TQString() ) ); - m_resourceLabel->tqsetAlignment( Qt::SingleLine ); + m_resourceLabel->tqsetAlignment( TQt::SingleLine ); m_emailGroup = new TQVButtonGroup( this ); m_emailGroup->setFlat( true ); diff --git a/kaddressbook/distributionlistentryview.h b/kaddressbook/distributionlistentryview.h index 3ee06309b..3eba6efa8 100644 --- a/kaddressbook/distributionlistentryview.h +++ b/kaddressbook/distributionlistentryview.h @@ -21,12 +21,13 @@ namespace KAB { class Core; -class DistributionListEntryView : public QWidget +class DistributionListEntryView : public TQWidget { Q_OBJECT + TQ_OBJECT public: - explicit DistributionListEntryView( KAB::Core* core, TQWidget* parent = 0 ); + explicit DistributionListEntryView( KAB::Core* core, TQWidget* tqparent = 0 ); void setEntry( const KPIM::DistributionList& list, const KPIM::DistributionList::Entry& entry ); public slots: diff --git a/kaddressbook/distributionlistpicker.cpp b/kaddressbook/distributionlistpicker.cpp index 7858e2957..fab91bc4c 100644 --- a/kaddressbook/distributionlistpicker.cpp +++ b/kaddressbook/distributionlistpicker.cpp @@ -16,8 +16,8 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include "distributionlistpicker.h" @@ -41,7 +41,7 @@ #include <tqregexp.h> #include <tqvalidator.h> -KPIM::DistributionListPickerDialog::DistributionListPickerDialog( KABC::AddressBook* book, TQWidget* parent ) : KDialogBase( parent, 0, true, TQString(), Ok | Cancel | User1 ), m_book( book ) +KPIM::DistributionListPickerDialog::DistributionListPickerDialog( KABC::AddressBook* book, TQWidget* tqparent ) : KDialogBase( tqparent, 0, true, TQString(), Ok | Cancel | User1 ), m_book( book ) { Q_ASSERT( m_book ); setModal( true ); diff --git a/kaddressbook/distributionlistpicker.h b/kaddressbook/distributionlistpicker.h index f5309c135..9d7d23faf 100644 --- a/kaddressbook/distributionlistpicker.h +++ b/kaddressbook/distributionlistpicker.h @@ -16,8 +16,8 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef KPIM_DISTRIBUTIONLISTPICKER_H @@ -38,8 +38,9 @@ namespace KPIM { class DistributionListPickerDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - explicit DistributionListPickerDialog( KABC::AddressBook* book, TQWidget* parent = 0 ); + explicit DistributionListPickerDialog( KABC::AddressBook* book, TQWidget* tqparent = 0 ); TQString selectedDistributionList() const; void setLabelText( const TQString& text ); diff --git a/kaddressbook/editors/cryptowidget.cpp b/kaddressbook/editors/cryptowidget.cpp index 45a5efbaf..a4d8b8bb0 100644 --- a/kaddressbook/editors/cryptowidget.cpp +++ b/kaddressbook/editors/cryptowidget.cpp @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include <config.h> @@ -68,8 +68,8 @@ TQString CryptoWidgetFactory::pageIdentifier() const return "crypto"; } -CryptoWidget::CryptoWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name ) - : KAB::ContactEditorWidget( ab, parent, name ), mReadOnly( false ) +CryptoWidget::CryptoWidget( KABC::AddressBook *ab, TQWidget *tqparent, const char *name ) + : KAB::ContactEditorWidget( ab, tqparent, name ), mReadOnly( false ) { TQGridLayout *topLayout = new TQGridLayout( this, 2, 5, KDialog::marginHint(), KDialog::spacingHint() ); diff --git a/kaddressbook/editors/cryptowidget.h b/kaddressbook/editors/cryptowidget.h index 8037a4a49..12f3ba992 100644 --- a/kaddressbook/editors/cryptowidget.h +++ b/kaddressbook/editors/cryptowidget.h @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef CRYPTOWIDGET_H @@ -36,9 +36,10 @@ class TQCheckBox; class CryptoWidget : public KAB::ContactEditorWidget { Q_OBJECT + TQ_OBJECT public: - CryptoWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 ); + CryptoWidget( KABC::AddressBook *ab, TQWidget *tqparent, const char *name = 0 ); ~CryptoWidget(); void loadContact( KABC::Addressee *addr ); @@ -59,9 +60,9 @@ class CryptoWidgetFactory : public KAB::ContactEditorWidgetFactory { public: CryptoWidgetFactory(); - KAB::ContactEditorWidget *createWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name ) + KAB::ContactEditorWidget *createWidget( KABC::AddressBook *ab, TQWidget *tqparent, const char *name ) { - return new CryptoWidget( ab, parent, name ); + return new CryptoWidget( ab, tqparent, name ); } TQString pageTitle() const; diff --git a/kaddressbook/editors/imaddressbase.ui b/kaddressbook/editors/imaddressbase.ui index 2f608a083..0a096f6ff 100644 --- a/kaddressbook/editors/imaddressbase.ui +++ b/kaddressbook/editors/imaddressbase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>IMAddressBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>IMAddressBase</cstring> </property> @@ -27,12 +27,12 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QComboBox" row="0" column="1"> + <widget class="TQComboBox" row="0" column="1"> <property name="name"> <cstring>cmbProtocol</cstring> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>labelProtocol</cstring> </property> @@ -43,12 +43,12 @@ <cstring>cmbProtocol</cstring> </property> </widget> - <widget class="QLineEdit" row="1" column="1"> + <widget class="TQLineEdit" row="1" column="1"> <property name="name"> <cstring>edtAddress</cstring> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>labelAddress</cstring> </property> @@ -59,7 +59,7 @@ <cstring>edtAddress</cstring> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>labelNetwork</cstring> </property> @@ -70,7 +70,7 @@ <cstring>edtNetwork</cstring> </property> </widget> - <widget class="QLineEdit" row="2" column="1"> + <widget class="TQLineEdit" row="2" column="1"> <property name="name"> <cstring>edtNetwork</cstring> </property> @@ -81,9 +81,9 @@ <tabstop>cmbProtocol</tabstop> <tabstop>edtAddress</tabstop> </tabstops> -<slots> +<Q_SLOTS> <slot>slotProtocolChanged( const QString & )</slot> <slot>slotProtocolChanged()</slot> -</slots> +</Q_SLOTS> <tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kaddressbook/editors/imaddresswidget.cpp b/kaddressbook/editors/imaddresswidget.cpp index 097b092c0..1d64c5b98 100644 --- a/kaddressbook/editors/imaddresswidget.cpp +++ b/kaddressbook/editors/imaddresswidget.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include <tqcheckbox.h> #include <tqcombobox.h> @@ -33,18 +33,18 @@ #include "imaddresswidget.h" -IMAddressWidget::IMAddressWidget( TQWidget *parent, TQValueList<KPluginInfo *> protocols ) - : IMAddressBase( parent ) +IMAddressWidget::IMAddressWidget( TQWidget *tqparent, TQValueList<KPluginInfo *> protocols ) + : IMAddressBase( tqparent ) { mProtocols = protocols; populateProtocols(); init(); } -IMAddressWidget::IMAddressWidget( TQWidget *parent, TQValueList<KPluginInfo *> protocols, +IMAddressWidget::IMAddressWidget( TQWidget *tqparent, TQValueList<KPluginInfo *> protocols, KPluginInfo *protocol, const TQString& address, const IMContext& context ) - : IMAddressBase( parent ) + : IMAddressBase( tqparent ) { Q_UNUSED( context ); diff --git a/kaddressbook/editors/imaddresswidget.h b/kaddressbook/editors/imaddresswidget.h index 11ee5f454..3cec21cfd 100644 --- a/kaddressbook/editors/imaddresswidget.h +++ b/kaddressbook/editors/imaddresswidget.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef IMADDRESSWIDGET_H #define IMADDRESSWIDGET_H @@ -42,10 +42,11 @@ class KPluginInfo; class IMAddressWidget : public IMAddressBase { Q_OBJECT + TQ_OBJECT public: - IMAddressWidget( TQWidget *parent, TQValueList<KPluginInfo *> protocols); - IMAddressWidget( TQWidget *parent, TQValueList<KPluginInfo *> protocols, + IMAddressWidget( TQWidget *tqparent, TQValueList<KPluginInfo *> protocols); + IMAddressWidget( TQWidget *tqparent, TQValueList<KPluginInfo *> protocols, KPluginInfo *protocol, const TQString& address, const IMContext& context = Any ); diff --git a/kaddressbook/editors/imeditorbase.ui b/kaddressbook/editors/imeditorbase.ui index 3c8e36010..bbc266370 100644 --- a/kaddressbook/editors/imeditorbase.ui +++ b/kaddressbook/editors/imeditorbase.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>IMEditorBase</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>IMEditorBase</cstring> </property> @@ -44,7 +44,7 @@ </size> </property> </spacer> - <widget class="QPushButton" row="3" column="1"> + <widget class="TQPushButton" row="3" column="1"> <property name="name"> <cstring>btnSetStandard</cstring> </property> diff --git a/kaddressbook/editors/imeditorwidget.cpp b/kaddressbook/editors/imeditorwidget.cpp index 30c3ca981..3e306a03b 100644 --- a/kaddressbook/editors/imeditorwidget.cpp +++ b/kaddressbook/editors/imeditorwidget.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include <tqlistview.h> @@ -43,9 +43,9 @@ #include "imeditorwidget.h" -IMAddressLVI::IMAddressLVI( KListView *parent, KPluginInfo *protocol, +IMAddressLVI::IMAddressLVI( KListView *tqparent, KPluginInfo *protocol, const TQString &address, const IMContext &context ) - : KListViewItem( parent ) + : KListViewItem( tqparent ) { setProtocol( protocol ); setAddress( address ); @@ -140,8 +140,8 @@ void IMAddressLVI::activate() /*===========================================================================*/ -IMEditorWidget::IMEditorWidget( TQWidget *parent, const TQString &preferredIM, const char *name ) - : KDialogBase( parent, name, false, i18n( "Edit Instant Messenging Address" ), +IMEditorWidget::IMEditorWidget( TQWidget *tqparent, const TQString &preferredIM, const char *name ) + : KDialogBase( tqparent, name, false, i18n( "Edit Instant Messenging Address" ), Help | Ok | Cancel, Ok, false ), mReadOnly( false ) { @@ -351,7 +351,7 @@ void IMEditorWidget::slotAdd() mPreferred = addressWid->address(); } - if ( mChangedProtocols.find( addressWid->protocol() ) == mChangedProtocols.end() ) + if ( mChangedProtocols.tqfind( addressWid->protocol() ) == mChangedProtocols.end() ) mChangedProtocols.append( addressWid->protocol() ); mWidget->lvAddresses->sort(); @@ -388,7 +388,7 @@ void IMEditorWidget::slotEdit() } // the entry for the protocol of the current address has changed - if ( mChangedProtocols.find( current->protocol() ) == mChangedProtocols.end() ) { + if ( mChangedProtocols.tqfind( current->protocol() ) == mChangedProtocols.end() ) { mChangedProtocols.append( current->protocol() ); } // update protocol - has another protocol gained an address? @@ -396,7 +396,7 @@ void IMEditorWidget::slotEdit() modified = true; // this proto is losing an entry current->setProtocol( addressWid->protocol() ); - if ( mChangedProtocols.find( current->protocol() ) == mChangedProtocols.end() ) + if ( mChangedProtocols.tqfind( current->protocol() ) == mChangedProtocols.end() ) mChangedProtocols.append( current->protocol() ); } @@ -431,7 +431,7 @@ void IMEditorWidget::slotDelete() while( it.current() ) { if ( it.current()->isSelected() ) { IMAddressLVI * current = static_cast<IMAddressLVI*>( *it ); - if ( mChangedProtocols.find( current->protocol() ) == mChangedProtocols.end() ) + if ( mChangedProtocols.tqfind( current->protocol() ) == mChangedProtocols.end() ) mChangedProtocols.append( current->protocol() ); if ( current->preferred() ) @@ -477,12 +477,12 @@ KPluginInfo * IMEditorWidget::protocolFromString( const TQString &fieldValue ) c void IMEditorWidget::splitField( const TQString &str, TQString &app, TQString &name, TQString &value ) { - int colon = str.find( ':' ); + int colon = str.tqfind( ':' ); if ( colon != -1 ) { TQString tmp = str.left( colon ); value = str.mid( colon + 1 ); - int dash = tmp.find( '-' ); + int dash = tmp.tqfind( '-' ); if ( dash != -1 ) { app = tmp.left( dash ); name = tmp.mid( dash + 1 ); diff --git a/kaddressbook/editors/imeditorwidget.h b/kaddressbook/editors/imeditorwidget.h index 25fd9804d..f1f2708db 100644 --- a/kaddressbook/editors/imeditorwidget.h +++ b/kaddressbook/editors/imeditorwidget.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef IMEDITORWIDGET_H @@ -49,9 +49,10 @@ enum IMContext { Any, Home, Work }; class IMEditorWidget : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - IMEditorWidget( TQWidget *parent, const TQString &preferredIM, const char *name = 0 ); + IMEditorWidget( TQWidget *tqparent, const TQString &preferredIM, const char *name = 0 ); ~IMEditorWidget() {}; void loadContact( KABC::Addressee *addr ); @@ -99,7 +100,7 @@ class IMEditorWidget : public KDialogBase class IMAddressLVI : public KListViewItem { public: - IMAddressLVI( KListView *parent, KPluginInfo * protocol, + IMAddressLVI( KListView *tqparent, KPluginInfo * protocol, const TQString &address, const IMContext &context = Any ); void setAddress( const TQString &address ); diff --git a/kaddressbook/emaileditwidget.cpp b/kaddressbook/emaileditwidget.cpp index 3cc2de14f..21d21e52f 100644 --- a/kaddressbook/emaileditwidget.cpp +++ b/kaddressbook/emaileditwidget.cpp @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include <tqcheckbox.h> @@ -44,7 +44,7 @@ #include "emaileditwidget.h" -class EmailValidator : public QRegExpValidator +class EmailValidator : public TQRegExpValidator { public: EmailValidator() @@ -55,11 +55,11 @@ class EmailValidator : public QRegExpValidator } }; -class EmailItem : public QListBoxText +class EmailItem : public TQListBoxText { public: - EmailItem( TQListBox *parent, const TQString &text, bool preferred ) - : TQListBoxText( parent, text ), mPreferred( preferred ) + EmailItem( TQListBox *tqparent, const TQString &text, bool preferred ) + : TQListBoxText( tqparent, text ), mPreferred( preferred ) {} void setPreferred( bool preferred ) { mPreferred = preferred; } @@ -86,8 +86,8 @@ class EmailItem : public QListBoxText bool mPreferred; }; -EmailEditWidget::EmailEditWidget( TQWidget *parent, const char *name ) - : TQWidget( parent, name ) +EmailEditWidget::EmailEditWidget( TQWidget *tqparent, const char *name ) + : TQWidget( tqparent, name ) { TQGridLayout *topLayout = new TQGridLayout( this, 2, 2, KDialog::marginHint(), KDialog::spacingHint() ); @@ -171,11 +171,11 @@ void EmailEditWidget::textChanged( const TQString &text ) } -EmailEditDialog::EmailEditDialog( const TQStringList &list, TQWidget *parent, +EmailEditDialog::EmailEditDialog( const TQStringList &list, TQWidget *tqparent, const char *name ) : KDialogBase( KDialogBase::Plain, i18n( "Edit Email Addresses" ), KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Help, - parent, name, true ) + tqparent, name, true ) { TQWidget *page = plainPage(); @@ -254,7 +254,7 @@ void EmailEditDialog::add() bool ok = false; TQString email = KInputDialog::getText( i18n( "Add Email" ), i18n( "New Email:" ), - TQString::null, &ok, this, "EmailEditDialog", + TQString(), &ok, this, "EmailEditDialog", validator ); if ( !ok ) diff --git a/kaddressbook/emaileditwidget.h b/kaddressbook/emaileditwidget.h index ea1af4c3f..c73308f0b 100644 --- a/kaddressbook/emaileditwidget.h +++ b/kaddressbook/emaileditwidget.h @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef EMAILEDITWIDGET_H @@ -41,12 +41,13 @@ class KListView; This widget displays a list box of the email addresses as well as buttons to manipulate them (up, down, add, remove). */ -class EmailEditWidget : public QWidget +class EmailEditWidget : public TQWidget { Q_OBJECT + TQ_OBJECT public: - EmailEditWidget( TQWidget *parent, const char *name = 0 ); + EmailEditWidget( TQWidget *tqparent, const char *name = 0 ); ~EmailEditWidget(); void setEmails( const TQStringList &list ); @@ -70,9 +71,10 @@ class EmailEditWidget : public QWidget class EmailEditDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - EmailEditDialog( const TQStringList &list, TQWidget *parent, + EmailEditDialog( const TQStringList &list, TQWidget *tqparent, const char *name = 0 ); ~EmailEditDialog(); diff --git a/kaddressbook/extensionmanager.cpp b/kaddressbook/extensionmanager.cpp index aa4a5c009..0f8100dbd 100644 --- a/kaddressbook/extensionmanager.cpp +++ b/kaddressbook/extensionmanager.cpp @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include <kactionclasses.h> @@ -44,9 +44,9 @@ ExtensionData::ExtensionData() : action( 0 ), widget( 0 ), weight( 0 ), isDetail { } -ExtensionManager::ExtensionManager( TQWidget* extensionBar, TQWidgetStack* detailsStack, KAB::Core *core, TQObject *parent, +ExtensionManager::ExtensionManager( TQWidget* extensionBar, TQWidgetStack* detailsStack, KAB::Core *core, TQObject *tqparent, const char *name ) - : TQObject( parent, name ), mExtensionBar( extensionBar ), mCore( core ), + : TQObject( tqparent, name ), mExtensionBar( extensionBar ), mCore( core ), mMapper( 0 ), mDetailsStack( detailsStack ), mActiveDetailsWidget( 0 ) { Q_ASSERT( mExtensionBar ); diff --git a/kaddressbook/extensionmanager.h b/kaddressbook/extensionmanager.h index 054266205..5c5a14c4d 100644 --- a/kaddressbook/extensionmanager.h +++ b/kaddressbook/extensionmanager.h @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef EXTENSIONMANAGER_H @@ -53,12 +53,13 @@ class ExtensionData bool isDetailsExtension; }; -class ExtensionManager : public QObject +class ExtensionManager : public TQObject { Q_OBJECT + TQ_OBJECT public: - ExtensionManager( TQWidget *extensionBar, TQWidgetStack *detailsStack, KAB::Core *core, TQObject *parent, const char *name = 0 ); + ExtensionManager( TQWidget *extensionBar, TQWidgetStack *detailsStack, KAB::Core *core, TQObject *tqparent, const char *name = 0 ); ~ExtensionManager(); /** diff --git a/kaddressbook/features/distributionlistngwidget.cpp b/kaddressbook/features/distributionlistngwidget.cpp index d6b1d7d96..1eac56b08 100644 --- a/kaddressbook/features/distributionlistngwidget.cpp +++ b/kaddressbook/features/distributionlistngwidget.cpp @@ -16,8 +16,8 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include "distributionlistngwidget.h" @@ -44,7 +44,7 @@ #include <tqpushbutton.h> #include <tqtooltip.h> -KAB::DistributionListNg::ListBox::ListBox( TQWidget* parent ) : KListBox( parent ) +KAB::DistributionListNg::ListBox::ListBox( TQWidget* tqparent ) : KListBox( tqparent ) { setAcceptDrops( true ); } @@ -84,9 +84,9 @@ namespace DistributionListNg { class Factory : public KAB::ExtensionFactory { public: - KAB::ExtensionWidget *extension( KAB::Core *core, TQWidget *parent, const char *name ) + KAB::ExtensionWidget *extension( KAB::Core *core, TQWidget *tqparent, const char *name ) { - return new KAB::DistributionListNg::MainWidget( core, parent, name ); + return new KAB::DistributionListNg::MainWidget( core, tqparent, name ); } TQString identifier() const @@ -115,7 +115,7 @@ TQString KAB::DistributionListNg::MainWidget::identifier() const return "distribution_list_editor_ng"; } -KAB::DistributionListNg::MainWidget::MainWidget( KAB::Core *core, TQWidget *parent, const char *name ) : KAB::ExtensionWidget( core, parent, name ) +KAB::DistributionListNg::MainWidget::MainWidget( KAB::Core *core, TQWidget *tqparent, const char *name ) : KAB::ExtensionWidget( core, tqparent, name ) { TQVBoxLayout *tqlayout = new TQVBoxLayout( this ); tqlayout->setSpacing( KDialog::spacingHint() ); diff --git a/kaddressbook/features/distributionlistngwidget.h b/kaddressbook/features/distributionlistngwidget.h index 8c90c0dc5..090fe0d50 100644 --- a/kaddressbook/features/distributionlistngwidget.h +++ b/kaddressbook/features/distributionlistngwidget.h @@ -16,8 +16,8 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef KAB_DISTRIBUTIONLISTNG_MAINWIDGET_H @@ -47,8 +47,9 @@ namespace DistributionListNg { class ListBox : public KListBox { Q_OBJECT + TQ_OBJECT public: - ListBox( TQWidget* parent = 0 ); + ListBox( TQWidget* tqparent = 0 ); signals: @@ -66,9 +67,10 @@ protected: class MainWidget : public KAB::ExtensionWidget { Q_OBJECT + TQ_OBJECT public: - explicit MainWidget( KAB::Core *core, TQWidget *parent = 0, const char *name = 0 ); + explicit MainWidget( KAB::Core *core, TQWidget *tqparent = 0, const char *name = 0 ); //impl TQString title() const; diff --git a/kaddressbook/features/distributionlistwidget.cpp b/kaddressbook/features/distributionlistwidget.cpp index 878ede7aa..16277784e 100644 --- a/kaddressbook/features/distributionlistwidget.cpp +++ b/kaddressbook/features/distributionlistwidget.cpp @@ -16,8 +16,8 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include "distributionlistwidget.h" @@ -55,9 +55,9 @@ typedef KABC::DistributionList DistributionList; class DistributionListFactory : public KAB::ExtensionFactory { public: - KAB::ExtensionWidget *extension( KAB::Core *core, TQWidget *parent, const char *name ) + KAB::ExtensionWidget *extension( KAB::Core *core, TQWidget *tqparent, const char *name ) { - return new DistributionListWidget( core, parent, name ); + return new DistributionListWidget( core, tqparent, name ); } TQString identifier() const @@ -78,11 +78,11 @@ extern "C" { the event is forwarded to the ViewManager and it tries to remove a contact instead of the distribution list. */ -class DeletePressedCatcher : public QObject +class DeletePressedCatcher : public TQObject { public: - DeletePressedCatcher( DistributionListWidget *parent ) - : TQObject( parent, "DeletePressedCatcher" ), mWidget( parent ) + DeletePressedCatcher( DistributionListWidget *tqparent ) + : TQObject( tqparent, "DeletePressedCatcher" ), mWidget( tqparent ) { } @@ -91,7 +91,7 @@ class DeletePressedCatcher : public QObject { if ( event->type() == TQEvent::AccelOverride ) { TQKeyEvent *keyEvent = (TQKeyEvent*)event; - if ( keyEvent->key() == Qt::Key_Delete ) { + if ( keyEvent->key() == TQt::Key_Delete ) { keyEvent->accept(); mWidget->removeContact(); return true; @@ -106,12 +106,12 @@ class DeletePressedCatcher : public QObject DistributionListWidget *mWidget; }; -class ContactItem : public QListViewItem +class ContactItem : public TQListViewItem { public: - ContactItem( DistributionListView *parent, const KABC::Addressee &addressee, - const TQString &email = TQString::null ) : - TQListViewItem( parent ), + ContactItem( DistributionListView *tqparent, const KABC::Addressee &addressee, + const TQString &email = TQString() ) : + TQListViewItem( tqparent ), mAddressee( addressee ), mEmail( email ) { @@ -146,9 +146,9 @@ class ContactItem : public QListViewItem TQString mEmail; }; -DistributionListWidget::DistributionListWidget( KAB::Core *core, TQWidget *parent, +DistributionListWidget::DistributionListWidget( KAB::Core *core, TQWidget *tqparent, const char *name ) - : KAB::ExtensionWidget( core, parent, name ) + : KAB::ExtensionWidget( core, tqparent, name ) #ifndef KDEPIM_NEW_DISTRLISTS , mManager( 0 ) #endif @@ -265,7 +265,7 @@ void DistributionListWidget::createList() { TQString newName = KInputDialog::getText( i18n( "New Distribution List" ), i18n( "Please enter name:" ), - TQString::null, 0, this ); + TQString(), 0, this ); if ( newName.isEmpty() ) return; @@ -344,7 +344,7 @@ void DistributionListWidget::removeList() { int result = KMessageBox::warningContinueCancel( this, i18n( "<qt>Delete distribution list <b>%1</b>?</qt>" ) .arg( mNameCombo->currentText() ), - TQString::null, KGuiItem( i18n("Delete"), "editdelete") ); + TQString(), KGuiItem( i18n("Delete"), "editdelete") ); if ( result != KMessageBox::Continue ) return; @@ -519,7 +519,7 @@ void DistributionListWidget::updateNameCombo() const TQStringList names = mManager->listNames(); #endif mNameCombo->insertStringList( names ); - mNameCombo->setCurrentItem( QMIN( pos, (int)names.count() - 1 ) ); + mNameCombo->setCurrentItem( TQMIN( pos, (int)names.count() - 1 ) ); updateContactView(); } @@ -590,8 +590,8 @@ void DistributionListWidget::changed() } #endif -DistributionListView::DistributionListView( TQWidget *parent, const char* name ) - : KListView( parent, name ) +DistributionListView::DistributionListView( TQWidget *tqparent, const char* name ) + : KListView( tqparent, name ) { setDragEnabled( true ); setAcceptDrops( true ); @@ -622,9 +622,9 @@ void DistributionListView::dropEvent( TQDropEvent *e ) EmailSelector::EmailSelector( const TQStringList &emails, - const TQString ¤t, TQWidget *parent ) + const TQString ¤t, TQWidget *tqparent ) : KDialogBase( KDialogBase::Plain, i18n("Select Email Address"), Ok|Cancel, Ok, - parent ) + tqparent ) { TQFrame *topFrame = plainPage(); TQBoxLayout *topLayout = new TQVBoxLayout( topFrame ); @@ -653,13 +653,13 @@ TQString EmailSelector::selected() const if ( button ) return mEmailMap[ mButtonGroup->id( button ) ]; - return TQString::null; + return TQString(); } TQString EmailSelector::getEmail( const TQStringList &emails, - const TQString ¤t, TQWidget *parent, bool &canceled ) + const TQString ¤t, TQWidget *tqparent, bool &canceled ) { - EmailSelector dlg( emails, current, parent ); + EmailSelector dlg( emails, current, tqparent ); if(dlg.exec()) { canceled = false; diff --git a/kaddressbook/features/distributionlistwidget.h b/kaddressbook/features/distributionlistwidget.h index e74ac758f..6890a6a72 100644 --- a/kaddressbook/features/distributionlistwidget.h +++ b/kaddressbook/features/distributionlistwidget.h @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef DISTRIBUTIONLISTWIDGET_H @@ -48,9 +48,10 @@ class DistributionListManager; class DistributionListWidget : public KAB::ExtensionWidget { Q_OBJECT + TQ_OBJECT public: - DistributionListWidget( KAB::Core*, TQWidget *parent, const char *name = 0 ); + DistributionListWidget( KAB::Core*, TQWidget *tqparent, const char *name = 0 ); virtual ~DistributionListWidget(); void contactsSelectionChanged(); @@ -107,9 +108,10 @@ class DistributionListWidget : public KAB::ExtensionWidget class DistributionListView : public KListView { Q_OBJECT + TQ_OBJECT public: - DistributionListView( TQWidget *parent, const char* name = 0 ); + DistributionListView( TQWidget *tqparent, const char* name = 0 ); protected: void dragEnterEvent( TQDragEnterEvent *e ); @@ -125,12 +127,12 @@ class EmailSelector : public KDialogBase { public: EmailSelector( const TQStringList &emails, const TQString ¤t, - TQWidget *parent ); + TQWidget *tqparent ); TQString selected() const; static TQString getEmail( const TQStringList &emails, const TQString ¤t, - TQWidget *parent, bool &canceled ); + TQWidget *tqparent, bool &canceled ); private: TQButtonGroup *mButtonGroup; diff --git a/kaddressbook/features/resourceselection.cpp b/kaddressbook/features/resourceselection.cpp index 59a3c1ee6..049f879b5 100644 --- a/kaddressbook/features/resourceselection.cpp +++ b/kaddressbook/features/resourceselection.cpp @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include <tqlayout.h> @@ -54,11 +54,11 @@ class AddressBookWrapper : public KABC::AddressBook } }; -class ResourceItem : public QCheckListItem +class ResourceItem : public TQCheckListItem { public: - ResourceItem( KListView *parent, KABC::Resource *resource ) - : TQCheckListItem( parent, resource->resourceName(), CheckBox ), + ResourceItem( KListView *tqparent, KABC::Resource *resource ) + : TQCheckListItem( tqparent, resource->resourceName(), CheckBox ), mResource( resource ), mChecked( false ), mIsSubresource( false ), mSubItemsCreated( false ), mResourceIdentifier() @@ -68,9 +68,9 @@ class ResourceItem : public QCheckListItem mChecked = isOn(); } - ResourceItem( KPIM::ResourceABC *resourceABC, ResourceItem* parent, + ResourceItem( KPIM::ResourceABC *resourceABC, ResourceItem* tqparent, const TQString& resourceIdent ) - : TQCheckListItem( parent, resourceABC->subresourceLabel( resourceIdent ), CheckBox ), + : TQCheckListItem( tqparent, resourceABC->subresourceLabel( resourceIdent ), CheckBox ), mResource( resourceABC ), mChecked( false ), mIsSubresource( true ), mSubItemsCreated( false ), mResourceIdentifier( resourceIdent ) @@ -134,8 +134,8 @@ void ResourceItem::stateChange( bool active ) //// -ResourceSelection::ResourceSelection( KAB::Core *core, TQWidget *parent, const char *name ) - : KAB::ExtensionWidget( core, parent, name ), mManager( 0 ) +ResourceSelection::ResourceSelection( KAB::Core *core, TQWidget *tqparent, const char *name ) + : KAB::ExtensionWidget( core, tqparent, name ), mManager( 0 ) { initGUI(); @@ -466,12 +466,12 @@ ResourceItem* ResourceSelection::selectedItem() const ResourceItem* ResourceSelection::findSubResourceItem( KPIM::ResourceABC *resource, const TQString &subResource ) { - TQListViewItemIterator parentIt( mListView ); - for ( ; *parentIt; ++parentIt ) { - if ( static_cast<ResourceItem*>(*parentIt)->resource() != resource ) + TQListViewItemIterator tqparentIt( mListView ); + for ( ; *tqparentIt; ++tqparentIt ) { + if ( static_cast<ResourceItem*>(*tqparentIt)->resource() != resource ) continue; - TQListViewItemIterator childIt( *parentIt ); + TQListViewItemIterator childIt( *tqparentIt ); for ( ; *childIt; ++childIt ) { ResourceItem *item = static_cast<ResourceItem*>(*childIt); if ( item->resourceIdentifier() == subResource ) @@ -520,9 +520,9 @@ void ResourceSelection::initGUI() class ResourceSelectionFactory : public KAB::ExtensionFactory { public: - KAB::ExtensionWidget *extension( KAB::Core *core, TQWidget *parent, const char *name ) + KAB::ExtensionWidget *extension( KAB::Core *core, TQWidget *tqparent, const char *name ) { - return new ResourceSelection( core, parent, name ); + return new ResourceSelection( core, tqparent, name ); } TQString identifier() const diff --git a/kaddressbook/features/resourceselection.h b/kaddressbook/features/resourceselection.h index 21c3ee841..e8939812b 100644 --- a/kaddressbook/features/resourceselection.h +++ b/kaddressbook/features/resourceselection.h @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef RESOURCESELECTION_H @@ -38,9 +38,10 @@ class ResourceItem; class ResourceSelection : public KAB::ExtensionWidget { Q_OBJECT + TQ_OBJECT public: - ResourceSelection( KAB::Core*, TQWidget *parent, const char *name ); + ResourceSelection( KAB::Core*, TQWidget *tqparent, const char *name ); virtual ~ResourceSelection(); TQString title() const; diff --git a/kaddressbook/filtereditdialog.cpp b/kaddressbook/filtereditdialog.cpp index a6ccd462c..60a67014c 100644 --- a/kaddressbook/filtereditdialog.cpp +++ b/kaddressbook/filtereditdialog.cpp @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include <tqbuttongroup.h> @@ -45,9 +45,9 @@ #include "kabprefs.h" #include "filtereditdialog.h" -FilterEditDialog::FilterEditDialog( TQWidget *parent, const char *name ) +FilterEditDialog::FilterEditDialog( TQWidget *tqparent, const char *name ) : KDialogBase( Plain, i18n( "Edit Address Book Filter" ), - Help | Ok | Cancel, Ok, parent, name, false, true ) + Help | Ok | Cancel, Ok, tqparent, name, false, true ) { initGUI(); @@ -102,7 +102,7 @@ Filter FilterEditDialog::filter() } filter.setCategories( categories ); - if ( mMatchRuleGroup->find( 0 )->isOn() ) + if ( mMatchRuleGroup->tqfind( 0 )->isOn() ) filter.setMatchRule( Filter::Matching ); else filter.setMatchRule( Filter::NotMatching ); @@ -161,9 +161,9 @@ void FilterEditDialog::slotHelp() kapp->invokeHelp( "using-filters" ); } -FilterDialog::FilterDialog( TQWidget *parent, const char *name ) +FilterDialog::FilterDialog( TQWidget *tqparent, const char *name ) : KDialogBase( Plain, i18n( "Edit Address Book Filters" ), - Ok | Cancel, Ok, parent, name, false, true ) + Ok | Cancel, Ok, tqparent, name, false, true ) { initGUI(); } diff --git a/kaddressbook/filtereditdialog.h b/kaddressbook/filtereditdialog.h index 2b5d38b6b..1d3c64395 100644 --- a/kaddressbook/filtereditdialog.h +++ b/kaddressbook/filtereditdialog.h @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef FILTEREDITDIALOG_H @@ -40,9 +40,10 @@ class KListView; class FilterDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - FilterDialog( TQWidget *parent, const char *name = 0 ); + FilterDialog( TQWidget *tqparent, const char *name = 0 ); ~FilterDialog(); void setFilters( const Filter::List &list ); @@ -70,8 +71,9 @@ class FilterDialog : public KDialogBase class FilterEditDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - FilterEditDialog( TQWidget *parent, const char *name = 0 ); + FilterEditDialog( TQWidget *tqparent, const char *name = 0 ); ~FilterEditDialog(); void setFilter( const Filter &filter ); diff --git a/kaddressbook/filterselectionwidget.cpp b/kaddressbook/filterselectionwidget.cpp index c963024d0..1b4873175 100644 --- a/kaddressbook/filterselectionwidget.cpp +++ b/kaddressbook/filterselectionwidget.cpp @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include <tqlabel.h> @@ -29,8 +29,8 @@ #include "filterselectionwidget.h" -FilterSelectionWidget::FilterSelectionWidget( TQWidget *parent, const char *name ) - : TQHBox( parent, name ) +FilterSelectionWidget::FilterSelectionWidget( TQWidget *tqparent, const char *name ) + : TQHBox( tqparent, name ) { setSpacing( KDialog::spacingHint() ); diff --git a/kaddressbook/filterselectionwidget.h b/kaddressbook/filterselectionwidget.h index bedb27111..da8077c46 100644 --- a/kaddressbook/filterselectionwidget.h +++ b/kaddressbook/filterselectionwidget.h @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef FILTERSELECTIONWIDGET_H @@ -33,12 +33,13 @@ class KComboBox; horizontal line. The combo box allows the user to select the active filter. */ -class FilterSelectionWidget : public QHBox +class FilterSelectionWidget : public TQHBox { Q_OBJECT + TQ_OBJECT public: - FilterSelectionWidget( TQWidget *parent, const char *name = 0 ); + FilterSelectionWidget( TQWidget *tqparent, const char *name = 0 ); ~FilterSelectionWidget(); void setItems( const TQStringList &names ); diff --git a/kaddressbook/freebusywidget.cpp b/kaddressbook/freebusywidget.cpp index 5b588fcfc..5a4199072 100644 --- a/kaddressbook/freebusywidget.cpp +++ b/kaddressbook/freebusywidget.cpp @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include <tqlabel.h> @@ -32,8 +32,8 @@ #include "freebusywidget.h" -FreeBusyWidget::FreeBusyWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name ) - : KAB::ContactEditorWidget( ab, parent, name ) +FreeBusyWidget::FreeBusyWidget( KABC::AddressBook *ab, TQWidget *tqparent, const char *name ) + : KAB::ContactEditorWidget( ab, tqparent, name ) { TQHBoxLayout *tqlayout = new TQHBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() ); diff --git a/kaddressbook/freebusywidget.h b/kaddressbook/freebusywidget.h index a33365697..a758f1418 100644 --- a/kaddressbook/freebusywidget.h +++ b/kaddressbook/freebusywidget.h @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef FREEBUSYWIDGET_H @@ -31,9 +31,10 @@ class FreeBusyWidget : public KAB::ContactEditorWidget { Q_OBJECT + TQ_OBJECT public: - FreeBusyWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 ); + FreeBusyWidget( KABC::AddressBook *ab, TQWidget *tqparent, const char *name = 0 ); ~FreeBusyWidget(); void loadContact( KABC::Addressee *addr ); @@ -50,9 +51,9 @@ class FreeBusyWidget : public KAB::ContactEditorWidget class FreeBusyWidgetFactory : public KAB::ContactEditorWidgetFactory { public: - KAB::ContactEditorWidget *createWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name ) + KAB::ContactEditorWidget *createWidget( KABC::AddressBook *ab, TQWidget *tqparent, const char *name ) { - return new FreeBusyWidget( ab, parent, name ); + return new FreeBusyWidget( ab, tqparent, name ); } TQString pageIdentifier() const { return "misc"; } diff --git a/kaddressbook/geowidget.cpp b/kaddressbook/geowidget.cpp index ec8c92f9b..4837a1ef4 100644 --- a/kaddressbook/geowidget.cpp +++ b/kaddressbook/geowidget.cpp @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include <kabc/geo.h> @@ -44,8 +44,8 @@ #include "geowidget.h" -GeoWidget::GeoWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name ) - : KAB::ContactEditorWidget( ab, parent, name ), mReadOnly( false ) +GeoWidget::GeoWidget( KABC::AddressBook *ab, TQWidget *tqparent, const char *name ) + : KAB::ContactEditorWidget( ab, tqparent, name ), mReadOnly( false ) { TQLabel *label = 0; @@ -56,7 +56,7 @@ GeoWidget::GeoWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name label = new TQLabel( this ); label->setPixmap( KGlobal::iconLoader()->loadIcon( "package_network", KIcon::Desktop, KIcon::SizeMedium ) ); - label->tqsetAlignment( Qt::AlignTop ); + label->tqsetAlignment( TQt::AlignTop ); topLayout->addMultiCellWidget( label, 0, 3, 0, 0 ); mGeoIsValid = new TQCheckBox( i18n( "Use geo data" ), this ); @@ -157,9 +157,9 @@ void GeoWidget::editGeoData() -GeoDialog::GeoDialog( TQWidget *parent, const char *name ) +GeoDialog::GeoDialog( TQWidget *tqparent, const char *name ) : KDialogBase( Plain, i18n( "Geo Data Input" ), Ok | Cancel, Ok, - parent, name, true, true ), + tqparent, name, true, true ), mUpdateSexagesimalInput( true ) { TQFrame *page = plainPage(); @@ -408,9 +408,9 @@ void GeoDialog::loadCityList() } if ( !c.isEmpty() && !n.isEmpty() ) { - pos = c.find( "+", 1 ); + pos = c.tqfind( "+", 1 ); if ( pos < 0 ) - pos = c.find( "-", 1 ); + pos = c.tqfind( "-", 1 ); if ( pos > 0 ) { GeoData data; data.latitude = calculateCoordinate( c.left( pos ) ); @@ -482,8 +482,8 @@ int GeoDialog::nearestCity( double x, double y ) const } -GeoMapWidget::GeoMapWidget( TQWidget *parent, const char *name ) - : TQWidget( parent, name ), mLatitude( 0 ), mLongitude( 0 ) +GeoMapWidget::GeoMapWidget( TQWidget *tqparent, const char *name ) + : TQWidget( tqparent, name ), mLatitude( 0 ), mLongitude( 0 ) { setBackgroundMode( NoBackground ); diff --git a/kaddressbook/geowidget.h b/kaddressbook/geowidget.h index 0713d02ec..f6f8dffd5 100644 --- a/kaddressbook/geowidget.h +++ b/kaddressbook/geowidget.h @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef GEOWIDGET_H @@ -51,9 +51,10 @@ typedef struct { class GeoWidget : public KAB::ContactEditorWidget { Q_OBJECT + TQ_OBJECT public: - GeoWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 ); + GeoWidget( KABC::AddressBook *ab, TQWidget *tqparent, const char *name = 0 ); ~GeoWidget(); void loadContact( KABC::Addressee *addr ); @@ -77,9 +78,10 @@ class GeoWidget : public KAB::ContactEditorWidget class GeoDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - GeoDialog( TQWidget *parent, const char *name = 0 ); + GeoDialog( TQWidget *tqparent, const char *name = 0 ); ~GeoDialog(); void setLatitude( double latitude ); @@ -119,12 +121,13 @@ class GeoDialog : public KDialogBase bool mUpdateSexagesimalInput; }; -class GeoMapWidget : public QWidget +class GeoMapWidget : public TQWidget { Q_OBJECT + TQ_OBJECT public: - GeoMapWidget( TQWidget *parent, const char *name = 0 ); + GeoMapWidget( TQWidget *tqparent, const char *name = 0 ); ~GeoMapWidget(); void setLatitude( double latitude ); @@ -148,9 +151,9 @@ class GeoMapWidget : public QWidget class GeoWidgetFactory : public KAB::ContactEditorWidgetFactory { public: - KAB::ContactEditorWidget *createWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name ) + KAB::ContactEditorWidget *createWidget( KABC::AddressBook *ab, TQWidget *tqparent, const char *name ) { - return new GeoWidget( ab, parent, name ); + return new GeoWidget( ab, tqparent, name ); } TQString pageIdentifier() const { return "misc"; } diff --git a/kaddressbook/imagewidget.cpp b/kaddressbook/imagewidget.cpp index 4a8ab340a..0dc83ae49 100644 --- a/kaddressbook/imagewidget.cpp +++ b/kaddressbook/imagewidget.cpp @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include <kabc/picture.h> @@ -47,8 +47,8 @@ #include "imagewidget.h" -ImageLoader::ImageLoader( TQWidget *parent ) - : TQObject( 0, "ImageLoader" ), mParent( parent ) +ImageLoader::ImageLoader( TQWidget *tqparent ) + : TQObject( 0, "ImageLoader" ), mParent( tqparent ) { } @@ -103,8 +103,8 @@ KABC::Picture ImageLoader::loadPicture( const KURL &url, bool *ok ) } -ImageButton::ImageButton( const TQString &title, TQWidget *parent ) - : TQPushButton( title, parent ), +ImageButton::ImageButton( const TQString &title, TQWidget *tqparent ) + : TQPushButton( title, tqparent ), mReadOnly( false ), mImageLoader( 0 ) { setAcceptDrops( true ); @@ -247,14 +247,14 @@ void ImageButton::clear() } ImageBaseWidget::ImageBaseWidget( const TQString &title, - TQWidget *parent, const char *name ) - : TQWidget( parent, name ), mReadOnly( false ) + TQWidget *tqparent, const char *name ) + : TQWidget( tqparent, name ), mReadOnly( false ) { mImageLoader = new ImageLoader( this ); 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 *tqlayout = new TQVBoxLayout( box->tqlayout(), KDialog::spacingHint() ); mImageButton = new ImageButton( i18n( "Picture" ), box ); @@ -290,8 +290,8 @@ KABC::Picture ImageBaseWidget::image() const } -ImageWidget::ImageWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name ) - : KAB::ContactEditorWidget( ab, parent, name ) +ImageWidget::ImageWidget( KABC::AddressBook *ab, TQWidget *tqparent, const char *name ) + : KAB::ContactEditorWidget( ab, tqparent, name ) { TQHBoxLayout *tqlayout = new TQHBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() ); diff --git a/kaddressbook/imagewidget.h b/kaddressbook/imagewidget.h index 82c8426f3..52b9c9c6c 100644 --- a/kaddressbook/imagewidget.h +++ b/kaddressbook/imagewidget.h @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef IMAGEWIDGET_H @@ -35,12 +35,13 @@ /** Small helper class */ -class ImageLoader : public QObject +class ImageLoader : public TQObject { Q_OBJECT + TQ_OBJECT public: - ImageLoader( TQWidget *parent ); + ImageLoader( TQWidget *tqparent ); KABC::Picture loadPicture( const KURL &url, bool *ok ); @@ -52,12 +53,13 @@ class ImageLoader : public QObject /** Small helper class */ -class ImageButton : public QPushButton +class ImageButton : public TQPushButton { Q_OBJECT + TQ_OBJECT public: - ImageButton( const TQString &title, TQWidget *parent ); + ImageButton( const TQString &title, TQWidget *tqparent ); void setReadOnly( bool readOnly ); @@ -93,12 +95,13 @@ class ImageButton : public QPushButton }; -class ImageBaseWidget : public QWidget +class ImageBaseWidget : public TQWidget { Q_OBJECT + TQ_OBJECT public: - ImageBaseWidget( const TQString &title, TQWidget *parent, const char *name = 0 ); + ImageBaseWidget( const TQString &title, TQWidget *tqparent, const char *name = 0 ); ~ImageBaseWidget(); /** @@ -126,7 +129,7 @@ class ImageBaseWidget : public QWidget class ImageWidget : public KAB::ContactEditorWidget { public: - ImageWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 ); + ImageWidget( KABC::AddressBook *ab, TQWidget *tqparent, const char *name = 0 ); void loadContact( KABC::Addressee *addr ); void storeContact( KABC::Addressee *addr ); @@ -142,9 +145,9 @@ class ImageWidget : public KAB::ContactEditorWidget class ImageWidgetFactory : public KAB::ContactEditorWidgetFactory { public: - KAB::ContactEditorWidget *createWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name ) + KAB::ContactEditorWidget *createWidget( KABC::AddressBook *ab, TQWidget *tqparent, const char *name ) { - return new ImageWidget( ab, parent, name ); + return new ImageWidget( ab, tqparent, name ); } TQString pageIdentifier() const { return "misc"; } diff --git a/kaddressbook/imeditwidget.cpp b/kaddressbook/imeditwidget.cpp index 11827f89a..c7507afcf 100644 --- a/kaddressbook/imeditwidget.cpp +++ b/kaddressbook/imeditwidget.cpp @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include <tqcheckbox.h> @@ -43,8 +43,8 @@ #include "imeditwidget.h" #include "imeditorwidget.h" -IMEditWidget::IMEditWidget( TQWidget *parent, KABC::Addressee &addr, const char *name ) - : TQWidget( parent, name ), mAddressee(addr) +IMEditWidget::IMEditWidget( TQWidget *tqparent, KABC::Addressee &addr, const char *name ) + : TQWidget( tqparent, name ), mAddressee(addr) { TQGridLayout *topLayout = new TQGridLayout( this, 2, 2, KDialog::marginHint(), KDialog::spacingHint() ); diff --git a/kaddressbook/imeditwidget.h b/kaddressbook/imeditwidget.h index 0d1ee222b..d528fafe2 100644 --- a/kaddressbook/imeditwidget.h +++ b/kaddressbook/imeditwidget.h @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef IMEDITWIDGET_H @@ -41,12 +41,13 @@ class KListView; This widget displays a list box of the instant messaging addresses as well as buttons to manipulate them (up, down, add, remove). */ -class IMEditWidget : public QWidget +class IMEditWidget : public TQWidget { Q_OBJECT + TQ_OBJECT public: - IMEditWidget(TQWidget *parent, KABC::Addressee &addr, const char *name = 0 ); + IMEditWidget(TQWidget *tqparent, KABC::Addressee &addr, const char *name = 0 ); ~IMEditWidget(); void setIMs( const TQStringList &list ); diff --git a/kaddressbook/incsearchwidget.cpp b/kaddressbook/incsearchwidget.cpp index 74349bd72..6b3463270 100644 --- a/kaddressbook/incsearchwidget.cpp +++ b/kaddressbook/incsearchwidget.cpp @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include <tqapplication.h> @@ -37,8 +37,8 @@ #include "incsearchwidget.h" -IncSearchWidget::IncSearchWidget( TQWidget *parent, const char *name ) - : TQWidget( parent, name ) +IncSearchWidget::IncSearchWidget( TQWidget *tqparent, const char *name ) + : TQWidget( tqparent, name ) { TQHBoxLayout *tqlayout = new TQHBoxLayout( this, 2, KDialog::spacingHint() ); @@ -159,10 +159,10 @@ void IncSearchWidget::clear() void IncSearchWidget::keyPressEvent( TQKeyEvent *event ) { - if ( event->key() == Qt::Key_Up ) { + if ( event->key() == TQt::Key_Up ) { event->accept(); emit scrollUp(); - } else if ( event->key() == Qt::Key_Down ) { + } else if ( event->key() == TQt::Key_Down ) { event->accept(); emit scrollDown(); } diff --git a/kaddressbook/incsearchwidget.h b/kaddressbook/incsearchwidget.h index 0d400c0fb..fa3a99a2b 100644 --- a/kaddressbook/incsearchwidget.h +++ b/kaddressbook/incsearchwidget.h @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef INCSEARCHWIDGET_H @@ -32,12 +32,13 @@ class TQComboBox; class TQTimer; class KLineEdit; -class IncSearchWidget : public QWidget +class IncSearchWidget : public TQWidget { Q_OBJECT + TQ_OBJECT public: - IncSearchWidget( TQWidget *parent, const char *name = 0 ); + IncSearchWidget( TQWidget *tqparent, const char *name = 0 ); ~IncSearchWidget(); KABC::Field::List currentFields() const; diff --git a/kaddressbook/interfaces/configurewidget.cpp b/kaddressbook/interfaces/configurewidget.cpp index f82b757fd..1f9325ed0 100644 --- a/kaddressbook/interfaces/configurewidget.cpp +++ b/kaddressbook/interfaces/configurewidget.cpp @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include <kabc/addressbook.h> @@ -27,9 +27,9 @@ using namespace KAB; -ConfigureWidget::ConfigureWidget( KABC::AddressBook *ab, TQWidget *parent, +ConfigureWidget::ConfigureWidget( KABC::AddressBook *ab, TQWidget *tqparent, const char *name ) - : TQWidget( parent, name ), mAddressBook( ab ) + : TQWidget( tqparent, name ), mAddressBook( ab ) { } diff --git a/kaddressbook/interfaces/configurewidget.h b/kaddressbook/interfaces/configurewidget.h index 0ce35e5c7..89e980084 100644 --- a/kaddressbook/interfaces/configurewidget.h +++ b/kaddressbook/interfaces/configurewidget.h @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef KAB_CONFIGUREWIDGET_H @@ -35,10 +35,10 @@ class AddressBook; namespace KAB { -class KDE_EXPORT ConfigureWidget : public QWidget +class KDE_EXPORT ConfigureWidget : public TQWidget { public: - ConfigureWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 ); + ConfigureWidget( KABC::AddressBook *ab, TQWidget *tqparent, const char *name = 0 ); ~ConfigureWidget(); /** diff --git a/kaddressbook/interfaces/contacteditorwidget.cpp b/kaddressbook/interfaces/contacteditorwidget.cpp index 45b38ef3e..230f8d019 100644 --- a/kaddressbook/interfaces/contacteditorwidget.cpp +++ b/kaddressbook/interfaces/contacteditorwidget.cpp @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include "contacteditorwidget.h" @@ -26,8 +26,8 @@ using namespace KAB; ContactEditorWidget::ContactEditorWidget( KABC::AddressBook *ab, - TQWidget *parent, const char *name ) - : TQWidget( parent, name ), mAddressBook( ab ), mModified( false ) + TQWidget *tqparent, const char *name ) + : TQWidget( tqparent, name ), mAddressBook( ab ), mModified( false ) { } diff --git a/kaddressbook/interfaces/contacteditorwidget.h b/kaddressbook/interfaces/contacteditorwidget.h index 28a376e77..dc8039b60 100644 --- a/kaddressbook/interfaces/contacteditorwidget.h +++ b/kaddressbook/interfaces/contacteditorwidget.h @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef KAB_CONTACTEDITORWIDGET_H @@ -34,14 +34,15 @@ namespace KAB { -class KDE_EXPORT ContactEditorWidget : public QWidget +class KDE_EXPORT ContactEditorWidget : public TQWidget { Q_OBJECT + TQ_OBJECT public: typedef TQValueList<ContactEditorWidget*> List; - ContactEditorWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 ); + ContactEditorWidget( KABC::AddressBook *ab, TQWidget *tqparent, const char *name = 0 ); ~ContactEditorWidget(); /** @@ -116,7 +117,7 @@ class KDE_EXPORT ContactEditorWidget : public QWidget class ContactEditorWidgetFactory : public KLibFactory { public: - virtual ContactEditorWidget *createWidget( KABC::AddressBook *ab, TQWidget *parent, + virtual ContactEditorWidget *createWidget( KABC::AddressBook *ab, TQWidget *tqparent, const char *name = 0 ) = 0; /** diff --git a/kaddressbook/interfaces/core.cpp b/kaddressbook/interfaces/core.cpp index 7f7d10481..b604d6564 100644 --- a/kaddressbook/interfaces/core.cpp +++ b/kaddressbook/interfaces/core.cpp @@ -17,16 +17,16 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include "core.h" using namespace KAB; -Core::Core( KXMLGUIClient *client, TQObject *parent, const char *name ) - : TQObject( parent, name ), mGUIClient( client ) +Core::Core( KXMLGUIClient *client, TQObject *tqparent, const char *name ) + : TQObject( tqparent, name ), mGUIClient( client ) { } diff --git a/kaddressbook/interfaces/core.h b/kaddressbook/interfaces/core.h index 16fa4c839..b4289249f 100644 --- a/kaddressbook/interfaces/core.h +++ b/kaddressbook/interfaces/core.h @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef KAB_CORE_H @@ -52,12 +52,13 @@ namespace KAB { class SearchManager; -class KDE_EXPORT Core : public QObject +class KDE_EXPORT Core : public TQObject { Q_OBJECT + TQ_OBJECT public: - Core( KXMLGUIClient *client, TQObject *parent, const char *name = 0 ); + Core( KXMLGUIClient *client, TQObject *tqparent, const char *name = 0 ); /** Returns a pointer to the StdAddressBook of the application. @@ -95,10 +96,10 @@ class KDE_EXPORT Core : public QObject resource or a null pointer if no resource was selected by the user. */ - virtual KABC::Resource *requestResource( TQWidget *parent ) = 0; + virtual KABC::Resource *requestResource( TQWidget *tqparent ) = 0; /** - Returns the parent widget. + Returns the tqparent widget. */ virtual TQWidget *widget() const = 0; @@ -187,7 +188,7 @@ class KDE_EXPORT Core : public QObject /** Shows an edit dialog for the given uid. */ - virtual void editContact( const TQString &uid = TQString::null ) = 0; + virtual void editContact( const TQString &uid = TQString() ) = 0; /** Shows an edit dialog for the given distribution list diff --git a/kaddressbook/interfaces/extensionwidget.cpp b/kaddressbook/interfaces/extensionwidget.cpp index 75622935c..bae99b03f 100644 --- a/kaddressbook/interfaces/extensionwidget.cpp +++ b/kaddressbook/interfaces/extensionwidget.cpp @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include "core.h" @@ -27,9 +27,9 @@ using namespace KAB; -ExtensionWidget::ExtensionWidget( Core *core, TQWidget *parent, +ExtensionWidget::ExtensionWidget( Core *core, TQWidget *tqparent, const char *name ) - : TQWidget( parent, name ), mCore( core ) + : TQWidget( tqparent, name ), mCore( core ) { } @@ -55,7 +55,7 @@ KABC::Addressee::List ExtensionWidget::selectedContacts() TQStringList::ConstIterator it; const TQStringList::ConstIterator endIt = uids.end(); for ( it = uids.begin(); it != endIt; ++it ) - list.append( mCore->addressBook()->tqfindByUid( *it ) ); + list.append( mCore->addressBook()->findByUid( *it ) ); return list; } diff --git a/kaddressbook/interfaces/extensionwidget.h b/kaddressbook/interfaces/extensionwidget.h index 52ee946ca..7b3daca9f 100644 --- a/kaddressbook/interfaces/extensionwidget.h +++ b/kaddressbook/interfaces/extensionwidget.h @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef KAB_EXTENSIONWIDGET_H @@ -36,12 +36,13 @@ namespace KAB { class Core; class ConfigureWidget; -class KDE_EXPORT ExtensionWidget : public QWidget +class KDE_EXPORT ExtensionWidget : public TQWidget { Q_OBJECT + TQ_OBJECT public: - ExtensionWidget( Core *core, TQWidget *parent, const char *name = 0 ); + ExtensionWidget( Core *core, TQWidget *tqparent, const char *name = 0 ); ~ExtensionWidget(); /** @@ -91,7 +92,7 @@ class KDE_EXPORT ExtensionWidget : public QWidget class ExtensionFactory : public KLibFactory { public: - virtual ExtensionWidget *extension( KAB::Core *core, TQWidget *parent, + virtual ExtensionWidget *extension( KAB::Core *core, TQWidget *tqparent, const char *name = 0 ) = 0; virtual ConfigureWidget *configureWidget( TQWidget*, const char* = 0 ) diff --git a/kaddressbook/interfaces/xxport.cpp b/kaddressbook/interfaces/xxport.cpp index 798ebf559..d4f5b2866 100644 --- a/kaddressbook/interfaces/xxport.cpp +++ b/kaddressbook/interfaces/xxport.cpp @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include <tqmap.h> @@ -40,9 +40,9 @@ class XXPort::XXPortPrivate KApplication *mKApp; }; -XXPort::XXPort( KABC::AddressBook *ab, TQWidget *parent, +XXPort::XXPort( KABC::AddressBook *ab, TQWidget *tqparent, const char *name ) - : TQObject( parent, name ), mAddressBook( ab ), mParentWidget( parent ), + : TQObject( tqparent, name ), mAddressBook( ab ), mParentWidget( tqparent ), d( new XXPortPrivate ) { setInstance( new KInstance( "kaddressbook" ) ); @@ -117,12 +117,12 @@ void XXPort::processEvents() const void XXPort::slotExportActivated( const TQString &data ) { - emit exportActivated( identifier(), ( data == "<empty>" ? TQString::null : data ) ); + emit exportActivated( identifier(), ( data == "<empty>" ? TQString() : data ) ); } void XXPort::slotImportActivated( const TQString &data ) { - emit importActivated( identifier(), ( data == "<empty>" ? TQString::null : data ) ); + emit importActivated( identifier(), ( data == "<empty>" ? TQString() : data ) ); } #include "xxport.moc" diff --git a/kaddressbook/interfaces/xxport.h b/kaddressbook/interfaces/xxport.h index d8b83c401..9b41850f8 100644 --- a/kaddressbook/interfaces/xxport.h +++ b/kaddressbook/interfaces/xxport.h @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef KAB_XXPORT_H @@ -45,10 +45,10 @@ class KApplication; */ #define K_EXPORT_KADDRESSBOOK_XXFILTER_CATALOG( libname, XXPortClass, catalog ) \ class KDE_NO_EXPORT localXXPortFactory : public KAB::XXPortFactory { \ - KAB::XXPort *xxportObject( KABC::AddressBook *ab, TQWidget *parent, const char *name ) \ + KAB::XXPort *xxportObject( KABC::AddressBook *ab, TQWidget *tqparent, const char *name ) \ { const char *cat = catalog; \ if (cat) KGlobal::locale()->insertCatalogue(cat); \ - return new XXPortClass( ab, parent, name ); \ + return new XXPortClass( ab, tqparent, name ); \ } \ }; \ K_EXPORT_COMPONENT_FACTORY( libname, localXXPortFactory ) @@ -68,9 +68,10 @@ namespace KAB { class KDE_EXPORT XXPort : public TQObject, virtual public KXMLGUIClient { Q_OBJECT + TQ_OBJECT public: - XXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 ); + XXPort( KABC::AddressBook *ab, TQWidget *tqparent, const char *name = 0 ); ~XXPort(); /** @@ -94,7 +95,7 @@ class KDE_EXPORT XXPort : public TQObject, virtual public KXMLGUIClient /** Processes outstanding KApplication events. It should be called occasionally when the import/export filter is busy performing - a long operation (e.g. reading from slow external devices). + a long operation (e.g. reading from slow external tqdevices). @see: TQApplication::processEvents() */ void processEvents() const; @@ -113,14 +114,14 @@ class KDE_EXPORT XXPort : public TQObject, virtual public KXMLGUIClient signals: /** Emitted whenever the export action is activated. - The parameter tqcontains the @ref identifier() for + The parameter contains the @ref identifier() for unique identification. */ void exportActivated( const TQString&, const TQString& ); /** Emitted whenever the import action is activated. - The parameter tqcontains the @ref identifier() for + The parameter contains the @ref identifier() for unique identification. */ void importActivated( const TQString&, const TQString& ); @@ -129,12 +130,12 @@ class KDE_EXPORT XXPort : public TQObject, virtual public KXMLGUIClient /** Create the import action. The identifier is passed in the import slot. */ - void createImportAction( const TQString &label, const TQString &identifier = TQString::null ); + void createImportAction( const TQString &label, const TQString &identifier = TQString() ); /** Create the export action. The identifier is passed in the export slot. */ - void createExportAction( const TQString &label, const TQString &identifier = TQString::null ); + void createExportAction( const TQString &label, const TQString &identifier = TQString() ); /** Returns a pointer to the address book object. @@ -142,7 +143,7 @@ class KDE_EXPORT XXPort : public TQObject, virtual public KXMLGUIClient KABC::AddressBook *addressBook() const; /** - Returns a pointer to the parent widget. It can be used as parent for + Returns a pointer to the tqparent widget. It can be used as tqparent for message boxes. */ TQWidget *tqparentWidget() const; @@ -162,7 +163,7 @@ class KDE_EXPORT XXPort : public TQObject, virtual public KXMLGUIClient class XXPortFactory : public KLibFactory { public: - virtual XXPort *xxportObject( KABC::AddressBook *ab, TQWidget *parent, + virtual XXPort *xxportObject( KABC::AddressBook *ab, TQWidget *tqparent, const char *name = 0 ) = 0; protected: diff --git a/kaddressbook/jumpbuttonbar.cpp b/kaddressbook/jumpbuttonbar.cpp index aa7cb891c..4ef22bc57 100644 --- a/kaddressbook/jumpbuttonbar.cpp +++ b/kaddressbook/jumpbuttonbar.cpp @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include <tqapplication.h> @@ -39,11 +39,11 @@ #include "jumpbuttonbar.h" -class JumpButton : public QPushButton +class JumpButton : public TQPushButton { public: JumpButton( const TQString &firstChar, const TQString &lastChar, - TQWidget *parent ); + TQWidget *tqparent ); TQString firstChar() const { return mChar; } @@ -52,8 +52,8 @@ class JumpButton : public QPushButton }; JumpButton::JumpButton( const TQString &firstChar, const TQString &lastChar, - TQWidget *parent ) - : TQPushButton( "", parent ), mChar( firstChar ) + TQWidget *tqparent ) + : TQPushButton( "", tqparent ), mChar( firstChar ) { setToggleButton( true ); if ( !lastChar.isEmpty() ) @@ -62,17 +62,17 @@ JumpButton::JumpButton( const TQString &firstChar, const TQString &lastChar, setText( firstChar.upper() ); } -JumpButtonBar::JumpButtonBar( KAB::Core *core, TQWidget *parent, const char *name ) - : TQWidget( parent, name ), mCore( core ) +JumpButtonBar::JumpButtonBar( KAB::Core *core, TQWidget *tqparent, const char *name ) + : TQWidget( tqparent, name ), mCore( core ) { setMinimumSize( 1, 1 ); TQVBoxLayout *tqlayout = new TQVBoxLayout( this, 0, 0 ); - tqlayout->tqsetAlignment( Qt::AlignTop ); + tqlayout->tqsetAlignment( TQt::AlignTop ); tqlayout->setAutoAdd( true ); tqlayout->setResizeMode( TQLayout::FreeResize ); - mGroupBox = new TQButtonGroup( 1, Qt::Horizontal, this ); + mGroupBox = new TQButtonGroup( 1, TQt::Horizontal, this ); mGroupBox->setExclusive( true ); mGroupBox->tqlayout()->setSpacing( 0 ); mGroupBox->tqlayout()->setMargin( 0 ); @@ -130,7 +130,7 @@ void JumpButtonBar::updateButtons() if ( characters.count() <= possibleButtons ) { // at first the easy case: all buttons fits in window for ( uint i = 0; i < characters.count(); ++i ) { - JumpButton *button = new JumpButton( characters[ i ], TQString::null, + JumpButton *button = new JumpButton( characters[ i ], TQString(), mGroupBox ); connect( button, TQT_SIGNAL( clicked() ), this, TQT_SLOT( letterClicked() ) ); mButtons.append( button ); @@ -150,7 +150,7 @@ void JumpButtonBar::updateButtons() continue; if ( characters.count() - current <= possibleButtons - i ) { JumpButton *button = new JumpButton( characters[ current ], - TQString::null, mGroupBox ); + TQString(), mGroupBox ); connect( button, TQT_SIGNAL( clicked() ), this, TQT_SLOT( letterClicked() ) ); mButtons.append( button ); button->show(); @@ -179,7 +179,7 @@ void JumpButtonBar::updateButtons() int maxWidth = 0; TQPushButton *button; for ( button = mButtons.first(); button; button = mButtons.next() ) - maxWidth = QMAX( maxWidth, button->tqsizeHint().width() ); + maxWidth = TQMAX( maxWidth, button->tqsizeHint().width() ); setFixedWidth( maxWidth ); } diff --git a/kaddressbook/jumpbuttonbar.h b/kaddressbook/jumpbuttonbar.h index 7ff678985..6408582d9 100644 --- a/kaddressbook/jumpbuttonbar.h +++ b/kaddressbook/jumpbuttonbar.h @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef JUMPBUTTONBAR_H @@ -44,12 +44,13 @@ class Field; /** Used to draw the jump button bar on the right of the view. */ -class JumpButtonBar : public QWidget +class JumpButtonBar : public TQWidget { Q_OBJECT + TQ_OBJECT public: - JumpButtonBar( KAB::Core *core, TQWidget *parent, const char *name = 0 ); + JumpButtonBar( KAB::Core *core, TQWidget *tqparent, const char *name = 0 ); ~JumpButtonBar(); public slots: diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index 66b0bb81e..14f9577a6 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ // Needed for ugly hack, to be removed in 4.0 @@ -92,16 +92,16 @@ #include "kabcore.h" -KABCore::KABCore( KXMLGUIClient *client, bool readWrite, TQWidget *parent, +KABCore::KABCore( KXMLGUIClient *client, bool readWrite, TQWidget *tqparent, const TQString &file, const char *name ) - : KAB::Core( client, parent, name ), mStatusBar( 0 ), mViewManager( 0 ), + : KAB::Core( client, tqparent, name ), mStatusBar( 0 ), mViewManager( 0 ), mExtensionManager( 0 ), mJumpButtonBar( 0 ), mCategorySelectDialog( 0 ), mCategoryEditDialog( 0 ), mLdapSearchDialog( 0 ), mReadWrite( readWrite ), mModified( false ) { - mWidget = new TQWidget( parent, name ); + mWidget = new TQWidget( tqparent, name ); - mIsPart = !parent->isA( "KAddressBookMain" ); + mIsPart = !tqparent->isA( "KAddressBookMain" ); mAddressBookChangedTimer = new TQTimer( this ); connect( mAddressBookChangedTimer, TQT_SIGNAL( timeout() ), @@ -114,7 +114,7 @@ KABCore::KABCore( KXMLGUIClient *client, bool readWrite, TQWidget *parent, mAddressBook = new KABC::AddressBook; mAddressBook->addResource( new KABC::ResourceFile( file ) ); if ( !mAddressBook->load() ) { - KMessageBox::error( parent, i18n("Unable to load '%1'.").arg( file ) ); + KMessageBox::error( tqparent, i18n("Unable to load '%1'.").arg( file ) ); } } mAddressBook->setErrorHandler( new KABC::GuiErrorHandler( mWidget ) ); @@ -140,7 +140,7 @@ KABCore::KABCore( KXMLGUIClient *client, bool readWrite, TQWidget *parent, mAddressBook->addCustomField( i18n( "Blog" ), KABC::Field::Personal, "BlogFeed", "KADDRESSBOOK" ); - mSearchManager = new KAB::SearchManager( mAddressBook, parent ); + mSearchManager = new KAB::SearchManager( mAddressBook, tqparent ); connect( mSearchManager, TQT_SIGNAL( contactsUpdated() ), this, TQT_SLOT( slotContactsUpdated() ) ); @@ -270,7 +270,7 @@ TQStringList KABCore::selectedUIDs() const return mViewManager->selectedUids(); } -KABC::Resource *KABCore::requestResource( TQWidget *parent ) +KABC::Resource *KABCore::requestResource( TQWidget *tqparent ) { TQPtrList<KABC::Resource> kabcResources = addressBook()->resources(); @@ -301,7 +301,7 @@ KABC::Resource *KABCore::requestResource( TQWidget *parent ) } } - KRES::Resource *res = KRES::SelectDialog::getResource( kresResources, parent ); + KRES::Resource *res = KRES::SelectDialog::getResource( kresResources, tqparent ); return static_cast<KABC::Resource*>( res ); // upcast } @@ -351,7 +351,7 @@ void KABCore::setContactSelected( const TQString &uid ) return; } - KABC::Addressee addr = mAddressBook->tqfindByUid( uid ); + KABC::Addressee addr = mAddressBook->findByUid( uid ); if ( !mDetailsViewer->isHidden() ) mDetailsViewer->setAddressee( addr ); #ifdef KDEPIM_NEW_DISTRLISTS @@ -430,9 +430,9 @@ void KABCore::setContactSelected( const TQString &uid ) mActionMerge->setEnabled( ( list.size() == 2 ) && writable ); if ( mReadWrite ) { - QClipboard *cb = TQApplication::clipboard(); + TQClipboard *cb = TQApplication::clipboard(); #if defined(KABC_VCARD_ENCODING_FIX) - const TQMimeSource *data = cb->data( QClipboard::Clipboard ); + const TQMimeSource *data = cb->data( TQClipboard::Clipboard ); list = AddresseeUtil::clipboardToAddressees( data->tqencodedData( "text/x-vcard" ) ); #else list = AddresseeUtil::clipboardToAddressees( cb->text() ); @@ -482,7 +482,7 @@ void KABCore::browse( const TQString& url ) void KABCore::selectAllContacts() { - mViewManager->setSelected( TQString::null, true ); + mViewManager->setSelected( TQString(), true ); } void KABCore::deleteContacts() @@ -498,7 +498,7 @@ void KABCore::deleteDistributionLists( const TQStringList & names ) return; if ( KMessageBox::warningContinueCancelList( mWidget, i18n( "Do you really want to delete this distribution list?", "Do you really want to delete these %n distribution lists?", names.count() ), - names, TQString::null, KStdGuiItem::del() ) == KMessageBox::Cancel ) + names, TQString(), KStdGuiItem::del() ) == KMessageBox::Cancel ) return; TQStringList uids; @@ -517,7 +517,7 @@ void KABCore::deleteContacts( const TQStringList &uids ) TQStringList::ConstIterator it = uids.begin(); const TQStringList::ConstIterator endIt( uids.end() ); while ( it != endIt ) { - KABC::Addressee addr = mAddressBook->tqfindByUid( *it ); + KABC::Addressee addr = mAddressBook->findByUid( *it ); names.append( addr.realName().isEmpty() ? addr.preferredEmail() : addr.realName() ); ++it; } @@ -533,7 +533,7 @@ void KABCore::deleteContacts( const TQStringList &uids ) "<b>Note:</b>The contacts will be also removed from all distribution lists." "</qt>", uids.count() ), - names, TQString::null, KStdGuiItem::del() ) == KMessageBox::Cancel ) { + names, TQString(), KStdGuiItem::del() ) == KMessageBox::Cancel ) { return; } @@ -541,7 +541,7 @@ void KABCore::deleteContacts( const TQStringList &uids ) mCommandHistory->addCommand( command ); // now if we deleted anything, refresh - setContactSelected( TQString::null ); + setContactSelected( TQString() ); setModified( true ); } } @@ -552,11 +552,11 @@ void KABCore::copyContacts() #if defined(KABC_VCARD_ENCODING_FIX) TQByteArray clipText = AddresseeUtil::addresseesToClipboard( addrList ); - QClipboard *cb = TQApplication::clipboard(); + TQClipboard *cb = TQApplication::clipboard(); cb->setText( TQString::fromUtf8( clipText.data() ) ); #else TQString clipText = AddresseeUtil::addresseesToClipboard( addrList ); - QClipboard *cb = TQApplication::clipboard(); + TQClipboard *cb = TQApplication::clipboard(); cb->setText( clipText ); #endif } @@ -575,9 +575,9 @@ void KABCore::cutContacts() void KABCore::pasteContacts() { - QClipboard *cb = TQApplication::clipboard(); + TQClipboard *cb = TQApplication::clipboard(); #if defined(KABC_VCARD_ENCODING_FIX) - const TQMimeSource *data = cb->data( QClipboard::Clipboard ); + const TQMimeSource *data = cb->data( TQClipboard::Clipboard ); KABC::Addressee::List list = AddresseeUtil::clipboardToAddressees( data->tqencodedData( "text/x-vcard" ) ); #else KABC::Addressee::List list = AddresseeUtil::clipboardToAddressees( cb->text() ); @@ -640,19 +640,19 @@ void KABCore::setWhoAmI() } TQString text( i18n( "<qt>Do you really want to use <b>%1</b> as your new personal contact?</qt>" ) ); - if ( KMessageBox::questionYesNo( mWidget, text.arg( addrList[ 0 ].assembledName() ), TQString::null, i18n("Use"), i18n("Do Not Use") ) == KMessageBox::Yes ) + if ( KMessageBox::questionYesNo( mWidget, text.arg( addrList[ 0 ].assembledName() ), TQString(), i18n("Use"), i18n("Do Not Use") ) == KMessageBox::Yes ) static_cast<KABC::StdAddressBook*>( KABC::StdAddressBook::self( true ) )->setWhoAmI( addrList[ 0 ] ); } void KABCore::incrementalTextSearch( const TQString& text ) { - setContactSelected( TQString::null ); + setContactSelected( TQString() ); mSearchManager->search( text, mIncSearchWidget->currentFields() ); } void KABCore::incrementalJumpButtonSearch( const TQString& character ) { - mViewManager->setSelected( TQString::null, false ); + mViewManager->setSelected( TQString(), false ); KABC::AddresseeList list = mSearchManager->contacts(); KABC::Field *field = mViewManager->currentSortField(); @@ -692,7 +692,7 @@ void KABCore::contactModified( const KABC::Addressee &addr ) Command *command = 0; // check if it exists already - KABC::Addressee origAddr = mAddressBook->tqfindByUid( addr.uid() ); + KABC::Addressee origAddr = mAddressBook->findByUid( addr.uid() ); if ( origAddr.isEmpty() ) { KABC::Addressee::List addressees; addressees.append( addr ); @@ -829,9 +829,9 @@ void KABCore::editContact( const TQString &uid ) } #endif - KABC::Addressee addr = mAddressBook->tqfindByUid( localUID ); + KABC::Addressee addr = mAddressBook->findByUid( localUID ); if ( !addr.isEmpty() ) { - AddresseeEditorDialog *dialog = mEditorDict.find( addr.uid() ); + AddresseeEditorDialog *dialog = mEditorDict.tqfind( addr.uid() ); if ( !dialog ) { if ( !addr.resource()->readOnly() ) @@ -950,7 +950,7 @@ void KABCore::extensionModified( const KABC::Addressee::List &list ) Command *command = 0; // check if it exists already - KABC::Addressee origAddr = mAddressBook->tqfindByUid( (*it).uid() ); + KABC::Addressee origAddr = mAddressBook->findByUid( (*it).uid() ); if ( origAddr.isEmpty() ) { KABC::Addressee::List addressees; addressees.append( *it ); @@ -973,7 +973,7 @@ void KABCore::extensionDeleted( const TQStringList &uidList ) mCommandHistory->addCommand( command ); // now if we deleted anything, refresh - setContactSelected( TQString::null ); + setContactSelected( TQString() ); setModified( true ); } @@ -1084,7 +1084,7 @@ void KABCore::showContactsAddress( const TQString &addrUid ) if ( uidList.isEmpty() ) return; - KABC::Addressee addr = mAddressBook->tqfindByUid( uidList.first() ); + KABC::Addressee addr = mAddressBook->findByUid( uidList.first() ); if ( addr.isEmpty() ) return; @@ -1139,9 +1139,9 @@ void KABCore::addressBookChanged() mSearchManager->reload(); - mViewManager->setSelected( TQString::null, false ); + mViewManager->setSelected( TQString(), false ); - TQString uid = TQString::null; + TQString uid = TQString(); if ( !selectedUids.isEmpty() ) { uid = selectedUids.first(); mViewManager->setSelected( uid, true ); @@ -1152,10 +1152,10 @@ void KABCore::addressBookChanged() updateCategories(); } -AddresseeEditorDialog *KABCore::createAddresseeEditorDialog( TQWidget *parent, +AddresseeEditorDialog *KABCore::createAddresseeEditorDialog( TQWidget *tqparent, const char *name ) { - AddresseeEditorDialog *dialog = new AddresseeEditorDialog( this, parent, + AddresseeEditorDialog *dialog = new AddresseeEditorDialog( this, tqparent, name ? name : "editorDialog" ); connect( dialog, TQT_SIGNAL( contactModified( const KABC::Addressee& ) ), TQT_SLOT( contactModified( const KABC::Addressee& ) ) ); @@ -1186,7 +1186,7 @@ void KABCore::slotEditorDestroyed( const TQString &uid ) KABC::Addressee addr = dialog->addressee(); if ( !addr.resource()->readOnly() ) { - TQApplication::setOverrideCursor( Qt::waitCursor ); + TQApplication::setOverrideCursor( TQt::waitCursor ); KABLock::self( mAddressBook )->unlock( addr.resource() ); TQApplication::restoreOverrideCursor(); } @@ -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 ); @@ -1406,7 +1406,7 @@ void KABCore::initActions() action->setWhatsThis( i18n( "You will be presented with a dialog, that offers you all possibilities to configure KAddressBook." ) ); // misc - action = new KAction( i18n( "&Lookup Addresses in LDAP Directory..." ), "find", 0, + action = new KAction( i18n( "&Lookup Addresses in LDAP Directory..." ), "tqfind", 0, this, TQT_SLOT( openLDAPDialog() ), actionCollection(), "ldap_lookup" ); action->setWhatsThis( i18n( "Search for contacts on a LDAP server<p>You will be presented with a dialog, where you can search for contacts and select the ones you want to add to your local address book." ) ); @@ -1449,7 +1449,7 @@ void KABCore::updateCategories() TQStringList::ConstIterator it; const TQStringList::ConstIterator endIt( customCategories.end() ); for ( it = customCategories.begin(); it != endIt; ++it ) { - if ( categories.find( *it ) == categories.end() ) { + if ( categories.tqfind( *it ) == categories.end() ) { categories.append( *it ); } } @@ -1503,14 +1503,14 @@ void KABCore::categoriesSelected( const TQStringList &categories ) { bool merge = false; TQString msg = i18n( "Merge with existing categories?" ); - if ( KMessageBox::questionYesNo( mWidget, msg, TQString::null, i18n( "Merge" ), i18n( "Do Not Merge" ) ) == KMessageBox::Yes ) + if ( KMessageBox::questionYesNo( mWidget, msg, TQString(), i18n( "Merge" ), i18n( "Do Not Merge" ) ) == KMessageBox::Yes ) merge = true; TQStringList uids = mViewManager->selectedUids(); TQStringList::ConstIterator it; const TQStringList::ConstIterator endIt( uids.end() ); for ( it = uids.begin(); it != endIt; ++it ) { - KABC::Addressee addr = mAddressBook->tqfindByUid( *it ); + KABC::Addressee addr = mAddressBook->findByUid( *it ); if ( !addr.isEmpty() ) { if ( !merge ) addr.setCategories( categories ); @@ -1617,7 +1617,7 @@ void KABCore::removeSelectedContactsFromDistList() TQStringList::ConstIterator it = uids.begin(); const TQStringList::ConstIterator endIt( uids.end() ); while ( it != endIt ) { - KABC::Addressee addr = mAddressBook->tqfindByUid( *it ); + KABC::Addressee addr = mAddressBook->findByUid( *it ); names.append( addr.realName().isEmpty() ? addr.preferredEmail() : addr.realName() ); ++it; } @@ -1635,7 +1635,7 @@ void KABCore::removeSelectedContactsFromDistList() "any other distribution list." "</qt>", uids.count() ).arg( mSelectedDistributionList ), - names, TQString::null, KStdGuiItem::del() ) == KMessageBox::Cancel ) { + names, TQString(), KStdGuiItem::del() ) == KMessageBox::Cancel ) { return; } diff --git a/kaddressbook/kabcore.h b/kaddressbook/kabcore.h index d1c275751..aed5e08f1 100644 --- a/kaddressbook/kabcore.h +++ b/kaddressbook/kabcore.h @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef KABCORE_H @@ -83,10 +83,11 @@ typedef struct { class KDE_EXPORT KABCore : public KAB::Core { Q_OBJECT + TQ_OBJECT public: - KABCore( KXMLGUIClient *client, bool readWrite, TQWidget *parent, - const TQString &file = TQString::null, const char *name = 0 ); + KABCore( KXMLGUIClient *client, bool readWrite, TQWidget *tqparent, + const TQString &file = TQString(), const char *name = 0 ); ~KABCore(); /** @@ -130,10 +131,10 @@ class KDE_EXPORT KABCore : public KAB::Core resource or a null pointer if no resource was selected by the user. */ - KABC::Resource *requestResource( TQWidget *parent ); + KABC::Resource *requestResource( TQWidget *tqparent ); /** - Returns the parent widget. + Returns the tqparent widget. */ TQWidget *widget() const; @@ -340,16 +341,16 @@ class KDE_EXPORT KABCore : public KAB::Core void load(); /** - Shows the edit dialog for the given uid. If the uid is TQString::null, + Shows the edit dialog for the given uid. If the uid is TQString(), the method will try to find a selected addressee in the view. */ - void editContact( const TQString &uid = TQString::null ); + void editContact( const TQString &uid = TQString() ); /** * Let the user chose a different resource for the selected contacts. * If the adding to the new resource is successfull, the contact is * removed from the old one, unless the Copy flag is given. */ - void storeContactIn( const TQString &uid = TQString::null, bool copy = false ); + void storeContactIn( const TQString &uid = TQString(), bool copy = false ); /** * Lets the user chose a different resource for the selected contacts and @@ -434,7 +435,7 @@ class KDE_EXPORT KABCore : public KAB::Core void updateCategories(); TQStringList allCategories() const; - AddresseeEditorDialog *createAddresseeEditorDialog( TQWidget *parent, + AddresseeEditorDialog *createAddresseeEditorDialog( TQWidget *tqparent, const char *name = 0 ); TQWidget *mWidget; diff --git a/kaddressbook/kablock.cpp b/kaddressbook/kablock.cpp index acb6c2870..259ee70da 100644 --- a/kaddressbook/kablock.cpp +++ b/kaddressbook/kablock.cpp @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include <kabc/addressbook.h> @@ -65,7 +65,7 @@ KABLock *KABLock::self( KABC::AddressBook *ab ) bool KABLock::lock( KABC::Resource *resource ) { - if ( mLocks.find( resource ) == mLocks.end() ) { // not locked yet + if ( mLocks.tqfind( resource ) == mLocks.end() ) { // not locked yet KABC::Ticket *ticket = mAddressBook->requestSaveTicket( resource ); if ( !ticket ) { return false; @@ -89,7 +89,7 @@ bool KABLock::unlock( KABC::Resource *resource ) if ( resource == 0 ) resource = wrapper->getStandardResource(); - if ( mLocks.find( resource ) == mLocks.end() ) { // hmm, not good... + if ( mLocks.tqfind( resource ) == mLocks.end() ) { // hmm, not good... return false; } else { LockEntry &entry = mLocks[ resource ]; diff --git a/kaddressbook/kablock.h b/kaddressbook/kablock.h index a90f77c94..a706d88fd 100644 --- a/kaddressbook/kablock.h +++ b/kaddressbook/kablock.h @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef KABLOCK_H diff --git a/kaddressbook/kabtools.cpp b/kaddressbook/kabtools.cpp index 83571a7a9..0b98eab3c 100644 --- a/kaddressbook/kabtools.cpp +++ b/kaddressbook/kabtools.cpp @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include <kabc/addressbook.h> @@ -65,7 +65,7 @@ void KABTools::mailVCards( const TQStringList &uids, KABC::AddressBook *ab ) TQStringList::ConstIterator it( uids.begin() ); const TQStringList::ConstIterator endIt( uids.end() ); for ( ; it != endIt; ++it ) { - KABC::Addressee addressee = ab->tqfindByUid( *it ); + KABC::Addressee addressee = ab->findByUid( *it ); if ( addressee.isEmpty() ) continue; @@ -97,10 +97,10 @@ void KABTools::mailVCards( const TQStringList &uids, KABC::AddressBook *ab ) } } - kapp->invokeMailer( TQString::null, TQString::null, TQString::null, - TQString::null, - TQString::null, - TQString::null, + kapp->invokeMailer( TQString(), TQString(), TQString(), + TQString(), + TQString(), + TQString(), urls.toStringList() ); } diff --git a/kaddressbook/kabtools.h b/kaddressbook/kabtools.h index 0d57c65eb..504540e9b 100644 --- a/kaddressbook/kabtools.h +++ b/kaddressbook/kabtools.h @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef KABTOOLS_H diff --git a/kaddressbook/kaddressbook_options.h b/kaddressbook/kaddressbook_options.h index 9439870bb..7b12532c3 100644 --- a/kaddressbook/kaddressbook_options.h +++ b/kaddressbook/kaddressbook_options.h @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef KADDRESSBOOK_OPTIONS_H diff --git a/kaddressbook/kaddressbook_part.cpp b/kaddressbook/kaddressbook_part.cpp index 39216b8f4..a29380adf 100644 --- a/kaddressbook/kaddressbook_part.cpp +++ b/kaddressbook/kaddressbook_part.cpp @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include <tqlayout.h> @@ -43,9 +43,9 @@ typedef KParts::GenericFactory< KAddressbookPart > KAddressbookFactory; K_EXPORT_COMPONENT_FACTORY( libkaddressbookpart, KAddressbookFactory ) KAddressbookPart::KAddressbookPart( TQWidget *tqparentWidget, const char *widgetName, - TQObject *parent, const char *name, + TQObject *tqparent, const char *name, const TQStringList & ) - : DCOPObject( "KAddressBookIface" ), KParts::ReadOnlyPart( parent, name ) + : DCOPObject( "KAddressBookIface" ), KParts::ReadOnlyPart( tqparent, name ) { setInstance( KAddressbookFactory::instance() ); diff --git a/kaddressbook/kaddressbook_part.h b/kaddressbook/kaddressbook_part.h index c2e6b10fc..05e099d29 100644 --- a/kaddressbook/kaddressbook_part.h +++ b/kaddressbook/kaddressbook_part.h @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef KADDRESSBOOK_PART_H #define KADDRESSBOOK_PART_H @@ -37,10 +37,11 @@ class KABCore; class KAddressbookPart: public KParts::ReadOnlyPart, virtual public KAddressBookIface { Q_OBJECT + TQ_OBJECT public: KAddressbookPart( TQWidget *tqparentWidget, const char *widgetName, - TQObject *parent, const char *name, const TQStringList& ); + TQObject *tqparent, const char *name, const TQStringList& ); virtual ~KAddressbookPart(); static KAboutData *createAboutData(); diff --git a/kaddressbook/kaddressbookiface.h b/kaddressbook/kaddressbookiface.h index ffdf941ec..2b70849f7 100644 --- a/kaddressbook/kaddressbookiface.h +++ b/kaddressbook/kaddressbookiface.h @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef KADDRESSBOOKIFACE_H diff --git a/kaddressbook/kaddressbookmain.cpp b/kaddressbook/kaddressbookmain.cpp index cf67d2eef..55f664a63 100644 --- a/kaddressbook/kaddressbookmain.cpp +++ b/kaddressbook/kaddressbookmain.cpp @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include <kedittoolbar.h> diff --git a/kaddressbook/kaddressbookmain.h b/kaddressbook/kaddressbookmain.h index aa1bb4ebd..0047f534a 100644 --- a/kaddressbook/kaddressbookmain.h +++ b/kaddressbook/kaddressbookmain.h @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef KADDRESSBOOKMAIN_H @@ -45,9 +45,10 @@ class KABCore; class KAddressBookMain : public KMainWindow, virtual public KAddressBookIface { Q_OBJECT + TQ_OBJECT public: - KAddressBookMain( const TQString &file = TQString::null ); + KAddressBookMain( const TQString &file = TQString() ); virtual ~KAddressBookMain(); public slots: diff --git a/kaddressbook/kaddressbookservice.cpp b/kaddressbook/kaddressbookservice.cpp index 320e90998..859db0ff4 100644 --- a/kaddressbook/kaddressbookservice.cpp +++ b/kaddressbook/kaddressbookservice.cpp @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include "core.h" diff --git a/kaddressbook/kaddressbookservice.h b/kaddressbook/kaddressbookservice.h index ac323f64f..4470ff024 100644 --- a/kaddressbook/kaddressbookservice.h +++ b/kaddressbook/kaddressbookservice.h @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef KADDRESSBOOKSERVICE_H diff --git a/kaddressbook/kaddressbookview.cpp b/kaddressbook/kaddressbookview.cpp index 2059fbb35..9f1aa3cec 100644 --- a/kaddressbook/kaddressbookview.cpp +++ b/kaddressbook/kaddressbookview.cpp @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include <tqlayout.h> @@ -37,9 +37,9 @@ #include "kaddressbookview.h" -KAddressBookView::KAddressBookView( KAB::Core *core, TQWidget *parent, +KAddressBookView::KAddressBookView( KAB::Core *core, TQWidget *tqparent, const char *name ) - : TQWidget( parent, name ), mCore( core ), mFieldList() + : TQWidget( tqparent, name ), mCore( core ), mFieldList() { initGUI(); @@ -79,10 +79,10 @@ TQString KAddressBookView::selectedEmails() TQStringList::ConstIterator it; for ( it = uidList.begin(); it != uidList.end(); ++it ) { - addr = mCore->addressBook()->tqfindByUid( *it ); + addr = mCore->addressBook()->findByUid( *it ); if ( !addr.isEmpty() ) { - TQString m = TQString::null; + TQString m = TQString(); if ( addr.emails().count() > 1 ) m = KABC::EmailSelector::getEmail( addr.emails(), addr.preferredEmail(), this ); @@ -189,15 +189,15 @@ void KAddressBookView::updateView() if ( !contacts.isEmpty() ) setFirstSelected( true ); else - emit selected( TQString::null ); + emit selected( TQString() ); } } ViewConfigureWidget *ViewFactory::configureWidget( KABC::AddressBook *ab, - TQWidget *parent, + TQWidget *tqparent, const char *name ) { - return new ViewConfigureWidget( ab, parent, name ); + return new ViewConfigureWidget( ab, tqparent, name ); } #include "kaddressbookview.moc" diff --git a/kaddressbook/kaddressbookview.h b/kaddressbook/kaddressbookview.h index a851e684c..eca5521bc 100644 --- a/kaddressbook/kaddressbookview.h +++ b/kaddressbook/kaddressbookview.h @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef KADDRESSBOOKVIEW_H @@ -53,14 +53,15 @@ namespace KABC { class AddressBook; } @author Mike Pilone <mpilone@slac.com> */ -class KDE_EXPORT KAddressBookView : public QWidget +class KDE_EXPORT KAddressBookView : public TQWidget { Q_OBJECT + TQ_OBJECT public: enum DefaultFilterType { None = 0, Active = 1, Specific = 2 }; - KAddressBookView( KAB::Core *core, TQWidget *parent, const char *name ); + KAddressBookView( KAB::Core *core, TQWidget *tqparent, const char *name ); virtual ~KAddressBookView(); /** @@ -169,7 +170,7 @@ class KDE_EXPORT KAddressBookView : public QWidget /** This method must be overloaded in subclasses. Select (highlight) the addressee matching <i>uid</i>. If uid - is equal to TQString::null, then all addressees should be selected. + is equal to TQString(), then all addressees should be selected. */ virtual void setSelected( const TQString &uid = TQString(), bool selected = true ) = 0; @@ -250,8 +251,8 @@ class KDE_EXPORT KAddressBookView : public QWidget KABC::Addressee::List addressees(); /** - This method returns the widget that should be used as the parent for - all view components. By using this widget as the parent and not + This method returns the widget that should be used as the tqparent for + all view components. By using this widget as the tqparent and not 'this', the view subclass has the option of placing other widgets around the view (ie: search fields, etc). Do not delete this widget! */ @@ -275,7 +276,7 @@ class KDE_EXPORT KAddressBookView : public QWidget class KDE_EXPORT ViewFactory : public KLibFactory { public: - virtual KAddressBookView *view( KAB::Core *core, TQWidget *parent, + virtual KAddressBookView *view( KAB::Core *core, TQWidget *tqparent, const char *name = 0 ) = 0; /** @return The type of the view. This is normally a small one word @@ -300,7 +301,7 @@ class KDE_EXPORT ViewFactory : public KLibFactory <B>not</B> be called. */ virtual ViewConfigureWidget *configureWidget( KABC::AddressBook *ab, - TQWidget *parent, + TQWidget *tqparent, const char *name = 0 ); protected: diff --git a/kaddressbook/kcmconfigs/addhostdialog.cpp b/kaddressbook/kcmconfigs/addhostdialog.cpp index c09e5b945..a6174dffd 100644 --- a/kaddressbook/kcmconfigs/addhostdialog.cpp +++ b/kaddressbook/kcmconfigs/addhostdialog.cpp @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include <tqlabel.h> @@ -33,8 +33,8 @@ #include <klocale.h> #include "addhostdialog.h" -AddHostDialog::AddHostDialog( KPIM::LdapServer *server, TQWidget* parent, const char* name ) - : KDialogBase( Plain, i18n( "Add Host" ), Ok | Cancel, Ok, parent, name, true, true ) +AddHostDialog::AddHostDialog( KPIM::LdapServer *server, TQWidget* tqparent, const char* name ) + : KDialogBase( Plain, i18n( "Add Host" ), Ok | Cancel, Ok, tqparent, name, true, true ) { mServer = server; diff --git a/kaddressbook/kcmconfigs/addhostdialog.h b/kaddressbook/kcmconfigs/addhostdialog.h index 702bb323b..956892d9f 100644 --- a/kaddressbook/kcmconfigs/addhostdialog.h +++ b/kaddressbook/kcmconfigs/addhostdialog.h @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef ADDHOSTDIALOG_H @@ -35,9 +35,10 @@ class TQSpinBox; class AddHostDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - AddHostDialog( KPIM::LdapServer* server, TQWidget* parent = 0, const char* name = 0 ); + AddHostDialog( KPIM::LdapServer* server, TQWidget* tqparent = 0, const char* name = 0 ); ~AddHostDialog(); signals: diff --git a/kaddressbook/kcmconfigs/addresseewidget.cpp b/kaddressbook/kcmconfigs/addresseewidget.cpp index a7d9ebe6f..b68e96c67 100644 --- a/kaddressbook/kcmconfigs/addresseewidget.cpp +++ b/kaddressbook/kcmconfigs/addresseewidget.cpp @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include <tqcstring.h> @@ -41,12 +41,12 @@ #include "addresseewidget.h" NamePartWidget::NamePartWidget( const TQString &title, const TQString &label, - TQWidget *parent, const char *name ) - : TQWidget( parent, name ), mTitle( title ), mLabel( label ) + TQWidget *tqparent, const char *name ) + : TQWidget( tqparent, name ), mTitle( title ), mLabel( label ) { TQHBoxLayout *tqlayout = 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->tqlayout(), 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..." ), this, TQT_SLOT( add() ) ); mEditButton = bbox->addButton( i18n( "Edit..." ), this, TQT_SLOT( edit() ) ); mEditButton->setEnabled( false ); @@ -91,7 +91,7 @@ void NamePartWidget::add() bool ok; TQString namePart = KInputDialog::getText( i18n( "New" ), mLabel, - TQString::null, &ok ); + TQString(), &ok ); if ( ok && !namePart.isEmpty() ) { mBox->insertItem( namePart ); emit modified(); @@ -131,8 +131,8 @@ void NamePartWidget::selectionChanged( TQListBoxItem *item ) -AddresseeWidget::AddresseeWidget( TQWidget *parent, const char *name ) - : TQWidget( parent, name ) +AddresseeWidget::AddresseeWidget( TQWidget *tqparent, const char *name ) + : TQWidget( tqparent, name ) { TQGridLayout *tqlayout = new TQGridLayout( this, 2, 3, KDialog::marginHint(), KDialog::spacingHint() ); diff --git a/kaddressbook/kcmconfigs/addresseewidget.h b/kaddressbook/kcmconfigs/addresseewidget.h index b8bbf217e..8c81ac23d 100644 --- a/kaddressbook/kcmconfigs/addresseewidget.h +++ b/kaddressbook/kcmconfigs/addresseewidget.h @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef ADDRESSEEWIDGET_H @@ -33,12 +33,13 @@ class TQListBox; class TQListBoxItem; class TQPushButton; -class NamePartWidget : public QWidget +class NamePartWidget : public TQWidget { Q_OBJECT + TQ_OBJECT public: - NamePartWidget( const TQString &title, const TQString &label, TQWidget *parent, + NamePartWidget( const TQString &title, const TQString &label, TQWidget *tqparent, const char *name = 0 ); ~NamePartWidget(); @@ -65,12 +66,13 @@ class NamePartWidget : public QWidget TQString mLabel; }; -class AddresseeWidget : public QWidget +class AddresseeWidget : public TQWidget { Q_OBJECT + TQ_OBJECT public: - AddresseeWidget( TQWidget *parent, const char *name = 0 ); + AddresseeWidget( TQWidget *tqparent, const char *name = 0 ); ~AddresseeWidget(); void restoreSettings(); diff --git a/kaddressbook/kcmconfigs/extensionconfigdialog.cpp b/kaddressbook/kcmconfigs/extensionconfigdialog.cpp index 0758f320c..62716886b 100644 --- a/kaddressbook/kcmconfigs/extensionconfigdialog.cpp +++ b/kaddressbook/kcmconfigs/extensionconfigdialog.cpp @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include <tqlayout.h> @@ -30,8 +30,8 @@ #include "extensionwidget.h" ExtensionConfigDialog::ExtensionConfigDialog( KAB::ExtensionFactory *factory, KConfig *config, - TQWidget *parent, const char *name ) - : KDialogBase( Plain, i18n( "Extension Settings" ), Ok | Cancel, Ok, parent, + TQWidget *tqparent, const char *name ) + : KDialogBase( Plain, i18n( "Extension Settings" ), Ok | Cancel, Ok, tqparent, name, true, true ), mWidget( 0 ), mConfig( config ) { TQFrame *page = plainPage(); diff --git a/kaddressbook/kcmconfigs/extensionconfigdialog.h b/kaddressbook/kcmconfigs/extensionconfigdialog.h index 34339fa01..de5f506b8 100644 --- a/kaddressbook/kcmconfigs/extensionconfigdialog.h +++ b/kaddressbook/kcmconfigs/extensionconfigdialog.h @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef EXTENSIONCONFIGDIALOG_H @@ -35,10 +35,11 @@ class ConfigureWidget; class ExtensionConfigDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: ExtensionConfigDialog( KAB::ExtensionFactory *factory, KConfig *config, - TQWidget *parent, const char *name = 0 ); + TQWidget *tqparent, const char *name = 0 ); ~ExtensionConfigDialog(); protected slots: diff --git a/kaddressbook/kcmconfigs/kabconfigwidget.cpp b/kaddressbook/kcmconfigs/kabconfigwidget.cpp index d1888624e..c65255db4 100644 --- a/kaddressbook/kcmconfigs/kabconfigwidget.cpp +++ b/kaddressbook/kcmconfigs/kabconfigwidget.cpp @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include <tqcheckbox.h> @@ -45,8 +45,8 @@ #include "kabconfigwidget.h" -KABConfigWidget::KABConfigWidget( TQWidget *parent, const char *name ) - : TQWidget( parent, name ) +KABConfigWidget::KABConfigWidget( TQWidget *tqparent, const char *name ) + : TQWidget( tqparent, name ) { TQVBoxLayout *topLayout = new TQVBoxLayout( this, 0, KDialog::spacingHint() ); @@ -59,9 +59,9 @@ KABConfigWidget::KABConfigWidget( TQWidget *parent, const char *name ) TQVBoxLayout *tqlayout = 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->tqlayout() ); - boxLayout->tqsetAlignment( Qt::AlignTop ); + boxLayout->tqsetAlignment( TQt::AlignTop ); mViewsSingleClickBox = new TQCheckBox( i18n( "Honor KDE single click" ), groupBox, "msingle" ); boxLayout->addWidget( mViewsSingleClickBox ); @@ -96,7 +96,7 @@ KABConfigWidget::KABConfigWidget( TQWidget *parent, const char *name ) tqlayout->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->tqlayout(), 3, 2, KDialog::spacingHint() ); label = new TQLabel( i18n( "Phone:" ), groupBox ); @@ -126,9 +126,9 @@ KABConfigWidget::KABConfigWidget( TQWidget *parent, const char *name ) tqlayout->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->tqlayout(), KDialog::spacingHint() ); - boxLayout->tqsetAlignment( Qt::AlignTop ); + boxLayout->tqsetAlignment( TQt::AlignTop ); mLocationMapURL = new TQComboBox( true, groupBox ); mLocationMapURL->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed ) ); diff --git a/kaddressbook/kcmconfigs/kabconfigwidget.h b/kaddressbook/kcmconfigs/kabconfigwidget.h index 54cdbf0ee..e169f2ef5 100644 --- a/kaddressbook/kcmconfigs/kabconfigwidget.h +++ b/kaddressbook/kcmconfigs/kabconfigwidget.h @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef KABCONFIGWIDGET_H @@ -36,12 +36,13 @@ class KListView; class AddresseeWidget; -class KABConfigWidget : public QWidget +class KABConfigWidget : public TQWidget { Q_OBJECT + TQ_OBJECT public: - KABConfigWidget( TQWidget *parent, const char *name = 0 ); + KABConfigWidget( TQWidget *tqparent, const char *name = 0 ); void restoreSettings(); void saveSettings(); diff --git a/kaddressbook/kcmconfigs/kabldapconfig.desktop b/kaddressbook/kcmconfigs/kabldapconfig.desktop index 2d29acdf0..e007f2b52 100644 --- a/kaddressbook/kcmconfigs/kabldapconfig.desktop +++ b/kaddressbook/kcmconfigs/kabldapconfig.desktop @@ -1,5 +1,5 @@ [Desktop Entry] -Icon=find +Icon=tqfind Type=Service ServiceTypes=KCModule DocPath=kaddressbook/preferences.html#preferences-ldap-lookup diff --git a/kaddressbook/kcmconfigs/kcmkabconfig.cpp b/kaddressbook/kcmconfigs/kcmkabconfig.cpp index f112c4c89..a504af0bb 100644 --- a/kaddressbook/kcmconfigs/kcmkabconfig.cpp +++ b/kaddressbook/kcmconfigs/kcmkabconfig.cpp @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include <tqlayout.h> @@ -35,13 +35,13 @@ extern "C" { - KDE_EXPORT KCModule *create_kabconfig( TQWidget *parent, const char * ) { - return new KCMKabConfig( parent, "kcmkabconfig" ); + KDE_EXPORT KCModule *create_kabconfig( TQWidget *tqparent, const char * ) { + return new KCMKabConfig( tqparent, "kcmkabconfig" ); } } -KCMKabConfig::KCMKabConfig( TQWidget *parent, const char *name ) - : KCModule( parent, name ) +KCMKabConfig::KCMKabConfig( TQWidget *tqparent, const char *name ) + : KCModule( tqparent, name ) { TQVBoxLayout *tqlayout = new TQVBoxLayout( this ); mConfigWidget = new KABConfigWidget( this, "mConfigWidget" ); diff --git a/kaddressbook/kcmconfigs/kcmkabconfig.h b/kaddressbook/kcmconfigs/kcmkabconfig.h index 5ffecea50..74232946f 100644 --- a/kaddressbook/kcmconfigs/kcmkabconfig.h +++ b/kaddressbook/kcmconfigs/kcmkabconfig.h @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef KCMKABCONFIG_H @@ -31,9 +31,10 @@ class KABConfigWidget; class KCMKabConfig : public KCModule { Q_OBJECT + TQ_OBJECT public: - KCMKabConfig( TQWidget *parent = 0, const char *name = 0 ); + KCMKabConfig( TQWidget *tqparent = 0, const char *name = 0 ); virtual void load(); virtual void save(); diff --git a/kaddressbook/kcmconfigs/kcmkabcustomfields.cpp b/kaddressbook/kcmconfigs/kcmkabcustomfields.cpp index 3b127eab2..8c0fa7316 100644 --- a/kaddressbook/kcmconfigs/kcmkabcustomfields.cpp +++ b/kaddressbook/kcmconfigs/kcmkabcustomfields.cpp @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include "kcmkabcustomfields.h" @@ -33,13 +33,13 @@ extern "C" { - KDE_EXPORT KCModule *create_kabcustomfields( TQWidget *parent, const char * ) { - return new KCMKabCustomFields( parent, "kcmkabcustomfields" ); + KDE_EXPORT KCModule *create_kabcustomfields( TQWidget *tqparent, const char * ) { + return new KCMKabCustomFields( tqparent, "kcmkabcustomfields" ); } } -KCMKabCustomFields::KCMKabCustomFields( TQWidget *parent, const char *name ) - : KCMDesignerFields( parent, name ) +KCMKabCustomFields::KCMKabCustomFields( TQWidget *tqparent, const char *name ) + : KCMDesignerFields( tqparent, name ) { } diff --git a/kaddressbook/kcmconfigs/kcmkabcustomfields.h b/kaddressbook/kcmconfigs/kcmkabcustomfields.h index 38cd19a98..4eb30a880 100644 --- a/kaddressbook/kcmconfigs/kcmkabcustomfields.h +++ b/kaddressbook/kcmconfigs/kcmkabcustomfields.h @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef KCMKABCUSTOMFIELDS_H #define KCMKABCUSTOMFIELDS_H @@ -28,7 +28,7 @@ class KCMKabCustomFields : public KPIM::KCMDesignerFields { public: - KCMKabCustomFields( TQWidget *parent = 0, const char *name = 0 ); + KCMKabCustomFields( TQWidget *tqparent = 0, const char *name = 0 ); protected: TQString localUiDir(); diff --git a/kaddressbook/kcmconfigs/kcmkabldapconfig.cpp b/kaddressbook/kcmconfigs/kcmkabldapconfig.cpp index 4cadf2633..b2f657c87 100644 --- a/kaddressbook/kcmconfigs/kcmkabldapconfig.cpp +++ b/kaddressbook/kcmconfigs/kcmkabldapconfig.cpp @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include <tqcheckbox.h> @@ -36,13 +36,13 @@ extern "C" { - KDE_EXPORT KCModule *create_kabldapconfig( TQWidget *parent, const char * ) { - return new KCMKabLdapConfig( parent, "kcmkabldapconfig" ); + KDE_EXPORT KCModule *create_kabldapconfig( TQWidget *tqparent, const char * ) { + return new KCMKabLdapConfig( tqparent, "kcmkabldapconfig" ); } } -KCMKabLdapConfig::KCMKabLdapConfig( TQWidget *parent, const char *name ) - : KCModule( parent, name ) +KCMKabLdapConfig::KCMKabLdapConfig( TQWidget *tqparent, const char *name ) + : KCModule( tqparent, name ) { TQVBoxLayout *tqlayout = new TQVBoxLayout( this ); mConfigWidget = new LDAPOptionsWidget( this ); diff --git a/kaddressbook/kcmconfigs/kcmkabldapconfig.h b/kaddressbook/kcmconfigs/kcmkabldapconfig.h index 53d1a21b4..10ec0d211 100644 --- a/kaddressbook/kcmconfigs/kcmkabldapconfig.h +++ b/kaddressbook/kcmconfigs/kcmkabldapconfig.h @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef KCMKABLDAPCONFIG_H @@ -33,9 +33,10 @@ class LDAPOptionsWidget; class KCMKabLdapConfig : public KCModule { Q_OBJECT + TQ_OBJECT public: - KCMKabLdapConfig( TQWidget *parent = 0, const char *name = 0 ); + KCMKabLdapConfig( TQWidget *tqparent = 0, const char *name = 0 ); virtual void load(); virtual void save(); diff --git a/kaddressbook/kcmconfigs/ldapoptionswidget.cpp b/kaddressbook/kcmconfigs/ldapoptionswidget.cpp index 639cec027..e0bbca236 100644 --- a/kaddressbook/kcmconfigs/ldapoptionswidget.cpp +++ b/kaddressbook/kcmconfigs/ldapoptionswidget.cpp @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include <tqgroupbox.h> @@ -42,11 +42,11 @@ #include <tqvbox.h> #include <kiconloader.h> -class LDAPItem : public QCheckListItem +class LDAPItem : public TQCheckListItem { public: - LDAPItem( TQListView *parent, const KPIM::LdapServer &server, bool isActive = false ) - : TQCheckListItem( parent, parent->lastItem(), TQString::null, TQCheckListItem::CheckBox ), + LDAPItem( TQListView *tqparent, const KPIM::LdapServer &server, bool isActive = false ) + : TQCheckListItem( tqparent, tqparent->lastItem(), TQString(), TQCheckListItem::CheckBox ), mIsActive( isActive ) { setServer( server ); @@ -69,15 +69,15 @@ class LDAPItem : public QCheckListItem bool mIsActive; }; -LDAPOptionsWidget::LDAPOptionsWidget( TQWidget* parent, const char* name ) - : TQWidget( parent, name ) +LDAPOptionsWidget::LDAPOptionsWidget( TQWidget* tqparent, const char* name ) + : TQWidget( tqparent, name ) { initGUI(); mHostListView->setSorting( -1 ); mHostListView->setAllColumnsShowFocus( true ); mHostListView->setFullWidth( true ); - mHostListView->addColumn( TQString::null ); + mHostListView->addColumn( TQString() ); mHostListView->header()->hide(); connect( mHostListView, TQT_SIGNAL( selectionChanged( TQListViewItem* ) ), diff --git a/kaddressbook/kcmconfigs/ldapoptionswidget.h b/kaddressbook/kcmconfigs/ldapoptionswidget.h index 10f1d90d8..17fbe6e6f 100644 --- a/kaddressbook/kcmconfigs/ldapoptionswidget.h +++ b/kaddressbook/kcmconfigs/ldapoptionswidget.h @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef LDAPOPTIONSWIDGET_H @@ -31,12 +31,13 @@ class KListView; class TQListViewItem; class TQPushButton; -class LDAPOptionsWidget : public QWidget +class LDAPOptionsWidget : public TQWidget { Q_OBJECT + TQ_OBJECT public: - LDAPOptionsWidget( TQWidget* parent = 0, const char* name = 0 ); + LDAPOptionsWidget( TQWidget* tqparent = 0, const char* name = 0 ); ~LDAPOptionsWidget(); void restoreSettings(); diff --git a/kaddressbook/keywidget.cpp b/kaddressbook/keywidget.cpp index 0e3094521..3949cd142 100644 --- a/kaddressbook/keywidget.cpp +++ b/kaddressbook/keywidget.cpp @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include <tqfile.h> @@ -38,8 +38,8 @@ #include "keywidget.h" -KeyWidget::KeyWidget( TQWidget *parent, const char *name ) - : TQWidget( parent, name ) +KeyWidget::KeyWidget( TQWidget *tqparent, const char *name ) + : TQWidget( tqparent, name ) { TQGridLayout *tqlayout = new TQGridLayout( this, 4, 2, KDialog::marginHint(), KDialog::spacingHint() ); diff --git a/kaddressbook/keywidget.h b/kaddressbook/keywidget.h index 566589dde..7e9a7b28f 100644 --- a/kaddressbook/keywidget.h +++ b/kaddressbook/keywidget.h @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef KEYWIDGET_H @@ -31,12 +31,13 @@ class KComboBox; class TQPushButton; -class KeyWidget : public QWidget +class KeyWidget : public TQWidget { Q_OBJECT + TQ_OBJECT public: - KeyWidget( TQWidget *parent, const char *name = 0 ); + KeyWidget( TQWidget *tqparent, const char *name = 0 ); ~KeyWidget(); void setKeys( const KABC::Key::List &list ); diff --git a/kaddressbook/ldapsearchdialog.cpp b/kaddressbook/ldapsearchdialog.cpp index 7074a5966..f23049909 100644 --- a/kaddressbook/ldapsearchdialog.cpp +++ b/kaddressbook/ldapsearchdialog.cpp @@ -49,7 +49,7 @@ static TQString asUtf8( const TQByteArray &val ) { if ( val.isEmpty() ) - return TQString::null; + return TQString(); const char *data = val.data(); @@ -101,11 +101,11 @@ static TQMap<TQString, TQString>& adrbookattr2ldap() return keys; } -class ContactListItem : public QListViewItem +class ContactListItem : public TQListViewItem { public: - ContactListItem( TQListView* parent, const KPIM::LdapAttrMap& attrs ) - : TQListViewItem( parent ), mAttrs( attrs ) + ContactListItem( TQListView* tqparent, const KPIM::LdapAttrMap& attrs ) + : TQListViewItem( tqparent ), mAttrs( attrs ) { } KPIM::LdapAttrMap mAttrs; @@ -139,9 +139,9 @@ TQValueList<ContactListItem*> LDAPSearchDialog::Private::selectedItems( TQListVi } LDAPSearchDialog::LDAPSearchDialog( KABC::AddressBook *ab, KABCore *core, - TQWidget* parent, const char* name ) + TQWidget* tqparent, const char* name ) : KDialogBase( Plain, i18n( "Search for Addresses in Directory" ), Help | User1 | User2 | - Cancel, Default, parent, name, false, true ), + Cancel, Default, tqparent, name, false, true ), mAddressBook( ab ), mCore( core ), d( new Private ) { setButtonCancel( KStdGuiItem::close() ); @@ -152,7 +152,7 @@ LDAPSearchDialog::LDAPSearchDialog( KABC::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->tqlayout(), 2, 5, spacingHint() ); boxLayout->setColStretch( 1, 1 ); @@ -202,7 +202,7 @@ LDAPSearchDialog::LDAPSearchDialog( KABC::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" ), this, TQT_SLOT( slotSelectAll() ) ); buttons->addButton( i18n( "Unselect All" ), this, TQT_SLOT( slotUnselectAll() ) ); @@ -372,7 +372,7 @@ TQString LDAPSearchDialog::makeFilter( const TQString& query, const TQString& at result = result.arg( "telephoneNumber" ).arg( query ); } else { // Error? - result = TQString::null; + result = TQString(); return result; } } @@ -384,7 +384,7 @@ void LDAPSearchDialog::slotStartSearch() { cancelQuery(); - TQApplication::setOverrideCursor( Qt::waitCursor ); + TQApplication::setOverrideCursor( TQt::waitCursor ); mSearchButton->setText( i18n( "Stop" ) ); disconnect( mSearchButton, TQT_SIGNAL( clicked() ), @@ -569,7 +569,7 @@ KABC::Addressee::List LDAPSearchDialog::importContactsUnlessTheyExist( const TQV for ( TQValueList<ContactListItem*>::ConstIterator it = selectedItems.begin(); it != selectedItems.end(); ++it ) { const ContactListItem * const cli = *it; KABC::Addressee addr = convertLdapAttributesToAddressee( cli->mAttrs ); - const KABC::Addressee::List existing = mCore->addressBook()->tqfindByEmail( addr.preferredEmail() ); + const KABC::Addressee::List existing = mCore->addressBook()->findByEmail( addr.preferredEmail() ); if ( existing.isEmpty() ) { addr.setUid( KApplication::randomString( 10 ) ); diff --git a/kaddressbook/ldapsearchdialog.h b/kaddressbook/ldapsearchdialog.h index f7f384d50..0d9727f6e 100644 --- a/kaddressbook/ldapsearchdialog.h +++ b/kaddressbook/ldapsearchdialog.h @@ -50,9 +50,10 @@ namespace KABC { class LDAPSearchDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - LDAPSearchDialog( KABC::AddressBook *ab, KABCore *core, TQWidget* parent, const char* name = 0 ); + LDAPSearchDialog( KABC::AddressBook *ab, KABCore *core, TQWidget* tqparent, const char* name = 0 ); ~LDAPSearchDialog(); bool isOK() const { return mIsOK; } diff --git a/kaddressbook/main.cpp b/kaddressbook/main.cpp index 48cf08b6d..bf0f35e50 100644 --- a/kaddressbook/main.cpp +++ b/kaddressbook/main.cpp @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include <stdlib.h> @@ -97,7 +97,7 @@ int KAddressBookApp::newInstance() // Handle startup notification and window activation // We do it ourselves instead of calling KUniqueApplication::newInstance // to avoid the show() call there. -#if defined Q_WS_X11 && ! defined K_WS_QTONLY +#if defined TQ_WS_X11 && ! defined K_WS_TQTONLY static bool firstInstance = true; if ( !firstInstance ) diff --git a/kaddressbook/nameeditdialog.cpp b/kaddressbook/nameeditdialog.cpp index f713ef4e2..248c92bdc 100644 --- a/kaddressbook/nameeditdialog.cpp +++ b/kaddressbook/nameeditdialog.cpp @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include <tqlayout.h> @@ -46,9 +46,9 @@ #include "nameeditdialog.h" NameEditDialog::NameEditDialog( const KABC::Addressee &addr, int type, - bool readOnly, TQWidget *parent, const char *name ) + bool readOnly, TQWidget *tqparent, const char *name ) : KDialogBase( Plain, i18n( "Edit Contact Name" ), Help | Ok | Cancel, - Ok, parent, name, true ), mAddressee( addr ) + Ok, tqparent, name, true ), mAddressee( addr ) { TQWidget *page = plainPage(); TQGridLayout *tqlayout = new TQGridLayout( page ); diff --git a/kaddressbook/nameeditdialog.h b/kaddressbook/nameeditdialog.h index 793c1a8f3..8a160073c 100644 --- a/kaddressbook/nameeditdialog.h +++ b/kaddressbook/nameeditdialog.h @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef NAMEEDITDIALOG_H @@ -40,6 +40,7 @@ class KComboBox; class NameEditDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: enum FormattedNameType @@ -53,7 +54,7 @@ class NameEditDialog : public KDialogBase }; NameEditDialog( const KABC::Addressee &addr, int type, - bool readOnly, TQWidget *parent, const char *name = 0 ); + bool readOnly, TQWidget *tqparent, const char *name = 0 ); ~NameEditDialog(); TQString familyName() const; diff --git a/kaddressbook/phoneeditwidget.cpp b/kaddressbook/phoneeditwidget.cpp index 46efcba98..2587ad3e6 100644 --- a/kaddressbook/phoneeditwidget.cpp +++ b/kaddressbook/phoneeditwidget.cpp @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include <tqbuttongroup.h> @@ -46,8 +46,8 @@ #include "phoneeditwidget.h" -PhoneTypeCombo::PhoneTypeCombo( TQWidget *parent ) - : KComboBox( parent, "TypeCombo" ), +PhoneTypeCombo::PhoneTypeCombo( TQWidget *tqparent ) + : KComboBox( tqparent, "TypeCombo" ), mType( KABC::PhoneNumber::Home ), mLastSelected( 0 ), mTypeList( KABC::PhoneNumber::typeList() ) @@ -126,8 +126,8 @@ void PhoneTypeCombo::otherSelected() update(); } -PhoneNumberWidget::PhoneNumberWidget( TQWidget *parent ) - : TQWidget( parent ) +PhoneNumberWidget::PhoneNumberWidget( TQWidget *tqparent ) + : TQWidget( tqparent ) { TQHBoxLayout *tqlayout = new TQHBoxLayout( this, 6, 11 ); @@ -166,8 +166,8 @@ void PhoneNumberWidget::setReadOnly( bool readOnly ) } -PhoneEditWidget::PhoneEditWidget( TQWidget *parent, const char *name ) - : TQWidget( parent, name ), mReadOnly( false ) +PhoneEditWidget::PhoneEditWidget( TQWidget *tqparent, const char *name ) + : TQWidget( tqparent, name ), mReadOnly( false ) { TQGridLayout *tqlayout = new TQGridLayout( this, 2, 2 ); tqlayout->setSpacing( KDialog::spacingHint() ); @@ -177,7 +177,7 @@ PhoneEditWidget::PhoneEditWidget( TQWidget *parent, const char *name ) mAddButton = new TQPushButton( i18n( "Add" ), this ); mAddButton->setMaximumSize( mAddButton->tqsizeHint() ); - tqlayout->addWidget( mAddButton, 1, 0, Qt::AlignRight ); + tqlayout->addWidget( mAddButton, 1, 0, TQt::AlignRight ); mRemoveButton = new TQPushButton( i18n( "Remove" ), this ); mRemoveButton->setMaximumSize( mRemoveButton->tqsizeHint() ); @@ -291,9 +291,9 @@ void PhoneEditWidget::changed( int pos ) /////////////////////////////////////////// // PhoneTypeDialog -PhoneTypeDialog::PhoneTypeDialog( int type, TQWidget *parent ) +PhoneTypeDialog::PhoneTypeDialog( int type, TQWidget *tqparent ) : KDialogBase( Plain, i18n( "Edit Phone Number" ), Ok | Cancel, Ok, - parent, "PhoneTypeDialog", true ), + tqparent, "PhoneTypeDialog", true ), mType( type ) { TQWidget *page = plainPage(); @@ -315,7 +315,7 @@ PhoneTypeDialog::PhoneTypeDialog( int type, TQWidget *parent ) new TQCheckBox( KABC::PhoneNumber::typeLabel( *it ), mGroup ); for ( int i = 0; i < mGroup->count(); ++i ) { - TQCheckBox *box = (TQCheckBox*)mGroup->find( i ); + TQCheckBox *box = (TQCheckBox*)mGroup->tqfind( i ); box->setChecked( mType & mTypeList[ i ] ); } @@ -327,7 +327,7 @@ int PhoneTypeDialog::type() const int type = 0; for ( int i = 0; i < mGroup->count(); ++i ) { - TQCheckBox *box = (TQCheckBox*)mGroup->find( i ); + TQCheckBox *box = (TQCheckBox*)mGroup->tqfind( i ); if ( box->isChecked() ) type += mTypeList[ i ]; } diff --git a/kaddressbook/phoneeditwidget.h b/kaddressbook/phoneeditwidget.h index 0db2301ed..aa8eb4d54 100644 --- a/kaddressbook/phoneeditwidget.h +++ b/kaddressbook/phoneeditwidget.h @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef PHONEEDITWIDGET_H @@ -39,9 +39,10 @@ class KComboBox; class PhoneTypeCombo : public KComboBox { Q_OBJECT + TQ_OBJECT public: - PhoneTypeCombo( TQWidget *parent ); + PhoneTypeCombo( TQWidget *tqparent ); ~PhoneTypeCombo(); void setType( int type ); @@ -62,12 +63,13 @@ class PhoneTypeCombo : public KComboBox TQValueList<int> mTypeList; }; -class PhoneNumberWidget : public QWidget +class PhoneNumberWidget : public TQWidget { Q_OBJECT + TQ_OBJECT public: - PhoneNumberWidget( TQWidget *parent ); + PhoneNumberWidget( TQWidget *tqparent ); void setNumber( const KABC::PhoneNumber &number ); KABC::PhoneNumber number() const; @@ -86,12 +88,13 @@ class PhoneNumberWidget : public QWidget /** Widget for editing phone numbers. */ -class PhoneEditWidget : public QWidget +class PhoneEditWidget : public TQWidget { Q_OBJECT + TQ_OBJECT public: - PhoneEditWidget( TQWidget *parent, const char *name = 0 ); + PhoneEditWidget( TQWidget *tqparent, const char *name = 0 ); ~PhoneEditWidget(); void setPhoneNumbers( const KABC::PhoneNumber::List &list ); @@ -128,8 +131,9 @@ class PhoneEditWidget : public QWidget class PhoneTypeDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - PhoneTypeDialog( int type, TQWidget *parent ); + PhoneTypeDialog( int type, TQWidget *tqparent ); int type() const; diff --git a/kaddressbook/printing/detailledstyle.cpp b/kaddressbook/printing/detailledstyle.cpp index 4cd597801..13e4fb4e4 100644 --- a/kaddressbook/printing/detailledstyle.cpp +++ b/kaddressbook/printing/detailledstyle.cpp @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include <kapplication.h> @@ -63,9 +63,9 @@ const char *ContactHeaderForeColor = "ContactHeaderForeColor"; const char *ContactHeaderBGColor = "ContactHeaderBGColor"; -DetailledPrintStyle::DetailledPrintStyle( PrintingWizard *parent, const char *name ) - : PrintStyle( parent, name ), - mPageAppearance( new AppearancePage( parent, "AppearancePage" ) ), +DetailledPrintStyle::DetailledPrintStyle( PrintingWizard *tqparent, const char *name ) + : PrintStyle( tqparent, name ), + mPageAppearance( new AppearancePage( tqparent, "AppearancePage" ) ), mPainter( 0 ), mPrintProgress( 0 ) { @@ -108,9 +108,9 @@ DetailledPrintStyle::DetailledPrintStyle( PrintingWizard *parent, const char *na mPageAppearance->cbBackgroundColor->setChecked( config->readBoolEntry( ColoredContactHeaders, true ) ); mPageAppearance->kcbHeaderBGColor->setColor( - config->readColorEntry( ContactHeaderBGColor, &Qt::black ) ); + config->readColorEntry( ContactHeaderBGColor, &TQt::black ) ); mPageAppearance->kcbHeaderTextColor->setColor( - config->readColorEntry( ContactHeaderForeColor, &Qt::white ) ); + config->readColorEntry( ContactHeaderForeColor, &TQt::white ) ); mPageAppearance->tqlayout()->setMargin( KDialog::marginHint() ); mPageAppearance->tqlayout()->setSpacing( KDialog::spacingHint() ); @@ -131,10 +131,10 @@ void DetailledPrintStyle::print( const KABC::Addressee::List &contacts, PrintPro bool useKDEFonts; TQFont font; - TQColor foreColor = Qt::black; - TQColor headerColor = Qt::white; + TQColor foreColor = TQt::black; + TQColor headerColor = TQt::white; bool useHeaderColor = true; - TQColor backColor = Qt::black; + TQColor backColor = TQt::black; bool useBGColor; // save, always available defaults: @@ -222,10 +222,10 @@ void DetailledPrintStyle::print( const KABC::Addressee::List &contacts, PrintPro TQPaintDeviceMetrics metrics( printer ); - left = QMAX( printer->margins().width(), marginLeft ); - top = QMAX( printer->margins().height(), marginTop ); - width = metrics.width() - left - QMAX( printer->margins().width(), marginRight ); - height = metrics.height() - top - QMAX( printer->margins().height(), marginBottom ); + left = TQMAX( printer->margins().width(), marginLeft ); + top = TQMAX( printer->margins().height(), marginTop ); + width = metrics.width() - left - TQMAX( printer->margins().width(), marginRight ); + height = metrics.height() - top - TQMAX( printer->margins().height(), marginBottom ); painter.setViewport( left, top, width, height ); progress->addMessage( i18n( "Printing" ) ); @@ -272,9 +272,9 @@ bool DetailledPrintStyle::printEntries( const KABC::Addressee::List &contacts, return true; } -DetailledPrintStyleFactory::DetailledPrintStyleFactory( PrintingWizard *parent, +DetailledPrintStyleFactory::DetailledPrintStyleFactory( PrintingWizard *tqparent, const char *name ) - : PrintStyleFactory( parent, name ) + : PrintStyleFactory( tqparent, name ) { } diff --git a/kaddressbook/printing/detailledstyle.h b/kaddressbook/printing/detailledstyle.h index e8515aa0d..977bcd494 100644 --- a/kaddressbook/printing/detailledstyle.h +++ b/kaddressbook/printing/detailledstyle.h @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef DETAILLEDSTYLE_H @@ -36,9 +36,10 @@ namespace KABPrinting { class DetailledPrintStyle : public PrintStyle { Q_OBJECT + TQ_OBJECT public: - DetailledPrintStyle( PrintingWizard *parent, const char *name = 0 ); + DetailledPrintStyle( PrintingWizard *tqparent, const char *name = 0 ); ~DetailledPrintStyle(); void print( const KABC::Addressee::List &contacts, PrintProgress* ); @@ -57,7 +58,7 @@ class DetailledPrintStyle : public PrintStyle class DetailledPrintStyleFactory : public PrintStyleFactory { public: - DetailledPrintStyleFactory( PrintingWizard *parent, const char *name = 0 ); + DetailledPrintStyleFactory( PrintingWizard *tqparent, const char *name = 0 ); PrintStyle *create() const; TQString description() const; diff --git a/kaddressbook/printing/ds_appearance.ui b/kaddressbook/printing/ds_appearance.ui index 03ca4b58a..eb93bd76c 100644 --- a/kaddressbook/printing/ds_appearance.ui +++ b/kaddressbook/printing/ds_appearance.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.0" stdsetdef="1"> <class>AppearancePage</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>AppearancePage</cstring> </property> @@ -25,7 +25,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>labelHeader</cstring> </property> @@ -72,7 +72,7 @@ <set>AlignVCenter|AlignLeft</set> </property> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>gbFont</cstring> </property> @@ -97,7 +97,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>cbStandardFonts</cstring> </property> @@ -108,7 +108,7 @@ <bool>true</bool> </property> </widget> - <widget class="QFrame"> + <widget class="TQFrame"> <property name="name"> <cstring>frameFonts</cstring> </property> @@ -131,7 +131,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>labelDetailsFont</cstring> </property> @@ -142,7 +142,7 @@ <set>AlignVCenter|AlignRight</set> </property> </widget> - <widget class="QLabel" row="3" column="2"> + <widget class="TQLabel" row="3" column="2"> <property name="name"> <cstring>labelDetailsFontSize</cstring> </property> @@ -153,7 +153,7 @@ <set>AlignVCenter|AlignRight</set> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>labelBodyFont</cstring> </property> @@ -164,7 +164,7 @@ <set>AlignVCenter|AlignRight</set> </property> </widget> - <widget class="QLabel" row="4" column="2"> + <widget class="TQLabel" row="4" column="2"> <property name="name"> <cstring>labelFixedFontSize</cstring> </property> @@ -175,7 +175,7 @@ <set>AlignVCenter|AlignRight</set> </property> </widget> - <widget class="QLabel" row="4" column="0"> + <widget class="TQLabel" row="4" column="0"> <property name="name"> <cstring>labelFixed</cstring> </property> @@ -196,7 +196,7 @@ <cstring>kisbFixedFontSize</cstring> </property> </widget> - <widget class="QLabel" row="2" column="2"> + <widget class="TQLabel" row="2" column="2"> <property name="name"> <cstring>labelBodyFontSize</cstring> </property> @@ -238,7 +238,7 @@ <cstring>kfcFixedFont</cstring> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>labelHeaderFont</cstring> </property> @@ -267,7 +267,7 @@ <cstring>kfcHeadlineFont</cstring> </property> </widget> - <widget class="QLabel" row="0" column="2"> + <widget class="TQLabel" row="0" column="2"> <property name="name"> <cstring>labelHeaderFontSize</cstring> </property> @@ -278,7 +278,7 @@ <set>AlignVCenter|AlignRight</set> </property> </widget> - <widget class="QLabel" row="1" column="2"> + <widget class="TQLabel" row="1" column="2"> <property name="name"> <cstring>labelHeaderFontSize_2</cstring> </property> @@ -294,7 +294,7 @@ <cstring>kisbBodyFontSize</cstring> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>labelHeadlines</cstring> </property> @@ -319,7 +319,7 @@ </widget> </vbox> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>gbHeadline</cstring> </property> @@ -344,7 +344,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>cbBackgroundColor</cstring> </property> @@ -355,7 +355,7 @@ <bool>true</bool> </property> </widget> - <widget class="QFrame"> + <widget class="TQFrame"> <property name="name"> <cstring>frameBGColor</cstring> </property> @@ -393,7 +393,7 @@ </color> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>tlBackgroundColor</cstring> </property> @@ -404,7 +404,7 @@ <set>AlignVCenter|AlignRight</set> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>tlHeaderColor</cstring> </property> diff --git a/kaddressbook/printing/kabentrypainter.cpp b/kaddressbook/printing/kabentrypainter.cpp index c74e4e410..356b53dfb 100644 --- a/kaddressbook/printing/kabentrypainter.cpp +++ b/kaddressbook/printing/kabentrypainter.cpp @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ @@ -133,9 +133,9 @@ int KABEntryPainter::hitsTalk( const TQPoint &p ) return hits( mTalkRects, p ); } -int KABEntryPainter::hits( const QRectList& list, const TQPoint &p ) +int KABEntryPainter::hits( const TQRectList& list, const TQPoint &p ) { - QRectList::const_iterator pos; + TQRectList::const_iterator pos; int count = 0; for ( pos = list.begin(); pos != list.end(); ++pos ) { @@ -174,7 +174,7 @@ bool KABEntryPainter::printAddressee( const KABC::Addressee &addr, // this is used to prepare some fields for printing and decide about // the tqlayout later: TQValueList<TQStringList> parts; - TQValueList<QRectList*> contents; + TQValueList<TQRectList*> contents; mEmailRects.clear(); mPhoneRects.clear(); @@ -189,9 +189,9 @@ bool KABEntryPainter::printAddressee( const KABC::Addressee &addr, painter->setPen( mBackgroundColor ); text = addr.realName(); - // tqreplacement for: api->addressbook()->literalName(entry, text); + // replacement for: api->addressbook()->literalName(entry, text); rect = painter->boundingRect( Ruler1, y, Width, Height, - Qt::AlignVCenter | Qt::AlignLeft, text ); + TQt::AlignVCenter | TQt::AlignLeft, text ); rect.setHeight( (int)( 1.25 * rect.height() ) ); if ( !fake && mUseHeaderColor ) @@ -202,7 +202,7 @@ bool KABEntryPainter::printAddressee( const KABC::Addressee &addr, // create a little (1/8) space on top of the letters: float ypos = y + ( (float)rect.height() ) * 0.125; painter->drawText( Ruler1, (int)ypos, Width, rect.height(), - Qt::AlignVCenter | Qt::AlignLeft, text ); + TQt::AlignVCenter | TQt::AlignLeft, text ); } // paint the birthday to the right: @@ -213,7 +213,7 @@ bool KABEntryPainter::printAddressee( const KABC::Addressee &addr, // create a little (1/8) space on top of the letters: float ypos = y + ( (float)rect.height() ) * 0.125; painter->drawText( 0, (int)ypos, Width-Ruler1, rect.height(), - Qt::AlignVCenter | Qt::AlignRight, line1 ); + TQt::AlignVCenter | TQt::AlignRight, line1 ); } } @@ -229,9 +229,9 @@ bool KABEntryPainter::printAddressee( const KABC::Addressee &addr, if ( fake ) { rect = painter->boundingRect( Ruler1, y, Width-Ruler1, Height, - Qt::AlignTop | Qt::AlignLeft, line1 ); + TQt::AlignTop | TQt::AlignLeft, line1 ); } else { - painter->drawText( Ruler1, y, Width-Ruler1, Height, Qt::AlignTop | Qt::AlignLeft, + painter->drawText( Ruler1, y, Width-Ruler1, Height, TQt::AlignTop | TQt::AlignLeft, line1, -1, &rect ); } @@ -304,10 +304,10 @@ bool KABEntryPainter::printAddressee( const KABC::Addressee &addr, int heights[ 4 ]= { 0, 0, 0, 0 }; TQValueList<TQStringList>::iterator pos = parts.begin(); - TQValueList<QRectList*>::iterator rpos = contents.begin(); + TQValueList<TQRectList*>::iterator rpos = contents.begin(); for ( uint counter = 0; counter < parts.count(); ++counter ) { - const int Offset = counter > 1 ? QMAX( heights[ 0 ], heights[ 1 ] ) : 0; + const int Offset = counter > 1 ? TQMAX( heights[ 0 ], heights[ 1 ] ) : 0; TQStringList list = *pos; painter->setFont( mHeadLineFont ); @@ -316,11 +316,11 @@ bool KABEntryPainter::printAddressee( const KABC::Addressee &addr, limits[ counter ].top() + heights[counter] + Offset, limits[ counter ].width(), limits[ counter ].height(), - Qt::AlignTop | Qt::AlignLeft, *list.at( 0 ) ); + TQt::AlignTop | TQt::AlignLeft, *list.at( 0 ) ); } else { painter->drawText( limits[ counter ].left(), limits[ counter ].top() + heights[ counter ] + Offset, limits[ counter ].width(), - limits[ counter ].height(), Qt::AlignTop | Qt::AlignLeft, + limits[ counter ].height(), TQt::AlignTop | TQt::AlignLeft, *list.at( 0 ), -1, &rect ); } @@ -334,12 +334,12 @@ bool KABEntryPainter::printAddressee( const KABC::Addressee &addr, rect = painter->boundingRect ( limits[ counter ].left() + Ruler1, limits[ counter ].top() + heights[ counter ] + Offset, limits[ counter ].width() - Ruler1, - limits[ counter ].height(), Qt::AlignTop | Qt::AlignLeft, + limits[ counter ].height(), TQt::AlignTop | TQt::AlignLeft, *list.at( c2 ) ); } else { painter->drawText( limits[ counter ].left() + Ruler1, limits[ counter ].top() + heights[ counter ] + Offset, limits[ counter ].width() - - Ruler1, limits[ counter ].height(), Qt::AlignTop | Qt::AlignLeft, + - Ruler1, limits[ counter ].height(), TQt::AlignTop | TQt::AlignLeft, *list.at( c2 ), -1, &rect ); } (*rpos)->push_back( rect ); @@ -350,7 +350,7 @@ bool KABEntryPainter::printAddressee( const KABC::Addressee &addr, ++rpos; } - y = y + QMAX( heights[ 0 ], heights[ 1 ] ) + QMAX( heights[ 2 ], heights[ 3 ] ); + y = y + TQMAX( heights[ 0 ], heights[ 1 ] ) + TQMAX( heights[ 2 ], heights[ 3 ] ); // ^^^^^ done with emails, telephone, URLs and talk addresses // now print the addresses: @@ -359,11 +359,11 @@ bool KABEntryPainter::printAddressee( const KABC::Addressee &addr, y += fmBody.lineSpacing() / 2; painter->setFont( mHeadLineFont ); if ( fake ) { - rect = painter->boundingRect( 0, y, Width, Height, Qt::AlignTop | Qt::AlignLeft, + rect = painter->boundingRect( 0, y, Width, Height, TQt::AlignTop | TQt::AlignLeft, addresses.count() == 1 ? i18n( "Address:" ) : i18n( "Addresses:" ) ); } else { - painter->drawText( 0, y, Width, Height, Qt::AlignTop | Qt::AlignLeft, + painter->drawText( 0, y, Width, Height, TQt::AlignTop | TQt::AlignLeft, addresses.count() == 1 ? i18n( "Address:" ) : i18n( "Addresses:" ), -1, &rect ); } @@ -400,7 +400,7 @@ bool KABEntryPainter::printAddressee( const KABC::Addressee &addr, } line1 += TQString::tqfromLatin1( ":" ); - text = TQString::null; + text = TQString(); if ( !address.extended().isEmpty() ) text = address.extended().stripWhiteSpace(); @@ -425,20 +425,20 @@ bool KABEntryPainter::printAddressee( const KABC::Addressee &addr, if ( fake ) { rect = painter->boundingRect( Ruler1, y, Width - Ruler1, Height, - Qt::AlignTop | Qt::AlignLeft, line1 ); + TQt::AlignTop | TQt::AlignLeft, line1 ); } else { painter->drawText( Ruler1, y, Width - Ruler1, Height, - Qt::AlignTop | Qt::AlignLeft, line1, -1, &rect ); + TQt::AlignTop | TQt::AlignLeft, line1, -1, &rect ); } y += rect.height(); if ( !line2.isEmpty() ) { if ( fake ) { rect = painter->boundingRect( Ruler2, y, Width - Ruler2, Height, - Qt::AlignTop | Qt::AlignLeft, line2 ); + TQt::AlignTop | TQt::AlignLeft, line2 ); } else { painter->drawText( Ruler2, y, Width - Ruler2, Height, - Qt::AlignTop | Qt::AlignLeft, line2, -1, &rect ); + TQt::AlignTop | TQt::AlignLeft, line2, -1, &rect ); } y += rect.height(); } @@ -446,10 +446,10 @@ bool KABEntryPainter::printAddressee( const KABC::Addressee &addr, if ( !line3.isEmpty() ) { if ( fake ) { rect = painter->boundingRect( Ruler2, y, Width - Ruler2, Height, - Qt::AlignTop | Qt::AlignLeft, line3 ); + TQt::AlignTop | TQt::AlignLeft, line3 ); } else { painter->drawText( Ruler2, y, Width - Ruler2, Height, - Qt::AlignTop | Qt::AlignLeft, line3, -1, &rect ); + TQt::AlignTop | TQt::AlignLeft, line3, -1, &rect ); } y += rect.height(); } @@ -457,10 +457,10 @@ bool KABEntryPainter::printAddressee( const KABC::Addressee &addr, if ( !line4.isEmpty() ) { if ( fake ) { rect = painter->boundingRect( Ruler2, y, Width - Ruler2, Height, - Qt::AlignTop | Qt::AlignLeft, line4 ); + TQt::AlignTop | TQt::AlignLeft, line4 ); } else { painter->drawText( Ruler2, y, Width - Ruler2, Height, - Qt::AlignTop | Qt::AlignLeft, line4, -1, &rect ); + TQt::AlignTop | TQt::AlignLeft, line4, -1, &rect ); } y += rect.height(); } @@ -469,11 +469,11 @@ bool KABEntryPainter::printAddressee( const KABC::Addressee &addr, if ( !address.label().isEmpty() ) { if ( fake ) { rect = painter->boundingRect( Ruler2, y, Width - Ruler2, Height, - Qt::AlignTop | Qt::AlignLeft, + TQt::AlignTop | TQt::AlignLeft, i18n( "(Deliver to:)" ) ); } else { painter->drawText( Ruler2, y, Width - Ruler2, Height, - Qt::AlignTop | Qt::AlignLeft, + TQt::AlignTop | TQt::AlignLeft, i18n( "(Deliver to:)" ), -1, &rect ); } @@ -481,10 +481,10 @@ bool KABEntryPainter::printAddressee( const KABC::Addressee &addr, y += fmBody.lineSpacing() / 4; if ( fake ) { rect = painter->boundingRect( Ruler3, y, Width - Ruler3, Height, - Qt::AlignTop | Qt::AlignLeft, address.label() ); + TQt::AlignTop | TQt::AlignLeft, address.label() ); } else { painter->drawText( Ruler3, y, Width - Ruler3, Height, - Qt::AlignTop | Qt::AlignLeft, address.label(), -1, &rect ); + TQt::AlignTop | TQt::AlignLeft, address.label(), -1, &rect ); } y += rect.height(); @@ -498,11 +498,11 @@ bool KABEntryPainter::printAddressee( const KABC::Addressee &addr, y += fmBody.lineSpacing() / 2; if ( fake ) { rect = painter->boundingRect( 0, y, Width, Height, - Qt::AlignTop | Qt::AlignLeft | Qt::WordBreak, + TQt::AlignTop | TQt::AlignLeft | TQt::WordBreak, addr.note() ); } else { painter->drawText( 0, y, Width, Height, - Qt::AlignTop | Qt::AlignLeft | Qt::WordBreak, + TQt::AlignTop | TQt::AlignLeft | TQt::WordBreak, addr.note(), -1, &rect ); } diff --git a/kaddressbook/printing/kabentrypainter.h b/kaddressbook/printing/kabentrypainter.h index 57ce69d88..6936128fb 100644 --- a/kaddressbook/printing/kabentrypainter.h +++ b/kaddressbook/printing/kabentrypainter.h @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef KABENTRYPAINTER_H @@ -31,7 +31,7 @@ #include <tqrect.h> #include <tqvaluelist.h> -typedef TQValueList<TQRect> QRectList; +typedef TQValueList<TQRect> TQRectList; class KABEntryPainter { @@ -62,9 +62,9 @@ class KABEntryPainter TQPainter *p, int top = 0, bool fake = false, TQRect *rect = 0 ); - void setForegroundColor( const TQColor &color = Qt::black ); - void setBackgroundColor( const TQColor &color = Qt::black ); - void setHeaderColor( const TQColor &color = Qt::white ); + void setForegroundColor( const TQColor &color = TQt::black ); + void setBackgroundColor( const TQColor &color = TQt::black ); + void setHeaderColor( const TQColor &color = TQt::white ); void setHeaderFont( const TQFont &font = TQFont( "Helvetica", 12, TQFont::Normal, true ) ); void setHeadLineFont( const TQFont &font = TQFont( "Helvetica", 12, TQFont::Normal, true ) ); @@ -106,7 +106,7 @@ class KABEntryPainter int hitsURL( const TQPoint &p ); private: - int hits( const QRectList& rects, const TQPoint &p ); + int hits( const TQRectList& rects, const TQPoint &p ); TQColor mForegroundColor; TQColor mBackgroundColor; @@ -124,10 +124,10 @@ class KABEntryPainter bool mShowPhones; bool mShowURLs; - QRectList mEmailRects; - QRectList mPhoneRects; - QRectList mURLRects; - QRectList mTalkRects; + TQRectList mEmailRects; + TQRectList mPhoneRects; + TQRectList mURLRects; + TQRectList mTalkRects; }; #endif diff --git a/kaddressbook/printing/mikesstyle.cpp b/kaddressbook/printing/mikesstyle.cpp index 26312ee1c..d7fb26b8d 100644 --- a/kaddressbook/printing/mikesstyle.cpp +++ b/kaddressbook/printing/mikesstyle.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include <tqpaintdevicemetrics.h> @@ -43,8 +43,8 @@ using namespace KABPrinting; const int mFieldSpacingHint = 2; -MikesStyle::MikesStyle( PrintingWizard *parent, const char *name ) - : PrintStyle( parent, name ) +MikesStyle::MikesStyle( PrintingWizard *tqparent, const char *name ) + : PrintStyle( tqparent, name ) { setPreview( "mike-style.png" ); } @@ -68,7 +68,7 @@ void MikesStyle::print( const KABC::Addressee::List &contacts, PrintProgress *pr mBoldFont = p.font(); mBoldFont.setBold( true ); TQFontMetrics fm( mFont ); - TQPaintDeviceMetrics metrics( p.device() ); + TQPaintDeviceMetrics metrics( p.tqdevice() ); int height = 0; KABC::Addressee::List::ConstIterator it; @@ -141,14 +141,14 @@ void MikesStyle::doPaint( TQPainter &painter, const KABC::Addressee &addr, { TQFontMetrics fm( font ); TQFontMetrics bfm( bFont ); - TQPaintDeviceMetrics metrics( painter.device() ); + TQPaintDeviceMetrics metrics( painter.tqdevice() ); int margin = 10; int width = metrics.width() - 10; int xPos = 5; int yPos = 0; - TQBrush brush( Qt::lightGray ); + TQBrush brush( TQt::lightGray ); - painter.setPen( Qt::black ); + painter.setPen( TQt::black ); painter.drawRect( xPos, yPos, width, maxHeight ); // The header @@ -207,7 +207,7 @@ void MikesStyle::paintTagLine( TQPainter &p, const TQFont &font ) TQString text = i18n( "Printed on %1 by KAddressBook (http://www.kde.org)" ) .arg( KGlobal::locale()->formatDateTime( TQDateTime::tqcurrentDateTime() ) ); - p.setPen( Qt::black ); + p.setPen( TQt::black ); p.drawText( 0, fm.height(), text ); } @@ -235,7 +235,7 @@ int MikesStyle::calcHeight( const KABC::Addressee &addr, for ( int i = numFields / 2; i < numFields; i++ ) halfHeight += fm.height() * (fieldList[ i ]->value( addr ).tqcontains( '\n' ) + 1); - height = QMAX( height, halfHeight ); + height = TQMAX( height, halfHeight ); // Add the title and the spacing height += bfm.height() + ((numFields / 2 + 3) * mFieldSpacingHint); @@ -244,8 +244,8 @@ int MikesStyle::calcHeight( const KABC::Addressee &addr, } -MikesStyleFactory::MikesStyleFactory( PrintingWizard *parent, const char *name ) - : PrintStyleFactory( parent, name ) +MikesStyleFactory::MikesStyleFactory( PrintingWizard *tqparent, const char *name ) + : PrintStyleFactory( tqparent, name ) { } diff --git a/kaddressbook/printing/mikesstyle.h b/kaddressbook/printing/mikesstyle.h index dbfabf178..6b61287d6 100644 --- a/kaddressbook/printing/mikesstyle.h +++ b/kaddressbook/printing/mikesstyle.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef MIKESSTYLE_H @@ -36,9 +36,10 @@ class PrintProgress; class MikesStyle : public PrintStyle { Q_OBJECT + TQ_OBJECT public: - MikesStyle( PrintingWizard *parent, const char *name ); + MikesStyle( PrintingWizard *tqparent, const char *name ); ~MikesStyle(); void print( const KABC::Addressee::List&, PrintProgress* ); @@ -54,7 +55,7 @@ class MikesStyle : public PrintStyle class MikesStyleFactory : public PrintStyleFactory { public: - MikesStyleFactory( PrintingWizard *parent, const char *name = 0 ); + MikesStyleFactory( PrintingWizard *tqparent, const char *name = 0 ); PrintStyle *create() const; TQString description() const; diff --git a/kaddressbook/printing/printingwizard.cpp b/kaddressbook/printing/printingwizard.cpp index 8f2e98f20..949ebd519 100644 --- a/kaddressbook/printing/printingwizard.cpp +++ b/kaddressbook/printing/printingwizard.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include <tqcombobox.h> @@ -53,9 +53,9 @@ using namespace KABPrinting; PrintingWizard::PrintingWizard( KPrinter *printer, KABC::AddressBook* ab, - const TQStringList& selection, TQWidget *parent, + const TQStringList& selection, TQWidget *tqparent, const char* name ) - : KWizard( parent, name ), mPrinter( printer ), mAddressBook( ab ), + : KWizard( tqparent, name ), mPrinter( printer ), mAddressBook( ab ), mSelection( selection ), mStyle( 0 ) { mSelectionPage = new SelectionPage( this ); @@ -162,7 +162,7 @@ void PrintingWizard::print() if ( mSelectionPage->useSelection() ) { TQStringList::ConstIterator it; for ( it = mSelection.begin(); it != mSelection.end(); ++it ) { - KABC::Addressee addr = addressBook()->tqfindByUid( *it ); + KABC::Addressee addr = addressBook()->findByUid( *it ); if ( !addr.isEmpty() ) list.append( addr ); } diff --git a/kaddressbook/printing/printingwizard.h b/kaddressbook/printing/printingwizard.h index ab82a8bcb..54442075c 100644 --- a/kaddressbook/printing/printingwizard.h +++ b/kaddressbook/printing/printingwizard.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef PRINTINGWIZARD_H @@ -50,6 +50,7 @@ namespace KABPrinting { class PrintingWizard : public KWizard { Q_OBJECT + TQ_OBJECT public: /** @@ -58,7 +59,7 @@ class PrintingWizard : public KWizard PrintingWizard( KPrinter *printer, KABC::AddressBook* ab, const TQStringList& selection, - TQWidget *parent = 0, const char *name = 0 ); + TQWidget *tqparent = 0, const char *name = 0 ); ~PrintingWizard(); /** diff --git a/kaddressbook/printing/printprogress.cpp b/kaddressbook/printing/printprogress.cpp index a66ca960e..9e0e3aa91 100644 --- a/kaddressbook/printing/printprogress.cpp +++ b/kaddressbook/printing/printprogress.cpp @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include <tqlayout.h> @@ -34,8 +34,8 @@ using namespace KABPrinting; -PrintProgress::PrintProgress( TQWidget *parent, const char *name ) - : TQWidget( parent, name ) +PrintProgress::PrintProgress( TQWidget *tqparent, const char *name ) + : TQWidget( tqparent, name ) { setCaption( i18n( "Printing: Progress" ) ); diff --git a/kaddressbook/printing/printprogress.h b/kaddressbook/printing/printprogress.h index 916d82058..a27c5fc3f 100644 --- a/kaddressbook/printing/printprogress.h +++ b/kaddressbook/printing/printprogress.h @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef PRINTPROGRESS_H @@ -37,12 +37,13 @@ namespace KABPrinting { information. It is provided to all print styles during a print process. It displays messages and a a progress bar. */ -class PrintProgress : public QWidget +class PrintProgress : public TQWidget { Q_OBJECT + TQ_OBJECT public: - PrintProgress( TQWidget *parent, const char *name = 0 ); + PrintProgress( TQWidget *tqparent, const char *name = 0 ); ~PrintProgress(); /** diff --git a/kaddressbook/printing/printsortmode.cpp b/kaddressbook/printing/printsortmode.cpp index 215a5fa09..685a47ac0 100644 --- a/kaddressbook/printing/printsortmode.cpp +++ b/kaddressbook/printing/printsortmode.cpp @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include <kabc/field.h> diff --git a/kaddressbook/printing/printsortmode.h b/kaddressbook/printing/printsortmode.h index a7992cc6c..69125419b 100644 --- a/kaddressbook/printing/printsortmode.h +++ b/kaddressbook/printing/printsortmode.h @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef PRINTSORTMODE_H diff --git a/kaddressbook/printing/printstyle.cpp b/kaddressbook/printing/printstyle.cpp index 90b196237..02e563eea 100644 --- a/kaddressbook/printing/printstyle.cpp +++ b/kaddressbook/printing/printstyle.cpp @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include <kstandarddirs.h> @@ -32,8 +32,8 @@ using namespace KABPrinting; -PrintStyle::PrintStyle( PrintingWizard* parent, const char* name ) - : TQObject( parent, name ), mWizard( parent ), mSortField( 0 ) +PrintStyle::PrintStyle( PrintingWizard* tqparent, const char* name ) + : TQObject( tqparent, name ), mWizard( tqparent ), mSortField( 0 ) { } @@ -76,7 +76,7 @@ PrintingWizard *PrintStyle::wizard() void PrintStyle::addPage( TQWidget *page, const TQString &title ) { - if ( mPageList.find( page ) == -1 ) { // not yet in the list + if ( mPageList.tqfind( page ) == -1 ) { // not yet in the list mPageList.append( page ); mPageTitles.append( title ); } @@ -118,8 +118,8 @@ bool PrintStyle::preferredSortType() return mSortType; } -PrintStyleFactory::PrintStyleFactory( PrintingWizard* parent, const char* name ) - : mParent( parent ), mName( name ) +PrintStyleFactory::PrintStyleFactory( PrintingWizard* tqparent, const char* name ) + : mParent( tqparent ), mName( name ) { } diff --git a/kaddressbook/printing/printstyle.h b/kaddressbook/printing/printstyle.h index 19dbf3bc5..f7e471e25 100644 --- a/kaddressbook/printing/printstyle.h +++ b/kaddressbook/printing/printstyle.h @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef PRINTSTYLE_H @@ -57,12 +57,13 @@ class PrintProgress; to the wizard object. */ -class PrintStyle : public QObject +class PrintStyle : public TQObject { Q_OBJECT + TQ_OBJECT public: - PrintStyle( PrintingWizard* parent, const char* name = 0 ); + PrintStyle( PrintingWizard* tqparent, const char* name = 0 ); virtual ~PrintStyle(); /** @@ -150,7 +151,7 @@ class PrintStyle : public QObject class PrintStyleFactory { public: - PrintStyleFactory( PrintingWizard* parent, const char* name = 0 ); + PrintStyleFactory( PrintingWizard* tqparent, const char* name = 0 ); virtual ~PrintStyleFactory(); virtual PrintStyle *create() const = 0; diff --git a/kaddressbook/printing/selectionpage.cpp b/kaddressbook/printing/selectionpage.cpp index e926d0dba..bf0a49a08 100644 --- a/kaddressbook/printing/selectionpage.cpp +++ b/kaddressbook/printing/selectionpage.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include <kdialog.h> @@ -38,8 +38,8 @@ #include "selectionpage.h" -SelectionPage::SelectionPage( TQWidget* parent, const char* name ) - : TQWidget( parent, name ) +SelectionPage::SelectionPage( TQWidget* tqparent, const char* name ) + : TQWidget( tqparent, name ) { setCaption( i18n( "Choose Which Contacts to Print" ) ); @@ -51,12 +51,12 @@ 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->tqlayout()->setSpacing( KDialog::spacingHint() ); mButtonGroup->tqlayout()->setMargin( KDialog::marginHint() ); TQGridLayout *groupLayout = new TQGridLayout( mButtonGroup->tqlayout() ); - groupLayout->tqsetAlignment( Qt::AlignTop ); + groupLayout->tqsetAlignment( TQt::AlignTop ); mUseWholeBook = new TQRadioButton( i18n( "&All contacts" ), mButtonGroup ); mUseWholeBook->setChecked( true ); @@ -76,7 +76,7 @@ SelectionPage::SelectionPage( TQWidget* parent, const char* name ) mUseCategories = new TQRadioButton( i18n( "Category &members" ), mButtonGroup ); TQWhatsThis::add( mUseCategories, i18n( "Only print contacts who are members of a category that is checked on the list to the left.\n" "This option is disabled if you have no categories." ) ); - groupLayout->addWidget( mUseCategories, 3, 0, Qt::AlignTop ); + groupLayout->addWidget( mUseCategories, 3, 0, TQt::AlignTop ); mFiltersCombo = new TQComboBox( false, mButtonGroup ); TQWhatsThis::add( mFiltersCombo, i18n( "Select a filter to decide which contacts to print." ) ); diff --git a/kaddressbook/printing/selectionpage.h b/kaddressbook/printing/selectionpage.h index 031b0b5e2..dded01ecd 100644 --- a/kaddressbook/printing/selectionpage.h +++ b/kaddressbook/printing/selectionpage.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef SELECTIONPAGE_H #define SELECTIONPAGE_H @@ -32,12 +32,13 @@ class TQListView; class TQListViewItem; class TQRadioButton; -class SelectionPage : public QWidget +class SelectionPage : public TQWidget { Q_OBJECT + TQ_OBJECT public: - SelectionPage( TQWidget* parent = 0, const char* name = 0 ); + SelectionPage( TQWidget* tqparent = 0, const char* name = 0 ); ~SelectionPage(); void setFilters( const TQStringList& ); diff --git a/kaddressbook/printing/stylepage.cpp b/kaddressbook/printing/stylepage.cpp index 172e7df7c..721cffaa0 100644 --- a/kaddressbook/printing/stylepage.cpp +++ b/kaddressbook/printing/stylepage.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include <tqbuttongroup.h> @@ -34,8 +34,8 @@ #include "stylepage.h" -StylePage::StylePage( KABC::AddressBook *ab, TQWidget* parent, const char* name ) - : TQWidget( parent, name ), mAddressBook( ab ) +StylePage::StylePage( KABC::AddressBook *ab, TQWidget* tqparent, const char* name ) + : TQWidget( tqparent, name ), mAddressBook( ab ) { initGUI(); @@ -121,10 +121,10 @@ 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->tqlayout(), 2, 2, KDialog::spacingHint() ); - sortLayout->tqsetAlignment( Qt::AlignTop ); + sortLayout->tqsetAlignment( TQt::AlignTop ); label = new TQLabel( i18n( "Criterion:" ), group ); sortLayout->addWidget( label, 0, 0 ); @@ -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->tqlayout(), KDialog::spacingHint() ); diff --git a/kaddressbook/printing/stylepage.h b/kaddressbook/printing/stylepage.h index 91be390fc..24d424597 100644 --- a/kaddressbook/printing/stylepage.h +++ b/kaddressbook/printing/stylepage.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef STYLEPAGE_H @@ -35,12 +35,13 @@ class TQPixmap; class TQRadioButton; class KComboBox; -class StylePage : public QWidget +class StylePage : public TQWidget { Q_OBJECT + TQ_OBJECT public: - StylePage( KABC::AddressBook *ab, TQWidget* parent = 0, const char* name = 0 ); + StylePage( KABC::AddressBook *ab, TQWidget* tqparent = 0, const char* name = 0 ); ~StylePage(); /** diff --git a/kaddressbook/searchmanager.cpp b/kaddressbook/searchmanager.cpp index 374a1af5b..462451f3e 100644 --- a/kaddressbook/searchmanager.cpp +++ b/kaddressbook/searchmanager.cpp @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include <config.h> // FOR KDEPIM_NEW_DISTRLISTS @@ -30,8 +30,8 @@ using namespace KAB; SearchManager::SearchManager( KABC::AddressBook *ab, - TQObject *parent, const char *name ) - : TQObject( parent, name ), mAddressBook( ab ) + TQObject *tqparent, const char *name ) + : TQObject( tqparent, name ), mAddressBook( ab ) { } @@ -117,7 +117,7 @@ void SearchManager::search( const TQString &pattern, const KABC::Field::List &fi mContacts.append( *it ); found = true; break; - } else if ( type == Contains && (*fieldIt)->value( *it ).find( pattern, 0, false ) != -1 ) { + } else if ( type == Contains && (*fieldIt)->value( *it ).tqfind( pattern, 0, false ) != -1 ) { mContacts.append( *it ); found = true; break; @@ -135,7 +135,7 @@ void SearchManager::search( const TQString &pattern, const KABC::Field::List &fi TQStringList::ConstIterator customIt( customs.begin() ); const TQStringList::ConstIterator customEndIt( customs.end() ); for ( ; customIt != customEndIt; ++customIt ) { - int pos = (*customIt).find( ':' ); + int pos = (*customIt).tqfind( ':' ); if ( pos != -1 ) { const TQString value = (*customIt).mid( pos + 1 ); if ( type == StartsWith && value.startsWith( pattern, false ) ) { @@ -144,7 +144,7 @@ void SearchManager::search( const TQString &pattern, const KABC::Field::List &fi } else if ( type == EndsWith && value.endsWith( pattern, false ) ) { mContacts.append( *it ); break; - } else if ( type == Contains && value.find( pattern, 0, false ) != -1 ) { + } else if ( type == Contains && value.tqfind( pattern, 0, false ) != -1 ) { mContacts.append( *it ); break; } else if ( type == Equals && value.localeAwareCompare( pattern ) == 0 ) { diff --git a/kaddressbook/searchmanager.h b/kaddressbook/searchmanager.h index 88ce94c7b..8443c7d36 100644 --- a/kaddressbook/searchmanager.h +++ b/kaddressbook/searchmanager.h @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef SEARCHMANAGER_H @@ -34,9 +34,10 @@ namespace KAB { -class SearchManager : public QObject +class SearchManager : public TQObject { Q_OBJECT + TQ_OBJECT public: enum Type { @@ -47,7 +48,7 @@ class SearchManager : public QObject }; SearchManager( KABC::AddressBook *ab, - TQObject *parent, const char *name = 0 ); + TQObject *tqparent, const char *name = 0 ); /** This method takes a pattern and searches for a match of the specified diff --git a/kaddressbook/secrecywidget.cpp b/kaddressbook/secrecywidget.cpp index 4db7197a1..34ff25ebf 100644 --- a/kaddressbook/secrecywidget.cpp +++ b/kaddressbook/secrecywidget.cpp @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include <tqlayout.h> @@ -29,8 +29,8 @@ #include "secrecywidget.h" -SecrecyWidget::SecrecyWidget( TQWidget *parent, const char *name ) - : TQWidget( parent, name ) +SecrecyWidget::SecrecyWidget( TQWidget *tqparent, const char *name ) + : TQWidget( tqparent, name ) { TQVBoxLayout *tqlayout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() ); diff --git a/kaddressbook/secrecywidget.h b/kaddressbook/secrecywidget.h index 0c07c0156..40492587e 100644 --- a/kaddressbook/secrecywidget.h +++ b/kaddressbook/secrecywidget.h @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef SECRECYWIDGET_H @@ -29,12 +29,13 @@ namespace KABC { class Secrecy; } class KComboBox; -class SecrecyWidget : public QWidget +class SecrecyWidget : public TQWidget { Q_OBJECT + TQ_OBJECT public: - SecrecyWidget( TQWidget *parent, const char *name = 0 ); + SecrecyWidget( TQWidget *tqparent, const char *name = 0 ); ~SecrecyWidget(); void setSecrecy( const KABC::Secrecy &secrecy ); diff --git a/kaddressbook/simpleaddresseeeditor.cpp b/kaddressbook/simpleaddresseeeditor.cpp index f55ab303b..d5eb004d5 100644 --- a/kaddressbook/simpleaddresseeeditor.cpp +++ b/kaddressbook/simpleaddresseeeditor.cpp @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include <tqlayout.h> @@ -30,8 +30,8 @@ #include "simpleaddresseeeditor.h" -SimpleAddresseeEditor::SimpleAddresseeEditor( TQWidget *parent, const char *name ) - : AddresseeEditorBase( parent, name ), +SimpleAddresseeEditor::SimpleAddresseeEditor( TQWidget *tqparent, const char *name ) + : AddresseeEditorBase( tqparent, name ), mDirty( false ), mBlockModified( false ) { diff --git a/kaddressbook/simpleaddresseeeditor.h b/kaddressbook/simpleaddresseeeditor.h index f8e16fb26..2ea10a822 100644 --- a/kaddressbook/simpleaddresseeeditor.h +++ b/kaddressbook/simpleaddresseeeditor.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef SIMPLEADDRESSEEEDITOR_H @@ -32,8 +32,9 @@ class KLineEdit; class SimpleAddresseeEditor : public AddresseeEditorBase { Q_OBJECT + TQ_OBJECT public: - SimpleAddresseeEditor( TQWidget *parent, const char *name = 0 ); + SimpleAddresseeEditor( TQWidget *tqparent, const char *name = 0 ); ~SimpleAddresseeEditor(); void setAddressee( const KABC::Addressee& ); diff --git a/kaddressbook/soundwidget.cpp b/kaddressbook/soundwidget.cpp index f94a72d24..bb0956363 100644 --- a/kaddressbook/soundwidget.cpp +++ b/kaddressbook/soundwidget.cpp @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include <kabc/sound.h> @@ -39,8 +39,8 @@ #include "soundwidget.h" -SoundWidget::SoundWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name ) - : KAB::ContactEditorWidget( ab, parent, name ), mReadOnly( false ) +SoundWidget::SoundWidget( KABC::AddressBook *ab, TQWidget *tqparent, const char *name ) + : KAB::ContactEditorWidget( ab, tqparent, name ), mReadOnly( false ) { TQGridLayout *topLayout = new TQGridLayout( this, 2, 3, KDialog::marginHint(), KDialog::spacingHint() ); @@ -48,7 +48,7 @@ SoundWidget::SoundWidget( KABC::AddressBook *ab, TQWidget *parent, const char *n TQLabel *label = new TQLabel( this ); label->setPixmap( KGlobal::iconLoader()->loadIcon( "multimedia", KIcon::Desktop, KIcon::SizeMedium ) ); - label->tqsetAlignment( Qt::AlignTop ); + label->tqsetAlignment( TQt::AlignTop ); topLayout->addMultiCellWidget( label, 0, 1, 0, 0 ); mPlayButton = new TQPushButton( i18n( "Play" ), this ); @@ -77,7 +77,7 @@ SoundWidget::SoundWidget( KABC::AddressBook *ab, TQWidget *parent, const char *n connect( mPlayButton, TQT_SIGNAL( clicked() ), TQT_SLOT( playSound() ) ); - TQWhatsThis::add( this, i18n( "This field stores a sound file which tqcontains the name of the contact to clarify the pronunciation." ) ); + TQWhatsThis::add( this, i18n( "This field stores a sound file which contains the name of the contact to clarify the pronunciation." ) ); TQWhatsThis::add( mUseSoundUrl, i18n( "Save only the URL to the sound file, not the whole object." ) ); } diff --git a/kaddressbook/soundwidget.h b/kaddressbook/soundwidget.h index 679609c6c..66fb74779 100644 --- a/kaddressbook/soundwidget.h +++ b/kaddressbook/soundwidget.h @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef SOUNDWIDGET_H @@ -36,9 +36,10 @@ class TQPushButton; class SoundWidget : public KAB::ContactEditorWidget { Q_OBJECT + TQ_OBJECT public: - SoundWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 ); + SoundWidget( KABC::AddressBook *ab, TQWidget *tqparent, const char *name = 0 ); ~SoundWidget(); void loadContact( KABC::Addressee *addr ); @@ -64,9 +65,9 @@ class SoundWidget : public KAB::ContactEditorWidget class SoundWidgetFactory : public KAB::ContactEditorWidgetFactory { public: - KAB::ContactEditorWidget *createWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name ) + KAB::ContactEditorWidget *createWidget( KABC::AddressBook *ab, TQWidget *tqparent, const char *name ) { - return new SoundWidget( ab, parent, name ); + return new SoundWidget( ab, tqparent, name ); } TQString pageIdentifier() const { return "misc"; } diff --git a/kaddressbook/thumbnailcreator/ldifvcardcreator.cpp b/kaddressbook/thumbnailcreator/ldifvcardcreator.cpp index 6a8e495d5..eb6b76700 100644 --- a/kaddressbook/thumbnailcreator/ldifvcardcreator.cpp +++ b/kaddressbook/thumbnailcreator/ldifvcardcreator.cpp @@ -184,9 +184,9 @@ bool VCard_LDIFCreator::createImageSmall() // render the information TQRect rect; int rest = mPixmap.width() - (numCharsPerLine * chSize.width()); - xborder = QMAX( xborder, rest / 2 ); // center horizontally + xborder = TQMAX( xborder, rest / 2 ); // center horizontally rest = mPixmap.height() - (numLines * chSize.height()); - yborder = QMAX( yborder, rest / 2 ); // center vertically + yborder = TQMAX( yborder, rest / 2 ); // center vertically // end centering int x = xborder, y = yborder; // where to paint the characters @@ -207,7 +207,7 @@ bool VCard_LDIFCreator::createImageSmall() // after starting a new line, we also jump to the next // physical newline in the file if we don't come from one if ( !newLine ) { - int pos = text.find( '\n', i ); + int pos = text.tqfind( '\n', i ); if ( pos > (int) i ) i = pos +1; } @@ -228,7 +228,7 @@ bool VCard_LDIFCreator::createImageSmall() rect = mSplitter->coordinates( ch ); if ( !rect.isEmpty() ) - bitBlt( &mPixmap, TQPoint(x,y), fontPixmap, rect, Qt::CopyROP ); + bitBlt( &mPixmap, TQPoint(x,y), fontPixmap, rect, TQt::CopyROP ); x += xOffset; // next character } diff --git a/kaddressbook/typecombo.h b/kaddressbook/typecombo.h index a8bbb4ca3..0648bf427 100644 --- a/kaddressbook/typecombo.h +++ b/kaddressbook/typecombo.h @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef TYPECOMBO_H @@ -37,7 +37,7 @@ class TypeCombo : public KComboBox typedef typename T::List List; typedef typename T::List::Iterator Iterator; - TypeCombo( List &list, TQWidget *parent, const char *name = 0 ); + TypeCombo( List &list, TQWidget *tqparent, const char *name = 0 ); void setLineEdit( TQLineEdit *edit ) { mLineEdit = edit; } TQLineEdit *lineEdit() const { return mLineEdit; } @@ -62,9 +62,9 @@ class TypeCombo : public KComboBox }; template <class T> -TypeCombo<T>::TypeCombo( TypeCombo::List &list, TQWidget *parent, +TypeCombo<T>::TypeCombo( TypeCombo::List &list, TQWidget *tqparent, const char *name ) - : KComboBox( parent, name ), + : KComboBox( tqparent, name ), mTypeList( list ) { } diff --git a/kaddressbook/undocmds.cpp b/kaddressbook/undocmds.cpp index bd26270fa..c0cd5a8a6 100644 --- a/kaddressbook/undocmds.cpp +++ b/kaddressbook/undocmds.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include <tqapplication.h> @@ -84,7 +84,7 @@ void DeleteCommand::execute() TQStringList::ConstIterator it; const TQStringList::ConstIterator endIt( mUIDList.end() ); for ( it = mUIDList.begin(); it != endIt; ++it ) { - addr = addressBook()->tqfindByUid( *it ); + addr = addressBook()->findByUid( *it ); lock()->lock( addr.resource() ); mAddresseeList.append( addr ); AddresseeConfig cfg( addr ); @@ -261,7 +261,7 @@ void CutCommand::unexecute() mAddresseeList.clear(); - QClipboard *cb = TQApplication::clipboard(); + TQClipboard *cb = TQApplication::clipboard(); kapp->processEvents(); cb->setText( mOldText ); } @@ -273,7 +273,7 @@ void CutCommand::execute() TQStringList::ConstIterator it; const TQStringList::ConstIterator endIt( mUIDList.end() ); for ( it = mUIDList.begin(); it != endIt; ++it ) { - addr = addressBook()->tqfindByUid( *it ); + addr = addressBook()->findByUid( *it ); mAddresseeList.append( addr ); lock()->lock( addr.resource() ); } @@ -289,7 +289,7 @@ void CutCommand::execute() // Convert to clipboard mClipText = AddresseeUtil::addresseesToClipboard( mAddresseeList ); - QClipboard *cb = TQApplication::clipboard(); + TQClipboard *cb = TQApplication::clipboard(); mOldText = cb->text(); kapp->processEvents(); #if defined(KABC_VCARD_ENCODING_FIX) @@ -332,7 +332,7 @@ void CopyToCommand::execute() TQStringList::Iterator it( mUIDList.begin() ); const TQStringList::Iterator endIt( mUIDList.end() ); while ( it != endIt ) { - KABC::Addressee addr = addressBook()->tqfindByUid( *it++ ); + KABC::Addressee addr = addressBook()->findByUid( *it++ ); if ( !addr.isEmpty() ) { KABC::Addressee newAddr( addr ); // We need to set a new uid, otherwise the insert below is @@ -379,7 +379,7 @@ void MoveToCommand::moveContactTo( KABC::Resource *resource ) TQStringList::Iterator it( mUIDList.begin() ); const TQStringList::Iterator endIt( mUIDList.end() ); while ( it != endIt ) { - KABC::Addressee addr = addressBook()->tqfindByUid( *it++ ); + KABC::Addressee addr = addressBook()->findByUid( *it++ ); if ( !addr.isEmpty() ) { KABC::Addressee newAddr( addr ); // We need to set a new uid, otherwise the insert below is @@ -391,7 +391,7 @@ void MoveToCommand::moveContactTo( KABC::Resource *resource ) addressBook()->insertAddressee( newAddr ); mAddresseeList.append( newAddr ); mUIDList.append( uid ); - const bool inserted = addressBook()->find( newAddr ) != addressBook()->end(); + const bool inserted = addressBook()->tqfind( newAddr ) != addressBook()->end(); if ( inserted ) { if ( resourceExist( addr.resource() ) ) { KABLock::self( addressBook() )->lock( addr.resource() ); diff --git a/kaddressbook/undocmds.h b/kaddressbook/undocmds.h index 43f6aae99..55c437676 100644 --- a/kaddressbook/undocmds.h +++ b/kaddressbook/undocmds.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef COMMANDS_H diff --git a/kaddressbook/viewconfigurefieldspage.cpp b/kaddressbook/viewconfigurefieldspage.cpp index 453f47587..7951bc770 100644 --- a/kaddressbook/viewconfigurefieldspage.cpp +++ b/kaddressbook/viewconfigurefieldspage.cpp @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include <tqlabel.h> @@ -36,14 +36,14 @@ #include "viewconfigurefieldspage.h" -class FieldItem : public QListBoxText +class FieldItem : public TQListBoxText { public: - FieldItem( TQListBox *parent, KABC::Field *field ) - : TQListBoxText( parent, field->label() ), mField( field ) {} + FieldItem( TQListBox *tqparent, KABC::Field *field ) + : TQListBoxText( tqparent, field->label() ), mField( field ) {} - FieldItem( TQListBox *parent, KABC::Field *field, int index ) - : TQListBoxText( parent, field->label(), parent->item( index ) ), + FieldItem( TQListBox *tqparent, KABC::Field *field, int index ) + : TQListBoxText( tqparent, field->label(), tqparent->item( index ) ), mField( field ) {} KABC::Field *field() { return mField; } @@ -54,9 +54,9 @@ class FieldItem : public QListBoxText ViewConfigureFieldsPage::ViewConfigureFieldsPage( KABC::AddressBook *ab, - TQWidget *parent, + TQWidget *tqparent, const char *name ) - : TQWidget( parent, name ), mAddressBook( ab ) + : TQWidget( tqparent, name ), mAddressBook( ab ) { initGUI(); } diff --git a/kaddressbook/viewconfigurefieldspage.h b/kaddressbook/viewconfigurefieldspage.h index eae950850..991a7e1c7 100644 --- a/kaddressbook/viewconfigurefieldspage.h +++ b/kaddressbook/viewconfigurefieldspage.h @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef VIEWCONFIGUREFIELDSPAGE_H @@ -35,12 +35,13 @@ class TQListBoxItem; class TQPushButton; class TQToolButton; -class ViewConfigureFieldsPage : public QWidget +class ViewConfigureFieldsPage : public TQWidget { Q_OBJECT + TQ_OBJECT public: - ViewConfigureFieldsPage( KABC::AddressBook *ab, TQWidget *parent = 0, + ViewConfigureFieldsPage( KABC::AddressBook *ab, TQWidget *tqparent = 0, const char *name = 0 ); void restoreSettings( KConfig* ); diff --git a/kaddressbook/viewconfigurefilterpage.cpp b/kaddressbook/viewconfigurefilterpage.cpp index 923743f85..fe9cf4418 100644 --- a/kaddressbook/viewconfigurefilterpage.cpp +++ b/kaddressbook/viewconfigurefilterpage.cpp @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include <tqbuttongroup.h> @@ -34,9 +34,9 @@ #include "viewconfigurefilterpage.h" #include "filter.h" -ViewConfigureFilterPage::ViewConfigureFilterPage( TQWidget *parent, +ViewConfigureFilterPage::ViewConfigureFilterPage( TQWidget *tqparent, const char *name ) - : TQWidget( parent, name ) + : TQWidget( tqparent, name ) { TQBoxLayout *topLayout = new TQVBoxLayout( this, 0, KDialog::spacingHint() ); @@ -47,7 +47,7 @@ ViewConfigureFilterPage::ViewConfigureFilterPage( TQWidget *parent, " this view is displayed. This feature allows you to configure views that only" " interact with certain types of information based on the filter. Once the view" " is activated, the filter can be changed at anytime." ), this ); - label->tqsetAlignment( Qt::AlignLeft | Qt::AlignTop | Qt::WordBreak ); + label->tqsetAlignment( TQt::AlignLeft | TQt::AlignTop | TQt::WordBreak ); topLayout->addWidget( label ); TQWidget *spacer = new TQWidget( this ); diff --git a/kaddressbook/viewconfigurefilterpage.h b/kaddressbook/viewconfigurefilterpage.h index 77d0bde65..4459a1cea 100644 --- a/kaddressbook/viewconfigurefilterpage.h +++ b/kaddressbook/viewconfigurefilterpage.h @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef VIEWCONFIGUREFILTERPAGE @@ -31,12 +31,13 @@ class TQButtonGroup; class KComboBox; class KConfig; -class ViewConfigureFilterPage : public QWidget +class ViewConfigureFilterPage : public TQWidget { Q_OBJECT + TQ_OBJECT public: - ViewConfigureFilterPage( TQWidget *parent, const char *name = 0 ); + ViewConfigureFilterPage( TQWidget *tqparent, const char *name = 0 ); ~ViewConfigureFilterPage(); void restoreSettings( KConfig* ); diff --git a/kaddressbook/viewconfigurewidget.cpp b/kaddressbook/viewconfigurewidget.cpp index f75fe1cec..1045988c2 100644 --- a/kaddressbook/viewconfigurewidget.cpp +++ b/kaddressbook/viewconfigurewidget.cpp @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include <tqlayout.h> @@ -37,9 +37,9 @@ #include "viewconfigurewidget.h" -ViewConfigureWidget::ViewConfigureWidget( KABC::AddressBook *ab, TQWidget *parent, +ViewConfigureWidget::ViewConfigureWidget( KABC::AddressBook *ab, TQWidget *tqparent, const char *name ) - : KAB::ConfigureWidget( ab, parent, name ) + : KAB::ConfigureWidget( ab, tqparent, name ) { TQVBoxLayout *topLayout = new TQVBoxLayout( this ); @@ -47,7 +47,7 @@ ViewConfigureWidget::ViewConfigureWidget( KABC::AddressBook *ab, TQWidget *paren topLayout->addWidget( mMainWidget ); // Add the first page, the attributes - TQVBox *page = addPage( i18n( "Fields" ), TQString::null, + TQVBox *page = addPage( i18n( "Fields" ), TQString(), KGlobal::iconLoader()->loadIcon( "view_detailed", KIcon::Panel ) ); @@ -55,7 +55,7 @@ ViewConfigureWidget::ViewConfigureWidget( KABC::AddressBook *ab, TQWidget *paren mFieldsPage = new ViewConfigureFieldsPage( addressBook(), page ); // Add the second page, the filter selection - page = addPage( i18n( "Default Filter" ), TQString::null, + page = addPage( i18n( "Default Filter" ), TQString(), KGlobal::iconLoader()->loadIcon( "filter", KIcon::Panel ) ); @@ -85,9 +85,9 @@ TQVBox *ViewConfigureWidget::addPage( const TQString &item, const TQString &head } ViewConfigureDialog::ViewConfigureDialog( ViewConfigureWidget *wdg, const TQString &viewName, - TQWidget *parent, const char *name ) + TQWidget *tqparent, const char *name ) : KDialogBase( Swallow, i18n( "Modify View: " ) + viewName, Help | Ok | Cancel, - Ok, parent, name, true, true ), mConfigWidget( wdg ) + Ok, tqparent, name, true, true ), mConfigWidget( wdg ) { setMainWidget( mConfigWidget ); diff --git a/kaddressbook/viewconfigurewidget.h b/kaddressbook/viewconfigurewidget.h index d3f7022ca..7abcf22f4 100644 --- a/kaddressbook/viewconfigurewidget.h +++ b/kaddressbook/viewconfigurewidget.h @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef VIEWCONFIGUREWIDGET_H @@ -48,9 +48,10 @@ class ViewConfigureFilterPage; class KDE_EXPORT ViewConfigureWidget : public KAB::ConfigureWidget { Q_OBJECT + TQ_OBJECT public: - ViewConfigureWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 ); + ViewConfigureWidget( KABC::AddressBook *ab, TQWidget *tqparent, const char *name = 0 ); virtual ~ViewConfigureWidget(); /** @@ -74,7 +75,7 @@ class KDE_EXPORT ViewConfigureWidget : public KAB::ConfigureWidget /** Use this method to add new pages to the widget. */ - TQVBox *addPage( const TQString &item, const TQString &header = TQString::null, + TQVBox *addPage( const TQString &item, const TQString &header = TQString(), const TQPixmap &pixmap = TQPixmap() ); private: @@ -87,10 +88,11 @@ class KDE_EXPORT ViewConfigureWidget : public KAB::ConfigureWidget class ViewConfigureDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: ViewConfigureDialog( ViewConfigureWidget *wdg, const TQString &viewName, - TQWidget *parent, const char *name = 0 ); + TQWidget *tqparent, const char *name = 0 ); ~ViewConfigureDialog(); void restoreSettings( KConfig* ); diff --git a/kaddressbook/viewmanager.cpp b/kaddressbook/viewmanager.cpp index 46eb653b5..e6d046450 100644 --- a/kaddressbook/viewmanager.cpp +++ b/kaddressbook/viewmanager.cpp @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include <tqfile.h> @@ -49,8 +49,8 @@ #include "viewmanager.h" -ViewManager::ViewManager( KAB::Core *core, TQWidget *parent, const char *name ) - : TQWidget( parent, name ), mCore( core ), mActiveView( 0 ), +ViewManager::ViewManager( KAB::Core *core, TQWidget *tqparent, const char *name ) + : TQWidget( tqparent, name ), mCore( core ), mActiveView( 0 ), mFilterSelectionWidget( 0 ) { initGUI(); @@ -133,7 +133,7 @@ KABC::Addressee::List ViewManager::selectedAddressees() const const TQStringList uids = selectedUids(); TQStringList::ConstIterator it; for ( it = uids.begin(); it != uids.end(); ++it ) { - KABC::Addressee addr = mCore->addressBook()->tqfindByUid( *it ); + KABC::Addressee addr = mCore->addressBook()->findByUid( *it ); if ( !addr.isEmpty() ) list.append( addr ); } @@ -195,7 +195,7 @@ void ViewManager::setActiveView( const TQString &name ) // we can't find it, it means it hasn't been instantiated, so we will // create it on demand. - view = mViewDict.find( name ); + view = mViewDict.tqfind( name ); // Check if we found the view. If we didn't, then we need to create it if ( view == 0 ) { @@ -205,7 +205,7 @@ void ViewManager::setActiveView( const TQString &name ) kdDebug(5720) << "ViewManager::setActiveView: creating view - " << name << endl; - ViewFactory *factory = mViewFactoryDict.find( type ); + ViewFactory *factory = mViewFactoryDict.tqfind( type ); if ( factory ) view = factory->view( mCore, mViewWidgetStack ); @@ -265,7 +265,7 @@ void ViewManager::editView() if ( !mActiveView ) return; - ViewFactory *factory = mViewFactoryDict.find( mActiveView->type() ); + ViewFactory *factory = mViewFactoryDict.tqfind( mActiveView->type() ); ViewConfigureWidget *wdg = 0; if ( factory ) { @@ -436,7 +436,7 @@ void ViewManager::dropped( TQDropEvent *e ) } else if ( KVCardDrag::decode( e, list ) ) { KABC::Addressee::List::ConstIterator it; for ( it = list.begin(); it != list.end(); ++it ) { - KABC::Addressee a = mCore->addressBook()->tqfindByUid( (*it).uid() ); + KABC::Addressee a = mCore->addressBook()->findByUid( (*it).uid() ); if ( a.isEmpty() ) { // not yet in address book mCore->addressBook()->insertAddressee( *it ); emit modified(); @@ -459,7 +459,7 @@ void ViewManager::startDrag() TQStringList::ConstIterator it; for ( it = uidList.begin(); it != uidList.end(); ++it ) - addrList.append( mCore->addressBook()->tqfindByUid( *it ) ); + addrList.append( mCore->addressBook()->findByUid( *it ) ); KMultipleDrag *drag = new KMultipleDrag( this ); @@ -519,7 +519,7 @@ void ViewManager::setActiveFilter( int index ) if ( mActiveView ) { mActiveView->setFilter( currentFilter ); mActiveView->refresh(); - emit selected( TQString::null ); + emit selected( TQString() ); } } diff --git a/kaddressbook/viewmanager.h b/kaddressbook/viewmanager.h index 06405ac64..15fd68fdd 100644 --- a/kaddressbook/viewmanager.h +++ b/kaddressbook/viewmanager.h @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef VIEWMANAGER_H @@ -47,12 +47,13 @@ namespace KABC { class AddressBook; } The view manager will also create and manage all dialogs directly related to views (ie: AddView, ConfigureView, DeleteView, etc). */ -class ViewManager : public QWidget +class ViewManager : public TQWidget { Q_OBJECT + TQ_OBJECT public: - ViewManager( KAB::Core *core, TQWidget *parent, const char *name = 0 ); + ViewManager( KAB::Core *core, TQWidget *tqparent, const char *name = 0 ); ~ViewManager(); void restoreSettings(); @@ -70,10 +71,10 @@ class ViewManager : public QWidget KABC::Field::List viewFields() const; public slots: - void setSelected( const TQString &uid = TQString::null, bool selected = true ); + void setSelected( const TQString &uid = TQString(), bool selected = true ); void setFirstSelected( bool selected = true ); - void refreshView( const TQString &uid = TQString::null ); + void refreshView( const TQString &uid = TQString() ); void editView(); void deleteView(); void addView(); diff --git a/kaddressbook/views/cardview.cpp b/kaddressbook/views/cardview.cpp index 5c8ccf827..9149c6536 100644 --- a/kaddressbook/views/cardview.cpp +++ b/kaddressbook/views/cardview.cpp @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ @@ -39,11 +39,11 @@ #define MIN_ITEM_WIDTH 80 -class CardViewTip : public QLabel +class CardViewTip : public TQLabel { public: - CardViewTip( TQWidget *parent = 0, const char *name = 0 ) - : TQLabel( parent, name ) + CardViewTip( TQWidget *tqparent = 0, const char *name = 0 ) + : TQLabel( tqparent, name ) { setPalette( TQToolTip::palette() ); setFrameStyle( Panel | Plain ); @@ -61,7 +61,7 @@ class CardViewTip : public QLabel }; // -// Warning: make sure you use findRef() instead of find() to find an +// Warning: make sure you use findRef() instead of tqfind() to find an // item! Only the pointer value is unique in the list. // class CardViewItemList : public TQPtrList<CardViewItem> @@ -136,7 +136,7 @@ class CardViewPrivate mCurrentItem( 0L ), mLastClickPos( TQPoint(0, 0) ), mRubberBandAnchor( 0 ), - mCompText( TQString::null ) + mCompText( TQString() ) {}; CardViewItemList mItemList; @@ -192,8 +192,8 @@ class CardViewItemPrivate }; -CardViewItem::CardViewItem( CardView *parent, const TQString &caption ) - : d( new CardViewItemPrivate() ), mView( parent ) +CardViewItem::CardViewItem( CardView *tqparent, const TQString &caption ) + : d( new CardViewItemPrivate() ), mView( tqparent ) { d->mCaption = caption; @@ -238,7 +238,7 @@ void CardViewItem::paintCard( TQPainter *p, TQColorGroup &cg ) int h = height() - ( mg * 2 ); const int colonWidth( fm.width( ":" ) ); int labelXPos = 2 + mg; - int labelWidth = QMIN( w / 2 - 4 - mg, d->maxLabelWidth + colonWidth + 4 ); + int labelWidth = TQMIN( w / 2 - 4 - mg, d->maxLabelWidth + colonWidth + 4 ); int valueXPos = labelWidth + 4 + mg; int valueWidth = w - labelWidth - 4 - mg; @@ -355,7 +355,7 @@ int CardViewItem::height( bool allowCache ) const for ( iter.toFirst(); iter.current(); ++iter ) { if ( !sef && (*iter)->second.isEmpty() ) continue; - lines = QMIN( (*iter)->second.tqcontains( '\n' ) + 1, maxLines ); + lines = TQMIN( (*iter)->second.tqcontains( '\n' ) + 1, maxLines ); fieldHeight += ( lines * fh ) + 2; } @@ -383,7 +383,7 @@ void CardViewItem::insertField( const TQString &label, const TQString &value ) if ( mView ) { mView->setLayoutDirty( true ); - d->maxLabelWidth = QMAX( mView->d->mFm->width( label ), d->maxLabelWidth ); + d->maxLabelWidth = TQMAX( mView->d->mFm->width( label ), d->maxLabelWidth ); } } @@ -507,7 +507,7 @@ void CardViewItem::showFullString( const TQPoint &itempos, CardViewTip *tip ) Field *_f; for ( _f = d->mFieldList.first(); _f != f; _f = d->mFieldList.next() ) if ( se || ! _f->second.isEmpty() ) - y += ( QMIN( _f->second.tqcontains( '\n' ) + 1, maxLines ) * fh ) + 2; + y += ( TQMIN( _f->second.tqcontains( '\n' ) + 1, maxLines ) * fh ) + 2; if ( isLabel && itempos.y() > y + fh ) return; @@ -515,13 +515,13 @@ void CardViewItem::showFullString( const TQPoint &itempos, CardViewTip *tip ) s = isLabel ? f->first : f->second; int colonWidth = mView->d->mFm->width(":"); - lw = drawLabels ? QMIN( w / 2 - 4 - mrg, d->maxLabelWidth + colonWidth + 4 ) : 0; + lw = drawLabels ? TQMIN( w / 2 - 4 - mrg, d->maxLabelWidth + colonWidth + 4 ) : 0; int mw = isLabel ? lw - colonWidth : w - lw - ( mrg * 2 ); if ( isLabel ) { trimmed = mView->d->mFm->width( s ) > mw - colonWidth; } else { - TQRect r( mView->d->mFm->boundingRect( 0, 0, INT_MAX, INT_MAX, Qt::AlignTop|Qt::AlignLeft, s ) ); - trimmed = r.width() > mw || r.height() / fh > QMIN( s.tqcontains( '\n' ) + 1, maxLines ); + TQRect r( mView->d->mFm->boundingRect( 0, 0, INT_MAX, INT_MAX, TQt::AlignTop|TQt::AlignLeft, s ) ); + trimmed = r.width() > mw || r.height() / fh > TQMIN( s.tqcontains( '\n' ) + 1, maxLines ); } } @@ -539,7 +539,7 @@ void CardViewItem::showFullString( const TQPoint &itempos, CardViewTip *tip ) if ( pnt.x() + tip->width() > mView->visibleWidth() ) pnt.setX( mView->visibleWidth() - tip->width() ); if ( pnt.y() + tip->height() > mView->visibleHeight() ) - pnt.setY( QMAX( 0, mView->visibleHeight() - tip->height() ) ); + pnt.setY( TQMAX( 0, mView->visibleHeight() - tip->height() ) ); // show tip->move( pnt ); tip->show(); @@ -560,7 +560,7 @@ CardViewItem::Field *CardViewItem::fieldAt( const TQPoint & itempos ) const Field *f; for ( f = d->mFieldList.first(); f; f = d->mFieldList.next() ) { if ( showEmpty || !f->second.isEmpty() ) - ypos += (QMIN( f->second.tqcontains( '\n' )+1, maxLines ) * fh) + 2; + ypos += (TQMIN( f->second.tqcontains( '\n' )+1, maxLines ) * fh) + 2; if ( iy <= ypos ) break; } @@ -569,8 +569,8 @@ CardViewItem::Field *CardViewItem::fieldAt( const TQPoint & itempos ) const } -CardView::CardView( TQWidget *parent, const char *name ) - : TQScrollView( parent, name ), +CardView::CardView( TQWidget *tqparent, const char *name ) + : TQScrollView( tqparent, name ), d( new CardViewPrivate() ) { d->mItemList.setAutoDelete( true ); @@ -805,7 +805,7 @@ int CardView::childCount() const } CardViewItem *CardView::findItem( const TQString &text, const TQString &label, - Qt::StringComparisonMode compare ) const + TQt::StringComparisonMode compare ) const { // If the text is empty, we will return null, since empty text will // match anything! @@ -813,7 +813,7 @@ CardViewItem *CardView::findItem( const TQString &text, const TQString &label, return 0; TQPtrListIterator<CardViewItem> iter( d->mItemList ); - if ( compare & Qt::BeginsWith ) { + if ( compare & TQt::BeginsWith ) { TQString value; for ( iter.toFirst(); iter.current(); ++iter ) { value = (*iter)->fieldValue( label ).upper(); @@ -915,7 +915,7 @@ void CardView::calcLayout() yPos += cardSpacing; if ( yPos + item->height() + cardSpacing >= height() - horizontalScrollBar()->height() ) { - maxHeight = QMAX( maxHeight, yPos ); + maxHeight = TQMAX( maxHeight, yPos ); // Drawing in this column would be greater than the height // of the scroll view, so move to next column @@ -936,7 +936,7 @@ void CardView::calcLayout() item->d->y = yPos; yPos += item->height(); - maxWidth = QMAX( maxWidth, d->mItemWidth ); + maxWidth = TQMAX( maxWidth, d->mItemWidth ); } xPos += maxWidth; @@ -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->tqrepaintCard(); emit selectionChanged(); } else if ( d->mSelectionMode == CardView::Extended ) { - if ( (e->button() & Qt::LeftButton) && (e->state() & Qt::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() & Qt::ControlButton) ) { + } else if ( (e->button() & TQt::LeftButton) && (e->state() & TQt::ControlButton) ) { item->setSelected( !item->isSelected() ); item->tqrepaintCard(); emit selectionChanged(); - } else if ( e->button() & Qt::LeftButton ) { + } else if ( e->button() & TQt::LeftButton ) { bool b = signalsBlocked(); blockSignals( true ); selectAll( false ); @@ -1111,7 +1111,7 @@ void CardView::contentsMouseReleaseEvent( TQMouseEvent *e ) drawRubberBands( 0 ); // we should move to reflect the new position if we are scrolled. if ( contentsX() ) { - int newX = QMAX( 0, ( d->mPressed * ( newiw + d->mColspace + d->mSepWidth ) ) - e->x() ); + int newX = TQMAX( 0, ( d->mPressed * ( newiw + d->mColspace + d->mSepWidth ) ) - e->x() ); setContentsPos( newX, contentsY() ); } // set new item width @@ -1123,7 +1123,7 @@ void CardView::contentsMouseReleaseEvent( TQMouseEvent *e ) } // If there are accel keys, we will not emit signals - if ( (e->state() & Qt::ShiftButton) || (e->state() & Qt::ControlButton) ) + if ( (e->state() & TQt::ShiftButton) || (e->state() & TQt::ControlButton) ) return; // Get the item at this position @@ -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(); @@ -1283,7 +1283,7 @@ void CardView::keyPressEvent( TQKeyEvent *e ) if ( contentsX() <= 0 ) return; int cw = columnWidth(); - int theCol = ( QMAX( 0, ( contentsX() / cw) * cw ) ) + d->mItemSpacing; + int theCol = ( TQMAX( 0, ( contentsX() / cw) * cw ) ) + d->mItemSpacing; aItem = itemAt( TQPoint( theCol + 1, d->mItemSpacing + 1 ) ); if ( aItem ) setCurrentItem( aItem ); diff --git a/kaddressbook/views/cardview.h b/kaddressbook/views/cardview.h index a5410419a..0001fcfb9 100644 --- a/kaddressbook/views/cardview.h +++ b/kaddressbook/views/cardview.h @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef CARDVIEW_H @@ -55,21 +55,21 @@ class CardViewItem A single field in the card view. The first item is the label and the second item is the value. */ - typedef QPair<TQString, TQString> Field; + typedef TQPair<TQString, TQString> Field; /** Constructor. - @param parent The CardView that this card should be displayed on. + @param tqparent The CardView that this card should be displayed on. @param caption The caption of the card. This is the text that will appear at the top of the card. This is also the string that will be used to sort the cards in the view. */ - CardViewItem( CardView *parent, const TQString &caption = TQString() ); + CardViewItem( CardView *tqparent, const TQString &caption = TQString() ); virtual ~CardViewItem(); /** - @return The caption of the card, or TQString::null if none was ever set. + @return The caption of the card, or TQString() if none was ever set. */ const TQString &caption() const; @@ -129,7 +129,7 @@ class CardViewItem bool isSelected() const; /** - Called by the parent card view when the mouse has been resting for + Called by the tqparent card view when the mouse has been resting for a certain amount of time. If the label or value at pos is obscured (trimmed) make the label display the full text. */ @@ -191,22 +191,23 @@ class CardViewItem can be used elsewhere. With the exception of a few simple config checks, the CardView is also 100% independant of KDE. */ -class CardView : public QScrollView +class CardView : public TQScrollView { friend class CardViewItem; Q_OBJECT + TQ_OBJECT public: /** Constructor. */ - CardView( TQWidget *parent, const char *name ); + CardView( TQWidget *tqparent, const char *name ); virtual ~CardView(); /** Inserts the item into the card view. This method does not have - to be called if you created the item with a proper parent. Once + to be called if you created the item with a proper tqparent. Once inserted, the CardView takes ownership of the item. */ void insertItem( CardViewItem *item ); @@ -261,7 +262,7 @@ class CardView : public QScrollView /** Sets the selection mode. - @see QListView + @see TQListView */ void setSelectionMode( SelectionMode mode ); @@ -321,7 +322,7 @@ class CardView : public QScrollView @return The first matching item, or 0 if no items match. */ CardViewItem *findItem( const TQString &text, const TQString &label, - Qt::StringComparisonMode compare = Qt::BeginsWith ) const; + TQt::StringComparisonMode compare = TQt::BeginsWith ) const; /** Returns the amounts of pixels required for one column. @@ -391,7 +392,7 @@ class CardView : public QScrollView will probably mean a crash in the items painting routine. */ // Note: I looked for a value in TQStyle::PixelMetric to use, but I could - // not see a useful one. One may turn up in a future version of Qt. + // not see a useful one. One may turn up in a future version of TQt. uint itemMargin() const; /** @@ -436,7 +437,7 @@ class CardView : public QScrollView TQFont headerFont() const; /** - Reimplementation from QWidget + Reimplementation from TQWidget */ void setFont( const TQFont &fnt ); diff --git a/kaddressbook/views/colorlistbox.cpp b/kaddressbook/views/colorlistbox.cpp index 8043eacde..df190d3c6 100644 --- a/kaddressbook/views/colorlistbox.cpp +++ b/kaddressbook/views/colorlistbox.cpp @@ -25,8 +25,8 @@ #include "colorlistbox.h" -ColorListBox::ColorListBox( TQWidget *parent, const char *name, WFlags f ) - :KListBox( parent, name, f ), mCurrentOnDragEnter(-1) +ColorListBox::ColorListBox( TQWidget *tqparent, const char *name, WFlags f ) + :KListBox( tqparent, name, f ), mCurrentOnDragEnter(-1) { connect( this, TQT_SIGNAL(selected(int)), this, TQT_SLOT(newColor(int)) ); setAcceptDrops( true); @@ -173,7 +173,7 @@ void ColorListItem::paint( TQPainter *p ) p->drawText( mBoxWidth+3*2, fm.ascent() + fm.leading()/2, text() ); - p->setPen( Qt::black ); + p->setPen( TQt::black ); p->drawRect( 3, 1, mBoxWidth, h-1 ); p->fillRect( 4, 2, mBoxWidth-2, h-3, mColor ); } diff --git a/kaddressbook/views/colorlistbox.h b/kaddressbook/views/colorlistbox.h index 053f06fff..566ec8b0a 100644 --- a/kaddressbook/views/colorlistbox.h +++ b/kaddressbook/views/colorlistbox.h @@ -26,9 +26,10 @@ class ColorListBox : public KListBox { Q_OBJECT + TQ_OBJECT public: - ColorListBox( TQWidget *parent=0, const char * name=0, WFlags f=0 ); + ColorListBox( TQWidget *tqparent=0, const char * name=0, WFlags f=0 ); void setColor( uint index, const TQColor &color ); TQColor color( uint index ) const; @@ -50,10 +51,10 @@ class ColorListBox : public KListBox }; -class ColorListItem : public QListBoxItem +class ColorListItem : public TQListBoxItem { public: - ColorListItem( const TQString &text, const TQColor &color=Qt::black ); + ColorListItem( const TQString &text, const TQColor &color=TQt::black ); const TQColor &color( void ); void setColor( const TQColor &color ); diff --git a/kaddressbook/views/configurecardviewdialog.cpp b/kaddressbook/views/configurecardviewdialog.cpp index 919e49878..fdccd52f0 100644 --- a/kaddressbook/views/configurecardviewdialog.cpp +++ b/kaddressbook/views/configurecardviewdialog.cpp @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include <tqstring.h> @@ -47,11 +47,11 @@ ///////////////////////////////// // ConfigureCardViewDialog -ConfigureCardViewWidget::ConfigureCardViewWidget( KABC::AddressBook *ab, TQWidget *parent, +ConfigureCardViewWidget::ConfigureCardViewWidget( KABC::AddressBook *ab, TQWidget *tqparent, const char *name ) - : ViewConfigureWidget( ab, parent, name ) + : ViewConfigureWidget( ab, tqparent, name ) { - TQWidget *page = addPage( i18n( "Look & Feel" ), TQString::null, + TQWidget *page = addPage( i18n( "Look & Feel" ), TQString(), DesktopIcon( "looknfeel" ) ); mAdvancedPage = new CardViewLookNFeelPage( page ); } @@ -76,8 +76,8 @@ void ConfigureCardViewWidget::saveSettings( KConfig *config ) //////////////////////// // CardViewLookNFeelPage -CardViewLookNFeelPage::CardViewLookNFeelPage( TQWidget *parent, const char *name ) - : TQVBox( parent, name ) +CardViewLookNFeelPage::CardViewLookNFeelPage( TQWidget *tqparent, const char *name ) + : TQVBox( tqparent, name ) { initGUI(); } @@ -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/configurecardviewdialog.h b/kaddressbook/views/configurecardviewdialog.h index 441a1e89c..52ec9cbbe 100644 --- a/kaddressbook/views/configurecardviewdialog.h +++ b/kaddressbook/views/configurecardviewdialog.h @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef CONFIGURECARDVIEWDIALOG_H @@ -48,7 +48,7 @@ class CardViewLookAndFeelPage; class ConfigureCardViewWidget : public ViewConfigureWidget { public: - ConfigureCardViewWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name ); + ConfigureCardViewWidget( KABC::AddressBook *ab, TQWidget *tqparent, const char *name ); virtual ~ConfigureCardViewWidget(); virtual void restoreSettings( KConfig* ); @@ -80,9 +80,10 @@ class ConfigureCardViewWidget : public ViewConfigureWidget class CardViewLookNFeelPage : public TQVBox { Q_OBJECT + TQ_OBJECT public: - CardViewLookNFeelPage( TQWidget *parent=0, const char *name=0 ); + CardViewLookNFeelPage( TQWidget *tqparent=0, const char *name=0 ); ~CardViewLookNFeelPage(); void restoreSettings( KConfig* ); diff --git a/kaddressbook/views/configuretableviewdialog.cpp b/kaddressbook/views/configuretableviewdialog.cpp index d65f42d38..309244e5d 100644 --- a/kaddressbook/views/configuretableviewdialog.cpp +++ b/kaddressbook/views/configuretableviewdialog.cpp @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include <tqstring.h> @@ -41,11 +41,11 @@ #include "configuretableviewdialog.h" ConfigureTableViewWidget::ConfigureTableViewWidget( KABC::AddressBook *ab, - TQWidget *parent, + TQWidget *tqparent, const char *name ) - : ViewConfigureWidget( ab, parent, name ) + : ViewConfigureWidget( ab, tqparent, name ) { - TQWidget *page = addPage( i18n( "Look & Feel" ), TQString::null, + TQWidget *page = addPage( i18n( "Look & Feel" ), TQString(), KGlobal::iconLoader()->loadIcon( "looknfeel", KIcon::Panel ) ); @@ -72,8 +72,8 @@ void ConfigureTableViewWidget::saveSettings( KConfig *config ) -LookAndFeelPage::LookAndFeelPage(TQWidget *parent, const char *name) - : TQWidget(parent, name) +LookAndFeelPage::LookAndFeelPage(TQWidget *tqparent, const char *name) + : TQWidget(tqparent, name) { initGUI(); @@ -113,7 +113,7 @@ void LookAndFeelPage::initGUI() { TQVBoxLayout *tqlayout = new TQVBoxLayout(this, 0, KDialogBase::spacingHint()); - TQButtonGroup *group = new TQButtonGroup(1, Qt::Horizontal, + TQButtonGroup *group = new TQButtonGroup(1, TQt::Horizontal, i18n("Row Separator"), this); tqlayout->addWidget(group); diff --git a/kaddressbook/views/configuretableviewdialog.h b/kaddressbook/views/configuretableviewdialog.h index 2e3378b4c..a0228cba6 100644 --- a/kaddressbook/views/configuretableviewdialog.h +++ b/kaddressbook/views/configuretableviewdialog.h @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef CONFIGURETABLEVIEWDIALOG_H @@ -45,7 +45,7 @@ class LookAndFeelPage; class ConfigureTableViewWidget : public ViewConfigureWidget { public: - ConfigureTableViewWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name ); + ConfigureTableViewWidget( KABC::AddressBook *ab, TQWidget *tqparent, const char *name ); virtual ~ConfigureTableViewWidget(); virtual void restoreSettings( KConfig* ); @@ -60,12 +60,13 @@ class ConfigureTableViewWidget : public ViewConfigureWidget /** Internal class. It is only defined here for tqmoc */ -class LookAndFeelPage : public QWidget +class LookAndFeelPage : public TQWidget { Q_OBJECT + TQ_OBJECT public: - LookAndFeelPage( TQWidget *parent, const char *name = 0 ); + LookAndFeelPage( TQWidget *tqparent, const char *name = 0 ); ~LookAndFeelPage() {} void restoreSettings( KConfig* ); diff --git a/kaddressbook/views/contactlistview.cpp b/kaddressbook/views/contactlistview.cpp index 5b9ecbf11..548ad5f98 100644 --- a/kaddressbook/views/contactlistview.cpp +++ b/kaddressbook/views/contactlistview.cpp @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include <tqheader.h> @@ -47,8 +47,8 @@ ///////////////////////////////// // DynamicTip Methods -DynamicTip::DynamicTip( ContactListView *parent) - : TQToolTip( parent ) +DynamicTip::DynamicTip( ContactListView *tqparent) + : TQToolTip( tqparent ) { } @@ -116,7 +116,7 @@ void DynamicTip::maybeTip( const TQPoint &pos ) linew = lastw; } else - i = QMAX( a, i-1 ); + i = TQMAX( a, i-1 ); } if ( notes[i] == '\n' || doBreak ) { @@ -147,12 +147,12 @@ void DynamicTip::maybeTip( const TQPoint &pos ) // ContactListViewItem Methods ContactListViewItem::ContactListViewItem(const KABC::Addressee &a, - ContactListView *parent, + ContactListView *tqparent, KABC::AddressBook *doc, const KABC::Field::List &fields, KIMProxy *proxy ) - : KListViewItem(parent), mAddressee(a), mFields( fields ), - parentListView( parent ), mDocument(doc), mIMProxy( proxy ) + : KListViewItem(tqparent), mAddressee(a), mFields( fields ), + tqparentListView( tqparent ), mDocument(doc), mIMProxy( proxy ) { if ( mIMProxy ) mHasIM = mIMProxy->isPresent( mAddressee.uid() ); @@ -164,15 +164,15 @@ ContactListViewItem::ContactListViewItem(const KABC::Addressee &a, TQString ContactListViewItem::key(int column, bool ascending) const { // Preserve behaviour of TQListViewItem::key(), otherwise we cause a crash if the column does not exist - if ( column >= parentListView->columns() ) - return TQString::null; + if ( column >= tqparentListView->columns() ) + return TQString(); #if KDE_VERSION >= 319 Q_UNUSED( ascending ) - if ( parentListView->showIM() ) { + if ( tqparentListView->showIM() ) { // in this case, one column is reserved for IM presence // so we have to process it differently - if ( column == parentListView->imColumn() ) { + if ( column == tqparentListView->imColumn() ) { // increment by one before converting to string so that -1 is not greater than 1 // create the sort key by taking the numeric status 0 low, 5 high, and subtracting it from 5 // so that the default ascending gives online before offline, etc. @@ -201,16 +201,16 @@ void ContactListViewItem::paintCell(TQPainter * p, if ( !p ) return; - if (parentListView->singleLine()) { - p->setPen( parentListView->alternateColor() ); + if (tqparentListView->singleLine()) { + p->setPen( tqparentListView->alternateColor() ); p->drawLine( 0, height() - 1, width, height() - 1 ); } } -ContactListView *ContactListViewItem::parent() +ContactListView *ContactListViewItem::tqparent() { - return parentListView; + return tqparentListView; } @@ -222,7 +222,7 @@ void ContactListViewItem::refresh() } // Update our addressee, since it may have changed elsewhere - mAddressee = mDocument->tqfindByUid(mAddressee.uid()); + mAddressee = mDocument->findByUid(mAddressee.uid()); if (mAddressee.isEmpty()) return; @@ -230,9 +230,9 @@ void ContactListViewItem::refresh() // don't show unknown presence, it's not interesting if ( mHasIM ) { if ( mIMProxy->presenceNumeric( mAddressee.uid() ) > 0 ) - setPixmap( parentListView->imColumn(), mIMProxy->presenceIcon( mAddressee.uid() ) ); + setPixmap( tqparentListView->imColumn(), mIMProxy->presenceIcon( mAddressee.uid() ) ); else - setPixmap( parentListView->imColumn(), TQPixmap() ); + setPixmap( tqparentListView->imColumn(), TQPixmap() ); } KABC::Field::List::ConstIterator it; @@ -258,9 +258,9 @@ void ContactListViewItem::setHasIM( bool hasIM ) ContactListView::ContactListView(KAddressBookTableView *view, KABC::AddressBook* /* doc */, - TQWidget *parent, + TQWidget *tqparent, const char *name ) - : KListView( parent, name ), + : KListView( tqparent, name ), pabWidget( view ), oldColumn( 0 ) { diff --git a/kaddressbook/views/contactlistview.h b/kaddressbook/views/contactlistview.h index 7936333aa..65c927026 100644 --- a/kaddressbook/views/contactlistview.h +++ b/kaddressbook/views/contactlistview.h @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef CONTACTLISTVIEW_H @@ -41,10 +41,10 @@ class KIMProxy; /** The whole tooltip design needs a lot of work. Currently it is * hacked together to function. */ -class DynamicTip : public QToolTip +class DynamicTip : public TQToolTip { public: - DynamicTip( ContactListView * parent ); + DynamicTip( ContactListView * tqparent ); protected: void maybeTip( const TQPoint & ); @@ -56,11 +56,11 @@ class ContactListViewItem : public KListViewItem { public: - ContactListViewItem(const KABC::Addressee &a, ContactListView* parent, + ContactListViewItem(const KABC::Addressee &a, ContactListView* tqparent, KABC::AddressBook *doc, const KABC::Field::List &fields, KIMProxy *proxy ); const KABC::Addressee &addressee() const { return mAddressee; } virtual void refresh(); - virtual ContactListView* parent(); + virtual ContactListView* tqparent(); virtual TQString key ( int, bool ) const; void setHasIM( bool hasIM ); /** Adds the border around the cell if the user wants it. @@ -72,7 +72,7 @@ public: private: KABC::Addressee mAddressee; KABC::Field::List mFields; - ContactListView *parentListView; + ContactListView *tqparentListView; KABC::AddressBook *mDocument; KIMProxy *mIMProxy; bool mHasIM; @@ -85,11 +85,12 @@ private: class ContactListView : public KListView { Q_OBJECT + TQ_OBJECT public: ContactListView(KAddressBookTableView *view, KABC::AddressBook *doc, - TQWidget *parent, + TQWidget *tqparent, const char *name = 0L ); virtual ~ContactListView() {} //void resort(); @@ -138,7 +139,7 @@ public: protected: /** Paints the background pixmap in the empty area. This method is needed - * since Qt::FixedPixmap will not scroll with the list view. + * since TQt::FixedPixmap will not scroll with the list view. */ virtual void paintEmptyArea( TQPainter * p, const TQRect & rect ); virtual void contentsMousePressEvent(TQMouseEvent*); diff --git a/kaddressbook/views/kaddressbookcardview.cpp b/kaddressbook/views/kaddressbookcardview.cpp index 2f0c859c5..1c7f2806d 100644 --- a/kaddressbook/views/kaddressbookcardview.cpp +++ b/kaddressbook/views/kaddressbookcardview.cpp @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include <tqapplication.h> @@ -43,19 +43,19 @@ class CardViewFactory : public ViewFactory { public: - KAddressBookView *view( KAB::Core *core, TQWidget *parent, const char *name ) + KAddressBookView *view( KAB::Core *core, TQWidget *tqparent, const char *name ) { - return new KAddressBookCardView( core, parent, name ); + return new KAddressBookCardView( core, tqparent, name ); } TQString type() const { return I18N_NOOP("Card"); } TQString description() const { return i18n( "Rolodex style cards represent contacts." ); } - ViewConfigureWidget *configureWidget( KABC::AddressBook *ab, TQWidget *parent, + ViewConfigureWidget *configureWidget( KABC::AddressBook *ab, TQWidget *tqparent, const char *name = 0 ) { - return new ConfigureCardViewWidget( ab, parent, name ); + return new ConfigureCardViewWidget( ab, tqparent, name ); } }; @@ -72,8 +72,8 @@ class AddresseeCardViewItem : public CardViewItem AddresseeCardViewItem( const KABC::Field::List &fields, bool showEmptyFields, KABC::AddressBook *doc, const KABC::Addressee &addr, - CardView *parent ) - : CardViewItem( parent, addr.realName() ), + CardView *tqparent ) + : CardViewItem( tqparent, addr.realName() ), mFields( fields ), mShowEmptyFields( showEmptyFields ), mDocument( doc ), mAddressee( addr ) { @@ -87,7 +87,7 @@ class AddresseeCardViewItem : public CardViewItem void refresh() { - mAddressee = mDocument->tqfindByUid( mAddressee.uid() ); + mAddressee = mDocument->findByUid( mAddressee.uid() ); if ( !mAddressee.isEmpty() ) { clearFields(); @@ -116,8 +116,8 @@ class AddresseeCardViewItem : public CardViewItem }; -AddresseeCardView::AddresseeCardView( TQWidget *parent, const char *name ) - : CardView( parent, name ) +AddresseeCardView::AddresseeCardView( TQWidget *tqparent, const char *name ) + : CardView( tqparent, name ) { setAcceptDrops( true ); } @@ -144,8 +144,8 @@ void AddresseeCardView::startDrag() KAddressBookCardView::KAddressBookCardView( KAB::Core *core, - TQWidget *parent, const char *name ) - : KAddressBookView( core, parent, name ) + TQWidget *tqparent, const char *name ) + : KAddressBookView( core, tqparent, name ) { mShowEmptyFields = false; @@ -282,7 +282,7 @@ void KAddressBookCardView::refresh( const TQString &uid ) mCardView->viewport()->update(); // by default nothing is selected - emit selected( TQString::null ); + emit selected( TQString() ); } else { // Try to find the one to refresh bool found = false; @@ -349,7 +349,7 @@ void KAddressBookCardView::addresseeSelected() } if ( !found ) - emit selected( TQString::null ); + emit selected( TQString() ); } void KAddressBookCardView::rmbClicked( CardViewItem*, const TQPoint &point ) @@ -359,12 +359,12 @@ void KAddressBookCardView::rmbClicked( CardViewItem*, const TQPoint &point ) void KAddressBookCardView::scrollUp() { - TQApplication::postEvent( mCardView, new TQKeyEvent( TQEvent::KeyPress, Qt::Key_Up, 0, 0 ) ); + TQApplication::postEvent( mCardView, new TQKeyEvent( TQEvent::KeyPress, TQt::Key_Up, 0, 0 ) ); } void KAddressBookCardView::scrollDown() { - TQApplication::postEvent( mCardView, new TQKeyEvent( TQEvent::KeyPress, Qt::Key_Down, 0, 0 ) ); + TQApplication::postEvent( mCardView, new TQKeyEvent( TQEvent::KeyPress, TQt::Key_Down, 0, 0 ) ); } #include "kaddressbookcardview.moc" diff --git a/kaddressbook/views/kaddressbookcardview.h b/kaddressbook/views/kaddressbookcardview.h index 045c1e051..9ccc8a40e 100644 --- a/kaddressbook/views/kaddressbookcardview.h +++ b/kaddressbook/views/kaddressbookcardview.h @@ -20,8 +20,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include <tqstring.h> @@ -30,7 +30,7 @@ #include "cardview.h" #include "kaddressbookview.h" -class QDragEntryEvent; +class TQDragEntryEvent; class TQDropEvent; class KConfig; class AddresseeCardView; @@ -43,9 +43,10 @@ class AddresseeCardView; class KAddressBookCardView : public KAddressBookView { Q_OBJECT + TQ_OBJECT public: - KAddressBookCardView( KAB::Core *core, TQWidget *parent, + KAddressBookCardView( KAB::Core *core, TQWidget *tqparent, const char *name = 0 ); virtual ~KAddressBookCardView(); @@ -77,8 +78,9 @@ class KAddressBookCardView : public KAddressBookView class AddresseeCardView : public CardView { Q_OBJECT + TQ_OBJECT public: - AddresseeCardView( TQWidget *parent, const char *name = 0 ); + AddresseeCardView( TQWidget *tqparent, const char *name = 0 ); ~AddresseeCardView(); signals: diff --git a/kaddressbook/views/kaddressbookiconview.cpp b/kaddressbook/views/kaddressbookiconview.cpp index 58b4a3409..16fe5cad0 100644 --- a/kaddressbook/views/kaddressbookiconview.cpp +++ b/kaddressbook/views/kaddressbookiconview.cpp @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include <tqapplication.h> @@ -42,9 +42,9 @@ class IconViewFactory : public ViewFactory { public: - KAddressBookView *view( KAB::Core *core, TQWidget *parent, const char *name ) + KAddressBookView *view( KAB::Core *core, TQWidget *tqparent, const char *name ) { - return new KAddressBookIconView( core, parent, name ); + return new KAddressBookIconView( core, tqparent, name ); } TQString type() const { return I18N_NOOP( "Icon" ); } @@ -59,8 +59,8 @@ extern "C" { } } -AddresseeIconView::AddresseeIconView( TQWidget *parent, const char *name ) - : KIconView( parent, name ) +AddresseeIconView::AddresseeIconView( TQWidget *tqparent, const char *name ) + : KIconView( tqparent, name ) { setSelectionMode( TQIconView::Extended ); setResizeMode( TQIconView::Adjust ); @@ -96,8 +96,8 @@ class AddresseeIconViewItem : public KIconViewItem { public: AddresseeIconViewItem( const KABC::Field::List&, KABC::AddressBook *doc, - const KABC::Addressee &addr, TQIconView *parent ) - : KIconViewItem( parent ), mDocument( doc ), mAddressee( addr ) + const KABC::Addressee &addr, TQIconView *tqparent ) + : KIconViewItem( tqparent ), mDocument( doc ), mAddressee( addr ) { refresh(); } @@ -106,7 +106,7 @@ class AddresseeIconViewItem : public KIconViewItem void refresh() { - mAddressee = mDocument->tqfindByUid( mAddressee.uid() ); + mAddressee = mDocument->findByUid( mAddressee.uid() ); if ( !mAddressee.isEmpty() ) setText( mAddressee.givenName() + " " + mAddressee.familyName() ); @@ -136,8 +136,8 @@ class AddresseeIconViewItem : public KIconViewItem KAddressBookIconView::KAddressBookIconView( KAB::Core *core, - TQWidget *parent, const char *name) - : KAddressBookView( core, parent, name ) + TQWidget *tqparent, const char *name) + : KAddressBookView( core, tqparent, name ) { TQVBoxLayout *tqlayout = new TQVBoxLayout( viewWidget() ); @@ -233,7 +233,7 @@ void KAddressBookIconView::refresh( const TQString &uid ) } } - refresh( TQString::null ); + refresh( TQString() ); } } @@ -291,7 +291,7 @@ void KAddressBookIconView::addresseeSelected() } if ( !found ) - emit selected( TQString::null ); + emit selected( TQString() ); } void KAddressBookIconView::rmbClicked( TQIconViewItem*, const TQPoint &point ) @@ -301,12 +301,12 @@ void KAddressBookIconView::rmbClicked( TQIconViewItem*, const TQPoint &point ) void KAddressBookIconView::scrollUp() { - TQApplication::postEvent( mIconView, new TQKeyEvent( TQEvent::KeyPress, Qt::Key_Up, 0, 0 ) ); + TQApplication::postEvent( mIconView, new TQKeyEvent( TQEvent::KeyPress, TQt::Key_Up, 0, 0 ) ); } void KAddressBookIconView::scrollDown() { - TQApplication::postEvent( mIconView, new TQKeyEvent( TQEvent::KeyPress, Qt::Key_Down, 0, 0 ) ); + TQApplication::postEvent( mIconView, new TQKeyEvent( TQEvent::KeyPress, TQt::Key_Down, 0, 0 ) ); } #include "kaddressbookiconview.moc" diff --git a/kaddressbook/views/kaddressbookiconview.h b/kaddressbook/views/kaddressbookiconview.h index dc6dddae0..5b9c8c7cc 100644 --- a/kaddressbook/views/kaddressbookiconview.h +++ b/kaddressbook/views/kaddressbookiconview.h @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef KADDRESSBOOKICONVIEW_H @@ -42,9 +42,10 @@ namespace KABC { class AddressBook; } class KAddressBookIconView : public KAddressBookView { Q_OBJECT + TQ_OBJECT public: - KAddressBookIconView( KAB::Core *core, TQWidget *parent, + KAddressBookIconView( KAB::Core *core, TQWidget *tqparent, const char *name = 0 ); virtual ~KAddressBookIconView(); @@ -75,9 +76,10 @@ class KAddressBookIconView : public KAddressBookView class AddresseeIconView : public KIconView { Q_OBJECT + TQ_OBJECT public: - AddresseeIconView( TQWidget *parent, const char *name = 0 ); + AddresseeIconView( TQWidget *tqparent, const char *name = 0 ); ~AddresseeIconView(); signals: diff --git a/kaddressbook/views/kaddressbooktableview.cpp b/kaddressbook/views/kaddressbooktableview.cpp index 89caa0455..65bcd36cf 100644 --- a/kaddressbook/views/kaddressbooktableview.cpp +++ b/kaddressbook/views/kaddressbooktableview.cpp @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include <tqapplication.h> @@ -61,9 +61,9 @@ class TableViewFactory : public ViewFactory { public: - KAddressBookView *view( KAB::Core *core, TQWidget *parent, const char *name ) + KAddressBookView *view( KAB::Core *core, TQWidget *tqparent, const char *name ) { - return new KAddressBookTableView( core, parent, name ); + return new KAddressBookTableView( core, tqparent, name ); } TQString type() const { return I18N_NOOP( "Table" ); } @@ -71,10 +71,10 @@ class TableViewFactory : public ViewFactory TQString description() const { return i18n( "A listing of contacts in a table. Each cell of " "the table holds a field of the contact." ); } - ViewConfigureWidget *configureWidget( KABC::AddressBook *ab, TQWidget *parent, + ViewConfigureWidget *configureWidget( KABC::AddressBook *ab, TQWidget *tqparent, const char *name = 0 ) { - return new ConfigureTableViewWidget( ab, parent, name ); + return new ConfigureTableViewWidget( ab, tqparent, name ); } }; @@ -86,8 +86,8 @@ extern "C" { } KAddressBookTableView::KAddressBookTableView( KAB::Core *core, - TQWidget *parent, const char *name ) - : KAddressBookView( core, parent, name ) + TQWidget *tqparent, const char *name ) + : KAddressBookView( core, tqparent, name ) { mMainLayout = new TQVBoxLayout( viewWidget(), 2 ); @@ -262,7 +262,7 @@ void KAddressBookTableView::refresh( const TQString &uid ) return; } } - refresh( TQString::null ); + refresh( TQString() ); } } @@ -330,7 +330,7 @@ void KAddressBookTableView::addresseeSelected() } if ( !found ) - emit selected( TQString::null ); + emit selected( TQString() ); } void KAddressBookTableView::addresseeExecuted( TQListViewItem *item ) @@ -341,9 +341,9 @@ void KAddressBookTableView::addresseeExecuted( TQListViewItem *item ) if ( ceItem ) emit executed( ceItem->addressee().uid() ); else - emit executed( TQString::null ); + emit executed( TQString() ); } else { - emit executed( TQString::null ); + emit executed( TQString() ); } } @@ -372,12 +372,12 @@ void KAddressBookTableView::updatePresence( const TQString &uid ) void KAddressBookTableView::scrollUp() { - TQApplication::postEvent( mListView, new TQKeyEvent( TQEvent::KeyPress, Qt::Key_Up, 0, 0 ) ); + TQApplication::postEvent( mListView, new TQKeyEvent( TQEvent::KeyPress, TQt::Key_Up, 0, 0 ) ); } void KAddressBookTableView::scrollDown() { - TQApplication::postEvent( mListView, new TQKeyEvent( TQEvent::KeyPress, Qt::Key_Down, 0, 0 ) ); + TQApplication::postEvent( mListView, new TQKeyEvent( TQEvent::KeyPress, TQt::Key_Down, 0, 0 ) ); } diff --git a/kaddressbook/views/kaddressbooktableview.h b/kaddressbook/views/kaddressbooktableview.h index d45314123..f212829f3 100644 --- a/kaddressbook/views/kaddressbooktableview.h +++ b/kaddressbook/views/kaddressbooktableview.h @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef KADDRESSBOOKTABLEVIEW_H @@ -62,9 +62,10 @@ class KAddressBookTableView : public KAddressBookView friend class ContactListView; Q_OBJECT + TQ_OBJECT public: - KAddressBookTableView( KAB::Core *core, TQWidget *parent, + KAddressBookTableView( KAB::Core *core, TQWidget *tqparent, const char *name = 0 ); virtual ~KAddressBookTableView(); diff --git a/kaddressbook/xxport/bookmark_xxport.cpp b/kaddressbook/xxport/bookmark_xxport.cpp index 2cfdf98ca..0b7c3dc7c 100644 --- a/kaddressbook/xxport/bookmark_xxport.cpp +++ b/kaddressbook/xxport/bookmark_xxport.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include <kbookmark.h> @@ -33,8 +33,8 @@ K_EXPORT_KADDRESSBOOK_XXFILTER( libkaddrbk_bookmark_xxport, BookmarkXXPort ) -BookmarkXXPort::BookmarkXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name ) - : KAB::XXPort( ab, parent, name ) +BookmarkXXPort::BookmarkXXPort( KABC::AddressBook *ab, TQWidget *tqparent, const char *name ) + : KAB::XXPort( ab, tqparent, name ) { createExportAction( i18n( "Export Bookmarks Menu..." ) ); } diff --git a/kaddressbook/xxport/bookmark_xxport.h b/kaddressbook/xxport/bookmark_xxport.h index f12ed8e28..09d95f910 100644 --- a/kaddressbook/xxport/bookmark_xxport.h +++ b/kaddressbook/xxport/bookmark_xxport.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef BOOKMARK_XXPORT_H @@ -30,9 +30,10 @@ class BookmarkXXPort : public KAB::XXPort { Q_OBJECT + TQ_OBJECT public: - BookmarkXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 ); + BookmarkXXPort( KABC::AddressBook *ab, TQWidget *tqparent, const char *name = 0 ); TQString identifier() const { return "bookmark"; } diff --git a/kaddressbook/xxport/csv_xxport.cpp b/kaddressbook/xxport/csv_xxport.cpp index 52286d3b7..5fdc89a5c 100644 --- a/kaddressbook/xxport/csv_xxport.cpp +++ b/kaddressbook/xxport/csv_xxport.cpp @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include <tqfile.h> @@ -36,8 +36,8 @@ K_EXPORT_KADDRESSBOOK_XXFILTER( libkaddrbk_csv_xxport, CSVXXPort ) -CSVXXPort::CSVXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name ) - : KAB::XXPort( ab, parent, name ) +CSVXXPort::CSVXXPort( KABC::AddressBook *ab, TQWidget *tqparent, const char *name ) + : KAB::XXPort( ab, tqparent, name ) { createImportAction( i18n( "Import CSV List..." ) ); createExportAction( i18n( "Export CSV List..." ) ); diff --git a/kaddressbook/xxport/csv_xxport.h b/kaddressbook/xxport/csv_xxport.h index b957299d4..a55f326b5 100644 --- a/kaddressbook/xxport/csv_xxport.h +++ b/kaddressbook/xxport/csv_xxport.h @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef CSV_XXPORT_H @@ -29,9 +29,10 @@ class CSVXXPort : public KAB::XXPort { Q_OBJECT + TQ_OBJECT public: - CSVXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 ); + CSVXXPort( KABC::AddressBook *ab, TQWidget *tqparent, const char *name = 0 ); TQString identifier() const { return "csv"; } diff --git a/kaddressbook/xxport/csvimportdialog.cpp b/kaddressbook/xxport/csvimportdialog.cpp index 36f760540..4356a5997 100644 --- a/kaddressbook/xxport/csvimportdialog.cpp +++ b/kaddressbook/xxport/csvimportdialog.cpp @@ -50,10 +50,10 @@ enum { Local = 0, Guess = 1, Latin1 = 2, Uni = 3, MSBug = 4, Codec = 5 }; -CSVImportDialog::CSVImportDialog( KABC::AddressBook *ab, TQWidget *parent, +CSVImportDialog::CSVImportDialog( KABC::AddressBook *ab, TQWidget *tqparent, const char * name ) : KDialogBase( Plain, i18n ( "CSV Import Dialog" ), Ok | Cancel | User1 | - User2, Ok, parent, name, true, true ), + User2, Ok, tqparent, name, true, true ), mAdjustRows( false ), mStartLine( 0 ), mTextQuote( '"' ), @@ -383,11 +383,11 @@ 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->tqlayout()->setSpacing( spacingHint() ); mDelimiterBox->tqlayout()->setMargin( marginHint() ); TQGridLayout *delimiterLayout = new TQGridLayout( mDelimiterBox->tqlayout() ); - delimiterLayout->tqsetAlignment( Qt::AlignTop ); + delimiterLayout->tqsetAlignment( TQt::AlignTop ); tqlayout->addMultiCellWidget( mDelimiterBox, 1, 4, 0, 0 ); mRadioComma = new TQRadioButton( i18n( "Comma" ), mDelimiterBox ); @@ -465,7 +465,7 @@ void CSVImportDialog::fillTable() int row, column; bool lastCharDelimiter = false; bool ignoreDups = mIgnoreDuplicates->isChecked(); - enum { S_START, S_QUOTED_FIELD, S_MAYBE_END_OF_QUOTED_FIELD, S_END_OF_QUOTED_FIELD, + enum { S_START, S_TQUOTED_FIELD, S_MAYBE_END_OF_TQUOTED_FIELD, S_END_OF_TQUOTED_FIELD, S_MAYBE_NORMAL_FIELD, S_NORMAL_FIELD } state = S_START; TQChar x; @@ -517,7 +517,7 @@ void CSVImportDialog::fillTable() switch ( state ) { case S_START : if ( x == mTextQuote ) { - state = S_QUOTED_FIELD; + state = S_TQUOTED_FIELD; } else if ( x == mDelimiter ) { if ( ( ignoreDups == false ) || ( lastCharDelimiter == false ) ) ++column; @@ -530,9 +530,9 @@ void CSVImportDialog::fillTable() state = S_MAYBE_NORMAL_FIELD; } break; - case S_QUOTED_FIELD : + case S_TQUOTED_FIELD : if ( x == mTextQuote ) { - state = S_MAYBE_END_OF_QUOTED_FIELD; + state = S_MAYBE_END_OF_TQUOTED_FIELD; } else if ( x == '\n' && mTextQuote.isNull() ) { setText( row - mStartLine + 1, column, field ); field = ""; @@ -549,10 +549,10 @@ void CSVImportDialog::fillTable() field += x; } break; - case S_MAYBE_END_OF_QUOTED_FIELD : + case S_MAYBE_END_OF_TQUOTED_FIELD : if ( x == mTextQuote ) { field += x; - state = S_QUOTED_FIELD; + state = S_TQUOTED_FIELD; } else if ( x == mDelimiter || x == '\n' ) { setText( row - mStartLine + 1, column, field ); field = ""; @@ -566,10 +566,10 @@ void CSVImportDialog::fillTable() } state = S_START; } else { - state = S_END_OF_QUOTED_FIELD; + state = S_END_OF_TQUOTED_FIELD; } break; - case S_END_OF_QUOTED_FIELD : + case S_END_OF_TQUOTED_FIELD : if ( x == mDelimiter || x == '\n' ) { setText( row - mStartLine + 1, column, field ); field = ""; @@ -583,13 +583,13 @@ void CSVImportDialog::fillTable() } state = S_START; } else { - state = S_END_OF_QUOTED_FIELD; + state = S_END_OF_TQUOTED_FIELD; } break; case S_MAYBE_NORMAL_FIELD : if ( x == mTextQuote ) { field = ""; - state = S_QUOTED_FIELD; + state = S_TQUOTED_FIELD; break; } case S_NORMAL_FIELD : @@ -707,11 +707,11 @@ void CSVImportDialog::resizeColumns() TQMap<TQString, uint>::ConstIterator it; for ( it = mTypeMap.begin(); it != mTypeMap.end(); ++it ) { - width = QMAX( width, fm.width( it.key() ) ); + width = TQMAX( width, fm.width( it.key() ) ); } for ( int i = 0; i < mTable->numCols(); ++i ) - mTable->setColumnWidth( i, QMAX( width + 15, mTable->columnWidth( i ) ) ); + mTable->setColumnWidth( i, TQMAX( width + 15, mTable->columnWidth( i ) ) ); } void CSVImportDialog::returnPressed() diff --git a/kaddressbook/xxport/csvimportdialog.h b/kaddressbook/xxport/csvimportdialog.h index baa538e03..f3c953ba5 100644 --- a/kaddressbook/xxport/csvimportdialog.h +++ b/kaddressbook/xxport/csvimportdialog.h @@ -41,9 +41,10 @@ class TQTable; class CSVImportDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - CSVImportDialog( KABC::AddressBook *ab, TQWidget *parent, + CSVImportDialog( KABC::AddressBook *ab, TQWidget *tqparent, const char *name = 0 ); ~CSVImportDialog(); diff --git a/kaddressbook/xxport/dateparser.cpp b/kaddressbook/xxport/dateparser.cpp index 2052407a6..387d731a1 100644 --- a/kaddressbook/xxport/dateparser.cpp +++ b/kaddressbook/xxport/dateparser.cpp @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include <tqdatetime.h> diff --git a/kaddressbook/xxport/dateparser.h b/kaddressbook/xxport/dateparser.h index 569969515..14fe14473 100644 --- a/kaddressbook/xxport/dateparser.h +++ b/kaddressbook/xxport/dateparser.h @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef DATEPARSER_H @@ -29,7 +29,7 @@ /** This class parses the date out of a given string with the help of a pattern. - The pattern can tqcontains the following key characters: + The pattern can contains the following key characters: y = year (e.g. 82) Y = year (e.g. 1982) m = month (e.g. 7, 07 or 12) diff --git a/kaddressbook/xxport/eudora_xxport.cpp b/kaddressbook/xxport/eudora_xxport.cpp index d31cd1115..ca804fe30 100644 --- a/kaddressbook/xxport/eudora_xxport.cpp +++ b/kaddressbook/xxport/eudora_xxport.cpp @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include <tqfile.h> @@ -38,8 +38,8 @@ K_EXPORT_KADDRESSBOOK_XXFILTER( libkaddrbk_eudora_xxport, EudoraXXPort ) -EudoraXXPort::EudoraXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name ) - : KAB::XXPort( ab, parent, name ) +EudoraXXPort::EudoraXXPort( KABC::AddressBook *ab, TQWidget *tqparent, const char *name ) + : KAB::XXPort( ab, tqparent, name ) { createImportAction( i18n( "Import Eudora Addressbook..." ) ); } @@ -124,22 +124,22 @@ TQString EudoraXXPort::key( const TQString& line) const { int e; TQString result; - int b = line.find( '\"', 0 ); + int b = line.tqfind( '\"', 0 ); if ( b == -1 ) { - b = line.find( ' ' ); + b = line.tqfind( ' ' ); if ( b == -1 ) return result; b++; - e = line.find( ' ', b ); + e = line.tqfind( ' ', b ); result = line.mid( b, e - b ); return result; } b++; - e = line.find( '\"', b ); + e = line.tqfind( '\"', b ); if ( e == -1 ) return result; @@ -191,14 +191,14 @@ TQString EudoraXXPort::get( const TQString& line, const TQString& key ) const uint i; // Find formatted key, return on error - b = line.find( fd ); + b = line.tqfind( fd ); if ( b == -1 ) - return TQString::null; + return TQString(); b += fd.length(); - e = line.find( '>', b ); + e = line.tqfind( '>', b ); if ( e == -1 ) - return TQString::null; + return TQString(); e--; TQString result = line.mid( b, e - b + 1 ); diff --git a/kaddressbook/xxport/eudora_xxport.h b/kaddressbook/xxport/eudora_xxport.h index 0181aa318..e8dcf939a 100644 --- a/kaddressbook/xxport/eudora_xxport.h +++ b/kaddressbook/xxport/eudora_xxport.h @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef EUDORA_XXPORT_H @@ -29,9 +29,10 @@ class EudoraXXPort : public KAB::XXPort { Q_OBJECT + TQ_OBJECT public: - EudoraXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 ); + EudoraXXPort( KABC::AddressBook *ab, TQWidget *tqparent, const char *name = 0 ); TQString identifier() const { return "eudora"; } @@ -43,7 +44,7 @@ class EudoraXXPort : public KAB::XXPort TQString comment( const TQString& line ) const; TQString email( const TQString& line ) const; TQString key( const TQString& line ) const; - int find( const TQString& key ) const; + int tqfind( const TQString& key ) const; }; #endif diff --git a/kaddressbook/xxport/gnokii_xxport.cpp b/kaddressbook/xxport/gnokii_xxport.cpp index faf527073..343831a90 100644 --- a/kaddressbook/xxport/gnokii_xxport.cpp +++ b/kaddressbook/xxport/gnokii_xxport.cpp @@ -16,8 +16,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ /* Description: @@ -77,8 +77,8 @@ static KProgressDialog *m_progressDlg; K_EXPORT_KADDRESSBOOK_XXFILTER( libkaddrbk_gnokii_xxport, GNOKIIXXPort ) -GNOKIIXXPort::GNOKIIXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name ) - : KAB::XXPort( ab, parent, name ) +GNOKIIXXPort::GNOKIIXXPort( KABC::AddressBook *ab, TQWidget *tqparent, const char *name ) + : KAB::XXPort( ab, tqparent, name ) { this_filter = this; m_progressDlg = NULL; @@ -94,7 +94,7 @@ static TQString makeValidPhone( const TQString &number ) TQString num = number.simplifyWhiteSpace(); TQString allowed("0123456789*+#pw"); for (unsigned int i=num.length(); i>=1; i--) - if (allowed.find(num[i-1])==-1) + if (allowed.tqfind(num[i-1])==-1) num.remove(i-1,1); if (num.isEmpty()) num = "0"; @@ -154,7 +154,7 @@ static TQString businit(void) GNOKII_DEBUG( TQString("Found mobile phone: %1 %2, Revision: %3, IMEI: %4\n") .arg(manufacturer, model, revision, imei) ); - return TQString::null; + return TQString(); } @@ -242,7 +242,7 @@ static gn_error read_phone_entries( const char *memtypestr, gn_memory_type memty // try to split Name into FamilyName and GivenName s = GN_FROM(name).simplifyWhiteSpace(); a->setFormattedName(s); // set formatted name as in Phone - if (s.find(',') == -1) { + if (s.tqfind(',') == -1) { // assumed format: "givenname [... familyname]" addrlist = TQStringList::split(' ', s); if (addrlist.count() == 1) { @@ -548,9 +548,7 @@ KABC::AddresseeList GNOKIIXXPort::importContacts( const TQString& ) const m_progressDlg->show(); processEvents(); -#if (QT_VERSION >= 0x030300) - m_progressDlg->setCursor( Qt::BusyCursor ); -#endif + m_progressDlg->setCursor( TQt::BusyCursor ); TQString errStr = businit(); m_progressDlg->unsetCursor(); @@ -605,9 +603,7 @@ bool GNOKIIXXPort::exportContacts( const KABC::AddresseeList &list, const TQStri gn_error error; bool deleteLabelInitialized = false; -#if (QT_VERSION >= 0x030300) - m_progressDlg->setCursor( Qt::BusyCursor ); -#endif + m_progressDlg->setCursor( TQt::BusyCursor ); TQString errStr = businit(); m_progressDlg->unsetCursor(); @@ -645,7 +641,7 @@ bool GNOKIIXXPort::exportContacts( const KABC::AddresseeList &list, const TQStri i18n("<qt>Do you want the selected contacts to be <b>appended</b> to " "the current mobile phonebook or should they <b>tqreplace</b> all " "currently existing phonebook entries ?<br><br>" - "Please note, that in case you choose to tqreplace the phonebook " + "Please note, that in case you choose to replace the phonebook " "entries, every contact in your phone will be deleted and only " "the newly exported contacts will be available from inside your phone.</qt>"), i18n("Export to Mobile Phone"), @@ -805,7 +801,7 @@ static gn_data data; static void busterminate(void) { gn_sm_functions(GN_OP_Terminate, NULL, &state); - if (lockfile) gn_device_unlock(lockfile); + if (lockfile) gn_tqdevice_unlock(lockfile); } static TQString businit(void) @@ -834,7 +830,7 @@ static TQString businit(void) aux = gn_cfg_get(gn_cfg_info, "global", "use_locking"); // Defaults to 'no' if (aux && !strcmp(aux, "yes")) { - lockfile = gn_device_lock(state.config.port_device); + lockfile = gn_tqdevice_lock(state.config.port_tqdevice); if (lockfile == NULL) { return i18n("Gnokii reports a 'Lock File Error'.\n " "Please exit all other running instances of gnokii, check if you have " @@ -872,7 +868,7 @@ static TQString businit(void) qstrncpy(imei, unknown, sizeof(imei)-1); if (m_progressDlg->wasCancelled()) - return TQString::null; + return TQString(); else error = gn_sm_functions(GN_OP_Identify, &data, &state); GNOKII_CHECK_ERROR(error); @@ -882,7 +878,7 @@ static TQString businit(void) PhoneProductId = TQString("%1-%2-%3-%4").arg(APP).arg(model).arg(revision).arg(imei); - return TQString::null; + return TQString(); } @@ -895,7 +891,7 @@ static gn_error read_phone_memstat( const gn_memory_type memtype, gn_memory_stat memset(memstat, 0, sizeof(*memstat)); memstat->memory_type = memtype; data.memory_status = memstat; - error = gn_sm_functions(GN_OP_GetMemoryStatus, &data, &state); + error = gn_sm_functions(GN_OP_GetMemorytqStatus, &data, &state); GNOKII_CHECK_ERROR(error); if (error != GN_ERR_NONE) { switch (memtype) { @@ -1019,7 +1015,7 @@ static gn_error read_phone_entries( const char *memtypestr, gn_memory_type memty // try to split Name into FamilyName and GivenName s = GN_FROM(entry.name).simplifyWhiteSpace(); a->setFormattedName(s); // set formatted name as in Phone - if (s.find(',') == -1) { + if (s.tqfind(',') == -1) { // assumed format: "givenname [... familyname]" addrlist = TQStringList::split(' ', s); if (addrlist.count() == 1) { @@ -1343,9 +1339,7 @@ KABC::AddresseeList GNOKIIXXPort::importContacts( const TQString& ) const m_progressDlg->show(); processEvents(); -#if (QT_VERSION >= 0x030300) - m_progressDlg->setCursor( Qt::BusyCursor ); -#endif + m_progressDlg->setCursor( TQt::BusyCursor ); TQString errStr = businit(); m_progressDlg->unsetCursor(); @@ -1400,9 +1394,7 @@ bool GNOKIIXXPort::exportContacts( const KABC::AddresseeList &list, const TQStri gn_error error; bool deleteLabelInitialized = false; -#if (QT_VERSION >= 0x030300) - m_progressDlg->setCursor( Qt::BusyCursor ); -#endif + m_progressDlg->setCursor( TQt::BusyCursor ); TQString errStr = businit(); m_progressDlg->unsetCursor(); @@ -1440,7 +1432,7 @@ bool GNOKIIXXPort::exportContacts( const KABC::AddresseeList &list, const TQStri i18n("<qt>Do you want the selected contacts to be <b>appended</b> to " "the current mobile phonebook or should they <b>tqreplace</b> all " "currently existing phonebook entries ?<br><br>" - "Please note, that in case you choose to tqreplace the phonebook " + "Please note, that in case you choose to replace the phonebook " "entries, every contact in your phone will be deleted and only " "the newly exported contacts will be available from inside your phone.</qt>"), i18n("Export to Mobile Phone"), diff --git a/kaddressbook/xxport/gnokii_xxport.h b/kaddressbook/xxport/gnokii_xxport.h index edee6abbe..a78ca2335 100644 --- a/kaddressbook/xxport/gnokii_xxport.h +++ b/kaddressbook/xxport/gnokii_xxport.h @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef GNOKII_XXPORT_H @@ -29,9 +29,10 @@ class GNOKIIXXPort : public KAB::XXPort { Q_OBJECT + TQ_OBJECT public: - GNOKIIXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 ); + GNOKIIXXPort( KABC::AddressBook *ab, TQWidget *tqparent, const char *name = 0 ); TQString identifier() const { return "gnokii"; } diff --git a/kaddressbook/xxport/kde2_xxport.cpp b/kaddressbook/xxport/kde2_xxport.cpp index fb03e2c32..b0e44c3db 100644 --- a/kaddressbook/xxport/kde2_xxport.cpp +++ b/kaddressbook/xxport/kde2_xxport.cpp @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include <tqfile.h> @@ -39,8 +39,8 @@ K_EXPORT_KADDRESSBOOK_XXFILTER( libkaddrbk_kde2_xxport, KDE2XXPort ) -KDE2XXPort::KDE2XXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name ) - : KAB::XXPort( ab, parent, name ) +KDE2XXPort::KDE2XXPort( KABC::AddressBook *ab, TQWidget *tqparent, const char *name ) + : KAB::XXPort( ab, tqparent, name ) { createImportAction( i18n( "Import KDE 2 Addressbook..." ) ); } diff --git a/kaddressbook/xxport/kde2_xxport.h b/kaddressbook/xxport/kde2_xxport.h index a56bc0288..895a09a43 100644 --- a/kaddressbook/xxport/kde2_xxport.h +++ b/kaddressbook/xxport/kde2_xxport.h @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef KDE2_XXPORT_H @@ -29,9 +29,10 @@ class KDE2XXPort : public KAB::XXPort { Q_OBJECT + TQ_OBJECT public: - KDE2XXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 ); + KDE2XXPort( KABC::AddressBook *ab, TQWidget *tqparent, const char *name = 0 ); TQString identifier() const { return "kde2"; } diff --git a/kaddressbook/xxport/ldif_xxport.cpp b/kaddressbook/xxport/ldif_xxport.cpp index 799e4ca35..307fb6821 100644 --- a/kaddressbook/xxport/ldif_xxport.cpp +++ b/kaddressbook/xxport/ldif_xxport.cpp @@ -19,8 +19,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ /* @@ -50,8 +50,8 @@ K_EXPORT_KADDRESSBOOK_XXFILTER( libkaddrbk_ldif_xxport, LDIFXXPort ) -LDIFXXPort::LDIFXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name ) - : KAB::XXPort( ab, parent, name ) +LDIFXXPort::LDIFXXPort( KABC::AddressBook *ab, TQWidget *tqparent, const char *name ) + : KAB::XXPort( ab, tqparent, name ) { createImportAction( i18n( "Import LDIF Addressbook..." ) ); createExportAction( i18n( "Export LDIF Addressbook..." ) ); diff --git a/kaddressbook/xxport/ldif_xxport.h b/kaddressbook/xxport/ldif_xxport.h index 72c047d64..2d1e9e04e 100644 --- a/kaddressbook/xxport/ldif_xxport.h +++ b/kaddressbook/xxport/ldif_xxport.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef LDIF_XXPORT_H @@ -30,9 +30,10 @@ class LDIFXXPort : public KAB::XXPort { Q_OBJECT + TQ_OBJECT public: - LDIFXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 ); + LDIFXXPort( KABC::AddressBook *ab, TQWidget *tqparent, const char *name = 0 ); TQString identifier() const { return "ldif"; } diff --git a/kaddressbook/xxport/opera_xxport.cpp b/kaddressbook/xxport/opera_xxport.cpp index c10a28523..9ddbcb396 100644 --- a/kaddressbook/xxport/opera_xxport.cpp +++ b/kaddressbook/xxport/opera_xxport.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include <tqfile.h> @@ -38,8 +38,8 @@ K_EXPORT_KADDRESSBOOK_XXFILTER( libkaddrbk_opera_xxport, OperaXXPort ) -OperaXXPort::OperaXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name ) - : KAB::XXPort( ab, parent, name ) +OperaXXPort::OperaXXPort( KABC::AddressBook *ab, TQWidget *tqparent, const char *name ) + : KAB::XXPort( ab, tqparent, name ) { createImportAction( i18n( "Import Opera Addressbook..." ) ); } @@ -84,7 +84,7 @@ KABC::AddresseeList OperaXXPort::importContacts( const TQString& ) const } if ( parseContact == true ) { - int sep = line.find( '=' ); + int sep = line.tqfind( '=' ); key = line.left( sep ).lower(); value = line.mid( sep + 1 ); if ( key == TQString::tqfromLatin1( "name" ) ) diff --git a/kaddressbook/xxport/opera_xxport.h b/kaddressbook/xxport/opera_xxport.h index 7730dde56..b33c91521 100644 --- a/kaddressbook/xxport/opera_xxport.h +++ b/kaddressbook/xxport/opera_xxport.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef OPERA_XXPORT_H @@ -30,9 +30,10 @@ class OperaXXPort : public KAB::XXPort { Q_OBJECT + TQ_OBJECT public: - OperaXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 ); + OperaXXPort( KABC::AddressBook *ab, TQWidget *tqparent, const char *name = 0 ); TQString identifier() const { return "opera"; } diff --git a/kaddressbook/xxport/pab_mapihd.cpp b/kaddressbook/xxport/pab_mapihd.cpp index 6d61cb339..b1ab4e5f4 100644 --- a/kaddressbook/xxport/pab_mapihd.cpp +++ b/kaddressbook/xxport/pab_mapihd.cpp @@ -151,7 +151,7 @@ pabrec_entry e=pr_unknown; return e; } -pabfields_t::pabfields_t(pabrec & R, TQWidget * /*parent*/) +pabfields_t::pabfields_t(pabrec & R, TQWidget * /*tqparent*/) { // Skip the first two words, because they're always the // same 000c 0014 ==> 0014 gives us the types, so we diff --git a/kaddressbook/xxport/pab_mapihd.h b/kaddressbook/xxport/pab_mapihd.h index c54be4500..7db97873a 100644 --- a/kaddressbook/xxport/pab_mapihd.h +++ b/kaddressbook/xxport/pab_mapihd.h @@ -105,7 +105,7 @@ word_t literal(int k); content_t order(int k); public: - pabfields_t(pabrec & R, TQWidget *parent); + pabfields_t(pabrec & R, TQWidget *tqparent); public: KABC::Addressee get( ); bool isOK(void) { return OK; } diff --git a/kaddressbook/xxport/pab_pablib.h b/kaddressbook/xxport/pab_pablib.h index c26cbdf23..13f2b7200 100644 --- a/kaddressbook/xxport/pab_pablib.h +++ b/kaddressbook/xxport/pab_pablib.h @@ -36,7 +36,7 @@ class pab TQFile in; const char *pabfile; TQString cap; - TQWidget *parent; + TQWidget *tqparent; public: pab(const char *pabFile); ~pab(); diff --git a/kaddressbook/xxport/pab_xxport.cpp b/kaddressbook/xxport/pab_xxport.cpp index 6aa818503..1b5b3c6f7 100644 --- a/kaddressbook/xxport/pab_xxport.cpp +++ b/kaddressbook/xxport/pab_xxport.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include <tqfile.h> @@ -40,8 +40,8 @@ K_EXPORT_KADDRESSBOOK_XXFILTER( libkaddrbk_pab_xxport, PABXXPort ) -PABXXPort::PABXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name ) - : KAB::XXPort( ab, parent, name ) +PABXXPort::PABXXPort( KABC::AddressBook *ab, TQWidget *tqparent, const char *name ) + : KAB::XXPort( ab, tqparent, name ) { createImportAction( i18n("Import MS Exchange Personal Address Book (.PAB)") ); } diff --git a/kaddressbook/xxport/pab_xxport.h b/kaddressbook/xxport/pab_xxport.h index e98b56bfa..70eef1a3f 100644 --- a/kaddressbook/xxport/pab_xxport.h +++ b/kaddressbook/xxport/pab_xxport.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef PAB_XXPORT_H @@ -30,9 +30,10 @@ class PABXXPort : public KAB::XXPort { Q_OBJECT + TQ_OBJECT public: - PABXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 ); + PABXXPort( KABC::AddressBook *ab, TQWidget *tqparent, const char *name = 0 ); TQString identifier() const { return "pab"; } diff --git a/kaddressbook/xxport/vcard_xxport.cpp b/kaddressbook/xxport/vcard_xxport.cpp index 69f854f33..e66016a14 100644 --- a/kaddressbook/xxport/vcard_xxport.cpp +++ b/kaddressbook/xxport/vcard_xxport.cpp @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include <tqcheckbox.h> @@ -56,7 +56,7 @@ class VCardViewerDialog : public KDialogBase { public: VCardViewerDialog( const KABC::Addressee::List &list, - TQWidget *parent, const char *name = 0 ); + TQWidget *tqparent, const char *name = 0 ); KABC::Addressee::List contacts() const; @@ -78,7 +78,7 @@ class VCardViewerDialog : public KDialogBase class VCardExportSelectionDialog : public KDialogBase { public: - VCardExportSelectionDialog( TQWidget *parent, const char *name = 0 ); + VCardExportSelectionDialog( TQWidget *tqparent, const char *name = 0 ); ~VCardExportSelectionDialog(); bool exportPrivateFields() const; @@ -93,8 +93,8 @@ class VCardExportSelectionDialog : public KDialogBase TQCheckBox *mEncryptionKeys; }; -VCardXXPort::VCardXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name ) - : KAB::XXPort( ab, parent, name ) +VCardXXPort::VCardXXPort( KABC::AddressBook *ab, TQWidget *tqparent, const char *name ) + : KAB::XXPort( ab, tqparent, name ) { createImportAction( i18n( "Import vCard..." ) ); createExportAction( i18n( "Export vCard 2.1..." ), "v21" ); @@ -131,7 +131,7 @@ bool VCardXXPort::exportContacts( const KABC::AddresseeList &addrList, const TQS TQString msg = i18n( "You have selected a list of contacts, shall they be " "exported to several files?" ); - switch ( KMessageBox::questionYesNo( tqparentWidget(), msg, TQString::null, i18n("Export to Several Files"), i18n("Export to One File") ) ) { + switch ( KMessageBox::questionYesNo( tqparentWidget(), msg, TQString(), i18n("Export to Several Files"), i18n("Export to One File") ) ) { case KMessageBox::Yes: { KURL baseUrl = KFileDialog::getExistingURL(); if ( baseUrl.isEmpty() ) @@ -208,7 +208,7 @@ KABC::AddresseeList VCardXXPort::importContacts( const TQString& ) const #endif } else { if ( XXPortManager::importURL.isEmpty() ) - urls = KFileDialog::getOpenURLs( TQString::null, "*.vcf|vCards", tqparentWidget(), + urls = KFileDialog::getOpenURLs( TQString(), "*.vcf|vCards", tqparentWidget(), i18n( "Select vCard to Import" ) ); else urls.append( XXPortManager::importURL ); @@ -445,7 +445,7 @@ void VCardXXPort::addKey( KABC::Addressee &addr, KABC::Key::Types type ) context->setArmor( false ); context->setTextMode( false ); - QGpgME::QByteArrayDataProvider dataProvider; + QGpgME::TQByteArrayDataProvider dataProvider; GpgME::Data dataObj( &dataProvider ); GpgME::Error error = context->exportPublicKeys( fingerprint.latin1(), dataObj ); delete context; @@ -465,9 +465,9 @@ void VCardXXPort::addKey( KABC::Addressee &addr, KABC::Key::Types type ) // ---------- VCardViewer Dialog ---------------- // VCardViewerDialog::VCardViewerDialog( const KABC::Addressee::List &list, - TQWidget *parent, const char *name ) + TQWidget *tqparent, const char *name ) : KDialogBase( Plain, i18n( "Import vCard" ), Yes | No | Apply | Cancel, Yes, - parent, name, true, true, KStdGuiItem::no(), KStdGuiItem::yes() ), + tqparent, name, true, true, KStdGuiItem::no(), KStdGuiItem::yes() ), mContacts( list ) { TQFrame *page = plainPage(); @@ -537,10 +537,10 @@ void VCardViewerDialog::slotCancel() // ---------- VCardExportSelection Dialog ---------------- // -VCardExportSelectionDialog::VCardExportSelectionDialog( TQWidget *parent, +VCardExportSelectionDialog::VCardExportSelectionDialog( TQWidget *tqparent, const char *name ) : KDialogBase( Plain, i18n( "Select vCard Fields" ), Ok | Cancel, Ok, - parent, name, true, true ) + tqparent, name, true, true ) { TQFrame *page = plainPage(); diff --git a/kaddressbook/xxport/vcard_xxport.h b/kaddressbook/xxport/vcard_xxport.h index 191d37a39..e051d53ff 100644 --- a/kaddressbook/xxport/vcard_xxport.h +++ b/kaddressbook/xxport/vcard_xxport.h @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef VCARD_XXPORT_H @@ -30,9 +30,10 @@ class VCardXXPort : public KAB::XXPort { Q_OBJECT + TQ_OBJECT public: - VCardXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 ); + VCardXXPort( KABC::AddressBook *ab, TQWidget *tqparent, const char *name = 0 ); TQString identifier() const { return "vcard"; } diff --git a/kaddressbook/xxportmanager.cpp b/kaddressbook/xxportmanager.cpp index aee87fd46..0f8332ed5 100644 --- a/kaddressbook/xxportmanager.cpp +++ b/kaddressbook/xxportmanager.cpp @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include <tqlayout.h> @@ -41,8 +41,8 @@ KURL XXPortManager::importURL = KURL(); TQString XXPortManager::importData = TQString(); -XXPortManager::XXPortManager( KAB::Core *core, TQObject *parent, const char *name ) - : TQObject( parent, name ), mCore( core ) +XXPortManager::XXPortManager( KAB::Core *core, TQObject *tqparent, const char *name ) + : TQObject( tqparent, name ), mCore( core ) { loadPlugins(); } diff --git a/kaddressbook/xxportmanager.h b/kaddressbook/xxportmanager.h index 92bc48fa0..fb179d6eb 100644 --- a/kaddressbook/xxportmanager.h +++ b/kaddressbook/xxportmanager.h @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef XXPORTMANAGER_H @@ -37,12 +37,13 @@ namespace KAB { class Core; } -class KDE_EXPORT XXPortManager : public QObject +class KDE_EXPORT XXPortManager : public TQObject { Q_OBJECT + TQ_OBJECT public: - XXPortManager( KAB::Core *core, TQObject *parent, const char *name = 0 ); + XXPortManager( KAB::Core *core, TQObject *tqparent, const char *name = 0 ); ~XXPortManager(); void restoreSettings(); diff --git a/kaddressbook/xxportselectdialog.cpp b/kaddressbook/xxportselectdialog.cpp index 9b84961dd..f7badeaaf 100644 --- a/kaddressbook/xxportselectdialog.cpp +++ b/kaddressbook/xxportselectdialog.cpp @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include <kabc/addressbook.h> @@ -44,9 +44,9 @@ #include "xxportselectdialog.h" XXPortSelectDialog::XXPortSelectDialog( KAB::Core *core, bool sort, - TQWidget* parent, const char* name ) + TQWidget* tqparent, const char* name ) : KDialogBase( Plain, i18n( "Choose Which Contacts to Export" ), Help | Ok | Cancel, - Ok, parent, name, true, true ), mCore( core ), + Ok, tqparent, name, true, true ), mCore( core ), mUseSorting( sort ) { initGUI(); @@ -94,7 +94,7 @@ KABC::AddresseeList XXPortSelectDialog::contacts() if ( mUseSelection->isChecked() ) { TQStringList::ConstIterator it; for ( it = selection.begin(); it != selection.end(); ++it ) { - KABC::Addressee addr = mCore->addressBook()->tqfindByUid( *it ); + KABC::Addressee addr = mCore->addressBook()->findByUid( *it ); if ( !addr.isEmpty() ) list.append( addr ); } @@ -186,12 +186,12 @@ void XXPortSelectDialog::initGUI() topLayout->addWidget( label ); mButtonGroup = new TQButtonGroup( i18n( "Selection" ), page ); - mButtonGroup->setColumnLayout( 0, Qt::Vertical ); + mButtonGroup->setColumnLayout( 0, TQt::Vertical ); mButtonGroup->tqlayout()->setSpacing( KDialog::spacingHint() ); mButtonGroup->tqlayout()->setMargin( KDialog::marginHint() ); TQGridLayout *groupLayout = new TQGridLayout( mButtonGroup->tqlayout() ); - groupLayout->tqsetAlignment( Qt::AlignTop ); + groupLayout->tqsetAlignment( TQt::AlignTop ); mUseWholeBook = new TQRadioButton( i18n( "&All contacts" ), mButtonGroup ); mUseWholeBook->setChecked( true ); @@ -210,7 +210,7 @@ void XXPortSelectDialog::initGUI() mUseCategories = new TQRadioButton( i18n( "Category &members" ), mButtonGroup ); TQWhatsThis::add( mUseCategories, i18n( "Only export contacts who are members of a category that is checked on the list to the left.\n" "This option is disabled if you have no categories." ) ); - groupLayout->addWidget( mUseCategories, 3, 0, Qt::AlignTop ); + groupLayout->addWidget( mUseCategories, 3, 0, TQt::AlignTop ); mFiltersCombo = new TQComboBox( false, mButtonGroup ); TQWhatsThis::add( mFiltersCombo, i18n( "Select a filter to decide which contacts to export." ) ); @@ -225,10 +225,10 @@ 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->tqlayout(), 2, 2, KDialog::spacingHint() ); - sortLayout->tqsetAlignment( Qt::AlignTop ); + sortLayout->tqsetAlignment( TQt::AlignTop ); label = new TQLabel( i18n( "Criterion:" ), sortingGroup ); sortLayout->addWidget( label, 0, 0 ); diff --git a/kaddressbook/xxportselectdialog.h b/kaddressbook/xxportselectdialog.h index cb620fd39..10c311b12 100644 --- a/kaddressbook/xxportselectdialog.h +++ b/kaddressbook/xxportselectdialog.h @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef XXPORTSELECTDIALOG_H #define XXPORTSELECTDIALOG_H @@ -45,9 +45,10 @@ class KComboBox; class XXPortSelectDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - XXPortSelectDialog( KAB::Core *core, bool sort, TQWidget* parent, + XXPortSelectDialog( KAB::Core *core, bool sort, TQWidget* tqparent, const char* name = 0 ); KABC::AddresseeList contacts(); |