diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:49:30 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:49:30 -0600 |
| commit | a9bde819f2b421dcc44741156e75eca4bb5fb4f4 (patch) | |
| tree | d087071b1e8fcf79698938efec19f8e48bab0799 /akregator/src/mk4storage | |
| parent | 5c4a80ead2b1fe57dc6a8c29d0368792344cd61e (diff) | |
| download | tdepim-a9bde819f2b421dcc44741156e75eca4bb5fb4f4.tar.gz tdepim-a9bde819f2b421dcc44741156e75eca4bb5fb4f4.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'akregator/src/mk4storage')
| -rw-r--r-- | akregator/src/mk4storage/feedstoragemk4impl.cpp | 2 | ||||
| -rw-r--r-- | akregator/src/mk4storage/storagemk4impl.cpp | 2 | ||||
| -rw-r--r-- | akregator/src/mk4storage/storagemk4impl.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/akregator/src/mk4storage/feedstoragemk4impl.cpp b/akregator/src/mk4storage/feedstoragemk4impl.cpp index 3b567933b..58d5e31f9 100644 --- a/akregator/src/mk4storage/feedstoragemk4impl.cpp +++ b/akregator/src/mk4storage/feedstoragemk4impl.cpp @@ -148,7 +148,7 @@ FeedStorageMK4Impl::FeedStorageMK4Impl(const TQString& url, StorageMK4Impl* main TQString t = url2; TQString t2 = url2; TQString filePath = main->archivePath() +"/"+ t.replace("/", "_").replace(":", "_"); - d->oldArchivePath = KGlobal::dirs()->saveLocation("data", "akregator/Archive/") + t2.replace("/", "_").replace(":", "_") + ".xml"; + d->oldArchivePath = TDEGlobal::dirs()->saveLocation("data", "akregator/Archive/") + t2.replace("/", "_").replace(":", "_") + ".xml"; d->convert = !TQFile::exists(filePath + ".mk4") && TQFile::exists(d->oldArchivePath); d->storage = new c4_Storage((filePath + ".mk4").local8Bit(), true); diff --git a/akregator/src/mk4storage/storagemk4impl.cpp b/akregator/src/mk4storage/storagemk4impl.cpp index becbd5186..1e104bd3f 100644 --- a/akregator/src/mk4storage/storagemk4impl.cpp +++ b/akregator/src/mk4storage/storagemk4impl.cpp @@ -90,7 +90,7 @@ StorageMK4Impl::StorageMK4Impl() : d(new StorageMK4ImplPrivate) TQString StorageMK4Impl::defaultArchivePath() { - return KGlobal::dirs()->saveLocation("data", "akregator")+"Archive"; + return TDEGlobal::dirs()->saveLocation("data", "akregator")+"Archive"; } StorageMK4Impl::~StorageMK4Impl() diff --git a/akregator/src/mk4storage/storagemk4impl.h b/akregator/src/mk4storage/storagemk4impl.h index 182807a88..d6c4a59c9 100644 --- a/akregator/src/mk4storage/storagemk4impl.h +++ b/akregator/src/mk4storage/storagemk4impl.h @@ -46,7 +46,7 @@ class StorageMK4Impl : public Storage virtual ~StorageMK4Impl(); - /** KGlobal::dirs()->saveLocation("data", "akregator")+"/Archive" */ + /** TDEGlobal::dirs()->saveLocation("data", "akregator")+"/Archive" */ static TQString defaultArchivePath(); /** sets the directory where the metakit files will be stored. |