diff options
Diffstat (limited to 'kaddressbook')
-rw-r--r-- | kaddressbook/editors/imaddressbase.ui | 2 | ||||
-rw-r--r-- | kaddressbook/editors/imeditorbase.ui | 4 | ||||
-rw-r--r-- | kaddressbook/features/resourceselection.cpp | 8 | ||||
-rw-r--r-- | kaddressbook/interfaces/xxport.cpp | 2 | ||||
-rw-r--r-- | kaddressbook/interfaces/xxport.h | 2 | ||||
-rw-r--r-- | kaddressbook/kaddressbook_part.cpp | 4 | ||||
-rw-r--r-- | kaddressbook/kaddressbook_part.h | 2 | ||||
-rw-r--r-- | kaddressbook/printing/ds_appearance.ui | 2 | ||||
-rw-r--r-- | kaddressbook/views/configurecardviewdialog.cpp | 2 | ||||
-rw-r--r-- | kaddressbook/views/contactlistview.cpp | 24 | ||||
-rw-r--r-- | kaddressbook/views/contactlistview.h | 2 | ||||
-rw-r--r-- | kaddressbook/xxport/csv_xxport.cpp | 12 | ||||
-rw-r--r-- | kaddressbook/xxport/gnokii_xxport.cpp | 36 | ||||
-rw-r--r-- | kaddressbook/xxport/kde2_xxport.cpp | 4 | ||||
-rw-r--r-- | kaddressbook/xxport/ldif_xxport.cpp | 10 | ||||
-rw-r--r-- | kaddressbook/xxport/opera_xxport.cpp | 2 | ||||
-rw-r--r-- | kaddressbook/xxport/pab_xxport.cpp | 2 | ||||
-rw-r--r-- | kaddressbook/xxport/vcard_xxport.cpp | 28 |
18 files changed, 74 insertions, 74 deletions
diff --git a/kaddressbook/editors/imaddressbase.ui b/kaddressbook/editors/imaddressbase.ui index a524fe88f..77988764e 100644 --- a/kaddressbook/editors/imaddressbase.ui +++ b/kaddressbook/editors/imaddressbase.ui @@ -85,5 +85,5 @@ <slot>slotProtocolChanged( const TQString & )</slot> <slot>slotProtocolChanged()</slot> </Q_SLOTS> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kaddressbook/editors/imeditorbase.ui b/kaddressbook/editors/imeditorbase.ui index c6cc32342..77d11794d 100644 --- a/kaddressbook/editors/imeditorbase.ui +++ b/kaddressbook/editors/imeditorbase.ui @@ -152,8 +152,8 @@ </widget> <customwidgets> </customwidgets> -<tqlayoutdefaults spacing="6" margin="0"/> -<tqlayoutfunctions spacing="KDialog::spacingHint"/> +<layoutdefaults spacing="6" margin="0"/> +<layoutfunctions spacing="KDialog::spacingHint"/> <includehints> <includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/kaddressbook/features/resourceselection.cpp b/kaddressbook/features/resourceselection.cpp index 5fe18f5d3..edbb37a08 100644 --- a/kaddressbook/features/resourceselection.cpp +++ b/kaddressbook/features/resourceselection.cpp @@ -466,12 +466,12 @@ ResourceItem* ResourceSelection::selectedItem() const ResourceItem* ResourceSelection::findSubResourceItem( KPIM::ResourceABC *resource, const TQString &subResource ) { - TQListViewItemIterator tqparentIt( mListView ); - for ( ; *tqparentIt; ++tqparentIt ) { - if ( static_cast<ResourceItem*>(*tqparentIt)->resource() != resource ) + TQListViewItemIterator parentIt( mListView ); + for ( ; *parentIt; ++parentIt ) { + if ( static_cast<ResourceItem*>(*parentIt)->resource() != resource ) continue; - TQListViewItemIterator childIt( *tqparentIt ); + TQListViewItemIterator childIt( *parentIt ); for ( ; *childIt; ++childIt ) { ResourceItem *item = static_cast<ResourceItem*>(*childIt); if ( item->resourceIdentifier() == subResource ) diff --git a/kaddressbook/interfaces/xxport.cpp b/kaddressbook/interfaces/xxport.cpp index d4f5b2866..8e8864d85 100644 --- a/kaddressbook/interfaces/xxport.cpp +++ b/kaddressbook/interfaces/xxport.cpp @@ -99,7 +99,7 @@ KABC::AddressBook *XXPort::addressBook() const return mAddressBook; } -TQWidget *XXPort::tqparentWidget() const +TQWidget *XXPort::parentWidget() const { return mParentWidget; } diff --git a/kaddressbook/interfaces/xxport.h b/kaddressbook/interfaces/xxport.h index 9b41850f8..0f24f5c0e 100644 --- a/kaddressbook/interfaces/xxport.h +++ b/kaddressbook/interfaces/xxport.h @@ -146,7 +146,7 @@ class KDE_EXPORT XXPort : public TQObject, virtual public KXMLGUIClient Returns a pointer to the tqparent widget. It can be used as tqparent for message boxes. */ - TQWidget *tqparentWidget() const; + TQWidget *parentWidget() const; private slots: void slotImportActivated( const TQString& ); diff --git a/kaddressbook/kaddressbook_part.cpp b/kaddressbook/kaddressbook_part.cpp index 5a981a4dd..88cd03109 100644 --- a/kaddressbook/kaddressbook_part.cpp +++ b/kaddressbook/kaddressbook_part.cpp @@ -42,7 +42,7 @@ typedef KParts::GenericFactory< KAddressbookPart > KAddressbookFactory; K_EXPORT_COMPONENT_FACTORY( libkaddressbookpart, KAddressbookFactory ) -KAddressbookPart::KAddressbookPart( TQWidget *tqparentWidget, const char *widgetName, +KAddressbookPart::KAddressbookPart( TQWidget *parentWidget, const char *widgetName, TQObject *tqparent, const char *name, const TQStringList & ) : DCOPObject( "KAddressBookIface" ), KParts::ReadOnlyPart( tqparent, name ) @@ -50,7 +50,7 @@ KAddressbookPart::KAddressbookPart( TQWidget *tqparentWidget, const char *widget setInstance( KAddressbookFactory::instance() ); // create a canvas to insert our widget - TQWidget *canvas = new TQWidget( tqparentWidget, widgetName ); + TQWidget *canvas = new TQWidget( parentWidget, widgetName ); canvas->setFocusPolicy( TQ_ClickFocus ); setWidget( canvas ); diff --git a/kaddressbook/kaddressbook_part.h b/kaddressbook/kaddressbook_part.h index 3991e7401..264209314 100644 --- a/kaddressbook/kaddressbook_part.h +++ b/kaddressbook/kaddressbook_part.h @@ -40,7 +40,7 @@ class KAddressbookPart: public KParts::ReadOnlyPart, virtual public KAddressBook TQ_OBJECT public: - KAddressbookPart( TQWidget *tqparentWidget, const char *widgetName, + KAddressbookPart( TQWidget *parentWidget, const char *widgetName, TQObject *tqparent, const char *name, const TQStringList& ); virtual ~KAddressbookPart(); diff --git a/kaddressbook/printing/ds_appearance.ui b/kaddressbook/printing/ds_appearance.ui index 5091e74c9..989b360d8 100644 --- a/kaddressbook/printing/ds_appearance.ui +++ b/kaddressbook/printing/ds_appearance.ui @@ -475,5 +475,5 @@ <slot>setDisabled(bool)</slot> </connection> </connections> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kaddressbook/views/configurecardviewdialog.cpp b/kaddressbook/views/configurecardviewdialog.cpp index 834431af9..846be3898 100644 --- a/kaddressbook/views/configurecardviewdialog.cpp +++ b/kaddressbook/views/configurecardviewdialog.cpp @@ -196,7 +196,7 @@ void CardViewLookNFeelPage::initGUI() TQTabWidget *tabs = new TQTabWidget( this ); // Layout - TQVBox *loTab = new TQVBox( this, "tqlayouttab" ); + TQVBox *loTab = new TQVBox( this, "layouttab" ); loTab->setSpacing( spacing ); loTab->setMargin( margin ); diff --git a/kaddressbook/views/contactlistview.cpp b/kaddressbook/views/contactlistview.cpp index 31f0ac6ca..eab88e2e3 100644 --- a/kaddressbook/views/contactlistview.cpp +++ b/kaddressbook/views/contactlistview.cpp @@ -54,10 +54,10 @@ DynamicTip::DynamicTip( ContactListView *tqparent) void DynamicTip::maybeTip( const TQPoint &pos ) { - if (!tqparentWidget()->inherits( "ContactListView" )) + if (!parentWidget()->inherits( "ContactListView" )) return; - ContactListView *plv = (ContactListView*)tqparentWidget(); + ContactListView *plv = (ContactListView*)parentWidget(); if (!plv->tooltips()) return; @@ -109,7 +109,7 @@ void DynamicTip::maybeTip( const TQPoint &pos ) linew += fm.width( notes[i] ); if ( lastSpace >= a && notes[i] != '\n' ) - if (linew >= tqparentWidget()->width()) { + if (linew >= parentWidget()->width()) { doBreak = true; if ( lastSpace > a ) { i = lastSpace; @@ -152,7 +152,7 @@ ContactListViewItem::ContactListViewItem(const KABC::Addressee &a, const KABC::Field::List &fields, KIMProxy *proxy ) : KListViewItem(tqparent), mAddressee(a), mFields( fields ), - tqparentListView( tqparent ), mDocument(doc), mIMProxy( proxy ) + parentListView( 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 >= tqparentListView->columns() ) + if ( column >= parentListView->columns() ) return TQString(); #if KDE_VERSION >= 319 Q_UNUSED( ascending ) - if ( tqparentListView->showIM() ) { + if ( parentListView->showIM() ) { // in this case, one column is reserved for IM presence // so we have to process it differently - if ( column == tqparentListView->imColumn() ) { + if ( column == parentListView->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,8 +201,8 @@ void ContactListViewItem::paintCell(TQPainter * p, if ( !p ) return; - if (tqparentListView->singleLine()) { - p->setPen( tqparentListView->alternateColor() ); + if (parentListView->singleLine()) { + p->setPen( parentListView->alternateColor() ); p->drawLine( 0, height() - 1, width, height() - 1 ); } } @@ -210,7 +210,7 @@ void ContactListViewItem::paintCell(TQPainter * p, ContactListView *ContactListViewItem::tqparent() { - return tqparentListView; + return parentListView; } @@ -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( tqparentListView->imColumn(), mIMProxy->presenceIcon( mAddressee.uid() ) ); + setPixmap( parentListView->imColumn(), mIMProxy->presenceIcon( mAddressee.uid() ) ); else - setPixmap( tqparentListView->imColumn(), TQPixmap() ); + setPixmap( parentListView->imColumn(), TQPixmap() ); } KABC::Field::List::ConstIterator it; diff --git a/kaddressbook/views/contactlistview.h b/kaddressbook/views/contactlistview.h index 65c927026..5492b9161 100644 --- a/kaddressbook/views/contactlistview.h +++ b/kaddressbook/views/contactlistview.h @@ -72,7 +72,7 @@ public: private: KABC::Addressee mAddressee; KABC::Field::List mFields; - ContactListView *tqparentListView; + ContactListView *parentListView; KABC::AddressBook *mDocument; KIMProxy *mIMProxy; bool mHasIM; diff --git a/kaddressbook/xxport/csv_xxport.cpp b/kaddressbook/xxport/csv_xxport.cpp index fc9ac247c..03962d3a0 100644 --- a/kaddressbook/xxport/csv_xxport.cpp +++ b/kaddressbook/xxport/csv_xxport.cpp @@ -50,7 +50,7 @@ bool CSVXXPort::exportContacts( const KABC::AddresseeList &list, const TQString& return true; if( TQFileInfo(url.path()).exists() ) { - if(KMessageBox::questionYesNo( tqparentWidget(), i18n("Do you want to overwrite file \"%1\"").tqarg( url.path()) ) == KMessageBox::No) + if(KMessageBox::questionYesNo( parentWidget(), i18n("Do you want to overwrite file \"%1\"").tqarg( url.path()) ) == KMessageBox::No) return false; } @@ -58,7 +58,7 @@ bool CSVXXPort::exportContacts( const KABC::AddresseeList &list, const TQString& KTempFile tmpFile; if ( tmpFile.status() != 0 ) { TQString txt = i18n( "<qt>Unable to open file <b>%1</b>.%2.</qt>" ); - KMessageBox::error( tqparentWidget(), txt.tqarg( url.url() ) + KMessageBox::error( parentWidget(), txt.tqarg( url.url() ) .tqarg( strerror( tmpFile.status() ) ) ); return false; } @@ -66,19 +66,19 @@ bool CSVXXPort::exportContacts( const KABC::AddresseeList &list, const TQString& doExport( tmpFile.file(), list ); tmpFile.close(); - return KIO::NetAccess::upload( tmpFile.name(), url, tqparentWidget() ); + return KIO::NetAccess::upload( tmpFile.name(), url, parentWidget() ); } else { TQFile file( url.path() ); if ( !file.open( IO_WriteOnly ) ) { TQString txt = i18n( "<qt>Unable to open file <b>%1</b>.</qt>" ); - KMessageBox::error( tqparentWidget(), txt.tqarg( url.path() ) ); + KMessageBox::error( parentWidget(), txt.tqarg( url.path() ) ); return false; } doExport( &file, list ); file.close(); - KMessageBox::information( tqparentWidget(), i18n( "The contacts have been exported successfully." ) ); + KMessageBox::information( parentWidget(), i18n( "The contacts have been exported successfully." ) ); return true; } @@ -86,7 +86,7 @@ bool CSVXXPort::exportContacts( const KABC::AddresseeList &list, const TQString& KABC::AddresseeList CSVXXPort::importContacts( const TQString& ) const { - CSVImportDialog dlg( addressBook(), tqparentWidget() ); + CSVImportDialog dlg( addressBook(), parentWidget() ); if ( dlg.exec() ) return dlg.contacts(); else diff --git a/kaddressbook/xxport/gnokii_xxport.cpp b/kaddressbook/xxport/gnokii_xxport.cpp index 053a850e2..564fcf5fb 100644 --- a/kaddressbook/xxport/gnokii_xxport.cpp +++ b/kaddressbook/xxport/gnokii_xxport.cpp @@ -528,7 +528,7 @@ KABC::AddresseeList GNOKIIXXPort::importContacts( const TQString& ) const { KABC::AddresseeList addrList; - if (KMessageBox::Continue != KMessageBox::warningContinueCancel(tqparentWidget(), + if (KMessageBox::Continue != KMessageBox::warningContinueCancel(parentWidget(), i18n("<qt>Please connect your Mobile Phone to your computer and press " "<b>Continue</b> to start importing the personal contacts.<br><br>" "Please note that if your Mobile Phone is not properly connected " @@ -536,7 +536,7 @@ KABC::AddresseeList GNOKIIXXPort::importContacts( const TQString& ) const "KAddressbook will behave unresponsively.</qt>") )) return addrList; - m_progressDlg = new KProgressDialog( tqparentWidget(), "importwidget", + m_progressDlg = new KProgressDialog( parentWidget(), "importwidget", i18n("Mobile Phone Import"), i18n("<qt><center>Establishing connection to the Mobile Phone.<br><br>" "Please wait...</center></qt>") ); @@ -553,7 +553,7 @@ KABC::AddresseeList GNOKIIXXPort::importContacts( const TQString& ) const m_progressDlg->unsetCursor(); if (!errStr.isEmpty()) { - KMessageBox::error(tqparentWidget(), errStr); + KMessageBox::error(parentWidget(), errStr); delete m_progressDlg; return addrList; } @@ -575,7 +575,7 @@ KABC::AddresseeList GNOKIIXXPort::importContacts( const TQString& ) const bool GNOKIIXXPort::exportContacts( const KABC::AddresseeList &list, const TQString & ) { - if (KMessageBox::Continue != KMessageBox::warningContinueCancel(tqparentWidget(), + if (KMessageBox::Continue != KMessageBox::warningContinueCancel(parentWidget(), i18n("<qt>Please connect your Mobile Phone to your computer and press " "<b>Continue</b> to start exporting the selected personal contacts.<br><br>" "Please note that if your Mobile Phone is not properly connected " @@ -583,7 +583,7 @@ bool GNOKIIXXPort::exportContacts( const KABC::AddresseeList &list, const TQStri "KAddressbook will behave unresponsively.</qt>") )) return false; - m_progressDlg = new KProgressDialog( tqparentWidget(), "importwidget", + m_progressDlg = new KProgressDialog( parentWidget(), "importwidget", i18n("Mobile Phone Export"), i18n("<qt><center>Establishing connection to the Mobile Phone.<br><br>" "Please wait...</center></qt>") ); @@ -608,7 +608,7 @@ bool GNOKIIXXPort::exportContacts( const KABC::AddresseeList &list, const TQStri m_progressDlg->unsetCursor(); if (!errStr.isEmpty()) { - KMessageBox::error(tqparentWidget(), errStr); + KMessageBox::error(parentWidget(), errStr); delete m_progressDlg; return false; } @@ -637,7 +637,7 @@ bool GNOKIIXXPort::exportContacts( const KABC::AddresseeList &list, const TQStri phone_count = memstat.used; if (memstat.free >= (int) list.count()) { - if (KMessageBox::No == KMessageBox::questionYesNo(tqparentWidget(), + if (KMessageBox::No == KMessageBox::questionYesNo(parentWidget(), 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>" @@ -756,7 +756,7 @@ finish: if (!failedList.isEmpty()) { GNOKII_DEBUG(TQString("Failed to export: %1\n").tqarg(failedList.join(", "))); - KMessageBox::informationList(tqparentWidget(), + KMessageBox::informationList(parentWidget(), i18n("<qt>The following contacts could not be exported to the Mobile Phone. " "Possible Reasons for this problem could be:<br><ul>" "<li>The contacts contain more information per entry than the phone can store.</li>" @@ -1319,7 +1319,7 @@ KABC::AddresseeList GNOKIIXXPort::importContacts( const TQString& ) const { KABC::AddresseeList addrList; - if (KMessageBox::Continue != KMessageBox::warningContinueCancel(tqparentWidget(), + if (KMessageBox::Continue != KMessageBox::warningContinueCancel(parentWidget(), i18n("<qt>Please connect your Mobile Phone to your computer and press " "<b>Continue</b> to start importing the personal contacts.<br><br>" "Please note that if your Mobile Phone is not properly connected " @@ -1327,7 +1327,7 @@ KABC::AddresseeList GNOKIIXXPort::importContacts( const TQString& ) const "KAddressbook will behave unresponsively.</qt>") )) return addrList; - m_progressDlg = new KProgressDialog( tqparentWidget(), "importwidget", + m_progressDlg = new KProgressDialog( parentWidget(), "importwidget", i18n("Mobile Phone Import"), i18n("<qt><center>Establishing connection to the Mobile Phone.<br><br>" "Please wait...</center></qt>") ); @@ -1344,7 +1344,7 @@ KABC::AddresseeList GNOKIIXXPort::importContacts( const TQString& ) const m_progressDlg->unsetCursor(); if (!errStr.isEmpty()) { - KMessageBox::error(tqparentWidget(), errStr); + KMessageBox::error(parentWidget(), errStr); delete m_progressDlg; return addrList; } @@ -1366,7 +1366,7 @@ KABC::AddresseeList GNOKIIXXPort::importContacts( const TQString& ) const bool GNOKIIXXPort::exportContacts( const KABC::AddresseeList &list, const TQString & ) { - if (KMessageBox::Continue != KMessageBox::warningContinueCancel(tqparentWidget(), + if (KMessageBox::Continue != KMessageBox::warningContinueCancel(parentWidget(), i18n("<qt>Please connect your Mobile Phone to your computer and press " "<b>Continue</b> to start exporting the selected personal contacts.<br><br>" "Please note that if your Mobile Phone is not properly connected " @@ -1374,7 +1374,7 @@ bool GNOKIIXXPort::exportContacts( const KABC::AddresseeList &list, const TQStri "KAddressbook will behave unresponsively.</qt>") )) return false; - m_progressDlg = new KProgressDialog( tqparentWidget(), "importwidget", + m_progressDlg = new KProgressDialog( parentWidget(), "importwidget", i18n("Mobile Phone Export"), i18n("<qt><center>Establishing connection to the Mobile Phone.<br><br>" "Please wait...</center></qt>") ); @@ -1399,7 +1399,7 @@ bool GNOKIIXXPort::exportContacts( const KABC::AddresseeList &list, const TQStri m_progressDlg->unsetCursor(); if (!errStr.isEmpty()) { - KMessageBox::error(tqparentWidget(), errStr); + KMessageBox::error(parentWidget(), errStr); delete m_progressDlg; return false; } @@ -1428,7 +1428,7 @@ bool GNOKIIXXPort::exportContacts( const KABC::AddresseeList &list, const TQStri phone_count = memstat.used; if (memstat.free >= (int) list.count()) { - if (KMessageBox::No == KMessageBox::questionYesNo(tqparentWidget(), + if (KMessageBox::No == KMessageBox::questionYesNo(parentWidget(), 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>" @@ -1547,7 +1547,7 @@ finish: if (!failedList.isEmpty()) { GNOKII_DEBUG(TQString("Failed to export: %1\n").tqarg(failedList.join(", "))); - KMessageBox::informationList(tqparentWidget(), + KMessageBox::informationList(parentWidget(), i18n("<qt>The following contacts could not be exported to the Mobile Phone. " "Possible Reasons for this problem could be:<br><ul>" "<li>The contacts contain more information per entry than the phone can store.</li>" @@ -1575,7 +1575,7 @@ finish: KABC::AddresseeList GNOKIIXXPort::importContacts( const TQString& ) const { KABC::AddresseeList addrList; - KMessageBox::error(tqparentWidget(), i18n("Gnokii interface is not available.\n" + KMessageBox::error(parentWidget(), i18n("Gnokii interface is not available.\n" "Please ask your distributor to add gnokii at compile time.")); return addrList; } @@ -1583,7 +1583,7 @@ KABC::AddresseeList GNOKIIXXPort::importContacts( const TQString& ) const bool GNOKIIXXPort::exportContacts( const KABC::AddresseeList &list, const TQString & ) { Q_UNUSED(list); - KMessageBox::error(tqparentWidget(), i18n("Gnokii interface is not available.\n" + KMessageBox::error(parentWidget(), i18n("Gnokii interface is not available.\n" "Please ask your distributor to add gnokii at compile time.")); return true; } diff --git a/kaddressbook/xxport/kde2_xxport.cpp b/kaddressbook/xxport/kde2_xxport.cpp index f5848d1ce..08fe4a108 100644 --- a/kaddressbook/xxport/kde2_xxport.cpp +++ b/kaddressbook/xxport/kde2_xxport.cpp @@ -49,11 +49,11 @@ KABC::AddresseeList KDE2XXPort::importContacts( const TQString& ) const { TQString fileName = locateLocal( "data", "kabc/std.vcf" ); if ( !TQFile::exists( fileName ) ) { - KMessageBox::sorry( tqparentWidget(), i18n( "<qt>Could not find a KDE 2 address book <b>%1</b>.</qt>" ).tqarg( fileName ) ); + KMessageBox::sorry( parentWidget(), i18n( "<qt>Could not find a KDE 2 address book <b>%1</b>.</qt>" ).tqarg( fileName ) ); return KABC::AddresseeList(); } - int result = KMessageBox::questionYesNoCancel( tqparentWidget(), + int result = KMessageBox::questionYesNoCancel( parentWidget(), i18n( "Override previously imported entries?" ), i18n( "Import KDE 2 Addressbook" ), i18n("Import"), i18n("Do Not Import") ); diff --git a/kaddressbook/xxport/ldif_xxport.cpp b/kaddressbook/xxport/ldif_xxport.cpp index 53ec7d996..8ff5cf44d 100644 --- a/kaddressbook/xxport/ldif_xxport.cpp +++ b/kaddressbook/xxport/ldif_xxport.cpp @@ -71,7 +71,7 @@ KABC::AddresseeList LDIFXXPort::importContacts( const TQString& ) const TQFile file( fileName ); if ( !file.open( IO_ReadOnly ) ) { TQString msg = i18n( "<qt>Unable to open <b>%1</b> for reading.</qt>" ); - KMessageBox::error( tqparentWidget(), msg.tqarg( fileName ) ); + KMessageBox::error( parentWidget(), msg.tqarg( fileName ) ); return addrList; } @@ -97,7 +97,7 @@ bool LDIFXXPort::exportContacts( const KABC::AddresseeList &list, const TQString return true; if( TQFileInfo(url.path()).exists() ) { - if(KMessageBox::questionYesNo( tqparentWidget(), i18n("Do you want to overwrite file \"%1\"").tqarg( url.path()) ) == KMessageBox::No) + if(KMessageBox::questionYesNo( parentWidget(), i18n("Do you want to overwrite file \"%1\"").tqarg( url.path()) ) == KMessageBox::No) return false; } @@ -106,7 +106,7 @@ bool LDIFXXPort::exportContacts( const KABC::AddresseeList &list, const TQString KTempFile tmpFile; if ( tmpFile.status() != 0 ) { TQString txt = i18n( "<qt>Unable to open file <b>%1</b>.%2.</qt>" ); - KMessageBox::error( tqparentWidget(), txt.tqarg( url.url() ) + KMessageBox::error( parentWidget(), txt.tqarg( url.url() ) .tqarg( strerror( tmpFile.status() ) ) ); return false; } @@ -114,14 +114,14 @@ bool LDIFXXPort::exportContacts( const KABC::AddresseeList &list, const TQString doExport( tmpFile.file(), list ); tmpFile.close(); - return KIO::NetAccess::upload( tmpFile.name(), url, tqparentWidget() ); + return KIO::NetAccess::upload( tmpFile.name(), url, parentWidget() ); } else { TQString filename = url.path(); TQFile file( filename ); if ( !file.open( IO_WriteOnly ) ) { TQString txt = i18n( "<qt>Unable to open file <b>%1</b>.</qt>" ); - KMessageBox::error( tqparentWidget(), txt.tqarg( filename ) ); + KMessageBox::error( parentWidget(), txt.tqarg( filename ) ); return false; } diff --git a/kaddressbook/xxport/opera_xxport.cpp b/kaddressbook/xxport/opera_xxport.cpp index 71b01e6e1..59fd52eaa 100644 --- a/kaddressbook/xxport/opera_xxport.cpp +++ b/kaddressbook/xxport/opera_xxport.cpp @@ -55,7 +55,7 @@ KABC::AddresseeList OperaXXPort::importContacts( const TQString& ) const TQFile file( fileName ); if ( !file.open( IO_ReadOnly ) ) { TQString msg = i18n( "<qt>Unable to open <b>%1</b> for reading.</qt>" ); - KMessageBox::error( tqparentWidget(), msg.tqarg( fileName ) ); + KMessageBox::error( parentWidget(), msg.tqarg( fileName ) ); return addrList; } diff --git a/kaddressbook/xxport/pab_xxport.cpp b/kaddressbook/xxport/pab_xxport.cpp index 7894e9c5b..8075a7da2 100644 --- a/kaddressbook/xxport/pab_xxport.cpp +++ b/kaddressbook/xxport/pab_xxport.cpp @@ -55,7 +55,7 @@ KABC::AddresseeList PABXXPort::importContacts( const TQString& ) const if ( fileName.isEmpty() ) return addrList; if ( !TQFile::exists( fileName ) ) { - KMessageBox::sorry( tqparentWidget(), i18n( "<qt>Could not find a MS Exchange Personal Address Book <b>%1</b>.</qt>" ).tqarg( fileName ) ); + KMessageBox::sorry( parentWidget(), i18n( "<qt>Could not find a MS Exchange Personal Address Book <b>%1</b>.</qt>" ).tqarg( fileName ) ); return addrList; } diff --git a/kaddressbook/xxport/vcard_xxport.cpp b/kaddressbook/xxport/vcard_xxport.cpp index 74b1e9dc8..d917292f7 100644 --- a/kaddressbook/xxport/vcard_xxport.cpp +++ b/kaddressbook/xxport/vcard_xxport.cpp @@ -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(), i18n("Export to Several Files"), i18n("Export to One File") ) ) { + switch ( KMessageBox::questionYesNo( parentWidget(), msg, TQString(), i18n("Export to Several Files"), i18n("Export to One File") ) ) { case KMessageBox::Yes: { KURL baseUrl = KFileDialog::getExistingURL(); if ( baseUrl.isEmpty() ) @@ -146,7 +146,7 @@ bool VCardXXPort::exportContacts( const KABC::AddresseeList &addrList, const TQS else testUrl = baseUrl.url() + "/" + (*it).givenName() + "_" + (*it).familyName(); - if ( KIO::NetAccess::exists( testUrl + (counter == 0 ? "" : TQString::number( counter )) + ".vcf", false, tqparentWidget() ) ) { + if ( KIO::NetAccess::exists( testUrl + (counter == 0 ? "" : TQString::number( counter )) + ".vcf", false, parentWidget() ) ) { counter++; url = testUrl + TQString::number( counter ) + ".vcf"; } else @@ -208,7 +208,7 @@ KABC::AddresseeList VCardXXPort::importContacts( const TQString& ) const #endif } else { if ( XXPortManager::importURL.isEmpty() ) - urls = KFileDialog::getOpenURLs( TQString(), "*.vcf|vCards", tqparentWidget(), + urls = KFileDialog::getOpenURLs( TQString(), "*.vcf|vCards", parentWidget(), i18n( "Select vCard to Import" ) ); else urls.append( XXPortManager::importURL ); @@ -220,7 +220,7 @@ KABC::AddresseeList VCardXXPort::importContacts( const TQString& ) const bool anyFailures = false; KURL::List::Iterator it; for ( it = urls.begin(); it != urls.end(); ++it ) { - if ( KIO::NetAccess::download( *it, fileName, tqparentWidget() ) ) { + if ( KIO::NetAccess::download( *it, fileName, parentWidget() ) ) { TQFile file( fileName ); @@ -253,13 +253,13 @@ KABC::AddresseeList VCardXXPort::importContacts( const TQString& ) const text = text.tqarg( (*it).url() ); text = text.tqarg( kapp->translate( "TQFile", TQString(file.errorString()).latin1() ) ); - KMessageBox::error( tqparentWidget(), text, caption ); + KMessageBox::error( parentWidget(), text, caption ); anyFailures = true; } } else { TQString text = i18n( "<qt>Unable to access vCard: %1</qt>" ); text = text.tqarg( KIO::NetAccess::lastErrorString() ); - KMessageBox::error( tqparentWidget(), text, caption ); + KMessageBox::error( parentWidget(), text, caption ); anyFailures = true; } } @@ -267,12 +267,12 @@ KABC::AddresseeList VCardXXPort::importContacts( const TQString& ) const if ( !XXPortManager::importURL.isEmpty() ) { // a vcard was passed via cmd if ( addrList.isEmpty() ) { if ( anyFailures && urls.count() > 1 ) - KMessageBox::information( tqparentWidget(), + KMessageBox::information( parentWidget(), i18n( "No contacts were imported, due to errors with the vCards." ) ); else if ( !anyFailures ) - KMessageBox::information( tqparentWidget(), i18n( "The vCard does not contain any contacts." ) ); + KMessageBox::information( parentWidget(), i18n( "The vCard does not contain any contacts." ) ); } else { - VCardViewerDialog dlg( addrList, tqparentWidget() ); + VCardViewerDialog dlg( addrList, parentWidget() ); dlg.exec(); addrList = dlg.contacts(); } @@ -293,7 +293,7 @@ KABC::AddresseeList VCardXXPort::parseVCard( const TQByteArray &data ) const bool VCardXXPort::doExport( const KURL &url, const TQByteArray &data ) { if( TQFileInfo(url.path()).exists() ) { - if(KMessageBox::questionYesNo( tqparentWidget(), i18n("Do you want to overwrite file \"%1\"").tqarg( url.path()) ) == KMessageBox::No) + if(KMessageBox::questionYesNo( parentWidget(), i18n("Do you want to overwrite file \"%1\"").tqarg( url.path()) ) == KMessageBox::No) return false; } KTempFile tmpFile; @@ -302,7 +302,7 @@ bool VCardXXPort::doExport( const KURL &url, const TQByteArray &data ) tmpFile.file()->writeBlock( data.data(), data.size() ); tmpFile.close(); - return KIO::NetAccess::upload( tmpFile.name(), url, tqparentWidget() ); + return KIO::NetAccess::upload( tmpFile.name(), url, parentWidget() ); } #else KABC::AddresseeList VCardXXPort::parseVCard( const TQString &data ) const @@ -315,7 +315,7 @@ KABC::AddresseeList VCardXXPort::parseVCard( const TQString &data ) const bool VCardXXPort::doExport( const KURL &url, const TQString &data ) { if( TQFileInfo(url.path()).exists() ) { - if(KMessageBox::questionYesNo( tqparentWidget(), i18n("Do you want to overwrite file \"%1\"").tqarg( url.path()) ) == KMessageBox::No) + if(KMessageBox::questionYesNo( parentWidget(), i18n("Do you want to overwrite file \"%1\"").tqarg( url.path()) ) == KMessageBox::No) return false; } KTempFile tmpFile; @@ -327,7 +327,7 @@ bool VCardXXPort::doExport( const KURL &url, const TQString &data ) stream << data; tmpFile.close(); - return KIO::NetAccess::upload( tmpFile.name(), url, tqparentWidget() ); + return KIO::NetAccess::upload( tmpFile.name(), url, parentWidget() ); } #endif @@ -338,7 +338,7 @@ KABC::AddresseeList VCardXXPort::filterContacts( const KABC::AddresseeList &addr if ( addrList.isEmpty() ) return addrList; - VCardExportSelectionDialog dlg( tqparentWidget() ); + VCardExportSelectionDialog dlg( parentWidget() ); if ( !dlg.exec() ) return list; |