From 86d8364ac704bdc8ad2dfcf52307d9626cfac567 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 25 Jan 2013 00:37:21 -0600 Subject: Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4 --- kaddressbook/views/configurecardviewdialog.cpp | 8 ++++---- kaddressbook/views/configurecardviewdialog.h | 10 +++++----- kaddressbook/views/configuretableviewdialog.cpp | 8 ++++---- kaddressbook/views/configuretableviewdialog.h | 10 +++++----- kaddressbook/views/kaddressbookcardview.cpp | 4 ++-- kaddressbook/views/kaddressbookcardview.h | 6 +++--- kaddressbook/views/kaddressbookiconview.cpp | 2 +- kaddressbook/views/kaddressbookiconview.h | 4 ++-- kaddressbook/views/kaddressbooktableview.cpp | 4 ++-- kaddressbook/views/kaddressbooktableview.h | 6 +++--- 10 files changed, 31 insertions(+), 31 deletions(-) (limited to 'kaddressbook/views') diff --git a/kaddressbook/views/configurecardviewdialog.cpp b/kaddressbook/views/configurecardviewdialog.cpp index 0ffc5e5df..347bd4233 100644 --- a/kaddressbook/views/configurecardviewdialog.cpp +++ b/kaddressbook/views/configurecardviewdialog.cpp @@ -60,14 +60,14 @@ ConfigureCardViewWidget::~ConfigureCardViewWidget() { } -void ConfigureCardViewWidget::restoreSettings( KConfig *config ) +void ConfigureCardViewWidget::restoreSettings( TDEConfig *config ) { ViewConfigureWidget::restoreSettings( config ); mAdvancedPage->restoreSettings( config ); } -void ConfigureCardViewWidget::saveSettings( KConfig *config ) +void ConfigureCardViewWidget::saveSettings( TDEConfig *config ) { ViewConfigureWidget::saveSettings( config ); @@ -86,7 +86,7 @@ CardViewLookNFeelPage::~CardViewLookNFeelPage() { } -void CardViewLookNFeelPage::restoreSettings( KConfig *config ) +void CardViewLookNFeelPage::restoreSettings( TDEConfig *config ) { // colors cbEnableCustomColors->setChecked( config->readBoolEntry( "EnableCustomColors", false ) ); @@ -132,7 +132,7 @@ void CardViewLookNFeelPage::restoreSettings( KConfig *config ) cbShowEmptyFields->setChecked( config->readBoolEntry( "ShowEmptyFields", false ) ); } -void CardViewLookNFeelPage::saveSettings( KConfig *config ) +void CardViewLookNFeelPage::saveSettings( TDEConfig *config ) { // colors config->writeEntry( "EnableCustomColors", cbEnableCustomColors->isChecked() ); diff --git a/kaddressbook/views/configurecardviewdialog.h b/kaddressbook/views/configurecardviewdialog.h index 9c079d887..892532c5e 100644 --- a/kaddressbook/views/configurecardviewdialog.h +++ b/kaddressbook/views/configurecardviewdialog.h @@ -34,7 +34,7 @@ class TQString; class TQWidget; class TQCheckBox; class TQLabel; -class KConfig; +class TDEConfig; namespace KABC { class AddressBook; } @@ -51,8 +51,8 @@ class ConfigureCardViewWidget : public ViewConfigureWidget ConfigureCardViewWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name ); virtual ~ConfigureCardViewWidget(); - virtual void restoreSettings( KConfig* ); - virtual void saveSettings( KConfig* ); + virtual void restoreSettings( TDEConfig* ); + virtual void saveSettings( TDEConfig* ); private: class CardViewLookNFeelPage *mAdvancedPage; @@ -86,8 +86,8 @@ class CardViewLookNFeelPage : public TQVBox { CardViewLookNFeelPage( TQWidget *parent=0, const char *name=0 ); ~CardViewLookNFeelPage(); - void restoreSettings( KConfig* ); - void saveSettings( KConfig* ); + void restoreSettings( TDEConfig* ); + void saveSettings( TDEConfig* ); private slots: void setTextFont(); diff --git a/kaddressbook/views/configuretableviewdialog.cpp b/kaddressbook/views/configuretableviewdialog.cpp index a8359884b..987feb17d 100644 --- a/kaddressbook/views/configuretableviewdialog.cpp +++ b/kaddressbook/views/configuretableviewdialog.cpp @@ -56,14 +56,14 @@ ConfigureTableViewWidget::~ConfigureTableViewWidget() { } -void ConfigureTableViewWidget::restoreSettings( KConfig *config ) +void ConfigureTableViewWidget::restoreSettings( TDEConfig *config ) { ViewConfigureWidget::restoreSettings( config ); mPage->restoreSettings( config ); } -void ConfigureTableViewWidget::saveSettings( KConfig *config ) +void ConfigureTableViewWidget::saveSettings( TDEConfig *config ) { ViewConfigureWidget::saveSettings( config ); @@ -81,7 +81,7 @@ LookAndFeelPage::LookAndFeelPage(TQWidget *parent, const char *name) enableBackgroundToggled(mBackgroundBox->isChecked()); } -void LookAndFeelPage::restoreSettings( KConfig *config ) +void LookAndFeelPage::restoreSettings( TDEConfig *config ) { mAlternateButton->setChecked(config->readBoolEntry("ABackground", true)); mLineButton->setChecked(config->readBoolEntry("SingleLine", false)); @@ -97,7 +97,7 @@ void LookAndFeelPage::restoreSettings( KConfig *config ) #endif } -void LookAndFeelPage::saveSettings( KConfig *config ) +void LookAndFeelPage::saveSettings( TDEConfig *config ) { config->writeEntry("ABackground", mAlternateButton->isChecked()); config->writeEntry("SingleLine", mLineButton->isChecked()); diff --git a/kaddressbook/views/configuretableviewdialog.h b/kaddressbook/views/configuretableviewdialog.h index d4a79a6f1..94fd2a687 100644 --- a/kaddressbook/views/configuretableviewdialog.h +++ b/kaddressbook/views/configuretableviewdialog.h @@ -31,7 +31,7 @@ class TQWidget; class TQRadioButton; class TQCheckBox; class KURLRequester; -class KConfig; +class TDEConfig; namespace KABC { class AddressBook; } @@ -48,8 +48,8 @@ class ConfigureTableViewWidget : public ViewConfigureWidget ConfigureTableViewWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name ); virtual ~ConfigureTableViewWidget(); - virtual void restoreSettings( KConfig* ); - virtual void saveSettings( KConfig* ); + virtual void restoreSettings( TDEConfig* ); + virtual void saveSettings( TDEConfig* ); private: void initGUI(); @@ -69,8 +69,8 @@ class LookAndFeelPage : public TQWidget LookAndFeelPage( TQWidget *parent, const char *name = 0 ); ~LookAndFeelPage() {} - void restoreSettings( KConfig* ); - void saveSettings( KConfig* ); + void restoreSettings( TDEConfig* ); + void saveSettings( TDEConfig* ); protected slots: void enableBackgroundToggled( bool ); diff --git a/kaddressbook/views/kaddressbookcardview.cpp b/kaddressbook/views/kaddressbookcardview.cpp index 4656f62b1..30e1ca672 100644 --- a/kaddressbook/views/kaddressbookcardview.cpp +++ b/kaddressbook/views/kaddressbookcardview.cpp @@ -178,7 +178,7 @@ KABC::Field *KAddressBookCardView::sortField() const return KABC::Field::allFields()[ 0 ]; } -void KAddressBookCardView::readConfig( KConfig *config ) +void KAddressBookCardView::readConfig( TDEConfig *config ) { KAddressBookView::readConfig( config ); @@ -238,7 +238,7 @@ void KAddressBookCardView::readConfig( KConfig *config ) this, TQT_SLOT( addresseeExecuted( CardViewItem* ) ) ); } -void KAddressBookCardView::writeConfig( KConfig *config ) +void KAddressBookCardView::writeConfig( TDEConfig *config ) { config->writeEntry( "ItemWidth", mCardView->itemWidth() ); KAddressBookView::writeConfig( config ); diff --git a/kaddressbook/views/kaddressbookcardview.h b/kaddressbook/views/kaddressbookcardview.h index f14b12fc8..90b738d53 100644 --- a/kaddressbook/views/kaddressbookcardview.h +++ b/kaddressbook/views/kaddressbookcardview.h @@ -32,7 +32,7 @@ class TQDragEntryEvent; class TQDropEvent; -class KConfig; +class TDEConfig; class AddresseeCardView; /** @@ -54,8 +54,8 @@ class KAddressBookCardView : public KAddressBookView virtual TQString type() const { return "Card"; } virtual KABC::Field *sortField() const; - virtual void readConfig( KConfig *config ); - virtual void writeConfig( KConfig *config ); + virtual void readConfig( TDEConfig *config ); + virtual void writeConfig( TDEConfig *config ); void scrollUp(); void scrollDown(); diff --git a/kaddressbook/views/kaddressbookiconview.cpp b/kaddressbook/views/kaddressbookiconview.cpp index 42e315c50..adf3de0e2 100644 --- a/kaddressbook/views/kaddressbookiconview.cpp +++ b/kaddressbook/views/kaddressbookiconview.cpp @@ -167,7 +167,7 @@ KABC::Field *KAddressBookIconView::sortField() const return KABC::Field::allFields()[ 2 ]; } -void KAddressBookIconView::readConfig( KConfig *config ) +void KAddressBookIconView::readConfig( TDEConfig *config ) { KAddressBookView::readConfig( config ); diff --git a/kaddressbook/views/kaddressbookiconview.h b/kaddressbook/views/kaddressbookiconview.h index 8cbc98a9d..56984cfc5 100644 --- a/kaddressbook/views/kaddressbookiconview.h +++ b/kaddressbook/views/kaddressbookiconview.h @@ -29,7 +29,7 @@ #include "kaddressbookview.h" class TQIconViewItem; -class KConfig; +class TDEConfig; class AddresseeIconView; class AddresseeIconViewItem; @@ -52,7 +52,7 @@ class KAddressBookIconView : public KAddressBookView virtual TQStringList selectedUids(); virtual TQString type() const { return "Icon"; } virtual KABC::Field *sortField() const; - virtual void readConfig( KConfig *config ); + virtual void readConfig( TDEConfig *config ); void scrollUp(); void scrollDown(); diff --git a/kaddressbook/views/kaddressbooktableview.cpp b/kaddressbook/views/kaddressbooktableview.cpp index de1ae2ec3..9432dafa2 100644 --- a/kaddressbook/views/kaddressbooktableview.cpp +++ b/kaddressbook/views/kaddressbooktableview.cpp @@ -173,14 +173,14 @@ KABC::Field *KAddressBookTableView::sortField() const return ( mListView->sortColumn() == -1 ? fields()[ 0 ] : fields()[ mListView->sortColumn() ] ); } -void KAddressBookTableView::writeConfig( KConfig *config ) +void KAddressBookTableView::writeConfig( TDEConfig *config ) { KAddressBookView::writeConfig( config ); mListView->saveLayout( config, config->group() ); } -void KAddressBookTableView::readConfig( KConfig *config ) +void KAddressBookTableView::readConfig( TDEConfig *config ) { KAddressBookView::readConfig( config ); diff --git a/kaddressbook/views/kaddressbooktableview.h b/kaddressbook/views/kaddressbooktableview.h index 3b2e0df13..4ebdfd938 100644 --- a/kaddressbook/views/kaddressbooktableview.h +++ b/kaddressbook/views/kaddressbooktableview.h @@ -41,7 +41,7 @@ class TQListViewItem; class TQListBox; class TQVBoxLayout; -class KConfig; +class TDEConfig; class KIMProxy; class ContactListViewItem; @@ -75,8 +75,8 @@ friend class ContactListView; virtual void setFirstSelected( bool selected = true ); virtual KABC::Field *sortField() const; - virtual void readConfig( KConfig *config ); - virtual void writeConfig( KConfig *config ); + virtual void readConfig( TDEConfig *config ); + virtual void writeConfig( TDEConfig *config ); virtual TQString type() const { return "Table"; } void scrollUp(); -- cgit v1.2.1