diff options
author | Timothy Pearson <[email protected]> | 2013-01-25 00:37:21 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2013-01-25 00:37:21 -0600 |
commit | 86d8364ac704bdc8ad2dfcf52307d9626cfac567 (patch) | |
tree | 97d3ac2c2f60780d9a1de4f82caac7cb27534501 /libtdepim/addresseeview.h | |
parent | a9bde819f2b421dcc44741156e75eca4bb5fb4f4 (diff) | |
download | tdepim-86d8364ac704bdc8ad2dfcf52307d9626cfac567.tar.gz tdepim-86d8364ac704bdc8ad2dfcf52307d9626cfac567.zip |
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'libtdepim/addresseeview.h')
-rw-r--r-- | libtdepim/addresseeview.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libtdepim/addresseeview.h b/libtdepim/addresseeview.h index 98a779832..782f4416e 100644 --- a/libtdepim/addresseeview.h +++ b/libtdepim/addresseeview.h @@ -29,7 +29,7 @@ #include <kimproxy.h> #include <tdepimmacros.h> -namespace KIO { +namespace TDEIO { class Job; } class KToggleAction; @@ -52,7 +52,7 @@ class KDE_EXPORT AddresseeView : public KTextBrowser which fields will be shown. */ AddresseeView( TQWidget *parent = 0, const char *name = 0, - KConfig *config = 0 ); + TDEConfig *config = 0 ); ~AddresseeView(); @@ -167,8 +167,8 @@ class KDE_EXPORT AddresseeView : public KTextBrowser void slotPresenceInfoExpired(); void configChanged(); - void data( KIO::Job*, const TQByteArray& ); - void result( KIO::Job* ); + void data( TDEIO::Job*, const TQByteArray& ); + void result( TDEIO::Job* ); private: void load(); @@ -178,11 +178,11 @@ class KDE_EXPORT AddresseeView : public KTextBrowser TQString strippedNumber( const TQString &number ); - KConfig *mConfig; + TDEConfig *mConfig; bool mDefaultConfig; TQByteArray mImageData; - KIO::Job *mImageJob; + TDEIO::Job *mImageJob; KToggleAction *mActionShowBirthday; KToggleAction *mActionShowAddresses; |