summaryrefslogtreecommitdiffstats
path: root/src/gui/editors/notation/NotationView.h
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/notation/NotationView.h
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/notation/NotationView.h')
-rw-r--r--src/gui/editors/notation/NotationView.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/editors/notation/NotationView.h b/src/gui/editors/notation/NotationView.h
index 861a523..56b39ae 100644
--- a/src/gui/editors/notation/NotationView.h
+++ b/src/gui/editors/notation/NotationView.h
@@ -366,7 +366,7 @@ public slots:
*/
void slotPrintLilyPond();
void slotPreviewLilyPond();
- void slotLilyPondViewProcessExited(KProcess *);
+ void slotLilyPondViewProcessExited(TDEProcess *);
/**
* put the marked text/object into the clipboard and remove it
@@ -1115,7 +1115,7 @@ protected:
bool m_printMode;
int m_printSize;
- static std::map<KProcess *, KTempFile *> m_lilyTempFileMap;
+ static std::map<TDEProcess *, KTempFile *> m_lilyTempFileMap;
int m_showHeadersGroup;
QDeferScrollView * m_headersGroupView;