summaryrefslogtreecommitdiffstats
path: root/src/document
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-02-01 23:16:04 -0600
committerTimothy Pearson <[email protected]>2013-02-01 23:16:04 -0600
commit990bf92fa5cefbe5ebb34a172d18bb3df745bd7a (patch)
treea458e45739951ac897cb2ca9cd172a30bdcc6e2f /src/document
parentfb3718a55f355cd22f9eb9fa4e89cd3b84b8c9ca (diff)
downloadrosegarden-990bf92fa5cefbe5ebb34a172d18bb3df745bd7a.tar.gz
rosegarden-990bf92fa5cefbe5ebb34a172d18bb3df745bd7a.zip
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'src/document')
-rw-r--r--src/document/MultiViewCommandHistory.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/document/MultiViewCommandHistory.cpp b/src/document/MultiViewCommandHistory.cpp
index a4957be..68efb3a 100644
--- a/src/document/MultiViewCommandHistory.cpp
+++ b/src/document/MultiViewCommandHistory.cpp
@@ -27,15 +27,15 @@
#include <klocale.h>
#include "misc/Debug.h"
-#include <kactioncollection.h>
-#include <kaction.h>
+#include <tdeactioncollection.h>
+#include <tdeaction.h>
#include <kcommand.h>
#include <kstdaction.h>
#include <tqobject.h>
#include <tqpopupmenu.h>
#include <tqregexp.h>
#include <tqstring.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
namespace Rosegarden