summaryrefslogtreecommitdiffstats
path: root/kioslaves
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-22 20:22:15 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-22 20:22:15 -0600
commit5fc6f26e12b596addd235f87320c31761bd5a84d (patch)
tree0a1ff964c23fce07fc088017df4ad537d57e62e5 /kioslaves
parent12c8a23fe75817cb4bfcd604c1863266dd75e840 (diff)
downloadtdepim-5fc6f26e12b596addd235f87320c31761bd5a84d.tar.gz
tdepim-5fc6f26e12b596addd235f87320c31761bd5a84d.zip
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kioslaves')
-rw-r--r--kioslaves/imap4/imap4.cc2
-rw-r--r--kioslaves/mbox/mbox.cc2
-rw-r--r--kioslaves/opengroupware/opengroupware.cpp2
-rw-r--r--kioslaves/sieve/sieve.cpp2
4 files changed, 4 insertions, 4 deletions
diff --git a/kioslaves/imap4/imap4.cc b/kioslaves/imap4/imap4.cc
index 81a941b34..e17808a0d 100644
--- a/kioslaves/imap4/imap4.cc
+++ b/kioslaves/imap4/imap4.cc
@@ -109,7 +109,7 @@ kdemain (int argc, char **argv)
{
kdDebug(7116) << "IMAP4::kdemain" << endl;
- KInstance instance ("kio_imap4");
+ TDEInstance instance ("kio_imap4");
if (argc != 4)
{
fprintf(stderr, "Usage: kio_imap4 protocol domain-socket1 domain-socket2\n");
diff --git a/kioslaves/mbox/mbox.cc b/kioslaves/mbox/mbox.cc
index 250fbe1c6..d351bdba0 100644
--- a/kioslaves/mbox/mbox.cc
+++ b/kioslaves/mbox/mbox.cc
@@ -43,7 +43,7 @@ extern "C" { KDE_EXPORT int kdemain(int argc, char* argv[]); }
int kdemain( int argc, char * argv[] )
{
KLocale::setMainCatalogue("tdelibs");
- KInstance instance("kio_mbox");
+ TDEInstance instance("kio_mbox");
(void) KGlobal::locale();
if (argc != 4) {
diff --git a/kioslaves/opengroupware/opengroupware.cpp b/kioslaves/opengroupware/opengroupware.cpp
index 0b1a8a557..70ffd7dcc 100644
--- a/kioslaves/opengroupware/opengroupware.cpp
+++ b/kioslaves/opengroupware/opengroupware.cpp
@@ -69,7 +69,7 @@ KDE_EXPORT int kdemain( int argc, char **argv );
int kdemain( int argc, char **argv )
{
- KInstance instance( "kio_OpenGroupware" );
+ TDEInstance instance( "kio_OpenGroupware" );
kdDebug(7000) << "Starting kio_OpenGroupware(pid: " << getpid() << ")" << endl;
diff --git a/kioslaves/sieve/sieve.cpp b/kioslaves/sieve/sieve.cpp
index 8132834a0..4e95c5a16 100644
--- a/kioslaves/sieve/sieve.cpp
+++ b/kioslaves/sieve/sieve.cpp
@@ -82,7 +82,7 @@ extern "C"
{
KDE_EXPORT int kdemain(int argc, char **argv)
{
- KInstance instance("kio_sieve" );
+ TDEInstance instance("kio_sieve" );
ksDebug() << "*** Starting kio_sieve " << endl;