diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 13:15:51 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 13:15:51 -0600 |
commit | d1bd46309ad2bee123bdf9081ae5b4e0aa7ccc7e (patch) | |
tree | ecd8c94dc36cb35dd4810a2b05d1b78bb969e143 /kio/misc | |
parent | 703fb0c89c2eee56a1e613e67a446db9d4287929 (diff) | |
download | tdelibs-d1bd46309ad2bee123bdf9081ae5b4e0aa7ccc7e.tar.gz tdelibs-d1bd46309ad2bee123bdf9081ae5b4e0aa7ccc7e.zip |
Rename KServer, KSocket, KIO_EXPORT, KIOInput, KIOJob, KIOConfig, KIOBuffer, and KBuffer to avoid conflicts with KDE4
Diffstat (limited to 'kio/misc')
-rw-r--r-- | kio/misc/kntlm/kntlm.h | 2 | ||||
-rw-r--r-- | kio/misc/tdesasl/tdesasl.h | 2 | ||||
-rw-r--r-- | kio/misc/uiserver.h | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/kio/misc/kntlm/kntlm.h b/kio/misc/kntlm/kntlm.h index 462624fcd..06b8febab 100644 --- a/kio/misc/kntlm/kntlm.h +++ b/kio/misc/kntlm/kntlm.h @@ -38,7 +38,7 @@ * This class doesn't maintain any state information, so all methods are static. */ -class KIO_EXPORT KNTLM { +class TDEIO_EXPORT KNTLM { public: enum Flags { diff --git a/kio/misc/tdesasl/tdesasl.h b/kio/misc/tdesasl/tdesasl.h index 1f68ac688..0c57096a8 100644 --- a/kio/misc/tdesasl/tdesasl.h +++ b/kio/misc/tdesasl/tdesasl.h @@ -69,7 +69,7 @@ class TQStrIList; * @version $Id$ */ -class KIO_EXPORT KDESasl +class TDEIO_EXPORT KDESasl { public: diff --git a/kio/misc/uiserver.h b/kio/misc/uiserver.h index c7cfaf5c0..abe935ad5 100644 --- a/kio/misc/uiserver.h +++ b/kio/misc/uiserver.h @@ -55,7 +55,7 @@ struct ListProgressColumnConfig * List view in the UIServer. * @internal */ -class KIO_EXPORT ListProgress : public KListView { +class TDEIO_EXPORT ListProgress : public KListView { Q_OBJECT @@ -103,7 +103,7 @@ protected: * One item in the ListProgress * @internal */ -class KIO_EXPORT ProgressItem : public TQObject, public TQListViewItem { +class TDEIO_EXPORT ProgressItem : public TQObject, public TQListViewItem { Q_OBJECT @@ -214,7 +214,7 @@ class UIServerSystemTray; * * @internal */ -class KIO_EXPORT UIServer : public KMainWindow, public DCOPObject { +class TDEIO_EXPORT UIServer : public KMainWindow, public DCOPObject { K_DCOP Q_OBJECT |