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 /kresources/configpage.h | |
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 'kresources/configpage.h')
-rw-r--r-- | kresources/configpage.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kresources/configpage.h b/kresources/configpage.h index ec1fb3799..d00372ac6 100644 --- a/kresources/configpage.h +++ b/kresources/configpage.h @@ -43,7 +43,7 @@ class KRESOURCES_EXPORT ResourcePageInfo : public KShared ResourcePageInfo(); ~ResourcePageInfo(); Manager<Resource> *mManager; - KConfig *mConfig; + TDEConfig *mConfig; }; class Resource; @@ -89,8 +89,8 @@ class KRESOURCES_EXPORT ConfigPage : public TQWidget, public ManagerObserver<Res void saveResourceSettings(); Manager<Resource>* mCurrentManager; - KConfig* mCurrentConfig; - KConfig* mConfig; + TDEConfig* mCurrentConfig; + TDEConfig* mConfig; TQString mFamily; TQStringList mFamilyMap; TQValueList<KSharedPtr<ResourcePageInfo> > mInfoMap; |