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/konq_viewmgr.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/konq_viewmgr.h')
| -rw-r--r-- | konqueror/konq_viewmgr.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/konqueror/konq_viewmgr.h b/konqueror/konq_viewmgr.h index 0e1a7f3dc..9b5c4e5b3 100644 --- a/konqueror/konq_viewmgr.h +++ b/konqueror/konq_viewmgr.h @@ -313,7 +313,7 @@ protected: const TQString &name, const KURL & defaultURL, bool openURL, bool openAfterCurrentPage = false ); // Disabled - we do it ourselves - virtual void setActiveInstance( KInstance * ) {} + virtual void setActiveInstance( TDEInstance * ) {} private: |