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.cpp | |
| 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.cpp')
| -rw-r--r-- | src/global.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/global.cpp b/src/global.cpp index f8b6f74..220147f 100644 --- a/src/global.cpp +++ b/src/global.cpp @@ -40,7 +40,7 @@ DebugWindow *Global::debugWindow = 0L; BackgroundManager *Global::backgroundManager = 0L; SystemTray *Global::systemTray = 0L; BNPView *Global::bnpView = 0L; -KGlobalAccel *Global::globalAccel = 0L; +TDEGlobalAccel *Global::globalAccel = 0L; KConfig *Global::basketConfig = 0L; AboutData Global::basketAbout; @@ -64,7 +64,7 @@ TQString Global::savesFolder() dir.mkdir(s_customSavesFolder); folder = new TQString(Settings::dataFolder().endsWith("/") ? Settings::dataFolder() : Settings::dataFolder() + "/"); } else { // The default path (should be that for most computers) - folder = new TQString(KGlobal::dirs()->saveLocation("data", "basket/")); + folder = new TQString(TDEGlobal::dirs()->saveLocation("data", "basket/")); } } |