diff options
| author | Timothy Pearson <[email protected]> | 2013-01-24 13:43:14 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-24 13:43:14 -0600 |
| commit | 79b21d47bce1ee428affc97534cd8b257232a871 (patch) | |
| tree | 0df1fa0109d9f2bcef932eda8b5c25b2e06669ed /kdesktop/desktop.h | |
| parent | 9a898d493f493adbc404f7223043c85f3817472b (diff) | |
| download | tdebase-79b21d47bce1ee428affc97534cd8b257232a871.tar.gz tdebase-79b21d47bce1ee428affc97534cd8b257232a871.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kdesktop/desktop.h')
| -rw-r--r-- | kdesktop/desktop.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kdesktop/desktop.h b/kdesktop/desktop.h index a681dc9a5..3aa81241c 100644 --- a/kdesktop/desktop.h +++ b/kdesktop/desktop.h @@ -32,7 +32,7 @@ class KURL; class TQCloseEvent; class TQDropEvent; class TQPopupMenu; -class KGlobalAccel; +class TDEGlobalAccel; class KWinModule; class KBackgroundManager; class TQTimer; @@ -187,7 +187,7 @@ signals: private: - KGlobalAccel *keys; + TDEGlobalAccel *keys; KWinModule* m_pKwinmodule; |