summaryrefslogtreecommitdiffstats
path: root/kioslave/thumbnail
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-22 20:15:55 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-22 20:15:55 -0600
commit1d061b286a8b183b39be60fe531f2b1c2915f03a (patch)
tree0a4c6ee79918e366077094fb59e9c1196d7f4156 /kioslave/thumbnail
parent1e0a98b8623428064963b1627e4e09ea02c1e87e (diff)
downloadtdebase-1d061b286a8b183b39be60fe531f2b1c2915f03a.tar.gz
tdebase-1d061b286a8b183b39be60fe531f2b1c2915f03a.zip
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kioslave/thumbnail')
-rw-r--r--kioslave/thumbnail/thumbnail.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/kioslave/thumbnail/thumbnail.cpp b/kioslave/thumbnail/thumbnail.cpp
index b73528610..29c3c8620 100644
--- a/kioslave/thumbnail/thumbnail.cpp
+++ b/kioslave/thumbnail/thumbnail.cpp
@@ -53,7 +53,7 @@
#include "thumbnail.h"
#include <kio/thumbcreator.h>
-// Use correctly KInstance instead of TDEApplication (but then no TQPixmap)
+// Use correctly TDEInstance instead of TDEApplication (but then no TQPixmap)
#undef USE_KINSTANCE
// Fix thumbnail: protocol
#define THUMBNAIL_HACK (1)
@@ -96,7 +96,7 @@ int kdemain(int argc, char **argv)
#endif
#ifdef USE_KINSTANCE
- KInstance instance("kio_thumbnail");
+ TDEInstance instance("kio_thumbnail");
#else
// creating TDEApplication in a slave in not a very good idea,
// as dispatchLoop() doesn't allow it to process its messages,