summaryrefslogtreecommitdiffstats
path: root/lib/kotext/KoTextView.h
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-22 19:55:40 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-22 19:55:40 -0600
commit73ff676f11662d6178c8854a7832ebffe2ae409d (patch)
tree9e89ea7d87940087d2d3c5db9b378ef989dd1346 /lib/kotext/KoTextView.h
parentc2ba2f56121c21a762619faf195e8332ef5b224f (diff)
downloadkoffice-73ff676f11662d6178c8854a7832ebffe2ae409d.tar.gz
koffice-73ff676f11662d6178c8854a7832ebffe2ae409d.zip
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'lib/kotext/KoTextView.h')
-rw-r--r--lib/kotext/KoTextView.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/kotext/KoTextView.h b/lib/kotext/KoTextView.h
index d1e9ee44..0954192b 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();