diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:35:07 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:35:07 -0600 |
commit | 703fb0c89c2eee56a1e613e67a446db9d4287929 (patch) | |
tree | dd8c5ca66075cd89c2638a2b48cf78386a9870a7 /kabc/addresslineedit.cpp | |
parent | 818e7abec3d5d3809b6b77293558678371c16b71 (diff) | |
download | tdelibs-703fb0c89c2eee56a1e613e67a446db9d4287929.tar.gz tdelibs-703fb0c89c2eee56a1e613e67a446db9d4287929.zip |
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'kabc/addresslineedit.cpp')
-rw-r--r-- | kabc/addresslineedit.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/kabc/addresslineedit.cpp b/kabc/addresslineedit.cpp index 6f056a404..76d99f634 100644 --- a/kabc/addresslineedit.cpp +++ b/kabc/addresslineedit.cpp @@ -61,13 +61,13 @@ TQTimer* AddressLineEdit::s_LDAPTimer = 0L; LdapSearch* AddressLineEdit::s_LDAPSearch = 0L; TQString* AddressLineEdit::s_LDAPText = 0L; AddressLineEdit* AddressLineEdit::s_LDAPLineEdit = 0L; -KConfig *AddressLineEdit::s_config = 0L; +TDEConfig *AddressLineEdit::s_config = 0L; static KStaticDeleter<KCompletion> completionDeleter; static KStaticDeleter<TQTimer> ldapTimerDeleter; static KStaticDeleter<LdapSearch> ldapSearchDeleter; static KStaticDeleter<TQString> ldapTextDeleter; -static KStaticDeleter<KConfig> configDeleter; +static KStaticDeleter<TDEConfig> configDeleter; AddressLineEdit::AddressLineEdit(TQWidget* parent, bool useCompletion, @@ -136,10 +136,10 @@ AddressLineEdit::~AddressLineEdit() //----------------------------------------------------------------------------- -KConfig* AddressLineEdit::config() +TDEConfig* AddressLineEdit::config() { if ( !s_config ) - configDeleter.setObject( s_config, new KConfig( "kabldaprc", false, false ) ); // Open read-write, no kdeglobals + configDeleter.setObject( s_config, new TDEConfig( "kabldaprc", false, false ) ); // Open read-write, no kdeglobals return s_config; } |