diff options
Diffstat (limited to 'tdeabc')
60 files changed, 232 insertions, 238 deletions
diff --git a/tdeabc/HOWTO b/tdeabc/HOWTO index 1070ccd4c..d53cd8725 100644 --- a/tdeabc/HOWTO +++ b/tdeabc/HOWTO @@ -169,7 +169,7 @@ The following code will create a file resource and save a contact into it: 39: 40: // PHOTO or LOGO 41: TDEABC::Picture photo; -42: QImage img; +42: TQImage img; 43: if ( img.load( "face.png", "PNG" ) ) { 44: photo.setData( img ); 45: photo.setType( "image/png" ); @@ -252,10 +252,10 @@ as argument. In line 41 we make use of TDEABC::Picture class to store the photo of the contact. This class can contain either an URL or the raw image data in form -of a QImage, in this example we use the latter. +of a TQImage, in this example we use the latter. In line 43 we try to load the image "face.png" from the local directory and -assign this QImage to the TDEABC::Picture class via the setData() function. +assign this TQImage to the TDEABC::Picture class via the setData() function. Additionally we set the type of the picture to "image/png". From 49 - 50 we insert 2 email addresses with the first one as preferred @@ -337,7 +337,7 @@ representation of one list. 12: QStringList emails = list->emails(); 13: QStringList::Iterator eit; 14: for ( eit = emails.begin(); eit != emails.end(); ++eit ) -15: kdDebug() << QString( "\t%1" ).arg( (*eit).latin1() ) << endl; +15: kdDebug() << TQString( "\t%1" ).arg( (*eit).latin1() ) << endl; 16: } In the first line a TDEABC::DistributionListManager is created. The manager takes @@ -365,8 +365,8 @@ changed. So to make your application aware of changes use the following code: #include <tdeabc/distributionlist.h> - 1: connect( TDEABC::DistributionListWatcher::self(), SIGNAL( changed() ), - 2: this, SLOT( slotDistributionListChanged() ) ); + 1: connect( TDEABC::DistributionListWatcher::self(), TQ_SIGNAL( changed() ), + 2: this, TQ_SLOT( slotDistributionListChanged() ) ); You see, as usual, easy ;) diff --git a/tdeabc/addressbook.cpp b/tdeabc/addressbook.cpp index b9d239ef4..a472b2bd0 100644 --- a/tdeabc/addressbook.cpp +++ b/tdeabc/addressbook.cpp @@ -711,15 +711,15 @@ bool AddressBook::addResource( Resource *resource ) d->mManager->add( resource ); resource->setAddressBook( this ); - connect( resource, TQT_SIGNAL( loadingFinished( Resource* ) ), - this, TQT_SLOT( resourceLoadingFinished( Resource* ) ) ); - connect( resource, TQT_SIGNAL( savingFinished( Resource* ) ), - this, TQT_SLOT( resourceSavingFinished( Resource* ) ) ); + connect( resource, TQ_SIGNAL( loadingFinished( Resource* ) ), + this, TQ_SLOT( resourceLoadingFinished( Resource* ) ) ); + connect( resource, TQ_SIGNAL( savingFinished( Resource* ) ), + this, TQ_SLOT( resourceSavingFinished( Resource* ) ) ); - connect( resource, TQT_SIGNAL( loadingError( Resource*, const TQString& ) ), - this, TQT_SLOT( resourceLoadingError( Resource*, const TQString& ) ) ); - connect( resource, TQT_SIGNAL( savingError( Resource*, const TQString& ) ), - this, TQT_SLOT( resourceSavingError( Resource*, const TQString& ) ) ); + connect( resource, TQ_SIGNAL( loadingError( Resource*, const TQString& ) ), + this, TQ_SLOT( resourceLoadingError( Resource*, const TQString& ) ) ); + connect( resource, TQ_SIGNAL( savingError( Resource*, const TQString& ) ), + this, TQ_SLOT( resourceSavingError( Resource*, const TQString& ) ) ); return true; } @@ -733,15 +733,15 @@ bool AddressBook::removeResource( Resource *resource ) resource->setAddressBook( 0 ); - disconnect( resource, TQT_SIGNAL( loadingFinished( Resource* ) ), - this, TQT_SLOT( resourceLoadingFinished( Resource* ) ) ); - disconnect( resource, TQT_SIGNAL( savingFinished( Resource* ) ), - this, TQT_SLOT( resourceSavingFinished( Resource* ) ) ); + disconnect( resource, TQ_SIGNAL( loadingFinished( Resource* ) ), + this, TQ_SLOT( resourceLoadingFinished( Resource* ) ) ); + disconnect( resource, TQ_SIGNAL( savingFinished( Resource* ) ), + this, TQ_SLOT( resourceSavingFinished( Resource* ) ) ); - disconnect( resource, TQT_SIGNAL( loadingError( Resource*, const TQString& ) ), - this, TQT_SLOT( resourceLoadingError( Resource*, const TQString& ) ) ); - disconnect( resource, TQT_SIGNAL( savingError( Resource*, const TQString& ) ), - this, TQT_SLOT( resourceLoadingError( Resource*, const TQString& ) ) ); + disconnect( resource, TQ_SIGNAL( loadingError( Resource*, const TQString& ) ), + this, TQ_SLOT( resourceLoadingError( Resource*, const TQString& ) ) ); + disconnect( resource, TQ_SIGNAL( savingError( Resource*, const TQString& ) ), + this, TQ_SLOT( resourceLoadingError( Resource*, const TQString& ) ) ); d->mManager->remove( resource ); diff --git a/tdeabc/addressbook.h b/tdeabc/addressbook.h index 5a3d1a45a..f505f5526 100644 --- a/tdeabc/addressbook.h +++ b/tdeabc/addressbook.h @@ -42,7 +42,7 @@ class Ticket; */ class KABC_EXPORT AddressBook : public TQObject { - Q_OBJECT + TQ_OBJECT friend KABC_EXPORT TQDataStream &operator<<( TQDataStream &, const AddressBook & ); friend KABC_EXPORT TQDataStream &operator>>( TQDataStream &, AddressBook & ); @@ -339,7 +339,7 @@ class KABC_EXPORT AddressBook : public TQObject /** @deprecated There is no need to call this function anymore. */ - void cleanUp() KDE_DEPRECATED; + void cleanUp() TDE_DEPRECATED; /** Used for debug output. This function prints out the list diff --git a/tdeabc/addresseedialog.cpp b/tdeabc/addresseedialog.cpp index 26c87d8b8..73e7b7172 100644 --- a/tdeabc/addresseedialog.cpp +++ b/tdeabc/addresseedialog.cpp @@ -72,15 +72,15 @@ AddresseeDialog::AddresseeDialog( TQWidget *parent, bool multiple ) : mAddresseeList->setAllColumnsShowFocus( true ); mAddresseeList->setFullWidth( true ); listLayout->addWidget( mAddresseeList ); - connect( mAddresseeList, TQT_SIGNAL( doubleClicked( TQListViewItem * ) ), - TQT_SLOT( slotOk() ) ); - connect( mAddresseeList, TQT_SIGNAL( selectionChanged( TQListViewItem * ) ), - TQT_SLOT( updateEdit( TQListViewItem * ) ) ); + connect( mAddresseeList, TQ_SIGNAL( doubleClicked( TQListViewItem * ) ), + TQ_SLOT( slotOk() ) ); + connect( mAddresseeList, TQ_SIGNAL( selectionChanged( TQListViewItem * ) ), + TQ_SLOT( updateEdit( TQListViewItem * ) ) ); mAddresseeEdit = new KLineEdit( topWidget ); mAddresseeEdit->setCompletionMode( TDEGlobalSettings::CompletionAuto ); - connect( mAddresseeEdit->completionObject(), TQT_SIGNAL( match( const TQString & ) ), - TQT_SLOT( selectItem( const TQString & ) ) ); + connect( mAddresseeEdit->completionObject(), TQ_SIGNAL( match( const TQString & ) ), + TQ_SLOT( selectItem( const TQString & ) ) ); mAddresseeEdit->setFocus(); mAddresseeEdit->completionObject()->setIgnoreCase( true ); listLayout->addWidget( mAddresseeEdit ); @@ -92,7 +92,7 @@ AddresseeDialog::AddresseeDialog( TQWidget *parent, bool multiple ) : topLayout->addLayout( selectedLayout ); topLayout->setSpacing( spacingHint() ); - TQGroupBox *selectedGroup = new TQGroupBox( 1, Qt::Horizontal, i18n("Selected"), + TQGroupBox *selectedGroup = new TQGroupBox( 1, TQt::Horizontal, i18n("Selected"), topWidget ); selectedLayout->addWidget( selectedGroup ); @@ -101,23 +101,23 @@ AddresseeDialog::AddresseeDialog( TQWidget *parent, bool multiple ) : mSelectedList->addColumn( i18n("Email") ); mSelectedList->setAllColumnsShowFocus( true ); mSelectedList->setFullWidth( true ); - connect( mSelectedList, TQT_SIGNAL( doubleClicked( TQListViewItem * ) ), - TQT_SLOT( removeSelected() ) ); + connect( mSelectedList, TQ_SIGNAL( doubleClicked( TQListViewItem * ) ), + TQ_SLOT( removeSelected() ) ); TQPushButton *unselectButton = new TQPushButton( i18n("Unselect"), selectedGroup ); - connect ( unselectButton, TQT_SIGNAL( clicked() ), TQT_SLOT( removeSelected() ) ); + connect ( unselectButton, TQ_SIGNAL( clicked() ), TQ_SLOT( removeSelected() ) ); - connect( mAddresseeList, TQT_SIGNAL( clicked( TQListViewItem * ) ), - TQT_SLOT( addSelected( TQListViewItem * ) ) ); + connect( mAddresseeList, TQ_SIGNAL( clicked( TQListViewItem * ) ), + TQ_SLOT( addSelected( TQListViewItem * ) ) ); setInitialSize( TQSize( 650, 350 ) ); } mAddressBook = StdAddressBook::self( true ); - connect( mAddressBook, TQT_SIGNAL( addressBookChanged( AddressBook* ) ), - TQT_SLOT( addressBookChanged() ) ); - connect( mAddressBook, TQT_SIGNAL( loadingFinished( Resource* ) ), - TQT_SLOT( addressBookChanged() ) ); + connect( mAddressBook, TQ_SIGNAL( addressBookChanged( AddressBook* ) ), + TQ_SLOT( addressBookChanged() ) ); + connect( mAddressBook, TQ_SIGNAL( loadingFinished( Resource* ) ), + TQ_SLOT( addressBookChanged() ) ); loadAddressBook(); } diff --git a/tdeabc/addresseedialog.h b/tdeabc/addresseedialog.h index f94b49b71..4623abdb1 100644 --- a/tdeabc/addresseedialog.h +++ b/tdeabc/addresseedialog.h @@ -82,7 +82,7 @@ class KABC_EXPORT AddresseeItem : public TQListViewItem */ class KABC_EXPORT AddresseeDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/tdeabc/addresslineedit.cpp b/tdeabc/addresslineedit.cpp index 93a327889..ef6537e28 100644 --- a/tdeabc/addresslineedit.cpp +++ b/tdeabc/addresslineedit.cpp @@ -104,22 +104,22 @@ void AddressLineEdit::init() ldapSearchDeleter.setObject( s_LDAPSearch, new LdapSearch ); ldapTextDeleter.setObject( s_LDAPText, new TQString ); } - connect( s_LDAPTimer, TQT_SIGNAL( timeout()), TQT_SLOT( slotStartLDAPLookup())); - connect( s_LDAPSearch, TQT_SIGNAL( searchData( const TQStringList& )), - TQT_SLOT( slotLDAPSearchData( const TQStringList& ))); + connect( s_LDAPTimer, TQ_SIGNAL( timeout()), TQ_SLOT( slotStartLDAPLookup())); + connect( s_LDAPSearch, TQ_SIGNAL( searchData( const TQStringList& )), + TQ_SLOT( slotLDAPSearchData( const TQStringList& ))); } if ( m_useCompletion && !m_completionInitialized ) { setCompletionObject( s_completion, false ); // we handle it ourself - connect( this, TQT_SIGNAL( completion(const TQString&)), - this, TQT_SLOT(slotCompletion() )); + connect( this, TQ_SIGNAL( completion(const TQString&)), + this, TQ_SLOT(slotCompletion() )); TDECompletionBox *box = completionBox(); - connect( box, TQT_SIGNAL( highlighted( const TQString& )), - this, TQT_SLOT( slotPopupCompletion( const TQString& ) )); - connect( box, TQT_SIGNAL( userCancelled( const TQString& )), - TQT_SLOT( userCancelled( const TQString& ))); + connect( box, TQ_SIGNAL( highlighted( const TQString& )), + this, TQ_SLOT( slotPopupCompletion( const TQString& ) )); + connect( box, TQ_SIGNAL( userCancelled( const TQString& )), + TQ_SLOT( userCancelled( const TQString& ))); m_completionInitialized = true; // don't connect muliple times. That's // ugly, tho, better have completionBox() @@ -190,7 +190,7 @@ void AddressLineEdit::keyPressEvent(TQKeyEvent *e) void AddressLineEdit::mouseReleaseEvent( TQMouseEvent * e ) { - if (m_useCompletion && (e->button() == Qt::MidButton)) + if (m_useCompletion && (e->button() == TQt::MidButton)) { m_smartPaste = true; KLineEdit::mouseReleaseEvent(e); diff --git a/tdeabc/addresslineedit.h b/tdeabc/addresslineedit.h index b8f83ceab..d42e35533 100644 --- a/tdeabc/addresslineedit.h +++ b/tdeabc/addresslineedit.h @@ -49,7 +49,7 @@ class LdapSearch; */ class KABC_EXPORT AddressLineEdit : public KLineEdit { - Q_OBJECT + TQ_OBJECT public: AddressLineEdit(TQWidget* parent, bool useCompletion = true, const char *name = 0L); diff --git a/tdeabc/distributionlist.cpp b/tdeabc/distributionlist.cpp index 7c55fccd6..3456418de 100644 --- a/tdeabc/distributionlist.cpp +++ b/tdeabc/distributionlist.cpp @@ -108,7 +108,7 @@ DistributionList::Entry::List DistributionList::entries() const return mEntries; } -typedef TQValueList< QPair<TQString, TQString> > MissingEntryList; +typedef TQValueList< TQPair<TQString, TQString> > MissingEntryList; class DistributionListManager::DistributionListManagerPrivate { @@ -275,7 +275,7 @@ DistributionListWatcher::DistributionListWatcher() mDirWatch = new KDirWatch; mDirWatch->addFile( locateLocal( "data", "tdeabc/distlists" ) ); - connect( mDirWatch, TQT_SIGNAL( dirty( const TQString& ) ), TQT_SIGNAL( changed() ) ); + connect( mDirWatch, TQ_SIGNAL( dirty( const TQString& ) ), TQ_SIGNAL( changed() ) ); mDirWatch->startScan(); } diff --git a/tdeabc/distributionlist.h b/tdeabc/distributionlist.h index 44de7f0d3..ef1b1fece 100644 --- a/tdeabc/distributionlist.h +++ b/tdeabc/distributionlist.h @@ -182,13 +182,13 @@ class KABC_EXPORT DistributionListManager \code TDEABC::DistributionListWatcher *watchdog = TDEABC::DistributionListWatcher::self() - connect( watchdog, TQT_SIGNAL( changed() ), TQT_SLOT( doSomething() ) ); + connect( watchdog, TQ_SIGNAL( changed() ), TQ_SLOT( doSomething() ) ); \endcode */ class KABC_EXPORT DistributionListWatcher : public TQObject { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/tdeabc/distributionlistdialog.cpp b/tdeabc/distributionlistdialog.cpp index 04578e19a..9d424a927 100644 --- a/tdeabc/distributionlistdialog.cpp +++ b/tdeabc/distributionlistdialog.cpp @@ -46,7 +46,7 @@ DistributionListDialog::DistributionListDialog( AddressBook *addressBook, TQWidg mEditor = new DistributionListEditorWidget( addressBook, this ); setMainWidget( mEditor ); - connect( this, TQT_SIGNAL( okClicked() ), mEditor, TQT_SLOT( save() ) ); + connect( this, TQ_SIGNAL( okClicked() ), mEditor, TQ_SLOT( save() ) ); } DistributionListDialog::~DistributionListDialog() @@ -66,7 +66,7 @@ EmailSelector::EmailSelector( const TQStringList &emails, const TQString ¤ TQFrame *topFrame = plainPage(); TQBoxLayout *topLayout = new TQVBoxLayout( topFrame ); - mButtonGroup = new TQButtonGroup( 1, Qt::Horizontal, i18n("Email Addresses"), + mButtonGroup = new TQButtonGroup( 1, TQt::Horizontal, i18n("Email Addresses"), topFrame ); topLayout->addWidget( mButtonGroup ); @@ -147,19 +147,19 @@ DistributionListEditorWidget::DistributionListEditorWidget( AddressBook *address mNameCombo = new TQComboBox( this ); nameLayout->addWidget( mNameCombo ); - connect( mNameCombo, TQT_SIGNAL( activated( int ) ), TQT_SLOT( updateEntryView() ) ); + connect( mNameCombo, TQ_SIGNAL( activated( int ) ), TQ_SLOT( updateEntryView() ) ); mNewButton = new TQPushButton( i18n("New List..."), this ); nameLayout->addWidget( mNewButton ); - connect( mNewButton, TQT_SIGNAL( clicked() ), TQT_SLOT( newList() ) ); + connect( mNewButton, TQ_SIGNAL( clicked() ), TQ_SLOT( newList() ) ); mEditButton = new TQPushButton( i18n("Rename List..."), this ); nameLayout->addWidget( mEditButton ); - connect( mEditButton, TQT_SIGNAL( clicked() ), TQT_SLOT( editList() ) ); + connect( mEditButton, TQ_SIGNAL( clicked() ), TQ_SLOT( editList() ) ); mRemoveButton = new TQPushButton( i18n("Remove List"), this ); nameLayout->addWidget( mRemoveButton ); - connect( mRemoveButton, TQT_SIGNAL( clicked() ), TQT_SLOT( removeList() ) ); + connect( mRemoveButton, TQ_SIGNAL( clicked() ), TQ_SLOT( removeList() ) ); TQGridLayout *gridLayout = new TQGridLayout( topLayout, 3, 3 ); gridLayout->setColStretch(1, 1); @@ -175,15 +175,15 @@ DistributionListEditorWidget::DistributionListEditorWidget( AddressBook *address mAddresseeView->addColumn( i18n("Preferred Email") ); mAddresseeView->setAllColumnsShowFocus( true ); gridLayout->addWidget( mAddresseeView, 1, 0 ); - connect( mAddresseeView, TQT_SIGNAL( selectionChanged() ), - TQT_SLOT( slotSelectionAddresseeViewChanged() ) ); - connect( mAddresseeView, TQT_SIGNAL( doubleClicked( TQListViewItem * ) ), - TQT_SLOT( addEntry() ) ); + connect( mAddresseeView, TQ_SIGNAL( selectionChanged() ), + TQ_SLOT( slotSelectionAddresseeViewChanged() ) ); + connect( mAddresseeView, TQ_SIGNAL( doubleClicked( TQListViewItem * ) ), + TQ_SLOT( addEntry() ) ); mAddEntryButton = new TQPushButton( i18n("Add Entry"), this ); mAddEntryButton->setEnabled(false); gridLayout->addWidget( mAddEntryButton, 2, 0 ); - connect( mAddEntryButton, TQT_SIGNAL( clicked() ), TQT_SLOT( addEntry() ) ); + connect( mAddEntryButton, TQ_SIGNAL( clicked() ), TQ_SLOT( addEntry() ) ); mEntryView = new TQListView( this ); mEntryView->addColumn( i18n("Name") ); @@ -192,16 +192,16 @@ DistributionListEditorWidget::DistributionListEditorWidget( AddressBook *address mEntryView->setEnabled(false); mEntryView->setAllColumnsShowFocus( true ); gridLayout->addMultiCellWidget( mEntryView, 1, 1, 1, 2 ); - connect( mEntryView, TQT_SIGNAL( selectionChanged() ), - TQT_SLOT( slotSelectionEntryViewChanged() ) ); + connect( mEntryView, TQ_SIGNAL( selectionChanged() ), + TQ_SLOT( slotSelectionEntryViewChanged() ) ); mChangeEmailButton = new TQPushButton( i18n("Change Email..."), this ); gridLayout->addWidget( mChangeEmailButton, 2, 1 ); - connect( mChangeEmailButton, TQT_SIGNAL( clicked() ), TQT_SLOT( changeEmail() ) ); + connect( mChangeEmailButton, TQ_SIGNAL( clicked() ), TQ_SLOT( changeEmail() ) ); mRemoveEntryButton = new TQPushButton( i18n("Remove Entry"), this ); gridLayout->addWidget( mRemoveEntryButton, 2, 2 ); - connect( mRemoveEntryButton, TQT_SIGNAL( clicked() ), TQT_SLOT( removeEntry() ) ); + connect( mRemoveEntryButton, TQ_SIGNAL( clicked() ), TQ_SLOT( removeEntry() ) ); mManager = new DistributionListManager( mAddressBook ); mManager->load(); diff --git a/tdeabc/distributionlistdialog.h b/tdeabc/distributionlistdialog.h index 0270c3605..3fd97243d 100644 --- a/tdeabc/distributionlistdialog.h +++ b/tdeabc/distributionlistdialog.h @@ -54,7 +54,7 @@ class DistributionListManager; */ class KABC_EXPORT DistributionListDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: /** @@ -100,7 +100,7 @@ class KABC_EXPORT EmailSelector : public KDialogBase */ class KABC_EXPORT DistributionListEditorWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: DistributionListEditorWidget( AddressBook *, TQWidget *parent ); diff --git a/tdeabc/distributionlisteditor.cpp b/tdeabc/distributionlisteditor.cpp index 215382f62..e2882378f 100644 --- a/tdeabc/distributionlisteditor.cpp +++ b/tdeabc/distributionlisteditor.cpp @@ -46,7 +46,7 @@ EmailSelectDialog::EmailSelectDialog( const TQStringList &emails, const TQString TQFrame *topFrame = plainPage(); TQBoxLayout *topLayout = new TQVBoxLayout( topFrame ); - mButtonGroup = new TQButtonGroup( 1, Qt::Horizontal, i18n("Email Addresses"), + mButtonGroup = new TQButtonGroup( 1, TQt::Horizontal, i18n("Email Addresses"), topFrame ); mButtonGroup->setRadioButtonExclusive( true ); topLayout->addWidget( mButtonGroup ); @@ -128,34 +128,34 @@ DistributionListEditor::DistributionListEditor( AddressBook *addressBook, TQWidg mNameCombo = new TQComboBox( this ); nameLayout->addWidget( mNameCombo ); - connect( mNameCombo, TQT_SIGNAL( activated( int ) ), TQT_SLOT( updateEntryView() ) ); + connect( mNameCombo, TQ_SIGNAL( activated( int ) ), TQ_SLOT( updateEntryView() ) ); newButton = new TQPushButton( i18n("New List"), this ); nameLayout->addWidget( newButton ); - connect( newButton, TQT_SIGNAL( clicked() ), TQT_SLOT( newList() ) ); + connect( newButton, TQ_SIGNAL( clicked() ), TQ_SLOT( newList() ) ); removeButton = new TQPushButton( i18n("Remove List"), this ); nameLayout->addWidget( removeButton ); - connect( removeButton, TQT_SIGNAL( clicked() ), TQT_SLOT( removeList() ) ); + connect( removeButton, TQ_SIGNAL( clicked() ), TQ_SLOT( removeList() ) ); mEntryView = new TQListView( this ); mEntryView->addColumn( i18n("Name") ); mEntryView->addColumn( i18n("Email") ); mEntryView->addColumn( i18n("Use Preferred") ); topLayout->addWidget( mEntryView ); - connect(mEntryView,TQT_SIGNAL(selectionChanged ()),this, TQT_SLOT(slotSelectionEntryViewChanged())); + connect(mEntryView,TQ_SIGNAL(selectionChanged ()),this, TQ_SLOT(slotSelectionEntryViewChanged())); changeEmailButton = new TQPushButton( i18n("Change Email"), this ); topLayout->addWidget( changeEmailButton ); - connect( changeEmailButton, TQT_SIGNAL( clicked() ), TQT_SLOT( changeEmail() ) ); + connect( changeEmailButton, TQ_SIGNAL( clicked() ), TQ_SLOT( changeEmail() ) ); removeEntryButton = new TQPushButton( i18n("Remove Entry"), this ); topLayout->addWidget( removeEntryButton ); - connect( removeEntryButton, TQT_SIGNAL( clicked() ), TQT_SLOT( removeEntry() ) ); + connect( removeEntryButton, TQ_SIGNAL( clicked() ), TQ_SLOT( removeEntry() ) ); addEntryButton = new TQPushButton( i18n("Add Entry"), this ); topLayout->addWidget( addEntryButton ); - connect( addEntryButton, TQT_SIGNAL( clicked() ), TQT_SLOT( addEntry() ) ); + connect( addEntryButton, TQ_SIGNAL( clicked() ), TQ_SLOT( addEntry() ) ); mAddresseeView = new TQListView( this ); mAddresseeView->addColumn( i18n("Name") ); @@ -163,7 +163,7 @@ DistributionListEditor::DistributionListEditor( AddressBook *addressBook, TQWidg topLayout->addWidget( mAddresseeView ); - connect(mAddresseeView,TQT_SIGNAL(selectionChanged ()),this, TQT_SLOT(slotSelectionAddresseeViewChanged())); + connect(mAddresseeView,TQ_SIGNAL(selectionChanged ()),this, TQ_SLOT(slotSelectionAddresseeViewChanged())); mManager = new DistributionListManager( mAddressBook ); mManager->load(); diff --git a/tdeabc/distributionlisteditor.h b/tdeabc/distributionlisteditor.h index 5c0b4c03a..e82d8961f 100644 --- a/tdeabc/distributionlisteditor.h +++ b/tdeabc/distributionlisteditor.h @@ -53,7 +53,7 @@ class KABC_EXPORT EmailSelectDialog : public KDialogBase */ class KABC_EXPORT DistributionListEditor : public TQWidget { - Q_OBJECT + TQ_OBJECT public: DistributionListEditor( AddressBook *, TQWidget *parent ); virtual ~DistributionListEditor(); diff --git a/tdeabc/formats/binaryformat.cpp b/tdeabc/formats/binaryformat.cpp index dcb49330e..778a81ef7 100644 --- a/tdeabc/formats/binaryformat.cpp +++ b/tdeabc/formats/binaryformat.cpp @@ -38,7 +38,7 @@ using namespace TDEABC; extern "C" { - KDE_EXPORT FormatPlugin *format() + TDE_EXPORT FormatPlugin *format() { return new BinaryFormat; } diff --git a/tdeabc/ldapclient.cpp b/tdeabc/ldapclient.cpp index 31256f46f..5ae18b848 100644 --- a/tdeabc/ldapclient.cpp +++ b/tdeabc/ldapclient.cpp @@ -138,12 +138,12 @@ void LdapClient::startQuery( const TQString& filter ) startParseLDIF(); mActive = true; mJob = TDEIO::get( url, false, false ); - connect( mJob, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), - this, TQT_SLOT( slotData( TDEIO::Job*, const TQByteArray& ) ) ); - connect( mJob, TQT_SIGNAL( infoMessage( TDEIO::Job*, const TQString& ) ), - this, TQT_SLOT( slotInfoMessage( TDEIO::Job*, const TQString& ) ) ); - connect( mJob, TQT_SIGNAL( result( TDEIO::Job* ) ), - this, TQT_SLOT( slotDone() ) ); + connect( mJob, TQ_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), + this, TQ_SLOT( slotData( TDEIO::Job*, const TQByteArray& ) ) ); + connect( mJob, TQ_SIGNAL( infoMessage( TDEIO::Job*, const TQString& ) ), + this, TQ_SLOT( slotInfoMessage( TDEIO::Job*, const TQString& ) ) ); + connect( mJob, TQ_SIGNAL( result( TDEIO::Job* ) ), + this, TQ_SLOT( slotDone() ) ); } void LdapClient::cancelQuery() @@ -158,7 +158,7 @@ void LdapClient::cancelQuery() void LdapClient::slotData( TDEIO::Job*, const TQByteArray& data ) { -#ifndef NDEBUG // don't create the QString +#ifndef NDEBUG // don't create the TQString // TQString str( data ); // kdDebug(5700) << "LdapClient: Got \"" << str << "\"\n"; #endif @@ -285,18 +285,18 @@ LdapSearch::LdapSearch() attrs << "cn" << "mail" << "givenname" << "sn"; ldapClient->setAttrs( attrs ); - connect( ldapClient, TQT_SIGNAL( result( const TDEABC::LdapObject& ) ), - this, TQT_SLOT( slotLDAPResult( const TDEABC::LdapObject& ) ) ); - connect( ldapClient, TQT_SIGNAL( done() ), - this, TQT_SLOT( slotLDAPDone() ) ); - connect( ldapClient, TQT_SIGNAL( error( const TQString& ) ), - this, TQT_SLOT( slotLDAPError( const TQString& ) ) ); + connect( ldapClient, TQ_SIGNAL( result( const TDEABC::LdapObject& ) ), + this, TQ_SLOT( slotLDAPResult( const TDEABC::LdapObject& ) ) ); + connect( ldapClient, TQ_SIGNAL( done() ), + this, TQ_SLOT( slotLDAPDone() ) ); + connect( ldapClient, TQ_SIGNAL( error( const TQString& ) ), + this, TQ_SLOT( slotLDAPError( const TQString& ) ) ); mClients.append( ldapClient ); } } - connect( &mDataTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotDataTimer() ) ); + connect( &mDataTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( slotDataTimer() ) ); } void LdapSearch::startSearch( const TQString& txt ) diff --git a/tdeabc/ldapclient.h b/tdeabc/ldapclient.h index a4a5747a6..c05162a22 100644 --- a/tdeabc/ldapclient.h +++ b/tdeabc/ldapclient.h @@ -84,7 +84,7 @@ class KABC_EXPORT LdapObject */ class KABC_EXPORT LdapClient : public TQObject { - Q_OBJECT + TQ_OBJECT public: LdapClient( TQObject* parent = 0, const char* name = 0 ); @@ -206,7 +206,7 @@ typedef TQValueList<LdapResult> LdapResultList; */ class KABC_EXPORT LdapSearch : public TQObject { - Q_OBJECT + TQ_OBJECT public: LdapSearch(); diff --git a/tdeabc/ldapconfigwidget.cpp b/tdeabc/ldapconfigwidget.cpp index 2c2dfbe75..0c5b845be 100644 --- a/tdeabc/ldapconfigwidget.cpp +++ b/tdeabc/ldapconfigwidget.cpp @@ -180,7 +180,7 @@ void LdapConfigWidget::initWidget() //without host query doesn't make sense if ( mHost ) { TQPushButton *dnquery = new TQPushButton( i18n( "Query Server" ), this ); - connect( dnquery, TQT_SIGNAL( clicked() ), TQT_SLOT( mQueryDNClicked() ) ); + connect( dnquery, TQ_SIGNAL( clicked() ), TQ_SLOT( mQueryDNClicked() ) ); mainLayout->addMultiCellWidget( dnquery, row, row, 2, 3 ); } row++; @@ -202,9 +202,9 @@ void LdapConfigWidget::initWidget() mSecSSL = new TQRadioButton( i18n( "SSL" ), btgroup, "kcfg_ldapssl" ); mainLayout->addMultiCellWidget( btgroup, row, row, 0, 3 ); - connect( mSecNO, TQT_SIGNAL( clicked() ), TQT_SLOT( setLDAPPort() ) ); - connect( mSecTLS, TQT_SIGNAL( clicked() ), TQT_SLOT( setLDAPPort() ) ); - connect( mSecSSL, TQT_SIGNAL( clicked() ), TQT_SLOT( setLDAPSPort( ) ) ); + connect( mSecNO, TQ_SIGNAL( clicked() ), TQ_SLOT( setLDAPPort() ) ); + connect( mSecTLS, TQ_SIGNAL( clicked() ), TQ_SLOT( setLDAPPort() ) ); + connect( mSecSSL, TQ_SIGNAL( clicked() ), TQ_SLOT( setLDAPSPort( ) ) ); mSecNO->setChecked( true ); row++; @@ -213,7 +213,7 @@ void LdapConfigWidget::initWidget() if ( mFlags & W_AUTHBOX ) { TQButtonGroup *authbox = - new TQButtonGroup( 3, Qt::Horizontal, i18n( "Authentication" ), this ); + new TQButtonGroup( 3, TQt::Horizontal, i18n( "Authentication" ), this ); mAnonymous = new TQRadioButton( i18n( "Anonymous" ), authbox, "kcfg_ldapanon" ); mSimple = new TQRadioButton( i18n( "Simple" ), authbox, "kcfg_ldapsimple" ); @@ -229,14 +229,14 @@ void LdapConfigWidget::initWidget() //without host query doesn't make sense if ( mHost ) { mQueryMech = new TQPushButton( i18n( "Query Server" ), authbox ); - connect( mQueryMech, TQT_SIGNAL( clicked() ), TQT_SLOT( mQueryMechClicked() ) ); + connect( mQueryMech, TQ_SIGNAL( clicked() ), TQ_SLOT( mQueryMechClicked() ) ); } mainLayout->addMultiCellWidget( authbox, row, row+1, 0, 3 ); - connect( mAnonymous, TQT_SIGNAL( stateChanged(int) ), TQT_SLOT( setAnonymous(int) ) ); - connect( mSimple, TQT_SIGNAL( stateChanged(int) ), TQT_SLOT( setSimple(int) ) ); - connect( mSASL, TQT_SIGNAL( stateChanged(int) ), TQT_SLOT( setSASL(int) ) ); + connect( mAnonymous, TQ_SIGNAL( stateChanged(int) ), TQ_SLOT( setAnonymous(int) ) ); + connect( mSimple, TQ_SIGNAL( stateChanged(int) ), TQ_SLOT( setSimple(int) ) ); + connect( mSASL, TQ_SIGNAL( stateChanged(int) ), TQ_SLOT( setSASL(int) ) ); mAnonymous->setChecked( true ); } @@ -293,10 +293,10 @@ void LdapConfigWidget::sendQuery() mLdif.startParsing(); TDEIO::Job *job = TDEIO::get( _url, true, false ); job->addMetaData("no-auth-prompt","true"); - connect( job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), - this, TQT_SLOT( loadData( TDEIO::Job*, const TQByteArray& ) ) ); - connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), - this, TQT_SLOT( loadResult( TDEIO::Job* ) ) ); + connect( job, TQ_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), + this, TQ_SLOT( loadData( TDEIO::Job*, const TQByteArray& ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ), + this, TQ_SLOT( loadResult( TDEIO::Job* ) ) ); if ( mProg == NULL ) mProg = new KProgressDialog( this, 0, i18n("LDAP Query"), _url.prettyURL(), true ); @@ -615,7 +615,7 @@ void LdapConfigWidget::setFlags( int flags ) obj = ch2.first(); while ( obj != 0 ) { widget = dynamic_cast<TQWidget*> (obj); - if ( widget && TQT_BASE_OBJECT(widget->parent()) == TQT_BASE_OBJECT(this) ) { + if ( widget && widget->parent() == this ) { mainLayout->remove( widget ); delete ( widget ); } diff --git a/tdeabc/ldapconfigwidget.h b/tdeabc/ldapconfigwidget.h index ed39bb776..9f053bfd9 100644 --- a/tdeabc/ldapconfigwidget.h +++ b/tdeabc/ldapconfigwidget.h @@ -49,7 +49,7 @@ namespace TDEABC { class KABC_EXPORT LdapConfigWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY( LCW_Flags flags READ flagsProp WRITE setFlagsProp ) TQ_PROPERTY( TQString user READ user WRITE setUser ) diff --git a/tdeabc/ldapurl.cpp b/tdeabc/ldapurl.cpp index c20dbd39e..c1e943688 100644 --- a/tdeabc/ldapurl.cpp +++ b/tdeabc/ldapurl.cpp @@ -36,7 +36,7 @@ LDAPUrl::LDAPUrl(const KURL &_url) { m_dn = path(); if ( !TQDir::isRelativePath(m_dn) ) -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN m_dn.remove(0,3); // e.g. "c:/" #else m_dn.remove(0,1); @@ -48,7 +48,7 @@ void LDAPUrl::setDn( const TQString &dn) { m_dn = dn; if ( !TQDir::isRelativePath(m_dn) ) -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN m_dn.remove(0,3); // e.g. "c:/" #else m_dn.remove(0,1); diff --git a/tdeabc/ldifconverter.cpp b/tdeabc/ldifconverter.cpp index 1527b4893..7c4a72025 100644 --- a/tdeabc/ldifconverter.cpp +++ b/tdeabc/ldifconverter.cpp @@ -152,7 +152,7 @@ bool LDIFConverter::addresseeToLDIF( const Addressee &addr, TQString &str ) ldif_out( t, "homeurl", addr.url().prettyURL() ); ldif_out( t, "description", addr.note() ); if (addr.revision().isValid()) - ldif_out(t, "modifytimestamp", dateToVCardString( TQT_TQDATETIME_OBJECT(addr.revision())) ); + ldif_out(t, "modifytimestamp", dateToVCardString( addr.revision()) ); t << "objectclass: top\n"; t << "objectclass: person\n"; diff --git a/tdeabc/ldifconverter.h b/tdeabc/ldifconverter.h index 30c8889d6..50c97f759 100644 --- a/tdeabc/ldifconverter.h +++ b/tdeabc/ldifconverter.h @@ -76,7 +76,7 @@ namespace TDEABC { * @param allowEncode Set to false if you wish no encoding of the value. * @since 3.2 */ - KABC_EXPORT TQString makeLDIFfieldString( TQString field, TQString value, bool allowEncode = true ) KDE_DEPRECATED; + KABC_EXPORT TQString makeLDIFfieldString( TQString field, TQString value, bool allowEncode = true ) TDE_DEPRECATED; diff --git a/tdeabc/lock.h b/tdeabc/lock.h index d4d04532a..6b96d9fe7 100644 --- a/tdeabc/lock.h +++ b/tdeabc/lock.h @@ -34,7 +34,7 @@ namespace TDEABC { */ class KABC_EXPORT Lock : public TQObject { - Q_OBJECT + TQ_OBJECT public: /** Constructor. diff --git a/tdeabc/plugins/dir/resourcedir.cpp b/tdeabc/plugins/dir/resourcedir.cpp index 304f585f0..7502084aa 100644 --- a/tdeabc/plugins/dir/resourcedir.cpp +++ b/tdeabc/plugins/dir/resourcedir.cpp @@ -87,9 +87,9 @@ void ResourceDir::init( const TQString &path, const TQString &format ) mLock = 0; - connect( &mDirWatch, TQT_SIGNAL( dirty(const TQString&) ), TQT_SLOT( pathChanged() ) ); - connect( &mDirWatch, TQT_SIGNAL( created(const TQString&) ), TQT_SLOT( pathChanged() ) ); - connect( &mDirWatch, TQT_SIGNAL( deleted(const TQString&) ), TQT_SLOT( pathChanged() ) ); + connect( &mDirWatch, TQ_SIGNAL( dirty(const TQString&) ), TQ_SLOT( pathChanged() ) ); + connect( &mDirWatch, TQ_SIGNAL( created(const TQString&) ), TQ_SLOT( pathChanged() ) ); + connect( &mDirWatch, TQ_SIGNAL( deleted(const TQString&) ), TQ_SLOT( pathChanged() ) ); setPath( path ); } diff --git a/tdeabc/plugins/dir/resourcedir.h b/tdeabc/plugins/dir/resourcedir.h index dc9d1d06a..8c9eb66a4 100644 --- a/tdeabc/plugins/dir/resourcedir.h +++ b/tdeabc/plugins/dir/resourcedir.h @@ -40,7 +40,7 @@ class Lock; */ class KABC_EXPORT ResourceDir : public Resource { - Q_OBJECT + TQ_OBJECT public: ResourceDir( const TDEConfig* ); diff --git a/tdeabc/plugins/dir/resourcedirconfig.h b/tdeabc/plugins/dir/resourcedirconfig.h index 51fac5812..9ba2ec492 100644 --- a/tdeabc/plugins/dir/resourcedirconfig.h +++ b/tdeabc/plugins/dir/resourcedirconfig.h @@ -30,7 +30,7 @@ namespace TDEABC { class KABC_EXPORT ResourceDirConfig : public KRES::ConfigWidget { - Q_OBJECT + TQ_OBJECT public: ResourceDirConfig( TQWidget* parent = 0, const char* name = 0 ); diff --git a/tdeabc/plugins/dir/resourcedirplugin.cpp b/tdeabc/plugins/dir/resourcedirplugin.cpp index 028dce31c..b2e749c6a 100644 --- a/tdeabc/plugins/dir/resourcedirplugin.cpp +++ b/tdeabc/plugins/dir/resourcedirplugin.cpp @@ -25,7 +25,7 @@ using namespace TDEABC; extern "C" { - KDE_EXPORT void *init_tdeabc_dir() + TDE_EXPORT void *init_tdeabc_dir() { return new KRES::PluginFactory<ResourceDir, ResourceDirConfig>(); } diff --git a/tdeabc/plugins/evolution/resourceevo.cpp b/tdeabc/plugins/evolution/resourceevo.cpp index a5df5fe18..c9b71b818 100644 --- a/tdeabc/plugins/evolution/resourceevo.cpp +++ b/tdeabc/plugins/evolution/resourceevo.cpp @@ -30,7 +30,7 @@ class EvolutionFactory : public KRES::PluginFactoryBase extern "C" { - KDE_EXPORT void *init_tdeabc_evo() + TDE_EXPORT void *init_tdeabc_evo() { return ( new EvolutionFactory() ); } diff --git a/tdeabc/plugins/file/resourcefile.cpp b/tdeabc/plugins/file/resourcefile.cpp index 3fa2a9406..2b25db4c4 100644 --- a/tdeabc/plugins/file/resourcefile.cpp +++ b/tdeabc/plugins/file/resourcefile.cpp @@ -83,9 +83,9 @@ void ResourceFile::init( const TQString &fileName, const TQString &formatName ) mFormat = factory->format( mFormatName ); } - connect( &mDirWatch, TQT_SIGNAL( dirty(const TQString&) ), TQT_SLOT( fileChanged() ) ); - connect( &mDirWatch, TQT_SIGNAL( created(const TQString&) ), TQT_SLOT( fileChanged() ) ); - connect( &mDirWatch, TQT_SIGNAL( deleted(const TQString&) ), TQT_SLOT( fileChanged() ) ); + connect( &mDirWatch, TQ_SIGNAL( dirty(const TQString&) ), TQ_SLOT( fileChanged() ) ); + connect( &mDirWatch, TQ_SIGNAL( created(const TQString&) ), TQ_SLOT( fileChanged() ) ); + connect( &mDirWatch, TQ_SIGNAL( deleted(const TQString&) ), TQ_SLOT( fileChanged() ) ); setFileName( fileName ); @@ -333,9 +333,9 @@ bool ResourceFile::asyncSave( Ticket *ticket ) bool ok = save( ticket ); if ( !ok ) - TQTimer::singleShot( 0, this, TQT_SLOT( emitSavingError() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( emitSavingError() ) ); else - TQTimer::singleShot( 0, this, TQT_SLOT( emitSavingFinished() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( emitSavingFinished() ) ); return ok; } diff --git a/tdeabc/plugins/file/resourcefile.h b/tdeabc/plugins/file/resourcefile.h index ffa19a4bf..2f38254a2 100644 --- a/tdeabc/plugins/file/resourcefile.h +++ b/tdeabc/plugins/file/resourcefile.h @@ -39,7 +39,7 @@ class Lock; */ class KABC_EXPORT ResourceFile : public Resource { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/tdeabc/plugins/file/resourcefileconfig.cpp b/tdeabc/plugins/file/resourcefileconfig.cpp index 2c8e0fce6..7995f3be1 100644 --- a/tdeabc/plugins/file/resourcefileconfig.cpp +++ b/tdeabc/plugins/file/resourcefileconfig.cpp @@ -51,8 +51,8 @@ ResourceFileConfig::ResourceFileConfig( TQWidget* parent, const char* name ) label = new TQLabel( i18n( "Location:" ), this ); mFileNameEdit = new KURLRequester( this ); - connect( mFileNameEdit, TQT_SIGNAL( textChanged( const TQString & ) ), - TQT_SLOT( checkFilePermissions( const TQString & ) ) ); + connect( mFileNameEdit, TQ_SIGNAL( textChanged( const TQString & ) ), + TQ_SLOT( checkFilePermissions( const TQString & ) ) ); mainLayout->addWidget( label, 1, 0 ); mainLayout->addWidget( mFileNameEdit, 1, 1 ); diff --git a/tdeabc/plugins/file/resourcefileconfig.h b/tdeabc/plugins/file/resourcefileconfig.h index 3be4cca49..0f3c12cd5 100644 --- a/tdeabc/plugins/file/resourcefileconfig.h +++ b/tdeabc/plugins/file/resourcefileconfig.h @@ -30,7 +30,7 @@ namespace TDEABC { class KABC_EXPORT ResourceFileConfig : public KRES::ConfigWidget { - Q_OBJECT + TQ_OBJECT public: ResourceFileConfig( TQWidget* parent = 0, const char* name = 0 ); diff --git a/tdeabc/plugins/file/resourcefileplugin.cpp b/tdeabc/plugins/file/resourcefileplugin.cpp index 6f7598a40..1838bf6b9 100644 --- a/tdeabc/plugins/file/resourcefileplugin.cpp +++ b/tdeabc/plugins/file/resourcefileplugin.cpp @@ -25,7 +25,7 @@ using namespace TDEABC; extern "C" { - KDE_EXPORT void *init_tdeabc_file() + TDE_EXPORT void *init_tdeabc_file() { return new KRES::PluginFactory<ResourceFile, ResourceFileConfig>(); } diff --git a/tdeabc/plugins/ldaptdeio/resourceldaptdeio.cpp b/tdeabc/plugins/ldaptdeio/resourceldaptdeio.cpp index ed6675392..f7c6ed36a 100644 --- a/tdeabc/plugins/ldaptdeio/resourceldaptdeio.cpp +++ b/tdeabc/plugins/ldaptdeio/resourceldaptdeio.cpp @@ -123,7 +123,7 @@ ResourceLDAPTDEIO::~ResourceLDAPTDEIO() void ResourceLDAPTDEIO::enter_loop() { TQWidget dummy(0,0,(WFlags)(WType_Dialog | WShowModal)); - dummy.setFocusPolicy( TQ_NoFocus ); + dummy.setFocusPolicy( TQWidget::NoFocus ); tqt_enter_modal(&dummy); tqApp->enter_loop(); tqt_leave_modal(&dummy); @@ -173,10 +173,10 @@ TQString ResourceLDAPTDEIO::findUid( const TQString &uid ) TDEIO::ListJob * listJob = TDEIO::listDir( url, false /* no GUI */ ); connect( listJob, - TQT_SIGNAL( entries( TDEIO::Job *, const TDEIO::UDSEntryList& ) ), - TQT_SLOT( entries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ) ); - connect( listJob, TQT_SIGNAL( result( TDEIO::Job* ) ), - this, TQT_SLOT( listResult( TDEIO::Job* ) ) ); + TQ_SIGNAL( entries( TDEIO::Job *, const TDEIO::UDSEntryList& ) ), + TQ_SLOT( entries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ) ); + connect( listJob, TQ_SIGNAL( result( TDEIO::Job* ) ), + this, TQ_SLOT( listResult( TDEIO::Job* ) ) ); enter_loop(); return d->mResultDn; @@ -511,8 +511,8 @@ TDEIO::Job *ResourceLDAPTDEIO::loadFromCache() KURL url( d->mCacheDst ); job = TDEIO::get( url, true, false ); - connect( job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), - this, TQT_SLOT( data( TDEIO::Job*, const TQByteArray& ) ) ); + connect( job, TQ_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), + this, TQ_SLOT( data( TDEIO::Job*, const TQByteArray& ) ) ); } return job; } @@ -535,17 +535,17 @@ bool ResourceLDAPTDEIO::load() createCache(); if ( d->mCachePolicy != Cache_Always ) { job = TDEIO::get( d->mLDAPUrl, true, false ); - connect( job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), - this, TQT_SLOT( data( TDEIO::Job*, const TQByteArray& ) ) ); - connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), - this, TQT_SLOT( syncLoadSaveResult( TDEIO::Job* ) ) ); + connect( job, TQ_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), + this, TQ_SLOT( data( TDEIO::Job*, const TQByteArray& ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ), + this, TQ_SLOT( syncLoadSaveResult( TDEIO::Job* ) ) ); enter_loop(); } job = loadFromCache(); if ( job ) { - connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), - this, TQT_SLOT( syncLoadSaveResult( TDEIO::Job* ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ), + this, TQ_SLOT( syncLoadSaveResult( TDEIO::Job* ) ) ); enter_loop(); } if ( mErrorMsg.isEmpty() ) { @@ -572,10 +572,10 @@ bool ResourceLDAPTDEIO::asyncLoad() createCache(); if ( d->mCachePolicy != Cache_Always ) { TDEIO::Job *job = TDEIO::get( d->mLDAPUrl, true, false ); - connect( job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), - this, TQT_SLOT( data( TDEIO::Job*, const TQByteArray& ) ) ); - connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), - this, TQT_SLOT( result( TDEIO::Job* ) ) ); + connect( job, TQ_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), + this, TQ_SLOT( data( TDEIO::Job*, const TQByteArray& ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ), + this, TQ_SLOT( result( TDEIO::Job* ) ) ); } else { result( NULL ); } @@ -714,8 +714,8 @@ void ResourceLDAPTDEIO::result( TDEIO::Job *job ) TDEIO::Job *cjob; cjob = loadFromCache(); if ( cjob ) { - connect( cjob, TQT_SIGNAL( result( TDEIO::Job* ) ), - this, TQT_SLOT( loadCacheResult( TDEIO::Job* ) ) ); + connect( cjob, TQ_SIGNAL( result( TDEIO::Job* ) ), + this, TQ_SLOT( loadCacheResult( TDEIO::Job* ) ) ); } else { if ( !mErrorMsg.isEmpty() ) emit loadingError( this, mErrorMsg ); @@ -730,10 +730,10 @@ bool ResourceLDAPTDEIO::save( Ticket* ) d->mSaveIt = begin(); TDEIO::Job *job = TDEIO::put( d->mLDAPUrl, -1, true, false, false ); - connect( job, TQT_SIGNAL( dataReq( TDEIO::Job*, TQByteArray& ) ), - this, TQT_SLOT( saveData( TDEIO::Job*, TQByteArray& ) ) ); - connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), - this, TQT_SLOT( syncLoadSaveResult( TDEIO::Job* ) ) ); + connect( job, TQ_SIGNAL( dataReq( TDEIO::Job*, TQByteArray& ) ), + this, TQ_SLOT( saveData( TDEIO::Job*, TQByteArray& ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ), + this, TQ_SLOT( syncLoadSaveResult( TDEIO::Job* ) ) ); enter_loop(); if ( mErrorMsg.isEmpty() ) { kdDebug(7125) << "ResourceLDAPTDEIO save ok!" << endl; @@ -750,10 +750,10 @@ bool ResourceLDAPTDEIO::asyncSave( Ticket* ) kdDebug(7125) << "ResourceLDAPTDEIO asyncSave" << endl; d->mSaveIt = begin(); TDEIO::Job *job = TDEIO::put( d->mLDAPUrl, -1, true, false, false ); - connect( job, TQT_SIGNAL( dataReq( TDEIO::Job*, TQByteArray& ) ), - this, TQT_SLOT( saveData( TDEIO::Job*, TQByteArray& ) ) ); - connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), - this, TQT_SLOT( saveResult( TDEIO::Job* ) ) ); + connect( job, TQ_SIGNAL( dataReq( TDEIO::Job*, TQByteArray& ) ), + this, TQ_SLOT( saveData( TDEIO::Job*, TQByteArray& ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ), + this, TQ_SLOT( saveResult( TDEIO::Job* ) ) ); return true; } diff --git a/tdeabc/plugins/ldaptdeio/resourceldaptdeio.h b/tdeabc/plugins/ldaptdeio/resourceldaptdeio.h index 8f0565c3e..e82e94c83 100644 --- a/tdeabc/plugins/ldaptdeio/resourceldaptdeio.h +++ b/tdeabc/plugins/ldaptdeio/resourceldaptdeio.h @@ -32,7 +32,7 @@ namespace TDEABC { class KABC_EXPORT ResourceLDAPTDEIO : public Resource { - Q_OBJECT + TQ_OBJECT public: enum CachePolicy{ Cache_No, Cache_NoConnection, Cache_Always }; diff --git a/tdeabc/plugins/ldaptdeio/resourceldaptdeioconfig.cpp b/tdeabc/plugins/ldaptdeio/resourceldaptdeioconfig.cpp index 429e6b494..9dc8a8a57 100644 --- a/tdeabc/plugins/ldaptdeio/resourceldaptdeioconfig.cpp +++ b/tdeabc/plugins/ldaptdeio/resourceldaptdeioconfig.cpp @@ -58,8 +58,8 @@ ResourceLDAPTDEIOConfig::ResourceLDAPTDEIOConfig( TQWidget* parent, const char* mEditButton = new TQPushButton( i18n( "Edit Attributes..." ), box ); mCacheButton = new TQPushButton( i18n( "Offline Use..." ), box ); - connect( mEditButton, TQT_SIGNAL( clicked() ), TQT_SLOT( editAttributes() ) ); - connect( mCacheButton, TQT_SIGNAL( clicked() ), TQT_SLOT( editCache() ) ); + connect( mEditButton, TQ_SIGNAL( clicked() ), TQ_SLOT( editAttributes() ) ); + connect( mCacheButton, TQ_SIGNAL( clicked() ), TQ_SLOT( editCache() ) ); } void ResourceLDAPTDEIOConfig::loadSettings( KRES::Resource *res ) @@ -247,7 +247,7 @@ AttributesDialog::AttributesDialog( const TQMap<TQString, TQString> &attributes, mMapCombo->insertItem( i18n( "Netscape" ) ); mMapCombo->insertItem( i18n( "Evolution" ) ); mMapCombo->insertItem( i18n( "Outlook" ) ); - connect( mMapCombo, TQT_SIGNAL( activated( int ) ), TQT_SLOT( mapChanged( int ) ) ); + connect( mMapCombo, TQ_SIGNAL( activated( int ) ), TQ_SLOT( mapChanged( int ) ) ); label = new TQLabel( i18n( "RDN prefix attribute:" ), page ); layout->addWidget( label, 1, 0 ); @@ -342,7 +342,7 @@ OfflineDialog::OfflineDialog( bool autoCache, int cachePolicy, const KURL &src, layout->setAutoAdd( true ); mSrc = src; mDst = dst; - mCacheGroup = new TQButtonGroup( 1, Qt::Horizontal, + mCacheGroup = new TQButtonGroup( 1, TQt::Horizontal, i18n("Offline Cache Policy"), page ); TQRadioButton *bt; @@ -356,10 +356,10 @@ OfflineDialog::OfflineDialog( bool autoCache, int cachePolicy, const KURL &src, mAutoCache->setChecked( autoCache ); mAutoCache->setEnabled( bt->isChecked() ); - connect( bt, TQT_SIGNAL(toggled(bool)), mAutoCache, TQT_SLOT(setEnabled(bool)) ); + connect( bt, TQ_SIGNAL(toggled(bool)), mAutoCache, TQ_SLOT(setEnabled(bool)) ); TQPushButton *lcache = new TQPushButton( i18n("Load into Cache"), page ); - connect( lcache, TQT_SIGNAL( clicked() ), TQT_SLOT( loadCache() ) ); + connect( lcache, TQ_SIGNAL( clicked() ), TQ_SLOT( loadCache() ) ); } OfflineDialog::~OfflineDialog() diff --git a/tdeabc/plugins/ldaptdeio/resourceldaptdeioconfig.h b/tdeabc/plugins/ldaptdeio/resourceldaptdeioconfig.h index d56b4de31..2d3f3571f 100644 --- a/tdeabc/plugins/ldaptdeio/resourceldaptdeioconfig.h +++ b/tdeabc/plugins/ldaptdeio/resourceldaptdeioconfig.h @@ -44,7 +44,7 @@ namespace TDEABC { class KABC_EXPORT ResourceLDAPTDEIOConfig : public KRES::ConfigWidget { - Q_OBJECT + TQ_OBJECT public: ResourceLDAPTDEIOConfig( TQWidget* parent = 0, const char* name = 0 ); @@ -68,7 +68,7 @@ class KABC_EXPORT ResourceLDAPTDEIOConfig : public KRES::ConfigWidget class AttributesDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: AttributesDialog( const TQMap<TQString, TQString> &attributes, int rdnprefix, @@ -93,7 +93,7 @@ class AttributesDialog : public KDialogBase class OfflineDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: OfflineDialog( bool autoCache, int cachePolicy, const KURL &src, diff --git a/tdeabc/plugins/ldaptdeio/resourceldaptdeioplugin.cpp b/tdeabc/plugins/ldaptdeio/resourceldaptdeioplugin.cpp index 6046e9ae2..aefd56b02 100644 --- a/tdeabc/plugins/ldaptdeio/resourceldaptdeioplugin.cpp +++ b/tdeabc/plugins/ldaptdeio/resourceldaptdeioplugin.cpp @@ -28,7 +28,7 @@ using namespace TDEABC; extern "C" { - KDE_EXPORT void *init_tdeabc_ldaptdeio() + TDE_EXPORT void *init_tdeabc_ldaptdeio() { TDEGlobal::locale()->insertCatalogue("tdeabc_ldaptdeio"); return new KRES::PluginFactory<ResourceLDAPTDEIO, ResourceLDAPTDEIOConfig>(); diff --git a/tdeabc/plugins/net/resourcenet.cpp b/tdeabc/plugins/net/resourcenet.cpp index cb908cd22..08fa8764a 100644 --- a/tdeabc/plugins/net/resourcenet.cpp +++ b/tdeabc/plugins/net/resourcenet.cpp @@ -192,8 +192,8 @@ bool ResourceNet::asyncLoad() TDEIO::Scheduler::checkSlaveOnHold( true ); d->mLoadJob = TDEIO::file_copy( mUrl, dest, -1, true, false, false ); d->mIsLoading = true; - connect( d->mLoadJob, TQT_SIGNAL( result( TDEIO::Job* ) ), - this, TQT_SLOT( downloadFinished( TDEIO::Job* ) ) ); + connect( d->mLoadJob, TQ_SIGNAL( result( TDEIO::Job* ) ), + this, TQ_SLOT( downloadFinished( TDEIO::Job* ) ) ); return true; } @@ -286,8 +286,8 @@ bool ResourceNet::asyncSave( Ticket* ) TDEIO::Scheduler::checkSlaveOnHold( true ); d->mIsSaving = true; d->mSaveJob = TDEIO::file_copy( src, mUrl, -1, true, false, false ); - connect( d->mSaveJob, TQT_SIGNAL( result( TDEIO::Job* ) ), - this, TQT_SLOT( uploadFinished( TDEIO::Job* ) ) ); + connect( d->mSaveJob, TQ_SIGNAL( result( TDEIO::Job* ) ), + this, TQ_SLOT( uploadFinished( TDEIO::Job* ) ) ); return true; } @@ -352,7 +352,7 @@ void ResourceNet::downloadFinished( TDEIO::Job* ) if ( !hasTempFile() || mTempFile->status() != 0 ) { d->mLastErrorString = i18n( "Download failed: Unable to create temporary file" ); - TQTimer::singleShot( 0, this, TQT_SLOT( signalError() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( signalError() ) ); return; } diff --git a/tdeabc/plugins/net/resourcenet.h b/tdeabc/plugins/net/resourcenet.h index e190c63c8..0ce7bf862 100644 --- a/tdeabc/plugins/net/resourcenet.h +++ b/tdeabc/plugins/net/resourcenet.h @@ -44,7 +44,7 @@ class FormatPlugin; */ class KABC_EXPORT ResourceNet : public Resource { - Q_OBJECT + TQ_OBJECT public: ResourceNet( const TDEConfig* ); diff --git a/tdeabc/plugins/net/resourcenetconfig.h b/tdeabc/plugins/net/resourcenetconfig.h index 513c77de2..df1a73ba6 100644 --- a/tdeabc/plugins/net/resourcenetconfig.h +++ b/tdeabc/plugins/net/resourcenetconfig.h @@ -30,7 +30,7 @@ namespace TDEABC { class KABC_EXPORT ResourceNetConfig : public KRES::ConfigWidget { - Q_OBJECT + TQ_OBJECT public: ResourceNetConfig( TQWidget* parent = 0, const char* name = 0 ); diff --git a/tdeabc/plugins/net/resourcenetplugin.cpp b/tdeabc/plugins/net/resourcenetplugin.cpp index cd87cc000..0e3b1d3c7 100644 --- a/tdeabc/plugins/net/resourcenetplugin.cpp +++ b/tdeabc/plugins/net/resourcenetplugin.cpp @@ -25,7 +25,7 @@ using namespace TDEABC; extern "C" { - KDE_EXPORT void *init_tdeabc_net() + TDE_EXPORT void *init_tdeabc_net() { return new KRES::PluginFactory<ResourceNet, ResourceNetConfig>(); } diff --git a/tdeabc/plugins/sql/resourcesql.cpp b/tdeabc/plugins/sql/resourcesql.cpp index b72afea15..3741fff3b 100644 --- a/tdeabc/plugins/sql/resourcesql.cpp +++ b/tdeabc/plugins/sql/resourcesql.cpp @@ -33,7 +33,7 @@ using namespace TDEABC; extern "C" { - KDE_EXPORT void *init_tdeabc_sql() + TDE_EXPORT void *init_tdeabc_sql() { return new KRES::PluginFactory<ResourceSql,ResourceSqlConfig>(); } @@ -247,7 +247,7 @@ bool ResourceSql::save( Ticket * ) (*it).prefix() + "','" + (*it).suffix() + "','" + (*it).nickName() + "','" + - (*it).birthday().toString( Qt::ISODate ) + "','" + + (*it).birthday().toString( TQt::ISODate ) + "','" + (*it).mailer() + "','" + TQString::number( (*it).timeZone().offset() ) + "','" + TQString::number( (*it).geo().latitude() ) + "','" + @@ -257,7 +257,7 @@ bool ResourceSql::save( Ticket * ) (*it).organization() + "','" + (*it).note() + "','" + (*it).productId() + "','" + - (*it).revision().toString( Qt::ISODate ) + "','" + + (*it).revision().toString( TQt::ISODate ) + "','" + (*it).sortString() + "','" + (*it).url().url() + "')" ); diff --git a/tdeabc/plugins/sql/resourcesqlconfig.h b/tdeabc/plugins/sql/resourcesqlconfig.h index e0c08880c..116248809 100644 --- a/tdeabc/plugins/sql/resourcesqlconfig.h +++ b/tdeabc/plugins/sql/resourcesqlconfig.h @@ -30,7 +30,7 @@ namespace TDEABC { class ResourceSqlConfig : public ResourceConfigWidget { - Q_OBJECT + TQ_OBJECT public: ResourceSqlConfig( TQWidget* parent = 0, const char* name = 0 ); diff --git a/tdeabc/resource.h b/tdeabc/resource.h index 5e9d9cb0d..d18c551d3 100644 --- a/tdeabc/resource.h +++ b/tdeabc/resource.h @@ -54,7 +54,7 @@ class KABC_EXPORT Ticket */ class KABC_EXPORT Resource : public KRES::Resource { - Q_OBJECT + TQ_OBJECT public: diff --git a/tdeabc/resourceselectdialog.cpp b/tdeabc/resourceselectdialog.cpp index a12e83611..1bede4a84 100644 --- a/tdeabc/resourceselectdialog.cpp +++ b/tdeabc/resourceselectdialog.cpp @@ -42,7 +42,7 @@ ResourceSelectDialog::ResourceSelectDialog( AddressBook *ab, TQWidget *parent, c TQVBoxLayout *mainLayout = new TQVBoxLayout( this ); mainLayout->setMargin( marginHint() ); - TQGroupBox *groupBox = new TQGroupBox( 2, Qt::Horizontal, this ); + TQGroupBox *groupBox = new TQGroupBox( 2, TQt::Horizontal, this ); groupBox->setTitle( i18n( "Resources" ) ); mResourceId = new TDEListBox( groupBox ); @@ -54,8 +54,8 @@ ResourceSelectDialog::ResourceSelectDialog( AddressBook *ab, TQWidget *parent, c KButtonBox *buttonBox = new KButtonBox( this ); buttonBox->addStretch(); - buttonBox->addButton( KStdGuiItem::ok(), TQT_TQOBJECT(this), TQT_SLOT( accept() ) ); - buttonBox->addButton( KStdGuiItem::cancel(), TQT_TQOBJECT(this), TQT_SLOT( reject() ) ); + buttonBox->addButton( KStdGuiItem::ok(), this, TQ_SLOT( accept() ) ); + buttonBox->addButton( KStdGuiItem::cancel(), this, TQ_SLOT( reject() ) ); buttonBox->layout(); mainLayout->addWidget( buttonBox ); diff --git a/tdeabc/resourceselectdialog.h b/tdeabc/resourceselectdialog.h index 1d820ece1..b8df436ac 100644 --- a/tdeabc/resourceselectdialog.h +++ b/tdeabc/resourceselectdialog.h @@ -38,7 +38,7 @@ class Resource; */ class KABC_EXPORT_DEPRECATED ResourceSelectDialog : KDialog { - Q_OBJECT + TQ_OBJECT public: ResourceSelectDialog( AddressBook *ab, TQWidget *parent = 0, diff --git a/tdeabc/scripts/field.src.cpp b/tdeabc/scripts/field.src.cpp index f8f126b83..e162ea961 100644 --- a/tdeabc/scripts/field.src.cpp +++ b/tdeabc/scripts/field.src.cpp @@ -121,7 +121,7 @@ TQString Field::value( const TDEABC::Addressee &a ) return a.preferredEmail(); case FieldImpl::Birthday: if ( a.birthday().isValid() ) - return a.birthday().date().toString( Qt::ISODate ); + return a.birthday().date().toString( TQt::ISODate ); else return TQString::null; case FieldImpl::Url: @@ -362,7 +362,7 @@ bool Field::setValue( TDEABC::Addressee &a, const TQString &value ) return true; } case FieldImpl::Birthday: - a.setBirthday( TQT_TQDATE_OBJECT(TQDate::fromString( value, Qt::ISODate )) ); + a.setBirthday( TQDate::fromString( value, TQt::ISODate ) ); return true; case FieldImpl::CustomField: a.insertCustom( mImpl->app(), mImpl->key(), value ); @@ -378,7 +378,7 @@ TQString Field::sortKey( const TDEABC::Addressee &a ) --CASEVALUE-- case FieldImpl::Birthday: if ( a.birthday().isValid() ) { - TQDate date = TQT_TQDATE_OBJECT(a.birthday().date()); + TQDate date = a.birthday().date(); TQString key; key.sprintf( "%02d-%02d", date.month(), date.day() ); return key; diff --git a/tdeabc/sound.h b/tdeabc/sound.h index 3ee64ac57..d4d00131f 100644 --- a/tdeabc/sound.h +++ b/tdeabc/sound.h @@ -35,7 +35,7 @@ namespace TDEABC { * \code * KTempFile tmp; * if(sound.isIntern()) { - * tmp.file()->tqwriteBlock( sound.data() ); + * tmp.file()->writeBlock( sound.data() ); * tmp.close(); * KAudioPlayer::play( tmp.name() ); * } else if(!sound.url().isEmpty()) { diff --git a/tdeabc/stdaddressbook.cpp b/tdeabc/stdaddressbook.cpp index 73343d8a9..d834215c3 100644 --- a/tdeabc/stdaddressbook.cpp +++ b/tdeabc/stdaddressbook.cpp @@ -103,15 +103,15 @@ void StdAddressBook::init( bool asynchronous ) error( TQString( "Unable to open resource '%1'!" ).arg( (*it)->resourceName() ) ); continue; } - connect( *it, TQT_SIGNAL( loadingFinished( Resource* ) ), - this, TQT_SLOT( resourceLoadingFinished( Resource* ) ) ); - connect( *it, TQT_SIGNAL( savingFinished( Resource* ) ), - this, TQT_SLOT( resourceSavingFinished( Resource* ) ) ); - - connect( *it, TQT_SIGNAL( loadingError( Resource*, const TQString& ) ), - this, TQT_SLOT( resourceLoadingError( Resource*, const TQString& ) ) ); - connect( *it, TQT_SIGNAL( savingError( Resource*, const TQString& ) ), - this, TQT_SLOT( resourceSavingError( Resource*, const TQString& ) ) ); + connect( *it, TQ_SIGNAL( loadingFinished( Resource* ) ), + this, TQ_SLOT( resourceLoadingFinished( Resource* ) ) ); + connect( *it, TQ_SIGNAL( savingFinished( Resource* ) ), + this, TQ_SLOT( resourceSavingFinished( Resource* ) ) ); + + connect( *it, TQ_SIGNAL( loadingError( Resource*, const TQString& ) ), + this, TQ_SLOT( resourceLoadingError( Resource*, const TQString& ) ) ); + connect( *it, TQ_SIGNAL( savingError( Resource*, const TQString& ) ), + this, TQ_SLOT( resourceSavingError( Resource*, const TQString& ) ) ); } Resource *res = standardResource(); diff --git a/tdeabc/stdaddressbook.h b/tdeabc/stdaddressbook.h index 290999d66..2a6b171e5 100644 --- a/tdeabc/stdaddressbook.h +++ b/tdeabc/stdaddressbook.h @@ -83,12 +83,12 @@ class KABC_EXPORT StdAddressBook : public AddressBook @deprecated Use AddressBook::save( Ticket* ) instead */ - static bool save() KDE_DEPRECATED; + static bool save() TDE_DEPRECATED; /** @deprecated There is no need to call this function anymore. */ - static void handleCrash() KDE_DEPRECATED; + static void handleCrash() TDE_DEPRECATED; /** Returns the default file name for vcard-based addressbook diff --git a/tdeabc/tests/testaddresslineedit.cpp b/tdeabc/tests/testaddresslineedit.cpp index 80bd311da..ee4513d98 100644 --- a/tdeabc/tests/testaddresslineedit.cpp +++ b/tdeabc/tests/testaddresslineedit.cpp @@ -21,7 +21,7 @@ int main( int argc,char **argv ) lineEdit->show(); app.setMainWidget( lineEdit ); - TQObject::connect( &app, TQT_SIGNAL( lastWindowClosed() ), &app, TQT_SLOT( quit() ) ); + TQObject::connect( &app, TQ_SIGNAL( lastWindowClosed() ), &app, TQ_SLOT( quit() ) ); app.exec(); diff --git a/tdeabc/tests/testdistlist.cpp b/tdeabc/tests/testdistlist.cpp index 833dca84e..4a46f8e83 100644 --- a/tdeabc/tests/testdistlist.cpp +++ b/tdeabc/tests/testdistlist.cpp @@ -51,7 +51,7 @@ int main(int argc,char **argv) editor->show(); app.setMainWidget(editor); - TQObject::connect( &app, TQT_SIGNAL( lastWindowClosed() ), &app, TQT_SLOT( quit() ) ); + TQObject::connect( &app, TQ_SIGNAL( lastWindowClosed() ), &app, TQ_SLOT( quit() ) ); app.exec(); diff --git a/tdeabc/tests/testldapclient.cpp b/tdeabc/tests/testldapclient.cpp index a48ce043f..338d703f3 100644 --- a/tdeabc/tests/testldapclient.cpp +++ b/tdeabc/tests/testldapclient.cpp @@ -97,12 +97,12 @@ void TestLDAPClient::testIntevation() // But this certainly looks fishy, it might break on non-utf8 systems. TQString filter = "&(|(objectclass=person)(objectclass=groupofnames)(mail=*))(|(cn=*Ägypten MDK*)(sn=*Ägypten MDK*))"; - connect( mClient, TQT_SIGNAL( result( const TDEABC::LdapObject& ) ), - this, TQT_SLOT( slotLDAPResult( const TDEABC::LdapObject& ) ) ); - connect( mClient, TQT_SIGNAL( done() ), - this, TQT_SLOT( slotLDAPDone() ) ); - connect( mClient, TQT_SIGNAL( error( const TQString& ) ), - this, TQT_SLOT( slotLDAPError( const TQString& ) ) ); + connect( mClient, TQ_SIGNAL( result( const TDEABC::LdapObject& ) ), + this, TQ_SLOT( slotLDAPResult( const TDEABC::LdapObject& ) ) ); + connect( mClient, TQ_SIGNAL( done() ), + this, TQ_SLOT( slotLDAPDone() ) ); + connect( mClient, TQ_SIGNAL( error( const TQString& ) ), + this, TQ_SLOT( slotLDAPError( const TQString& ) ) ); mClient->startQuery( filter ); kapp->eventLoop()->enterLoop(); delete mClient; mClient = 0; diff --git a/tdeabc/tests/testldapclient.h b/tdeabc/tests/testldapclient.h index 502115b07..8b1a9bda4 100644 --- a/tdeabc/tests/testldapclient.h +++ b/tdeabc/tests/testldapclient.h @@ -26,7 +26,7 @@ typedef TDEABC::LdapClient LdapClient; class TestLDAPClient : public TQObject { - Q_OBJECT + TQ_OBJECT public: TestLDAPClient() {} diff --git a/tdeabc/tests/testlock.cpp b/tdeabc/tests/testlock.cpp index f9d880753..d593945bf 100644 --- a/tdeabc/tests/testlock.cpp +++ b/tdeabc/tests/testlock.cpp @@ -77,11 +77,11 @@ LockWidget::LockWidget( const TQString &identifier ) TQPushButton *button = new TQPushButton( "Lock", this ); topLayout->addWidget( button ); - connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( lock() ) ); + connect( button, TQ_SIGNAL( clicked() ), TQ_SLOT( lock() ) ); button = new TQPushButton( "Unlock", this ); topLayout->addWidget( button ); - connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( unlock() ) ); + connect( button, TQ_SIGNAL( clicked() ), TQ_SLOT( unlock() ) ); } mLockView = new TQListView( this ); @@ -94,15 +94,15 @@ LockWidget::LockWidget( const TQString &identifier ) TQPushButton *quitButton = new TQPushButton( "Quit", this ); topLayout->addWidget( quitButton ); - connect( quitButton, TQT_SIGNAL( clicked() ), TQT_SLOT( close() ) ); + connect( quitButton, TQ_SIGNAL( clicked() ), TQ_SLOT( close() ) ); KDirWatch *watch = KDirWatch::self(); - connect( watch, TQT_SIGNAL( dirty( const TQString & ) ), - TQT_SLOT( updateLockView() ) ); - connect( watch, TQT_SIGNAL( created( const TQString & ) ), - TQT_SLOT( updateLockView() ) ); - connect( watch, TQT_SIGNAL( deleted( const TQString & ) ), - TQT_SLOT( updateLockView() ) ); + connect( watch, TQ_SIGNAL( dirty( const TQString & ) ), + TQ_SLOT( updateLockView() ) ); + connect( watch, TQ_SIGNAL( created( const TQString & ) ), + TQ_SLOT( updateLockView() ) ); + connect( watch, TQ_SIGNAL( deleted( const TQString & ) ), + TQ_SLOT( updateLockView() ) ); watch->addDir( Lock::locksDir() ); watch->startScan(); } diff --git a/tdeabc/tests/testlock.h b/tdeabc/tests/testlock.h index 62466b89a..a093a9ecb 100644 --- a/tdeabc/tests/testlock.h +++ b/tdeabc/tests/testlock.h @@ -30,7 +30,7 @@ class TQListView; class KABC_EXPORT LockWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: LockWidget( const TQString &identifier ); ~LockWidget(); diff --git a/tdeabc/vcardconverter.h b/tdeabc/vcardconverter.h index c8944ff1c..9c7cb17de 100644 --- a/tdeabc/vcardconverter.h +++ b/tdeabc/vcardconverter.h @@ -111,12 +111,12 @@ class KABC_EXPORT VCardConverter /** @deprecated */ - bool vCardToAddressee( const TQString&, Addressee &, Version version = v3_0 ) KDE_DEPRECATED; + bool vCardToAddressee( const TQString&, Addressee &, Version version = v3_0 ) TDE_DEPRECATED; /** @deprecated */ - bool addresseeToVCard( const Addressee&, TQString&, Version version = v3_0 ) KDE_DEPRECATED; + bool addresseeToVCard( const Addressee&, TQString&, Version version = v3_0 ) TDE_DEPRECATED; private: /** diff --git a/tdeabc/vcardformatimpl.cpp b/tdeabc/vcardformatimpl.cpp index 3a0883edc..4f2ea6809 100644 --- a/tdeabc/vcardformatimpl.cpp +++ b/tdeabc/vcardformatimpl.cpp @@ -331,8 +331,8 @@ void VCardFormatImpl::saveAddressee( const Addressee &addressee, VCARD::VCard *v addTextValue( v, EntityCategories, addressee.categories().join(",") ); - addDateValue( v, EntityBirthday, TQT_TQDATE_OBJECT(addressee.birthday().date()) ); - addDateTimeValue( v, EntityRevision, TQT_TQDATETIME_OBJECT(addressee.revision()) ); + addDateValue( v, EntityBirthday, addressee.birthday().date() ); + addDateTimeValue( v, EntityRevision, addressee.revision() ); addGeoValue( v, addressee.geo() ); addUTCValue( v, addressee.timeZone() ); diff --git a/tdeabc/vcardparser/CMakeLists.txt b/tdeabc/vcardparser/CMakeLists.txt index 692b7829f..e141d1f47 100644 --- a/tdeabc/vcardparser/CMakeLists.txt +++ b/tdeabc/vcardparser/CMakeLists.txt @@ -73,12 +73,6 @@ tde_add_check_executable( testread2 LINK ${TDEABC_TESTS_LINK} ) -if( CMAKE_VERSION VERSION_LESS "2.8.4" ) - if( NOT EXISTS "${CMAKE_CURRENT_BINARY_DIR}/tests" ) - execute_process( COMMAND ln -s "${CMAKE_CURRENT_SOURCE_DIR}/tests" "${CMAKE_CURRENT_BINARY_DIR}/tests" ) - endif( ) -endif() - add_test( NAME tdeabc/vcardparser/testread2 COMMAND testread2 WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" ) # testread tests diff --git a/tdeabc/vcardtool.cpp b/tdeabc/vcardtool.cpp index c1e793e77..71246497f 100644 --- a/tdeabc/vcardtool.cpp +++ b/tdeabc/vcardtool.cpp @@ -139,7 +139,7 @@ TQString VCardTool::createVCards( Addressee::List list, VCard::Version version ) card.addLine( createAgent( version, (*addrIt).agent() ) ); // BDAY - card.addLine( VCardLine( "BDAY", createDateTime( TQT_TQDATETIME_OBJECT((*addrIt).birthday()) ) ) ); + card.addLine( VCardLine( "BDAY", createDateTime( (*addrIt).birthday()) ) ); // CATEGORIES if ( version == VCard::v3_0 ) { @@ -262,7 +262,7 @@ TQString VCardTool::createVCards( Addressee::List list, VCard::Version version ) card.addLine( VCardLine( "PRODID", TQString((*addrIt).productId()) ) ); // REV - card.addLine( VCardLine( "REV", createDateTime( TQT_TQDATETIME_OBJECT((*addrIt).revision()) ) ) ); + card.addLine( VCardLine( "REV", createDateTime( (*addrIt).revision()) ) ); // ROLE VCardLine roleLine( "ROLE", TQString((*addrIt).role()) ); |