diff options
| author | Timothy Pearson <[email protected]> | 2013-01-22 20:15:55 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-22 20:15:55 -0600 |
| commit | 1d061b286a8b183b39be60fe531f2b1c2915f03a (patch) | |
| tree | 0a4c6ee79918e366077094fb59e9c1196d7f4156 /konqueror/listview/konq_listview.h | |
| parent | 1e0a98b8623428064963b1627e4e09ea02c1e87e (diff) | |
| download | tdebase-1d061b286a8b183b39be60fe531f2b1c2915f03a.tar.gz tdebase-1d061b286a8b183b39be60fe531f2b1c2915f03a.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'konqueror/listview/konq_listview.h')
| -rw-r--r-- | konqueror/listview/konq_listview.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/konqueror/listview/konq_listview.h b/konqueror/listview/konq_listview.h index a6dc8450e..40f8b2269 100644 --- a/konqueror/listview/konq_listview.h +++ b/konqueror/listview/konq_listview.h @@ -46,11 +46,11 @@ public: virtual KParts::Part* createPartObject( TQWidget *parentWidget, const char *, TQObject *parent, const char *name, const char*, const TQStringList &args ); - static KInstance *instance(); + static TDEInstance *instance(); static KonqPropsView *defaultViewProps(); private: - static KInstance *s_instance; + static TDEInstance *s_instance; static KonqPropsView *s_defaultViewProps; }; |