diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:18:28 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:18:28 -0600 |
commit | 934db26c3f8efe148a5680c22f965ee10f818a61 (patch) | |
tree | 4a47cbb3ef398d11fa9283b5afdcd0a8d84fad7c /src/global.h | |
parent | a1fb52e00e362130a46b34570e53f2c1f322f373 (diff) | |
download | basket-934db26c3f8efe148a5680c22f965ee10f818a61.tar.gz basket-934db26c3f8efe148a5680c22f965ee10f818a61.zip |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'src/global.h')
-rw-r--r-- | src/global.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/global.h b/src/global.h index 7c4af68..35571ac 100644 --- a/src/global.h +++ b/src/global.h @@ -29,7 +29,7 @@ class DebugWindow; class BackgroundManager; class SystemTray; class BNPView; -class KGlobalAccel; +class TDEGlobalAccel; class KMainWindow; class TDEAboutData; @@ -49,7 +49,7 @@ class Global static BackgroundManager *backgroundManager; static SystemTray *systemTray; static BNPView *bnpView; - static KGlobalAccel *globalAccel; + static TDEGlobalAccel *globalAccel; static KConfig *basketConfig; static AboutData basketAbout; |