summaryrefslogtreecommitdiffstats
path: root/kpf
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-02-01 23:21:47 -0600
committerTimothy Pearson <[email protected]>2013-02-01 23:21:47 -0600
commitda47dd9fc60e6e0eecf609fb934eb0e2bd3ef3fb (patch)
treeb42ba87fcdfa425a31e243a62d71e1de248b6ee8 /kpf
parent4ed8d784e29102ed1659f4ccf71fcc6fb0dad5c8 (diff)
downloadtdenetwork-da47dd9fc60e6e0eecf609fb934eb0e2bd3ef3fb.tar.gz
tdenetwork-da47dd9fc60e6e0eecf609fb934eb0e2bd3ef3fb.zip
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'kpf')
-rw-r--r--kpf/src/ActiveMonitorWindow.cpp2
-rw-r--r--kpf/src/ActiveMonitorWindow.h2
-rw-r--r--kpf/src/AppletItem.cpp2
-rw-r--r--kpf/src/DirSelectWidget.h2
4 files changed, 4 insertions, 4 deletions
diff --git a/kpf/src/ActiveMonitorWindow.cpp b/kpf/src/ActiveMonitorWindow.cpp
index 22545816..e2a3e782 100644
--- a/kpf/src/ActiveMonitorWindow.cpp
+++ b/kpf/src/ActiveMonitorWindow.cpp
@@ -21,7 +21,7 @@
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-#include <kaction.h>
+#include <tdeaction.h>
#include <klocale.h>
#include "ActiveMonitor.h"
diff --git a/kpf/src/ActiveMonitorWindow.h b/kpf/src/ActiveMonitorWindow.h
index 63c502b9..26545c03 100644
--- a/kpf/src/ActiveMonitorWindow.h
+++ b/kpf/src/ActiveMonitorWindow.h
@@ -24,7 +24,7 @@
#ifndef KPF_ACTIVE_MONITOR_WINDOW_H
#define KPF_ACTIVE_MONITOR_WINDOW_H
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
class TDEAction;
diff --git a/kpf/src/AppletItem.cpp b/kpf/src/AppletItem.cpp
index 6741eb19..e47e0ee2 100644
--- a/kpf/src/AppletItem.cpp
+++ b/kpf/src/AppletItem.cpp
@@ -29,7 +29,7 @@
#include <kiconloader.h>
#include <klocale.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
#include <kurldrag.h>
#include <kapplication.h>
diff --git a/kpf/src/DirSelectWidget.h b/kpf/src/DirSelectWidget.h
index e542b5a2..07bf23a6 100644
--- a/kpf/src/DirSelectWidget.h
+++ b/kpf/src/DirSelectWidget.h
@@ -24,7 +24,7 @@
#ifndef KPF_DIR_SELECT_WIDGET_H
#define KPF_DIR_SELECT_WIDGET_H
-#include <klistview.h>
+#include <tdelistview.h>
namespace KPF
{