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 /kioslave/http | |
| parent | 07c48c43ff72c237e4028154f4594102b798073f (diff) | |
| download | tdelibs-28edc0aa2ab09297288186f5bc15765eb7be58c0.tar.gz tdelibs-28edc0aa2ab09297288186f5bc15765eb7be58c0.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kioslave/http')
| -rw-r--r-- | kioslave/http/http.cc | 4 | ||||
| -rw-r--r-- | kioslave/http/http_cache_cleaner.cpp | 2 | ||||
| -rw-r--r-- | kioslave/http/kcookiejar/kcookiewin.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/kioslave/http/http.cc b/kioslave/http/http.cc index 8c732d823..f6e714988 100644 --- a/kioslave/http/http.cc +++ b/kioslave/http/http.cc @@ -100,7 +100,7 @@ int kdemain( int argc, char **argv ) { KLocale::setMainCatalogue("tdelibs"); TDEInstance instance( "kio_http" ); - ( void ) KGlobal::locale(); + ( void ) TDEGlobal::locale(); if (argc != 4) { @@ -5120,7 +5120,7 @@ void HTTPProtocol::configAuth( char *p, bool isForProxy ) { //for sites like lib.homelinux.org TQTextCodec* oldCodec=TQTextCodec::codecForCStrings(); - if (KGlobal::locale()->language().contains("ru")) + if (TDEGlobal::locale()->language().contains("ru")) TQTextCodec::setCodecForCStrings(TQTextCodec::codecForName("CP1251")); p += 6; diff --git a/kioslave/http/http_cache_cleaner.cpp b/kioslave/http/http_cache_cleaner.cpp index 4a140262e..554d221d5 100644 --- a/kioslave/http/http_cache_cleaner.cpp +++ b/kioslave/http/http_cache_cleaner.cpp @@ -220,7 +220,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv) if (deleteAll) m_maxCacheSize = -1; - TQString strCacheDir = KGlobal::dirs()->saveLocation("cache", "http"); + TQString strCacheDir = TDEGlobal::dirs()->saveLocation("cache", "http"); TQDir cacheDir( strCacheDir ); if (!cacheDir.exists()) diff --git a/kioslave/http/kcookiejar/kcookiewin.cpp b/kioslave/http/kcookiejar/kcookiewin.cpp index ca86e0a16..57a22f62c 100644 --- a/kioslave/http/kcookiejar/kcookiewin.cpp +++ b/kioslave/http/kcookiejar/kcookiewin.cpp @@ -357,7 +357,7 @@ void KCookieDetail::slotNextCookie() TQDateTime cookiedate; cookiedate.setTime_t( m_cookie->expireDate() ); if ( m_cookie->expireDate() ) - m_expires->setText( KGlobal::locale()->formatDateTime(cookiedate) ); + m_expires->setText( TDEGlobal::locale()->formatDateTime(cookiedate) ); else m_expires->setText( i18n("End of Session") ); TQString sec; |