summaryrefslogtreecommitdiffstats
path: root/plugins/upnp
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-02-01 23:15:01 -0600
committerTimothy Pearson <[email protected]>2013-02-01 23:15:01 -0600
commit0889370e3050561372c3816dfb2902771ca83765 (patch)
tree03f268c37790f8bf319bf11a142826bc1074155d /plugins/upnp
parente4b7f05fbc9ea24f82940cc38c4dffdcd6802440 (diff)
downloadktorrent-0889370e3050561372c3816dfb2902771ca83765.tar.gz
ktorrent-0889370e3050561372c3816dfb2902771ca83765.zip
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'plugins/upnp')
-rw-r--r--plugins/upnp/upnpplugin.cpp2
-rw-r--r--plugins/upnp/upnpprefwidget.cpp2
-rw-r--r--plugins/upnp/upnpwidget.ui2
3 files changed, 3 insertions, 3 deletions
diff --git a/plugins/upnp/upnpplugin.cpp b/plugins/upnp/upnpplugin.cpp
index 8d2ff8f..b2195d6 100644
--- a/plugins/upnp/upnpplugin.cpp
+++ b/plugins/upnp/upnpplugin.cpp
@@ -23,7 +23,7 @@
#include <kiconloader.h>
#include <kstandarddirs.h>
#include <kstdaction.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
#include <interfaces/guiinterface.h>
#include <util/fileops.h>
#include "upnpplugin.h"
diff --git a/plugins/upnp/upnpprefwidget.cpp b/plugins/upnp/upnpprefwidget.cpp
index fba0c34..b44c43d 100644
--- a/plugins/upnp/upnpprefwidget.cpp
+++ b/plugins/upnp/upnpprefwidget.cpp
@@ -18,7 +18,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
-#include <klistview.h>
+#include <tdelistview.h>
#include <kmessagebox.h>
#include <kpushbutton.h>
#include <torrent/udptrackersocket.h>
diff --git a/plugins/upnp/upnpwidget.ui b/plugins/upnp/upnpwidget.ui
index 3bc2408..d38b269 100644
--- a/plugins/upnp/upnpwidget.ui
+++ b/plugins/upnp/upnpwidget.ui
@@ -132,7 +132,7 @@
</customwidgets>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
- <includehint>klistview.h</includehint>
+ <includehint>tdelistview.h</includehint>
<includehint>kpushbutton.h</includehint>
<includehint>kpushbutton.h</includehint>
</includehints>