summaryrefslogtreecommitdiffstats
path: root/konqueror/about/konq_aboutpage.cc
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 /konqueror/about/konq_aboutpage.cc
parent1e0a98b8623428064963b1627e4e09ea02c1e87e (diff)
downloadtdebase-1d061b286a8b183b39be60fe531f2b1c2915f03a.tar.gz
tdebase-1d061b286a8b183b39be60fe531f2b1c2915f03a.zip
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'konqueror/about/konq_aboutpage.cc')
-rw-r--r--konqueror/about/konq_aboutpage.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/konqueror/about/konq_aboutpage.cc b/konqueror/about/konq_aboutpage.cc
index d9e62d28a..6b573d438 100644
--- a/konqueror/about/konq_aboutpage.cc
+++ b/konqueror/about/konq_aboutpage.cc
@@ -21,7 +21,7 @@
K_EXPORT_COMPONENT_FACTORY( konq_aboutpage, KonqAboutPageFactory )
-KInstance *KonqAboutPageFactory::s_instance = 0;
+TDEInstance *KonqAboutPageFactory::s_instance = 0;
TQString *KonqAboutPageFactory::s_launch_html = 0;
TQString *KonqAboutPageFactory::s_intro_html = 0;
TQString *KonqAboutPageFactory::s_specs_html = 0;
@@ -31,7 +31,7 @@ TQString *KonqAboutPageFactory::s_plugins_html = 0;
KonqAboutPageFactory::KonqAboutPageFactory( TQObject *parent, const char *name )
: KParts::Factory( parent, name )
{
- s_instance = new KInstance( "konqaboutpage" );
+ s_instance = new TDEInstance( "konqaboutpage" );
}
KonqAboutPageFactory::~KonqAboutPageFactory()