diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:15:55 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:15:55 -0600 |
| commit | 1d061b286a8b183b39be60fe531f2b1c2915f03a (patch) | |
| tree | 0a4c6ee79918e366077094fb59e9c1196d7f4156 /konqueror/sidebar/test | |
| parent | 1e0a98b8623428064963b1627e4e09ea02c1e87e (diff) | |
| download | tdebase-1d061b286a8b183b39be60fe531f2b1c2915f03a.tar.gz tdebase-1d061b286a8b183b39be60fe531f2b1c2915f03a.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'konqueror/sidebar/test')
| -rw-r--r-- | konqueror/sidebar/test/konqsidebartest.cpp | 2 | ||||
| -rw-r--r-- | konqueror/sidebar/test/konqsidebartest.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/konqueror/sidebar/test/konqsidebartest.cpp b/konqueror/sidebar/test/konqsidebartest.cpp index a790ee7e1..2032fe202 100644 --- a/konqueror/sidebar/test/konqsidebartest.cpp +++ b/konqueror/sidebar/test/konqsidebartest.cpp @@ -19,7 +19,7 @@ extern "C" { - KDE_EXPORT void* create_konq_sidebartest(KInstance *instance,TQObject *par,TQWidget *widp,TQString &desktopname,const char *name) + KDE_EXPORT void* create_konq_sidebartest(TDEInstance *instance,TQObject *par,TQWidget *widp,TQString &desktopname,const char *name) { return new SidebarTest(instance,par,widp,desktopname,name); } diff --git a/konqueror/sidebar/test/konqsidebartest.h b/konqueror/sidebar/test/konqsidebartest.h index 5c36080fd..c5abab26c 100644 --- a/konqueror/sidebar/test/konqsidebartest.h +++ b/konqueror/sidebar/test/konqsidebartest.h @@ -24,7 +24,7 @@ class SidebarTest : public KonqSidebarPlugin { Q_OBJECT public: - SidebarTest(KInstance *inst,TQObject *parent,TQWidget *widgetParent, TQString &desktopName_, const char* name=0): + SidebarTest(TDEInstance *inst,TQObject *parent,TQWidget *widgetParent, TQString &desktopName_, const char* name=0): KonqSidebarPlugin(inst,parent,widgetParent,desktopName_,name) { widget=new TQLabel("Init Value",widgetParent); |