summaryrefslogtreecommitdiffstats
path: root/src/k3bappdevicemanager.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-02-01 23:10:14 -0600
committerTimothy Pearson <[email protected]>2013-02-01 23:10:14 -0600
commitbba095a5aab3f7cbf3ec062071e94f5c1e66e50b (patch)
tree2a7e8b53757b499b0b08d235cfe58e9505ca4aa3 /src/k3bappdevicemanager.cpp
parent08e6e3d01bc56d3b55c1512164f48d3db762bd53 (diff)
downloadk3b-bba095a5aab3f7cbf3ec062071e94f5c1e66e50b.tar.gz
k3b-bba095a5aab3f7cbf3ec062071e94f5c1e66e50b.zip
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'src/k3bappdevicemanager.cpp')
-rw-r--r--src/k3bappdevicemanager.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/k3bappdevicemanager.cpp b/src/k3bappdevicemanager.cpp
index 04da69f..f9c5e33 100644
--- a/src/k3bappdevicemanager.cpp
+++ b/src/k3bappdevicemanager.cpp
@@ -21,14 +21,14 @@
#include <k3bapplication.h>
#include <k3bmediacache.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include <kinputdialog.h>
#include <kmessagebox.h>
#include <kinputdialog.h>
#include <tdeio/job.h>
#include <klocale.h>
#include <tdeio/global.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
K3bAppDeviceManager::K3bAppDeviceManager( TQObject* parent, const char* name )