summaryrefslogtreecommitdiffstats
path: root/src/gui/configuration
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/gui/configuration
parentfb3718a55f355cd22f9eb9fa4e89cd3b84b8c9ca (diff)
downloadrosegarden-990bf92fa5cefbe5ebb34a172d18bb3df745bd7a.tar.gz
rosegarden-990bf92fa5cefbe5ebb34a172d18bb3df745bd7a.zip
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'src/gui/configuration')
-rw-r--r--src/gui/configuration/DocumentMetaConfigurationPage.cpp2
-rw-r--r--src/gui/configuration/HeadersConfigurationPage.cpp2
-rw-r--r--src/gui/configuration/NotationConfigurationPage.cpp2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/configuration/DocumentMetaConfigurationPage.cpp b/src/gui/configuration/DocumentMetaConfigurationPage.cpp
index c554633..fc1488f 100644
--- a/src/gui/configuration/DocumentMetaConfigurationPage.cpp
+++ b/src/gui/configuration/DocumentMetaConfigurationPage.cpp
@@ -43,7 +43,7 @@
#include "gui/general/GUIPalette.h"
#include "TabbedConfigurationPage.h"
#include <tdeconfig.h>
-#include <klistview.h>
+#include <tdelistview.h>
#include <tqframe.h>
#include <tqlabel.h>
#include <tqlistview.h>
diff --git a/src/gui/configuration/HeadersConfigurationPage.cpp b/src/gui/configuration/HeadersConfigurationPage.cpp
index 9357145..132df33 100644
--- a/src/gui/configuration/HeadersConfigurationPage.cpp
+++ b/src/gui/configuration/HeadersConfigurationPage.cpp
@@ -33,7 +33,7 @@
#include <kapplication.h>
#include <tdeconfig.h>
-#include <klistview.h>
+#include <tdelistview.h>
#include <klocale.h>
#include <tqgroupbox.h>
#include <tqlabel.h>
diff --git a/src/gui/configuration/NotationConfigurationPage.cpp b/src/gui/configuration/NotationConfigurationPage.cpp
index e5cbb32..9bb61d7 100644
--- a/src/gui/configuration/NotationConfigurationPage.cpp
+++ b/src/gui/configuration/NotationConfigurationPage.cpp
@@ -45,7 +45,7 @@
#include "TabbedConfigurationPage.h"
#include <kcombobox.h>
#include <tdeconfig.h>
-#include <kfontrequester.h>
+#include <tdefontrequester.h>
#include <kmessagebox.h>
#include <tqcheckbox.h>
#include <tqcombobox.h>