diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:49:30 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:49:30 -0600 |
commit | a9bde819f2b421dcc44741156e75eca4bb5fb4f4 (patch) | |
tree | d087071b1e8fcf79698938efec19f8e48bab0799 /kaddressbook | |
parent | 5c4a80ead2b1fe57dc6a8c29d0368792344cd61e (diff) | |
download | tdepim-a9bde819f2b421dcc44741156e75eca4bb5fb4f4.tar.gz tdepim-a9bde819f2b421dcc44741156e75eca4bb5fb4f4.zip |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kaddressbook')
30 files changed, 50 insertions, 50 deletions
diff --git a/kaddressbook/addresseditwidget.cpp b/kaddressbook/addresseditwidget.cpp index 3924f9012..4e4b6e61d 100644 --- a/kaddressbook/addresseditwidget.cpp +++ b/kaddressbook/addresseditwidget.cpp @@ -469,7 +469,7 @@ void AddressEditDialog::updateAddressEdits() mPreferredCheckBox->setChecked( a.type() & KABC::Address::Pref ); if ( a.isEmpty() ) - mCountryCombo->setCurrentText( KGlobal::locale()->twoAlphaToCountryName( KGlobal::locale()->country() ) ); + mCountryCombo->setCurrentText( TDEGlobal::locale()->twoAlphaToCountryName( TDEGlobal::locale()->country() ) ); mStreetTextEdit->setFocus(); diff --git a/kaddressbook/addresseeeditorwidget.cpp b/kaddressbook/addresseeeditorwidget.cpp index cceba5458..b875c99af 100644 --- a/kaddressbook/addresseeeditorwidget.cpp +++ b/kaddressbook/addresseeeditorwidget.cpp @@ -157,7 +157,7 @@ void AddresseeEditorWidget::setupTab1() // Person icon label = new TQLabel( tab1 ); - label->setPixmap( KGlobal::iconLoader()->loadIcon( "personal", KIcon::Desktop, + label->setPixmap( TDEGlobal::iconLoader()->loadIcon( "personal", KIcon::Desktop, KIcon::SizeMedium ) ); layout->addMultiCellWidget( label, 0, 1, 0, 0 ); @@ -212,7 +212,7 @@ void AddresseeEditorWidget::setupTab1() ////////////////////////////////////// // Phone numbers (upper right) label = new TQLabel( tab1 ); - label->setPixmap( KGlobal::iconLoader()->loadIcon( "kaddressbook", + label->setPixmap( TDEGlobal::iconLoader()->loadIcon( "kaddressbook", KIcon::Desktop, KIcon::SizeMedium ) ); layout->addMultiCellWidget( label, 0, 1, 3, 3 ); @@ -226,7 +226,7 @@ void AddresseeEditorWidget::setupTab1() ////////////////////////////////////// // Addresses (lower left) label = new TQLabel( tab1 ); - label->setPixmap( KGlobal::iconLoader()->loadIcon( "kfm_home", KIcon::Desktop, + label->setPixmap( TDEGlobal::iconLoader()->loadIcon( "kfm_home", KIcon::Desktop, KIcon::SizeMedium ) ); layout->addMultiCellWidget( label, 5, 6, 0, 0 ); @@ -237,7 +237,7 @@ void AddresseeEditorWidget::setupTab1() ////////////////////////////////////// // Email / Web (lower right) label = new TQLabel( tab1 ); - label->setPixmap( KGlobal::iconLoader()->loadIcon( "email", KIcon::Desktop, + label->setPixmap( TDEGlobal::iconLoader()->loadIcon( "email", KIcon::Desktop, KIcon::SizeMedium ) ); layout->addMultiCellWidget( label, 5, 6, 3, 3 ); @@ -252,7 +252,7 @@ void AddresseeEditorWidget::setupTab1() TQHBoxLayout *homePageLayout = new TQHBoxLayout( 0, 11, 7 ); label = new TQLabel( tab1 ); - label->setPixmap( KGlobal::iconLoader()->loadIcon( "homepage", KIcon::Desktop, + label->setPixmap( TDEGlobal::iconLoader()->loadIcon( "homepage", KIcon::Desktop, KIcon::SizeMedium ) ); homePageLayout->addWidget( label ); @@ -325,7 +325,7 @@ void AddresseeEditorWidget::setupTab2() // Department label = new TQLabel( tab2 ); - label->setPixmap( KGlobal::iconLoader()->loadIcon( "folder", KIcon::Desktop, + label->setPixmap( TDEGlobal::iconLoader()->loadIcon( "folder", KIcon::Desktop, KIcon::SizeMedium ) ); layout->addMultiCellWidget( label, 0, 1, 0, 0 ); @@ -384,7 +384,7 @@ void AddresseeEditorWidget::setupTab2() // Personal info label = new TQLabel( tab2 ); - label->setPixmap( KGlobal::iconLoader()->loadIcon( "personal", KIcon::Desktop, + label->setPixmap( TDEGlobal::iconLoader()->loadIcon( "personal", KIcon::Desktop, KIcon::SizeMedium ) ); layout->addMultiCellWidget( label, 4, 5, 0, 0 ); @@ -484,7 +484,7 @@ void AddresseeEditorWidget::setupCustomFieldsTabs() { TQStringList activePages = KABPrefs::instance()->advancedCustomFields(); - const TQStringList list = KGlobal::dirs()->findAllResources( "data", "kaddressbook/contacteditorpages/*.ui", true, true ); + const TQStringList list = TDEGlobal::dirs()->findAllResources( "data", "kaddressbook/contacteditorpages/*.ui", true, true ); for ( TQStringList::ConstIterator it = list.begin(); it != list.end(); ++it ) { if ( activePages.find( (*it).mid( (*it).findRev('/') + 1 ) ) == activePages.end() ) continue; diff --git a/kaddressbook/common/locationmap.cpp b/kaddressbook/common/locationmap.cpp index 2fbda71cb..e1f23e662 100644 --- a/kaddressbook/common/locationmap.cpp +++ b/kaddressbook/common/locationmap.cpp @@ -72,7 +72,7 @@ TQString LocationMap::createUrl( const KABC::Address &addr ) %c country (in ISO format) */ - TQString urlTemplate = KABPrefs::instance()->locationMapURL().arg( KGlobal::locale()->country() ); + TQString urlTemplate = KABPrefs::instance()->locationMapURL().arg( TDEGlobal::locale()->country() ); if ( urlTemplate.isEmpty() ) { KMessageBox::error( 0, i18n( "No service provider available for map lookup!\nPlease add one in the configuration dialog." ) ); return TQString(); diff --git a/kaddressbook/distributionlistentryview.cpp b/kaddressbook/distributionlistentryview.cpp index 9d927a5d4..3fc16142e 100644 --- a/kaddressbook/distributionlistentryview.cpp +++ b/kaddressbook/distributionlistentryview.cpp @@ -105,7 +105,7 @@ void KAB::DistributionListEntryView::setEntry( const KPIM::DistributionList& lis TQPixmap pixmap; pixmap.convertFromImage( m_entry.addressee.photo().data() ); - m_imageLabel->setPixmap( pixmap.isNull() ? KGlobal::iconLoader()->loadIcon( "personal", KIcon::Desktop ) : pixmap ); + m_imageLabel->setPixmap( pixmap.isNull() ? TDEGlobal::iconLoader()->loadIcon( "personal", KIcon::Desktop ) : pixmap ); m_addresseeLabel->setText( i18n( "Formatted name, role, organization", "<qt><h2>%1</h2><p>%2<br/>%3</p></qt>" ).arg( m_entry.addressee.formattedName(), m_entry.addressee.role(), m_entry.addressee.organization() ) ); m_distListLabel->setURL( m_list.name() ); m_distListLabel->setText( m_list.name() ); diff --git a/kaddressbook/editors/cryptowidget.cpp b/kaddressbook/editors/cryptowidget.cpp index 89d41ab35..f89a068e6 100644 --- a/kaddressbook/editors/cryptowidget.cpp +++ b/kaddressbook/editors/cryptowidget.cpp @@ -54,8 +54,8 @@ extern "C" { CryptoWidgetFactory::CryptoWidgetFactory() { - KGlobal::locale()->insertCatalogue( "libkleopatra" ); - KGlobal::iconLoader()->addAppDir( "libkleopatra" ); + TDEGlobal::locale()->insertCatalogue( "libkleopatra" ); + TDEGlobal::iconLoader()->addAppDir( "libkleopatra" ); } TQString CryptoWidgetFactory::pageTitle() const diff --git a/kaddressbook/features/distributionlistwidget.cpp b/kaddressbook/features/distributionlistwidget.cpp index d279cc01f..c49deee6a 100644 --- a/kaddressbook/features/distributionlistwidget.cpp +++ b/kaddressbook/features/distributionlistwidget.cpp @@ -221,7 +221,7 @@ DistributionListWidget::DistributionListWidget( KAB::Core *core, TQWidget *paren installEventFilter( catcher ); mContactView->installEventFilter( catcher ); - mContactView->restoreLayout( KGlobal::config(), "DistributionListViewColumns" ); + mContactView->restoreLayout( TDEGlobal::config(), "DistributionListViewColumns" ); KAcceleratorManager::manage( this ); } @@ -232,7 +232,7 @@ DistributionListWidget::~DistributionListWidget() delete mManager; #endif - mContactView->saveLayout( KGlobal::config(), "DistributionListViewColumns" ); + mContactView->saveLayout( TDEGlobal::config(), "DistributionListViewColumns" ); } void DistributionListWidget::save() diff --git a/kaddressbook/features/resourceselection.cpp b/kaddressbook/features/resourceselection.cpp index 4972fd45d..03e7f1f43 100644 --- a/kaddressbook/features/resourceselection.cpp +++ b/kaddressbook/features/resourceselection.cpp @@ -64,7 +64,7 @@ class ResourceItem : public TQCheckListItem mResourceIdentifier() { setOn( resource->isActive() ); - setPixmap( 0, KGlobal::iconLoader()->loadIcon( "contents", KIcon::Small ) ); + setPixmap( 0, TDEGlobal::iconLoader()->loadIcon( "contents", KIcon::Small ) ); mChecked = isOn(); } @@ -77,7 +77,7 @@ class ResourceItem : public TQCheckListItem { KPIM::ResourceABC* res = dynamic_cast<KPIM::ResourceABC *>( mResource ); setOn( res->subresourceActive( mResourceIdentifier ) ); - setPixmap( 0, KGlobal::iconLoader()->loadIcon( "contents", KIcon::Small ) ); + setPixmap( 0, TDEGlobal::iconLoader()->loadIcon( "contents", KIcon::Small ) ); mChecked = isOn(); } diff --git a/kaddressbook/geowidget.cpp b/kaddressbook/geowidget.cpp index 000cc41df..8a2751258 100644 --- a/kaddressbook/geowidget.cpp +++ b/kaddressbook/geowidget.cpp @@ -54,7 +54,7 @@ GeoWidget::GeoWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name topLayout->setSpacing( KDialog::spacingHint() ); label = new TQLabel( this ); - label->setPixmap( KGlobal::iconLoader()->loadIcon( "package_network", + label->setPixmap( TDEGlobal::iconLoader()->loadIcon( "package_network", KIcon::Desktop, KIcon::SizeMedium ) ); label->setAlignment( TQt::AlignTop ); topLayout->addMultiCellWidget( label, 0, 3, 0, 0 ); diff --git a/kaddressbook/imagewidget.cpp b/kaddressbook/imagewidget.cpp index dd844499c..bb2064883 100644 --- a/kaddressbook/imagewidget.cpp +++ b/kaddressbook/imagewidget.cpp @@ -144,7 +144,7 @@ void ImageButton::startDrag() void ImageButton::updateGUI() { if ( mPicture.data().isNull() ) - setPixmap( KGlobal::iconLoader()->iconPath( "personal", KIcon::Desktop ) ); + setPixmap( TDEGlobal::iconLoader()->iconPath( "personal", KIcon::Desktop ) ); else setPixmap( mPicture.data() ); } @@ -208,7 +208,7 @@ void ImageButton::mouseMoveEvent( TQMouseEvent *event ) { if ( (event->state() & Qt::LeftButton) && (event->pos() - mDragStartPos).manhattanLength() > - KGlobalSettings::dndEventDelay() ) { + TDEGlobalSettings::dndEventDelay() ) { startDrag(); } } diff --git a/kaddressbook/interfaces/xxport.h b/kaddressbook/interfaces/xxport.h index 021275d5a..f3eddebbf 100644 --- a/kaddressbook/interfaces/xxport.h +++ b/kaddressbook/interfaces/xxport.h @@ -47,7 +47,7 @@ class TDEApplication; class KDE_NO_EXPORT localXXPortFactory : public KAB::XXPortFactory { \ KAB::XXPort *xxportObject( KABC::AddressBook *ab, TQWidget *parent, const char *name ) \ { const char *cat = catalog; \ - if (cat) KGlobal::locale()->insertCatalogue(cat); \ + if (cat) TDEGlobal::locale()->insertCatalogue(cat); \ return new XXPortClass( ab, parent, name ); \ } \ }; \ diff --git a/kaddressbook/kaddressbook_part.cpp b/kaddressbook/kaddressbook_part.cpp index 9ffe7375b..88f55d311 100644 --- a/kaddressbook/kaddressbook_part.cpp +++ b/kaddressbook/kaddressbook_part.cpp @@ -56,7 +56,7 @@ KAddressbookPart::KAddressbookPart( TQWidget *parentWidget, const char *widgetNa TQVBoxLayout *topLayout = new TQVBoxLayout( canvas ); - KGlobal::iconLoader()->addAppDir( "kaddressbook" ); + TDEGlobal::iconLoader()->addAppDir( "kaddressbook" ); mCore = new KABCore( this, true, canvas ); mCore->restoreSettings(); diff --git a/kaddressbook/kaddressbookmain.cpp b/kaddressbook/kaddressbookmain.cpp index a3dc9d990..081ab2a5e 100644 --- a/kaddressbook/kaddressbookmain.cpp +++ b/kaddressbook/kaddressbookmain.cpp @@ -174,7 +174,7 @@ void KAddressBookMain::saveToProfile( const TQString& ) const void KAddressBookMain::configureToolbars() { - saveMainWindowSettings( KGlobal::config(), "MainWindow" ); + saveMainWindowSettings( TDEGlobal::config(), "MainWindow" ); KEditToolbar edit( factory() ); connect( &edit, TQT_SIGNAL( newToolbarConfig() ), @@ -186,7 +186,7 @@ void KAddressBookMain::configureToolbars() void KAddressBookMain::newToolbarConfig() { createGUI( "kaddressbookui.rc", false ); - applyMainWindowSettings( KGlobal::config(), "MainWindow" ); + applyMainWindowSettings( TDEGlobal::config(), "MainWindow" ); } #include "kaddressbookmain.moc" diff --git a/kaddressbook/kcmconfigs/kabconfigwidget.cpp b/kaddressbook/kcmconfigs/kabconfigwidget.cpp index bbed600e8..e4c6e23da 100644 --- a/kaddressbook/kcmconfigs/kabconfigwidget.cpp +++ b/kaddressbook/kcmconfigs/kabconfigwidget.cpp @@ -171,7 +171,7 @@ void KABConfigWidget::restoreSettings() mFaxHook->setText( KABPrefs::instance()->faxHookApplication() ); mAddresseeWidget->restoreSettings(); mEditorCombo->setCurrentItem( KABPrefs::instance()->editorType() ); - mLocationMapURL->setCurrentText( KABPrefs::instance()->locationMapURL().arg( KGlobal::locale()->country() ) ); + mLocationMapURL->setCurrentText( KABPrefs::instance()->locationMapURL().arg( TDEGlobal::locale()->country() ) ); mLocationMapURL->lineEdit()->setCursorPosition( 0 ); KConfig config( "kabcrc", false, false ); diff --git a/kaddressbook/kcmconfigs/kcmkabcustomfields.cpp b/kaddressbook/kcmconfigs/kcmkabcustomfields.cpp index 8cc428aa0..0a76b6d2c 100644 --- a/kaddressbook/kcmconfigs/kcmkabcustomfields.cpp +++ b/kaddressbook/kcmconfigs/kcmkabcustomfields.cpp @@ -72,6 +72,6 @@ TQString KCMKabCustomFields::applicationName() TQString KCMKabCustomFields::kabLocalDir() { TQStringList kabdirs = locateLocal("data", "kaddressbook/"); - return kabdirs.grep( TQRegExp( "^"+KGlobal::dirs()->localtdedir() ) ).first(); + return kabdirs.grep( TQRegExp( "^"+TDEGlobal::dirs()->localtdedir() ) ).first(); } diff --git a/kaddressbook/ldapsearchdialog.cpp b/kaddressbook/ldapsearchdialog.cpp index 5a171e53d..cf7b1d5f8 100644 --- a/kaddressbook/ldapsearchdialog.cpp +++ b/kaddressbook/ldapsearchdialog.cpp @@ -573,7 +573,7 @@ KABC::Addressee::List LDAPSearchDialog::importContactsUnlessTheyExist( const TQV if ( existing.isEmpty() ) { addr.setUid( TDEApplication::randomString( 10 ) ); - addr.setNote( i18n( "arguments are host name, datetime", "Imported from LDAP directory %1 on %2" ).arg( d->itemToServer[cli], KGlobal::locale()->formatDateTime( now ) ) ); + addr.setNote( i18n( "arguments are host name, datetime", "Imported from LDAP directory %1 on %2" ).arg( d->itemToServer[cli], TDEGlobal::locale()->formatDateTime( now ) ) ); addr.setResource( resource ); mCore->addressBook()->insertAddressee( addr ); TQString displayString; diff --git a/kaddressbook/main.cpp b/kaddressbook/main.cpp index 0ff8da8c2..805a20cc8 100644 --- a/kaddressbook/main.cpp +++ b/kaddressbook/main.cpp @@ -121,7 +121,7 @@ int main( int argc, char *argv[] ) return 0; KAddressBookApp app; - KGlobal::locale()->insertCatalogue( "libtdepim" ); + TDEGlobal::locale()->insertCatalogue( "libtdepim" ); bool ret = app.exec(); while (KMainWindow::memberList->first()) diff --git a/kaddressbook/printing/detailledstyle.cpp b/kaddressbook/printing/detailledstyle.cpp index a9c0b8d3b..377669732 100644 --- a/kaddressbook/printing/detailledstyle.cpp +++ b/kaddressbook/printing/detailledstyle.cpp @@ -72,8 +72,8 @@ DetailledPrintStyle::DetailledPrintStyle( PrintingWizard *parent, const char *na KConfig *config; TQFont font; bool kdeFonts; - TQFont standard = KGlobalSettings::generalFont(); - TQFont fixed = KGlobalSettings::fixedFont(); + TQFont standard = TDEGlobalSettings::generalFont(); + TQFont fixed = TDEGlobalSettings::fixedFont(); setPreview( "detailed-style.png" ); @@ -163,11 +163,11 @@ void DetailledPrintStyle::print( const KABC::Addressee::List &contacts, PrintPro } if ( mPageAppearance->cbStandardFonts->isChecked() ) { - TQFont standard = KGlobalSettings::generalFont(); + TQFont standard = TDEGlobalSettings::generalFont(); header = standard; headlines = standard; body = standard; - fixed = KGlobalSettings::fixedFont(); + fixed = TDEGlobalSettings::fixedFont(); comment = standard; } else { header.setFamily( mPageAppearance->kfcHeaderFont->currentText() ); diff --git a/kaddressbook/printing/kabentrypainter.cpp b/kaddressbook/printing/kabentrypainter.cpp index d7be5bd53..0bf45386b 100644 --- a/kaddressbook/printing/kabentrypainter.cpp +++ b/kaddressbook/printing/kabentrypainter.cpp @@ -208,7 +208,7 @@ bool KABEntryPainter::printAddressee( const KABC::Addressee &addr, // paint the birthday to the right: TQDateTime dt = addr.birthday(); if ( dt.isValid() ) { - line1 = KGlobal::locale()->formatDate( dt.date(), true ); + line1 = TDEGlobal::locale()->formatDate( dt.date(), true ); if ( !fake ) { // create a little (1/8) space on top of the letters: float ypos = y + ( (float)rect.height() ) * 0.125; diff --git a/kaddressbook/printing/mikesstyle.cpp b/kaddressbook/printing/mikesstyle.cpp index 62f89d558..99ead8138 100644 --- a/kaddressbook/printing/mikesstyle.cpp +++ b/kaddressbook/printing/mikesstyle.cpp @@ -205,7 +205,7 @@ void MikesStyle::paintTagLine( TQPainter &p, const TQFont &font ) TQFontMetrics fm( font ); TQString text = i18n( "Printed on %1 by KAddressBook (http://www.kde.org)" ) - .arg( KGlobal::locale()->formatDateTime( TQDateTime::currentDateTime() ) ); + .arg( TDEGlobal::locale()->formatDateTime( TQDateTime::currentDateTime() ) ); p.setPen( TQt::black ); p.drawText( 0, fm.height(), text ); diff --git a/kaddressbook/soundwidget.cpp b/kaddressbook/soundwidget.cpp index d661a14ea..ec412aa35 100644 --- a/kaddressbook/soundwidget.cpp +++ b/kaddressbook/soundwidget.cpp @@ -46,7 +46,7 @@ SoundWidget::SoundWidget( KABC::AddressBook *ab, TQWidget *parent, const char *n KDialog::spacingHint() ); TQLabel *label = new TQLabel( this ); - label->setPixmap( KGlobal::iconLoader()->loadIcon( "multimedia", + label->setPixmap( TDEGlobal::iconLoader()->loadIcon( "multimedia", KIcon::Desktop, KIcon::SizeMedium ) ); label->setAlignment( TQt::AlignTop ); topLayout->addMultiCellWidget( label, 0, 1, 0, 0 ); diff --git a/kaddressbook/thumbnailcreator/ldifvcardcreator.cpp b/kaddressbook/thumbnailcreator/ldifvcardcreator.cpp index 3216ea733..7460ad806 100644 --- a/kaddressbook/thumbnailcreator/ldifvcardcreator.cpp +++ b/kaddressbook/thumbnailcreator/ldifvcardcreator.cpp @@ -48,7 +48,7 @@ extern "C" { ThumbCreator *new_creator() { - KGlobal::locale()->insertCatalogue( "kaddressbook" ); + TDEGlobal::locale()->insertCatalogue( "kaddressbook" ); return new VCard_LDIFCreator; } } @@ -238,7 +238,7 @@ bool VCard_LDIFCreator::createImageSmall() bool VCard_LDIFCreator::createImageBig() { - TQFont normalFont( KGlobalSettings::generalFont() ); + TQFont normalFont( TDEGlobalSettings::generalFont() ); TQFont titleFont( normalFont ); titleFont.setBold(true); // titleFont.setUnderline(true); diff --git a/kaddressbook/viewconfigurewidget.cpp b/kaddressbook/viewconfigurewidget.cpp index efefbd818..8278b2f1d 100644 --- a/kaddressbook/viewconfigurewidget.cpp +++ b/kaddressbook/viewconfigurewidget.cpp @@ -48,7 +48,7 @@ ViewConfigureWidget::ViewConfigureWidget( KABC::AddressBook *ab, TQWidget *paren // Add the first page, the attributes TQVBox *page = addPage( i18n( "Fields" ), TQString(), - KGlobal::iconLoader()->loadIcon( "view_detailed", + TDEGlobal::iconLoader()->loadIcon( "view_detailed", KIcon::Panel ) ); // Add the select fields page @@ -56,7 +56,7 @@ ViewConfigureWidget::ViewConfigureWidget( KABC::AddressBook *ab, TQWidget *paren // Add the second page, the filter selection page = addPage( i18n( "Default Filter" ), TQString(), - KGlobal::iconLoader()->loadIcon( "filter", + TDEGlobal::iconLoader()->loadIcon( "filter", KIcon::Panel ) ); mFilterPage = new ViewConfigureFilterPage( page ); diff --git a/kaddressbook/viewmanager.cpp b/kaddressbook/viewmanager.cpp index aca8113fc..3938c14a9 100644 --- a/kaddressbook/viewmanager.cpp +++ b/kaddressbook/viewmanager.cpp @@ -497,7 +497,7 @@ void ViewManager::startDrag() } } - drag->setPixmap( KGlobal::iconLoader()->loadIcon( "vcard", KIcon::Desktop ) ); + drag->setPixmap( TDEGlobal::iconLoader()->loadIcon( "vcard", KIcon::Desktop ) ); drag->dragCopy(); } diff --git a/kaddressbook/views/cardview.cpp b/kaddressbook/views/cardview.cpp index 9675cdc8b..2979ee5d2 100644 --- a/kaddressbook/views/cardview.cpp +++ b/kaddressbook/views/cardview.cpp @@ -1129,7 +1129,7 @@ void CardView::contentsMouseReleaseEvent( TQMouseEvent *e ) // Get the item at this position CardViewItem *item = itemAt( e->pos() ); - if ( item && KGlobalSettings::singleClick() ) + if ( item && TDEGlobalSettings::singleClick() ) emit executed( item ); } @@ -1142,7 +1142,7 @@ void CardView::contentsMouseDoubleClickEvent( TQMouseEvent *e ) if ( item ) d->mCurrentItem = item; - if ( item && !KGlobalSettings::singleClick() ) + if ( item && !TDEGlobalSettings::singleClick() ) emit executed(item); emit doubleClicked( item ); diff --git a/kaddressbook/views/configurecardviewdialog.cpp b/kaddressbook/views/configurecardviewdialog.cpp index 2c815150c..0ffc5e5df 100644 --- a/kaddressbook/views/configurecardviewdialog.cpp +++ b/kaddressbook/views/configurecardviewdialog.cpp @@ -91,7 +91,7 @@ void CardViewLookNFeelPage::restoreSettings( KConfig *config ) // colors cbEnableCustomColors->setChecked( config->readBoolEntry( "EnableCustomColors", false ) ); TQColor c; - c = KGlobalSettings::baseColor(); + c = TDEGlobalSettings::baseColor(); lbColors->insertItem( new ColorListItem( i18n("Background Color"), config->readColorEntry( "BackgroundColor", &c ) ) ); c = colorGroup().foreground(); diff --git a/kaddressbook/views/configuretableviewdialog.cpp b/kaddressbook/views/configuretableviewdialog.cpp index ae9d61551..a8359884b 100644 --- a/kaddressbook/views/configuretableviewdialog.cpp +++ b/kaddressbook/views/configuretableviewdialog.cpp @@ -46,7 +46,7 @@ ConfigureTableViewWidget::ConfigureTableViewWidget( KABC::AddressBook *ab, : ViewConfigureWidget( ab, parent, name ) { TQWidget *page = addPage( i18n( "Look & Feel" ), TQString(), - KGlobal::iconLoader()->loadIcon( "looknfeel", + TDEGlobal::iconLoader()->loadIcon( "looknfeel", KIcon::Panel ) ); mPage = new LookAndFeelPage( page ); diff --git a/kaddressbook/views/contactlistview.cpp b/kaddressbook/views/contactlistview.cpp index c59c47eee..fbd98f022 100644 --- a/kaddressbook/views/contactlistview.cpp +++ b/kaddressbook/views/contactlistview.cpp @@ -240,7 +240,7 @@ void ContactListViewItem::refresh() if ( (*it)->label() == KABC::Addressee::birthdayLabel() ) { TQDate date = mAddressee.birthday().date(); if ( date.isValid() ) - setText( i++, KGlobal::locale()->formatDate( date, true ) ); + setText( i++, TDEGlobal::locale()->formatDate( date, true ) ); else setText( i++, "" ); } else @@ -268,7 +268,7 @@ ContactListView::ContactListView(KAddressBookTableView *view, mSingleLine = false; mToolTips = true; mShowIM = true; - mAlternateColor = KGlobalSettings::alternateBackgroundColor(); + mAlternateColor = TDEGlobalSettings::alternateBackgroundColor(); setAlternateBackgroundEnabled(mABackground); setAcceptDrops( true ); diff --git a/kaddressbook/views/kaddressbookiconview.cpp b/kaddressbook/views/kaddressbookiconview.cpp index d9c3aa2f6..42e315c50 100644 --- a/kaddressbook/views/kaddressbookiconview.cpp +++ b/kaddressbook/views/kaddressbookiconview.cpp @@ -112,7 +112,7 @@ class AddresseeIconViewItem : public KIconViewItem setText( mAddressee.givenName() + " " + mAddressee.familyName() ); TQPixmap icon; - TQPixmap defaultIcon( KGlobal::iconLoader()->loadIcon( "vcard", KIcon::Desktop ) ); + TQPixmap defaultIcon( TDEGlobal::iconLoader()->loadIcon( "vcard", KIcon::Desktop ) ); KABC::Picture pic = mAddressee.photo(); if ( pic.data().isNull() ) pic = mAddressee.logo(); diff --git a/kaddressbook/xxport/csvimportdialog.cpp b/kaddressbook/xxport/csvimportdialog.cpp index 78cdbf562..728823019 100644 --- a/kaddressbook/xxport/csvimportdialog.cpp +++ b/kaddressbook/xxport/csvimportdialog.cpp @@ -792,7 +792,7 @@ void CSVImportDialog::applyTemplate() TQStringList templates; // load all template files - TQStringList list = KGlobal::dirs()->findAllResources( "data" , TQString( kapp->name() ) + + TQStringList list = TDEGlobal::dirs()->findAllResources( "data" , TQString( kapp->name() ) + "/csv-templates/*.desktop", true, true ); for ( TQStringList::iterator it = list.begin(); it != list.end(); ++it ) diff --git a/kaddressbook/xxport/kde2_xxport.cpp b/kaddressbook/xxport/kde2_xxport.cpp index 309bb9b5b..f5abefde3 100644 --- a/kaddressbook/xxport/kde2_xxport.cpp +++ b/kaddressbook/xxport/kde2_xxport.cpp @@ -59,7 +59,7 @@ KABC::AddresseeList KDE2XXPort::importContacts( const TQString& ) const if ( !result ) return KABC::AddresseeList(); - KProcess proc; + TDEProcess proc; if ( result == KMessageBox::Yes ) { proc << "kab2kabc"; @@ -70,7 +70,7 @@ KABC::AddresseeList KDE2XXPort::importContacts( const TQString& ) const kdDebug(5720) << "KAddressBook::importKDE2(): Unknow return value." << endl; return KABC::AddresseeList(); } - proc.start( KProcess::Block ); + proc.start( TDEProcess::Block ); addressBook()->load(); |