summaryrefslogtreecommitdiffstats
path: root/kivio/kiviopart/kiviostencilsetaction.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-01-22 19:55:40 -0600
committerTimothy Pearson <[email protected]>2013-01-22 19:55:40 -0600
commit73ff676f11662d6178c8854a7832ebffe2ae409d (patch)
tree9e89ea7d87940087d2d3c5db9b378ef989dd1346 /kivio/kiviopart/kiviostencilsetaction.cpp
parentc2ba2f56121c21a762619faf195e8332ef5b224f (diff)
downloadkoffice-73ff676f11662d6178c8854a7832ebffe2ae409d.tar.gz
koffice-73ff676f11662d6178c8854a7832ebffe2ae409d.zip
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kivio/kiviopart/kiviostencilsetaction.cpp')
-rw-r--r--kivio/kiviopart/kiviostencilsetaction.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/kivio/kiviopart/kiviostencilsetaction.cpp b/kivio/kiviopart/kiviostencilsetaction.cpp
index 0741dfdc..3c798b37 100644
--- a/kivio/kiviopart/kiviostencilsetaction.cpp
+++ b/kivio/kiviopart/kiviostencilsetaction.cpp
@@ -129,7 +129,7 @@ int KivioStencilSetAction::plug( TQWidget* widget, int index)
index );
else
{
- KInstance *instance;
+ TDEInstance *instance;
if ( m_parentCollection )
instance = m_parentCollection->instance();