diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:47:22 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:47:22 -0600 |
| commit | 28edc0aa2ab09297288186f5bc15765eb7be58c0 (patch) | |
| tree | 7b7a01768b3781763186c825af21bb14717d2c32 /tdecore/network | |
| parent | 07c48c43ff72c237e4028154f4594102b798073f (diff) | |
| download | tdelibs-28edc0aa2ab09297288186f5bc15765eb7be58c0.tar.gz tdelibs-28edc0aa2ab09297288186f5bc15765eb7be58c0.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'tdecore/network')
| -rw-r--r-- | tdecore/network/kresolverstandardworkers.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tdecore/network/kresolverstandardworkers.cpp b/tdecore/network/kresolverstandardworkers.cpp index 77c085e08..41075685e 100644 --- a/tdecore/network/kresolverstandardworkers.cpp +++ b/tdecore/network/kresolverstandardworkers.cpp @@ -84,7 +84,7 @@ void KBlacklistWorker::init() // HACK! // FIXME KDE4: How do I detect there is an instance, without triggering // its creation or an assertion fault? - if (!KGlobal::_instance) + if (!TDEGlobal::_instance) return; static bool beenhere = false; @@ -99,7 +99,7 @@ void KBlacklistWorker::init() void KBlacklistWorker::loadBlacklist() { TQMutexLocker locker(&blacklistMutex); - TQStringList filelist = KGlobal::dirs()->findAllResources("config", "ipv6blacklist"); + TQStringList filelist = TDEGlobal::dirs()->findAllResources("config", "ipv6blacklist"); TQStringList::ConstIterator it = filelist.constBegin(), end = filelist.constEnd(); |