diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 19:55:40 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 19:55:40 -0600 |
| commit | 73ff676f11662d6178c8854a7832ebffe2ae409d (patch) | |
| tree | 9e89ea7d87940087d2d3c5db9b378ef989dd1346 /lib/kotext | |
| parent | c2ba2f56121c21a762619faf195e8332ef5b224f (diff) | |
| download | koffice-73ff676f11662d6178c8854a7832ebffe2ae409d.tar.gz koffice-73ff676f11662d6178c8854a7832ebffe2ae409d.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'lib/kotext')
| -rw-r--r-- | lib/kotext/KoTextView.cpp | 2 | ||||
| -rw-r--r-- | lib/kotext/KoTextView.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/kotext/KoTextView.cpp b/lib/kotext/KoTextView.cpp index cb8116c9d..47d7004b2 100644 --- a/lib/kotext/KoTextView.cpp +++ b/lib/kotext/KoTextView.cpp @@ -1087,7 +1087,7 @@ KoLinkVariable * KoTextView::linkVariable() return dynamic_cast<KoLinkVariable *>(variable()); } -TQPtrList<KAction> KoTextView::dataToolActionList(KInstance * instance, const TQString& word, bool & _singleWord ) +TQPtrList<KAction> KoTextView::dataToolActionList(TDEInstance * instance, const TQString& word, bool & _singleWord ) { m_singleWord = false; m_wordUnderCursor = TQString(); diff --git a/lib/kotext/KoTextView.h b/lib/kotext/KoTextView.h index d1e9ee446..0954192bc 100644 --- a/lib/kotext/KoTextView.h +++ b/lib/kotext/KoTextView.h @@ -36,7 +36,7 @@ class KoParagCounter; class KCommand; class TQTimer; class KAction; -class KInstance; +class TDEInstance; class KDataToolInfo; class KoLinkVariable; class KoVariable; @@ -134,7 +134,7 @@ public: TQString wordUnderCursor( const KoTextCursor& cursor ); /** Return the list of actions from data-tools. Used to populate a RMB popupmenu usually. */ - TQPtrList<KAction> dataToolActionList( KInstance * instance, const TQString& word, bool & _singleWord ); + TQPtrList<KAction> dataToolActionList( TDEInstance * instance, const TQString& word, bool & _singleWord ); void insertSoftHyphen(); void insertLineBreak(); |