diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:20:05 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:20:05 -0600 |
| commit | b19ddece21e102b8e4b292037ca7578f60b128fe (patch) | |
| tree | 6572ca25aba80849cdfa7578bbbc9121d23afbc3 /kioslave/http | |
| parent | e729c6d549f12e27b358a1dad04ff254c033ac71 (diff) | |
| download | tdelibs-b19ddece21e102b8e4b292037ca7578f60b128fe.tar.gz tdelibs-b19ddece21e102b8e4b292037ca7578f60b128fe.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kioslave/http')
| -rw-r--r-- | kioslave/http/http.cc | 2 | ||||
| -rw-r--r-- | kioslave/http/http_cache_cleaner.cpp | 2 | ||||
| -rw-r--r-- | kioslave/http/kcookiejar/main.cpp | 2 | ||||
| -rw-r--r-- | kioslave/http/kcookiejar/tests/kcookiejartest.cpp | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/kioslave/http/http.cc b/kioslave/http/http.cc index bb9eb5866..8c732d823 100644 --- a/kioslave/http/http.cc +++ b/kioslave/http/http.cc @@ -99,7 +99,7 @@ extern "C" { int kdemain( int argc, char **argv ) { KLocale::setMainCatalogue("tdelibs"); - KInstance instance( "kio_http" ); + TDEInstance instance( "kio_http" ); ( void ) KGlobal::locale(); if (argc != 4) diff --git a/kioslave/http/http_cache_cleaner.cpp b/kioslave/http/http_cache_cleaner.cpp index a94ce3206..4a140262e 100644 --- a/kioslave/http/http_cache_cleaner.cpp +++ b/kioslave/http/http_cache_cleaner.cpp @@ -200,7 +200,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv) bool deleteAll = args->isSet("clear-all"); - KInstance ins( appName ); + TDEInstance ins( appName ); if (!deleteAll) { diff --git a/kioslave/http/kcookiejar/main.cpp b/kioslave/http/kcookiejar/main.cpp index 87cefe3bb..e24112888 100644 --- a/kioslave/http/kcookiejar/main.cpp +++ b/kioslave/http/kcookiejar/main.cpp @@ -48,7 +48,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char *argv[]) TDECmdLineArgs::addCmdLineOptions( options ); - KInstance a("kcookiejar"); + TDEInstance a("kcookiejar"); kapp->dcopClient()->attach(); diff --git a/kioslave/http/kcookiejar/tests/kcookiejartest.cpp b/kioslave/http/kcookiejar/tests/kcookiejartest.cpp index d457ae5c0..05f0ac0ea 100644 --- a/kioslave/http/kcookiejar/tests/kcookiejartest.cpp +++ b/kioslave/http/kcookiejar/tests/kcookiejartest.cpp @@ -249,12 +249,12 @@ int main(int argc, char *argv[]) lastYear = new TQCString(TQString("Fri, 04-May-%1 01:00:00 GMT").arg(TQDate::currentDate().year()-1).utf8()); nextYear = new TQCString(TQString(" expires=Fri, 04-May-%1 01:00:00 GMT").arg(TQDate::currentDate().year()+1).utf8()); - KAboutData about("kcookietest", "kcookietest", "1.0", description, KAboutData::License_GPL, "(C) 2004 Waldo Bastian"); + TDEAboutData about("kcookietest", "kcookietest", "1.0", description, TDEAboutData::License_GPL, "(C) 2004 Waldo Bastian"); TDECmdLineArgs::init( argc, argv, &about); TDECmdLineArgs::addCmdLineOptions( options ); - KInstance a("kcookietest"); + TDEInstance a("kcookietest"); TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); if (args->count() != 1) |