diff options
| author | Timothy Pearson <[email protected]> | 2013-01-25 00:05:29 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-25 00:05:29 -0600 |
| commit | e54e867af243223a620f12bf260e1af9ac9f6dc5 (patch) | |
| tree | 0e741cd6800d16c390671051ae525f760d87cdb5 /src/global.cpp | |
| parent | 934db26c3f8efe148a5680c22f965ee10f818a61 (diff) | |
| download | basket-e54e867af243223a620f12bf260e1af9ac9f6dc5.tar.gz basket-e54e867af243223a620f12bf260e1af9ac9f6dc5.zip | |
Rename KCModule, KConfig, KIO, KServer, and KSocket 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 220147f..b205478 100644 --- a/src/global.cpp +++ b/src/global.cpp @@ -41,7 +41,7 @@ BackgroundManager *Global::backgroundManager = 0L; SystemTray *Global::systemTray = 0L; BNPView *Global::bnpView = 0L; TDEGlobalAccel *Global::globalAccel = 0L; -KConfig *Global::basketConfig = 0L; +TDEConfig *Global::basketConfig = 0L; AboutData Global::basketAbout; void Global::setCustomSavesFolder(const TQString &folder) @@ -92,7 +92,7 @@ KMainWindow* Global::mainWindow() return 0; } -KConfig* Global::config() +TDEConfig* Global::config() { if(!Global::basketConfig) Global::basketConfig = KSharedConfig::openConfig("basketrc"); |