summaryrefslogtreecommitdiffstats
path: root/src/gui/editors/segment/MarkerEditor.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:26:42 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:26:42 -0600
commit59ff04ffaf48f18383b39ea6da17b8e18b6b50c3 (patch)
tree3c5878d4255116c6146b38687214acf355eb7564 /src/gui/editors/segment/MarkerEditor.cpp
parentc329cc4e7edb85184878ba8238c4344cbaba2ac0 (diff)
downloadrosegarden-59ff04ffaf48f18383b39ea6da17b8e18b6b50c3.tar.gz
rosegarden-59ff04ffaf48f18383b39ea6da17b8e18b6b50c3.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'src/gui/editors/segment/MarkerEditor.cpp')
-rw-r--r--src/gui/editors/segment/MarkerEditor.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/editors/segment/MarkerEditor.cpp b/src/gui/editors/segment/MarkerEditor.cpp
index 20fb211..0f25aeb 100644
--- a/src/gui/editors/segment/MarkerEditor.cpp
+++ b/src/gui/editors/segment/MarkerEditor.cpp
@@ -387,7 +387,7 @@ MarkerEditor::setupActions()
actionCollection(),
KStdAction::stdName(KStdAction::Redo));
- TQString pixmapDir = KGlobal::dirs()->findResource("appdata", "pixmaps/");
+ TQString pixmapDir = TDEGlobal::dirs()->findResource("appdata", "pixmaps/");
kapp->config()->setGroup(MarkerEditorConfigGroup);
int timeMode = kapp->config()->readNumEntry("timemode", 0);