diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 23:21:04 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 23:21:04 -0600 |
| commit | d1e0cc99a202cef3306b90b8839a6726e89f201e (patch) | |
| tree | a0d01a91644fd94aa6da5d8944e052b67461faad /tdeio/misc | |
| parent | 3e3559f2d4f4c4ffa3caa0374928c8a12be29bf3 (diff) | |
| download | tdelibs-d1e0cc99a202cef3306b90b8839a6726e89f201e.tar.gz tdelibs-d1e0cc99a202cef3306b90b8839a6726e89f201e.zip | |
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'tdeio/misc')
| -rw-r--r-- | tdeio/misc/uiserver.cpp | 4 | ||||
| -rw-r--r-- | tdeio/misc/uiserver.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/tdeio/misc/uiserver.cpp b/tdeio/misc/uiserver.cpp index 4f4b720f5..abe918854 100644 --- a/tdeio/misc/uiserver.cpp +++ b/tdeio/misc/uiserver.cpp @@ -41,8 +41,8 @@ #include <twin.h> #include <kdialog.h> #include <ksystemtray.h> -#include <kpopupmenu.h> -#include <kaction.h> +#include <tdepopupmenu.h> +#include <tdeaction.h> #include <tqcheckbox.h> #include <tqlabel.h> diff --git a/tdeio/misc/uiserver.h b/tdeio/misc/uiserver.h index c86886bac..05b15ba18 100644 --- a/tdeio/misc/uiserver.h +++ b/tdeio/misc/uiserver.h @@ -27,9 +27,9 @@ #include <tdeio/global.h> #include <tdeio/authinfo.h> #include <kurl.h> -#include <kmainwindow.h> +#include <tdemainwindow.h> #include <kdatastream.h> -#include <klistview.h> +#include <tdelistview.h> #include <ksslcertdlg.h> class ListProgress; |