diff options
| author | Timothy Pearson <[email protected]> | 2013-01-24 13:47:46 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-24 13:47:46 -0600 |
| commit | 27430f06c6cc2187c639f59f342f07f1fde91a8b (patch) | |
| tree | 493c1095950b7f0a82690cedac1b749666be1b47 /kmix/kmix.h | |
| parent | 794a886cbd6d6893d62026f3800b95051652fc5a (diff) | |
| download | tdemultimedia-27430f06c6cc2187c639f59f342f07f1fde91a8b.tar.gz tdemultimedia-27430f06c6cc2187c639f59f342f07f1fde91a8b.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kmix/kmix.h')
| -rw-r--r-- | kmix/kmix.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kmix/kmix.h b/kmix/kmix.h index b116af22..870fcb2e 100644 --- a/kmix/kmix.h +++ b/kmix/kmix.h @@ -38,7 +38,7 @@ class TQWidgetStack; #include <kmainwindow.h> class KAccel; -class KGlobalAccel; +class TDEGlobalAccel; class KComboBox; class KMixerWidget; class KMixerPrefWidget; @@ -92,7 +92,7 @@ KMixWindow : public KMainWindow private: KAccel *m_keyAccel; - KGlobalAccel *m_globalAccel; + TDEGlobalAccel *m_globalAccel; TQPopupMenu *m_fileMenu; TQPopupMenu *m_viewMenu; TQPopupMenu *m_helpMenu; |