diff options
author | Timothy Pearson <[email protected]> | 2013-01-24 13:26:42 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2013-01-24 13:26:42 -0600 |
commit | 59ff04ffaf48f18383b39ea6da17b8e18b6b50c3 (patch) | |
tree | 3c5878d4255116c6146b38687214acf355eb7564 /src/gui/application/RosegardenGUIApp.h | |
parent | c329cc4e7edb85184878ba8238c4344cbaba2ac0 (diff) | |
download | rosegarden-59ff04ffaf48f18383b39ea6da17b8e18b6b50c3.tar.gz rosegarden-59ff04ffaf48f18383b39ea6da17b8e18b6b50c3.zip |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'src/gui/application/RosegardenGUIApp.h')
-rw-r--r-- | src/gui/application/RosegardenGUIApp.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/gui/application/RosegardenGUIApp.h b/src/gui/application/RosegardenGUIApp.h index 23933ea..4e5cc34 100644 --- a/src/gui/application/RosegardenGUIApp.h +++ b/src/gui/application/RosegardenGUIApp.h @@ -52,7 +52,7 @@ class KURL; class KTempFile; class KToggleAction; class KRecentFilesAction; -class KProcess; +class TDEProcess; class KConfig; class KAction; @@ -674,7 +674,7 @@ public slots: */ void slotPrintLilyPond(); void slotPreviewLilyPond(); - void slotLilyPondViewProcessExited(KProcess *); + void slotLilyPondViewProcessExited(TDEProcess *); /** * Let the user enter a MusicXml file to export to @@ -1132,7 +1132,7 @@ public slots: /** * Called when the sequencer auxiliary process exits */ - void slotSequencerExited(KProcess*); + void slotSequencerExited(TDEProcess*); /// When the transport closes void slotCloseTransport(); @@ -1600,11 +1600,11 @@ private: KAction *m_rewindEndTransport; KAction *m_ffwdEndTransport; - KProcess* m_sequencerProcess; + TDEProcess* m_sequencerProcess; bool m_sequencerCheckedIn; #ifdef HAVE_LIBJACK - KProcess* m_jackProcess; + TDEProcess* m_jackProcess; #endif // HAVE_LIBJACK ZoomSlider<double> *m_zoomSlider; @@ -1663,7 +1663,7 @@ private: static RosegardenGUIApp *m_myself; - static std::map<KProcess *, KTempFile *> m_lilyTempFileMap; + static std::map<TDEProcess *, KTempFile *> m_lilyTempFileMap; // Used to fetch the current sequencer position from the mmapped sequencer information file // |